Skip to content

Beautiful Open-Source Form Builder

209a6 tailwind + nuxt UI migraiton (#813)

Julien Nahum1fe7abb597a5
diff --git a/.cursor/rules/api-query.mdc b/.cursor/rules/api-query.mdc
new file mode 100644
index 000000000..a739a0135
--- /dev/null
+++ b/.cursor/rules/api-query.mdc
@@ -0,0 +1,113 @@
+---
+description: Nuxt client side, API and TanStack Query patterns for data fetching, caching, and state management. Use when needed to change how data is fetched from back-end, or when working with @/api modules, @/composables/query files, cache invalidation, SSR data fetching, or TanStack Query implementation.
+globs:
+alwaysApply: false
+---
+
+# API & TanStack Query Guidelines
+
+> **Scope** – These rules cover _front-end server-state management_ in the Nuxt client. They do **not** address UI-only state (handled by Pinia) nor back-end Laravel endpoints.
+
+---
+
+## 1. Two-Layer Approach
+
+| Layer | Folder | Responsibility |
+| --------------------- | ---------------------------- | ------------------------------------------------------------------------------------------------ |
+| **API functions** | `client/api/*` | Thin wrappers around `$fetch` that talk to the REST API. No caching, no Vue code. |
+| **Query composables** | `client/composables/query/*` | Wrap API calls with TanStack Query for caching, mutations, optimistic updates, and invalidation. |
+
+> Example mapping – `client/api/workspace.js` ↔︎ `client/composables/query/useWorkspaces.js`
+
+---
+
+## 2. Query Composable Conventions
+
+1. **Expose factories, not results** – Each composable returns methods (`list()`, `detail(id)`, `create()`, …). The caller decides _when_ to register the query/mutation.
+2. **Query keys** – Use predictable, hierarchical keys:
+ - List: `["workspaces", "list"]`
+ - Item: `["workspaces", id]`
+3. **Cache writes after mutations** – Inside `onSuccess` use `queryClient.setQueryData` to update affected caches, then call `invalidate()` only when a true refetch is needed.
+4. **Utilities** – Provide at minimum `invalidate()` (call `queryClient.invalidateQueries({ queryKey: [domain] })`).
+
+---
+
+## 3. Usage in Components
+
+```vue
+<script setup>
+// Queries
+const { list } = useWorkspaces();
+const { data: workspaces, isLoading, isError } = list();
+
+// Mutations (Promise-based)
+const { create } = useWorkspaces();
+const createWorkspace = create();
+
+const onSubmit = (form) => {
+ createWorkspace
+ .mutateAsync(form)
+ .then(() => useAlert().success("Created"))
+ .catch((err) => useAlert().error(err.message));
+};
+</script>
+
+<template>
+ <div v-if="isLoading">Loading…</div>
+ <div v-else-if="isError">Failed to load</div>
+ <ul v-else>
+ <li v-for="ws in workspaces" :key="ws.id">{{ ws.name }}</li>
+ </ul>
+ <UButton :loading="createWorkspace.isPending" @click="onSubmit(form)"
+ >Create</UButton
+ >
+</template>
+```
+
+### Why `.mutateAsync().then().catch()`?
+
+It keeps control flow explicit, works with native Promises, and avoids `try/catch` inside template methods.
+
+---
+
+## 4. SSR & Suspense
+
+During SSR we sometimes need the data _before_ HTML is streamed. TanStack Query offers `.suspense()` on every query:
+
+```js
+// middleware/client/middleware/01.check-auth.global.js (excerpt)
+await Promise.all([
+ useAuth().user().suspense(),
+ useWorkspaces().list().suspense(),
+]);
+```
+
+`<Suspense>` blocks in Vue templates are discouraged – prefer awaiting in middleware or `serverPrefetch`.
+
+---
+
+## 5. Authentication Plumbing
+
+`client/composables/useOpnApi.js` injects `Authorization: Bearer <token>` automatically (token is stored in cookies). The `01.check-auth.global.js` middleware initializes the store and pre-loads user + workspace data on navigation.
+
+You normally **don’t** need to add headers manually.
+
+---
+
+## 6. Common Pitfalls
+
+| ❌ Anti-pattern | ✅ Fix |
+| -------------------------------------------- | -------------------------------------------------------- |
+| Creating queries inside `watch` / `computed` | Call composables at top level; use `enabled` when needed |
+| Mixing UI state in TanStack cache | Keep UI state in Pinia |
+| Broad `queryClient.invalidateQueries()` | Use domain-level `invalidate()` |
+
+---
+
+## 7. Checklist for New Composables
+
+- [ ] Map 1-to-1 with an API module
+- [ ] Provide `list`, `detail`, and the necessary mutations
+- [ ] Use consistent query keys
+- [ ] Handle optimistic cache updates in `onSuccess`
+- [ ] Expose `invalidate()`
diff --git a/.cursor/rules/forms.mdc b/.cursor/rules/forms.mdc
new file mode 100644
index 000000000..0f42308f6
--- /dev/null
+++ b/.cursor/rules/forms.mdc
@@ -0,0 +1,328 @@
+---
+description: Nuxt client: Form creation, validation, and state management patterns. Use when working with form components, input validation, error handling, form submission with TanStack Query mutations, or when creating/modifying forms with @/components/forms, useForm composable, or form-related functionality.
+globs:
+alwaysApply: false
+---
+# Forms Rules
+
+Guidelines for working with forms, validation, and user input in the OpnForm frontend.
+
+## Form Setup
+
+### Form Initialization
+- Always use `useForm()` composable for form state management
+- Initialize with default values for all form fields
+- Use descriptive field names that match API expectations
+
+```vue
+// ✅ Good - Initialize with defaults
+const form = useForm({
+ email: '',
+ password: '',
+ remember: false
+})
+
+// ❌ Bad - Empty initialization
+const form = useForm({})
+```
+
+### Form Template Structure
+- Always include `@submit.prevent="handleSubmit"` on form elements
+- Use semantic HTML form elements
+
+```vue
+// ✅ Good - Proper form structure
+<form @submit.prevent="handleSubmit">
+ <!-- form inputs -->
+</form>
+
+// ❌ Bad - Missing submit handler
+<form>
+ <!-- form inputs -->
+</form>
+```
+
+## Form Components
+
+### Input Component Usage
+- Pass `:form="form"` to all form input components
+- Use `name` attribute that matches form field names
+- Always provide meaningful labels for accessibility
+
+```vue
+// ✅ Good - Complete input props
+<TextInput
+ name="email"
+ :form="form"
+ label="Email Address"
+ type="email"
+ :required="true"
+ placeholder="Enter your email"
+/>
+
+// ❌ Bad - Missing required props
+<TextInput name="email" />
+```
+
+### Available Input Components
+- `<TextInput>` - Text, email, password, tel, url inputs
+- `<TextareaInput>` - Multi-line text areas
+- `<CheckboxInput>` - Boolean checkboxes
+- `<SelectInput>` - Dropdown selects
+- `<RadioInput>` - Radio button groups
+- `<FileInput>` - File uploads
+- Custom inputs should extend `useFormInput` composable
+
+### Custom Input Components
+- Use `useFormInput` composable for consistent behavior
+- Export `inputProps` for prop definitions
+- Emit `update:modelValue` for v-model compatibility
+
+```vue
+// ✅ Good - Custom input structure
+<script setup>
+import { useFormInput, inputProps } from '@/components/forms/useFormInput.js'
+
+const props = defineProps({
+ ...inputProps,
+ // Custom props here
+})
+
+const emit = defineEmits(['update:modelValue'])
+const { compVal, hasError, hasValidation } = useFormInput(props, { emit })
+</script>
+```
+
+## Validation & Error Handling
+
+### Client-Side Validation
+- Use HTML5 validation attributes (`required`, `type`, `pattern`)
+- Combine with server-side validation for comprehensive coverage
+- Validation errors are automatically cleared when input values change
+
+```vue
+// ✅ Good - Client-side validation
+<TextInput
+ name="email"
+ :form="form"
+ type="email"
+ :required="true"
+ label="Email Address"
+/>
+```
+
+### Server-Side Validation
+- Form automatically handles Laravel validation responses
+- No manual error handling needed for standard validation
+- API should return errors in Laravel format: `{ errors: { field: ["message"] } }`
+
+```js
+// ✅ Good - Let form handle validation errors
+form.mutate(mutation)
+ .then(() => {
+ // Handle success
+ })
+ .catch((error) => {
+ // Form automatically handles validation errors
+ // Only handle non-validation errors here
+ })
+```
+
+### Live Validation (Precognition)
+- Use `form.validate()` for real-time server validation
+- Typically trigger on `@blur` events for better UX
+- Pass specific fields to validate with `Set([fieldName])`
+
+```vue
+// ✅ Good - Live validation on blur
+<TextInput
+ name="email"
+ :form="form"
+ @blur="() => form.validate('post', '/api/endpoint', {}, new Set(['email']))"
+/>
+```
+
+## TanStack Query Integration
+
+### Form Submission with Mutations
+- Use `form.mutate(mutation)` for TanStack Query integration
+- Always return promises for proper error handling
+- Chain `.then()` and `.catch()` for control flow
+
+```vue
+// ✅ Good - TanStack Query integration
+<script setup>
+const { create } = useWorkspaces()
+const createMutation = create()
+
+const handleSubmit = () => {
+ form.mutate(createMutation)
+ .then((response) => {
+ useAlert().success('Success!')
+ // Handle success (redirect, etc.)
+ })
+ .catch((error) => {
+ // Form handles validation errors automatically
+ if (error.response?.status !== 422) {
+ useAlert().error('Something went wrong')
+ }
+ })
+}
+</script>
+```
+
+### Alternative: Direct API Calls
+- Use `form.post()`, `form.put()`, etc. for direct API calls
+- Only when TanStack Query mutations aren't available
+- Prefer TanStack Query for better caching and state management
+
+```js
+// ✅ Acceptable - Direct API calls when needed
+form.post('/api/endpoint')
+ .then((response) => {
+ // Handle success
+ })
+ .catch((error) => {
+ // Form handles errors automatically
+ })
+```
+
+## Form State Management
+
+### Form Methods
+- `form.data()` - Get current form data
+- `form.reset()` - Reset to original state
+- `form.resetAndFill(data)` - Clear and set new data
+- `form.clear()` - Clear errors and state
+- `form.fill(data)` - Update with partial data
+
+```js
+// ✅ Good - Using form methods
+const handleReset = () => {
+ form.reset() // Returns to original state
+}
+
+const handleNewData = (newData) => {
+ form.resetAndFill(newData) // Clear and set new data
+}
+```
+
+### Form State Properties
+- `form.busy` - Form is submitting
+- `form.successful` - Last submission successful
+- `form.recentlySuccessful` - Recently successful (with timeout)
+- `form.errors` - Error collection
+
+```vue
+// ✅ Good - Using form state
+<UButton
+ type="submit"
+ :loading="form.busy"
+ :disabled="form.busy"
+ label="Submit"
+/>
+
+<div v-if="form.recentlySuccessful" class="success-message">
+ Form submitted successfully!
+</div>
+```
+
+## Best Practices
+
+### Performance
+- Initialize forms with default values to prevent reactivity issues
+- Use `@blur` instead of `@input` for live validation to reduce API calls
+- Debounce live validation if needed for better UX
+
+### Accessibility
+- Always provide meaningful labels
+- Use proper input types (`email`, `tel`, `url`, etc.)
+- Include `aria-describedby` for error messages when needed
+- Ensure proper tab order and keyboard navigation
+
+### Error Handling
+- Let the form handle validation errors automatically
+- Only add custom error handling for business logic errors
+- Use `useAlert()` for user-friendly error messages
+- Don't duplicate error messages that the form already displays
+
+### Security
+- Never bypass server-side validation
+- Use proper input types to prevent XSS
+- Handle file uploads securely with proper validation
+- Validate sensitive operations server-side
+
+### User Experience
+- Validation errors are automatically cleared when input values change
+- Show loading states during form submission
+- Provide success feedback after successful submissions
+- Use placeholders and help text for guidance
+
+```vue
+// ✅ Good - Complete form example
+<template>
+ <form @submit.prevent="handleSubmit">
+ <TextInput
+ name="email"
+ :form="form"
+ label="Email Address"
+ type="email"
+ :required="true"
+ placeholder="Enter your email"
+ help="We'll never share your email with anyone"
+ />
+
+ <UButton
+ type="submit"
+ :loading="form.busy"
+ :disabled="form.busy"
+ label="Submit"
+ />
+ </form>
+</template>
+
+<script setup>
+const { create } = useWorkspaces()
+const createMutation = create()
+
+const form = useForm({
+ email: ''
+})
+
+const handleSubmit = () => {
+ form.mutate(createMutation)
+ .then(() => {
+ useAlert().success('Success!')
+ // Handle redirect or next steps
+ })
+ .catch((error) => {
+ if (error.response?.status !== 422) {
+ useAlert().error('Something went wrong')
+ }
+ })
+}
+</script>
+```
+
+## Common Patterns
+
+### Modal Forms
+- Use `form.resetAndFill()` when opening modals with existing data
+- Clear form state when closing modals
+- Handle success by closing modal and showing feedback
+
+### Multi-Step Forms
+- Use separate form instances for each step
+- Validate each step before proceeding
+- Combine data from all steps for final submission
+
+### File Uploads
+- Form automatically handles `FormData` serialization
+- Use `FileInput` component for file selection
+- Handle file validation server-side
+
+### Dynamic Forms
+- Use `form.fill()` to update form data dynamically
+- React to external data changes appropriately
+- Maintain form state consistency with external state
+
diff --git a/.cursor/rules/front-end.mdc b/.cursor/rules/front-end.mdc
index b0505f667..9b29155aa 100644
--- a/.cursor/rules/front-end.mdc
+++ b/.cursor/rules/front-end.mdc
@@ -1,30 +1,34 @@
---
description: Vue and Nuxt guidelines
globs: client/**.*
+alwaysApply: false
---
-You are an expert in Nuxt, Vue.js, Vue Router, Pinia, VueUse, NuxtUI library and Tailwind, with a deep understanding of best practices and performance optimization techniques in these technologies.
+You are an expert in Nuxt, Vue.js, Vue Router, Pinia, VueUse, NuxtUI v3 library and Tailwind, with a deep understanding of best practices and performance optimization techniques in these technologies.
-Code Style and Structure
+## Code Style and Structure
- Write concise, maintainable, and technically accurate code with relevant examples.
- Use functional and declarative programming patterns; avoid classes.
- Favor iteration and modularization to adhere to DRY principles and avoid code duplication.
- Use descriptive variable names with auxiliary verbs (e.g., isLoading, hasError).
- Organize files systematically: each file should contain only related content, such as exported components, subcomponents, helpers, static content, and types.
+- No need to import Vue Reactivity APIs like ref or computed, as well as lifecycle hooks and helpers in .vue components, as they are auto-imported by Nuxt
+- For promises and async, always use ().then().error().finally() syntax over try/catch/await
-Naming Conventions
+## Naming Conventions
- Use lowercase with dashes for directories (e.g., components/auth-wizard).
- Favor named exports for functions.
We don't use typescript, javascript only (except when really required for config file for instance).
-Syntax and Formatting
+## Syntax and Formatting
- Use the "function" keyword for pure functions to benefit from hoisting and clarity.
-- Always use the Vue Composition API script setup style. If a legacy file still used
+- Always use the Vue Composition API script setup style. If a legacy file still using options API, it it's short then directly update the script section. If it's longer and a bit more complex, make the requried change using the existing options API and at the end ask if you should migrate to composition API.
-UI and Styling
-- Use Nuxt UI components (https://ui.nuxt.com/components) and Tailwind for components and styling.
+## UI and Styling
+- Use Nuxt UI v3 components (https://ui.nuxt.com/components) and Tailwind for components and styling. Ex: <UModal>, <UPopover>, <UToolTip>, <UBadge> etc... Essentially use NuxtUI for everything but for form components.
- Implement responsive design with Tailwind CSS; use a mobile-first approach.
- Build UI components using atomic design principles, organizing them from smallest to largest (e.g., atoms, molecules, organisms, pages).
+- Icons: use the <Icon> component, and for icon names always use `i-library-icon` syntax.
Forms
- For forms inputs, use the components in client/components/forms such as <TextInput> etc.
diff --git a/.github/workflows/laravel.yml b/.github/workflows/laravel.yml
index 042329560..0f73288fd 100644
--- a/.github/workflows/laravel.yml
+++ b/.github/workflows/laravel.yml
@@ -64,7 +64,7 @@ jobs:
- name: Set up Node.js
uses: actions/setup-node@v4
with:
- node-version: "20"
+ node-version: "22.17.0"
- uses: actions/cache@v4
with:
@@ -207,7 +207,7 @@ jobs:
- name: Set up Node.js
uses: actions/setup-node@v4
with:
- node-version: "20"
+ node-version: "22.17.0"
- uses: actions/cache@v4
with:
diff --git a/README.md b/README.md
index 17c70e98f..9f8ea780b 100644
--- a/README.md
+++ b/README.md
@@ -16,8 +16,6 @@
<a href="https://github.com/JhumanJ/OpnForm/discussions/new?category=q-a"><img src="https://img.shields.io/badge/Ask a question-Github-%231F80C0" alt="Ask a question"></a>
<a href="https://feedback.opnform.com"><img src="https://img.shields.io/badge/Feature request-Featurebase-%231F80C0" alt="Ask a question"></a>
<a href="https://discord.gg/YTSjU2a9TS"><img src="https://dcbadge.vercel.app/api/server/YTSjU2a9TS?style=flat" alt="Ask a question"></a>
-<a href="https://console.algora.io/org/OpnForm/bounties?status=open"><img src="https://img.shields.io/endpoint?url=https%3A%2F%2Fconsole.algora.io%2Fapi%2Fshields%2FOpnForm%2Fbounties%3Fstatus%3Dopen" alt="Open Bounties"></a>
-<a href="https://console.algora.io/org/OpnForm/bounties?status=completed"><img src="https://img.shields.io/endpoint?url=https%3A%2F%2Fconsole.algora.io%2Fapi%2Fshields%2FOpnForm%2Fbounties%3Fstatus%3Dcompleted" alt="Rewarded Bounties"></a>
</p>
OpnForm is an open-source form builder.
diff --git a/api/.env.example b/api/.env.example
index 61448dee3..ff2fe6b35 100644
--- a/api/.env.example
+++ b/api/.env.example
@@ -86,7 +86,7 @@ CADDY_AUTHORIZED_IPS=
GOOGLE_CLIENT_ID=
GOOGLE_CLIENT_SECRET=
-GOOGLE_REDIRECT_URL=http://localhost:3000/settings/connections/callback/google
+GOOGLE_REDIRECT_URL=http://localhost:3000/connections/callback/google
GOOGLE_AUTH_REDIRECT_URL=http://localhost:3000/oauth/google/callback
GOOGLE_FONTS_API_KEY=
@@ -98,4 +98,4 @@ ZAPIER_ENABLED=false
STRIPE_CLIENT_ID=
STRIPE_CLIENT_SECRET=
-STRIPE_REDIRECT_URI=http://localhost:3000/settings/connections/callback/stripe
\ No newline at end of file
+STRIPE_REDIRECT_URI=http://localhost:3000/connections/callback/stripe
\ No newline at end of file
diff --git a/api/app/Http/Controllers/Auth/OAuthController.php b/api/app/Http/Controllers/Auth/OAuthController.php
index 43af9762e..fc532a3f7 100644
--- a/api/app/Http/Controllers/Auth/OAuthController.php
+++ b/api/app/Http/Controllers/Auth/OAuthController.php
@@ -3,149 +3,221 @@
namespace App\Http\Controllers\Auth;
use App\Http\Controllers\Controller;
+use App\Http\Controllers\Auth\Traits\ManagesJWT;
+use App\Http\Resources\OAuthProviderResource;
+use App\Integrations\OAuth\Drivers\Contracts\WidgetOAuthDriver;
+use App\Integrations\OAuth\OAuthConnectionService;
use App\Integrations\OAuth\OAuthProviderService;
-use App\Models\OAuthProvider;
-use App\Models\User;
-use App\Models\Workspace;
-use Illuminate\Foundation\Auth\AuthenticatesUsers;
+use App\Service\OAuth\OAuthUserService;
+use App\Service\OAuth\OAuthProviderService as OAuthProviderServiceClass;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Cache;
class OAuthController extends Controller
{
- use AuthenticatesUsers;
+ use ManagesJWT;
+
+ public const INTENT_AUTH = 'auth';
+ public const INTENT_INTEGRATION = 'integration';
+
+ public function __construct(
+ private OAuthConnectionService $oauthConnectionService,
+ private OAuthUserService $oauthUserService,
+ private OAuthProviderServiceClass $oauthProviderService
+ ) {
+ }
/**
- * Create a new controller instance.
- *
- * @return void
+ * Redirect the user to the provider authentication page.
*/
- public function __construct()
+ public function redirect(Request $request, string $provider)
{
- config([
- 'services.github.redirect' => route('oauth.callback', 'github'),
+ $request->validate([
+ 'intent' => 'required|in:auth,integration'
]);
+
+ $providerService = OAuthProviderService::from($provider);
+ $intent = $request->input('intent');
+
+ // Validate intent requirements
+ $this->validateIntentRequirements($intent, $providerService);
+
+ $scopes = $providerService->getDriver()->getScopesForIntent($intent);
+
+ // For integrations, store context for the callback
+ if ($intent === self::INTENT_INTEGRATION) {
+ $context = [
+ 'intent' => $intent,
+ 'intention' => $request->input('intention'),
+ 'autoClose' => $request->boolean('autoClose', false),
+ ];
+ Cache::put("oauth-context:" . Auth::id(), $context, now()->addMinutes(5));
+ } else {
+ // For auth, store UTM data
+ Cache::put("oauth-context:auth:" . session()->getId(), [
+ 'intent' => $intent,
+ 'utm_data' => $request->input('utm_data')
+ ], now()->addMinutes(5));
+ }
+
+ $url = $this->oauthConnectionService->getRedirectUrl($providerService, $scopes);
+ return response()->json(['url' => $url]);
}
/**
- * Redirect the user to the provider authentication page.
- *
- * @param string $provider
- * @return \Illuminate\Http\RedirectResponse
+ * Handle the OAuth callback from the provider.
*/
- public function redirect(OAuthProviderService $provider)
+ public function callback(string $provider)
{
- return response()->json([
- 'url' => $provider->getDriver()->setRedirectUrl(config('services.google.auth_redirect'))->getRedirectUrl()
+ $providerService = OAuthProviderService::from($provider);
+
+ // Get user data from OAuth redirect
+ $userData = $this->getUserDataFromRedirect($providerService);
+
+ // Determine intent from cached context
+ $intent = $this->getIntentFromContext();
+
+ return $this->handleIntent($intent, $providerService, $userData);
+ }
+
+ /**
+ * Handle widget-based OAuth callback.
+ */
+ public function handleWidgetCallback(string $service, Request $request)
+ {
+ $request->validate([
+ 'intent' => 'required|in:auth,integration'
]);
+
+ $providerService = OAuthProviderService::from($service);
+ $intent = $request->input('intent');
+
+ // Validate intent requirements
+ $this->validateIntentRequirements($intent, $providerService);
+
+ // Get user data from widget
+ $userData = $this->getUserDataFromWidget($providerService, $request);
+
+ return $this->handleIntent($intent, $providerService, $userData);
}
/**
- * Obtain the user information from the provider.
- *
- * @param string $driver
- * @return \Illuminate\Http\Response
+ * Handle intent-based flow
*/
- public function handleCallback(OAuthProviderService $provider)
+ private function handleIntent(string $intent, OAuthProviderService $providerService, array $userData)
{
- try {
- $driverUser = $provider->getDriver()->setRedirectUrl(config('services.google.auth_redirect'))->getUser();
- } catch (\Exception $e) {
- return $this->error([
- "message" => "OAuth service failed to authenticate: " . $e->getMessage()
- ]);
- }
+ return match ($intent) {
+ self::INTENT_AUTH => $this->handleAuthenticationFlow($providerService, $userData),
+ self::INTENT_INTEGRATION => $this->handleIntegrationFlow($providerService, $userData),
+ default => abort(400, 'Invalid intent')
+ };
+ }
- $user = $this->findOrCreateUser($provider, $driverUser);
+ /**
+ * Handle authentication flow (create user + authenticate)
+ */
+ private function handleAuthenticationFlow(OAuthProviderService $providerService, array $userData)
+ {
+ // Find or create user
+ $user = $this->oauthUserService->findOrCreateUser($userData, $providerService);
- if (!$user) {
- return $this->error([
- "message" => "User not found."
- ]);
- }
+ // Create/update OAuth provider record
+ $this->oauthProviderService->createOrUpdateProvider($user, $providerService, $userData);
- if ($user->has_registered) {
- return $this->error([
- "message" => "This email is already registered. Please sign in with your password."
- ]);
+ // Return JWT token for authentication
+ return $this->sendLoginResponse($user);
+ }
+
+ /**
+ * Handle integration flow (connect OAuth provider to existing user)
+ */
+ private function handleIntegrationFlow(OAuthProviderService $providerService, array $userData)
+ {
+ if (!Auth::check()) {
+ abort(401, 'Authentication required for integration connections');
}
- $this->guard()->setToken(
- $token = $this->guard()->login($user)
- );
+ /** @var \App\Models\User $user */
+ $user = Auth::user();
+
+ // Create/update OAuth provider record
+ $oauthProvider = $this->oauthProviderService->createOrUpdateProvider($user, $providerService, $userData);
+
+ // Get cached context
+ $context = Cache::pull("oauth-context:{$user->id}", [
+ 'intention' => null,
+ 'autoClose' => false
+ ]);
return response()->json([
- 'token' => $token,
- 'token_type' => 'bearer',
- 'expires_in' => $this->guard()->getPayload()->get('exp') - time(),
- 'new_user' => $user->new_user
+ 'provider' => OAuthProviderResource::make($oauthProvider),
+ 'autoClose' => $context['autoClose'],
+ 'intention' => $context['intention'],
]);
}
- /**
- * @p aram \Laravel\Socialite\Contracts\User $socialiteUser
- * @return \App\Models\User | null
- */
- protected function findOrCreateUser($provider, $socialiteUser)
+ // Helper methods
+ private function validateIntentRequirements(string $intent, OAuthProviderService $providerService): void
{
- $oauthProvider = OAuthProvider::where('provider', $provider)
- ->where('provider_user_id', $socialiteUser->getId())
- ->first();
-
- if ($oauthProvider) {
- $oauthProvider->update([
- 'access_token' => $socialiteUser->token,
- 'refresh_token' => $socialiteUser->refreshToken,
- 'scopes' => $socialiteUser->approvedScopes
- ]);
-
- return $oauthProvider->user;
+ if ($intent === self::INTENT_INTEGRATION && !Auth::check()) {
+ abort(401, 'Integration requires authentication');
}
-
- if (!$provider->getDriver()->canCreateUser()) {
- return null;
+ if (!$providerService->supportsIntent($intent)) {
+ abort(400, "Service {$providerService->value} does not support intent {$intent}");
}
+ }
- $email = strtolower($socialiteUser->getEmail());
- $user = User::whereEmail($email)->first();
+ private function getUserDataFromRedirect(OAuthProviderService $providerService): array
+ {
+ $driver = $providerService->getDriver();
+ $socialiteUser = $driver->getUser();
- if ($user) {
- $user->has_registered = true;
- return $user;
+ return [
+ 'id' => $socialiteUser->getId(),
+ 'name' => $socialiteUser->getName(),
+ 'email' => $socialiteUser->getEmail(),
+ 'provider_user_id' => $socialiteUser->getId(),
+ 'access_token' => $socialiteUser->token,
+ 'refresh_token' => $socialiteUser->refreshToken,
+ 'avatar' => $socialiteUser->getAvatar(),
+ 'scopes' => $socialiteUser->approvedScopes ?? [],
+ ];
+ }
+
+ private function getUserDataFromWidget(OAuthProviderService $providerService, Request $request): array
+ {
+ $driver = $providerService->getDriver();
+
+ if (!$driver instanceof WidgetOAuthDriver) {
+ abort(400, 'This provider does not support widget authentication');
}
- $utmData = request()->utm_data;
- $user = User::create([
- 'name' => $socialiteUser->getName(),
- 'email' => $email,
- 'email_verified_at' => now(),
- 'utm_data' => is_string($utmData) ? json_decode($utmData, true) : $utmData
- ]);
+ if (!$driver->verifyWidgetData($request->all())) {
+ abort(400, 'Invalid widget data');
+ }
- // Create and sync workspace
- $workspace = Workspace::create([
- 'name' => 'My Workspace',
- 'icon' => '🧪',
- ]);
+ return $driver->getUserFromWidgetData($request->all());
+ }
+
+ private function getIntentFromContext(): string
+ {
+ // Try authenticated user context first
+ if (Auth::check()) {
+ $context = Cache::get("oauth-context:" . Auth::id());
+ if ($context && isset($context['intent'])) {
+ return $context['intent'];
+ }
+ }
+
+ // Try session context for auth flows
+ $context = Cache::get("oauth-context:auth:" . session()->getId());
+ if ($context && isset($context['intent'])) {
+ return $context['intent'];
+ }
- $user->workspaces()->sync([
- $workspace->id => [
- 'role' => User::ROLE_ADMIN,
- ],
- ], false);
- $user->new_user = true;
-
- OAuthProvider::create(
- [
- 'user_id' => $user->id,
- 'provider' => $provider,
- 'provider_user_id' => $socialiteUser->getId(),
- 'access_token' => $socialiteUser->token,
- 'refresh_token' => $socialiteUser->refreshToken,
- 'name' => $socialiteUser->getName(),
- 'email' => $socialiteUser->getEmail(),
- 'scopes' => $socialiteUser->approvedScopes
- ]
- );
- return $user;
+ // Default to auth if no context found
+ return self::INTENT_AUTH;
}
}
diff --git a/api/app/Http/Controllers/Auth/RegisterController.php b/api/app/Http/Controllers/Auth/RegisterController.php
index 771d8cb63..90872f0d2 100644
--- a/api/app/Http/Controllers/Auth/RegisterController.php
+++ b/api/app/Http/Controllers/Auth/RegisterController.php
@@ -10,6 +10,7 @@ use App\Models\Workspace;
use Illuminate\Contracts\Auth\MustVerifyEmail;
use Illuminate\Foundation\Auth\RegistersUsers;
use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\Validator;
use Illuminate\Validation\Rule;
use App\Rules\ValidReCaptcha;
@@ -45,12 +46,19 @@ class RegisterController extends Controller
return response()->json(['status' => trans('verification.sent')]);
}
- return response()->json(array_merge(
- (new UserResource($user))->toArray($request),
- [
- 'appsumo_license' => $this->appsumoLicense,
- ]
- ));
+ /** @var \Tymon\JWTAuth\JWTGuard $guard */
+ $guard = Auth::guard('api');
+ $token = $guard->fromUser($user);
+
+ // The 'new_user' field is used by the front-end to ensure that we can track this event as a registration.
+ return response()->json([
+ 'token' => $token,
+ 'token_type' => 'bearer',
+ 'expires_in' => $guard->factory()->getTTL() * 60,
+ 'appsumo_license' => $this->appsumoLicense,
+ 'new_user' => true,
+ 'user' => new UserResource($user),
+ ]);
}
/**
diff --git a/api/app/Http/Controllers/Auth/Traits/ManagesJWT.php b/api/app/Http/Controllers/Auth/Traits/ManagesJWT.php
new file mode 100644
index 000000000..2b3d425f0
--- /dev/null
+++ b/api/app/Http/Controllers/Auth/Traits/ManagesJWT.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace App\Http\Controllers\Auth\Traits;
+
+use App\Models\User;
+use Illuminate\Http\JsonResponse;
+
+trait ManagesJWT
+{
+ /**
+ * Send the response after the user was authenticated.
+ */
+ protected function sendLoginResponse(User $user): JsonResponse
+ {
+ $guard = auth('api');
+ $token = $guard->login($user);
+
+ return response()->json([
+ 'token' => $token,
+ 'token_type' => 'bearer',
+ 'expires_in' => config('jwt.ttl') * 60,
+ 'new_user' => $user->new_user ?? false
+ ]);
+ }
+}
diff --git a/api/app/Http/Controllers/Auth/UserController.php b/api/app/Http/Controllers/Auth/UserController.php
index 234ec5266..1ccb24894 100644
--- a/api/app/Http/Controllers/Auth/UserController.php
+++ b/api/app/Http/Controllers/Auth/UserController.php
@@ -28,7 +28,7 @@ class UserController extends Controller
Auth::user()->delete();
return $this->success([
- 'message' => 'User deleted.',
+ 'message' => 'Sorry to see you go 👋',
]);
}
}
diff --git a/api/app/Http/Controllers/Content/FeatureFlagsController.php b/api/app/Http/Controllers/Content/FeatureFlagsController.php
index dd7cae533..b1390ee46 100644
--- a/api/app/Http/Controllers/Content/FeatureFlagsController.php
+++ b/api/app/Http/Controllers/Content/FeatureFlagsController.php
@@ -30,15 +30,16 @@ class FeatureFlagsController extends Controller
'google' => [
'fonts' => !empty(config('services.google.fonts_api_key')),
'auth' => !empty(config('services.google.client_id')) && !empty(config('services.google.client_secret')),
+ 'client_id' => config('services.google.client_id'),
],
'telegram' => [
- 'bot_id' => config('services.telegram.bot_id') ?? false
+ 'bot_id' => $this->extractTelegramBotId()
]
],
'integrations' => [
'zapier' => config('services.zapier.enabled'),
'google_sheets' => !empty(config('services.google.client_id')) && !empty(config('services.google.client_secret')),
- 'telegram' => !empty(config('services.telegram.bot_id')) && !empty(config('services.telegram.bot_token')),
+ 'telegram' => !empty(config('services.telegram.bot_token')),
],
];
});
@@ -58,4 +59,22 @@ class FeatureFlagsController extends Controller
return config('app.docker_version');
}
+
+ /**
+ * Extract bot ID from Telegram bot token
+ */
+ private function extractTelegramBotId(): string|false
+ {
+ $botToken = config('services.telegram.bot_token');
+
+ if (empty($botToken)) {
+ return false;
+ }
+
+ // Bot token format: 1234567890:ABCdefGHIjklMNOpqrsTUVwxyz
+ // Extract the bot ID (everything before the colon)
+ $parts = explode(':', $botToken);
+
+ return $parts[0] ?? false;
+ }
}
diff --git a/api/app/Http/Controllers/Forms/AiFormController.php b/api/app/Http/Controllers/Forms/AiFormController.php
index a46e3d7f4..356a44e0b 100644
--- a/api/app/Http/Controllers/Forms/AiFormController.php
+++ b/api/app/Http/Controllers/Forms/AiFormController.php
@@ -3,6 +3,7 @@
namespace App\Http\Controllers\Forms;
use App\Http\Controllers\Controller;
+use App\Http\Requests\AiGenerateFieldsRequest;
use App\Http\Requests\AiGenerateFormRequest;
use App\Models\Forms\AI\AiFormCompletion;
@@ -28,7 +29,23 @@ class AiFormController extends Controller
}
return $this->success([
+ 'message' => 'Your data is ready! Feel free to customize it to your needs before publishing.',
'ai_form_completion' => $aiFormCompletion,
]);
}
+
+ public function generateFields(AiGenerateFieldsRequest $request)
+ {
+ $this->middleware('throttle:4,1');
+
+ return $this->success([
+ 'message' => 'Generating your fields, please wait...',
+ 'ai_form_completion_id' => AiFormCompletion::create([
+ 'type' => AiFormCompletion::TYPE_FIELDS,
+ 'form_prompt' => $request->input('fields_prompt'),
+ 'context' => $request->input('current_form_structure'),
+ 'ip' => $request->ip(),
+ ])->id,
+ ]);
+ }
}
diff --git a/api/app/Http/Controllers/Forms/FormStatsController.php b/api/app/Http/Controllers/Forms/FormStatsController.php
index eb6fedc60..f2fed17b8 100644
--- a/api/app/Http/Controllers/Forms/FormStatsController.php
+++ b/api/app/Http/Controllers/Forms/FormStatsController.php
@@ -6,8 +6,8 @@ use App\Http\Controllers\Controller;
use App\Http\Requests\FormStatsRequest;
use App\Models\Forms\FormSubmission;
use Carbon\CarbonPeriod;
-use Carbon\CarbonInterval;
use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Cache;
class FormStatsController extends Controller
{
@@ -47,7 +47,7 @@ class FormStatsController extends Controller
$totalViews = $form->views_count;
$totalSubmissions = $form->submissions_count;
- $averageDuration = \Cache::remember('form_stats_average_duration_' . $form->id, 1800, function () use ($form) {
+ $averageDuration = Cache::remember('form_stats_average_duration_' . $form->id, 1800, function () use ($form) {
$submissionsWithDuration = $form->submissions()->whereNotNull('completion_time')->count() ?? 0;
$totalDuration = $form->submissions()->whereNotNull('completion_time')->sum('completion_time') ?? 0;
return $submissionsWithDuration > 0 ? round($totalDuration / $submissionsWithDuration) : null;
@@ -57,7 +57,30 @@ class FormStatsController extends Controller
'views' => $totalViews,
'submissions' => $totalSubmissions,
'completion_rate' => $totalViews > 0 ? round(($totalSubmissions / $totalViews) * 100, 2) : 0,
- 'average_duration' => $averageDuration ? CarbonInterval::seconds($averageDuration)->cascade()->forHumans(null, true) : null
+ 'average_duration' => $averageDuration ? $this->formatDuration($averageDuration) : null
];
}
+
+ private function formatDuration(int $seconds): string
+ {
+ $hours = floor($seconds / 3600);
+ $minutes = floor(($seconds % 3600) / 60);
+ $remainingSeconds = $seconds % 60;
+
+ $parts = [];
+
+ if ($hours > 0) {
+ $parts[] = $hours . 'h';
+ }
+
+ if ($minutes > 0) {
+ $parts[] = $minutes . 'm';
+ }
+
+ if ($remainingSeconds > 0 || empty($parts)) {
+ $parts[] = $remainingSeconds . 's';
+ }
+
+ return implode(' ', $parts);
+ }
}
diff --git a/api/app/Http/Controllers/Settings/OAuthProviderController.php b/api/app/Http/Controllers/Settings/OAuthProviderController.php
index e6d6c5f8e..9fba67f8f 100644
--- a/api/app/Http/Controllers/Settings/OAuthProviderController.php
+++ b/api/app/Http/Controllers/Settings/OAuthProviderController.php
@@ -4,11 +4,8 @@ namespace App\Http\Controllers\Settings;
use App\Http\Controllers\Controller;
use App\Http\Resources\OAuthProviderResource;
-use App\Integrations\OAuth\OAuthProviderService;
use App\Models\OAuthProvider;
-use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth;
-use Illuminate\Support\Facades\Cache;
class OAuthProviderController extends Controller
{
@@ -22,97 +19,6 @@ class OAuthProviderController extends Controller
return OAuthProviderResource::collection($providers);
}
- public function connect(Request $request, OAuthProviderService $service)
- {
- $userId = Auth::id();
- $context = [
- 'intention' => $request->input('intention'),
- 'autoClose' => $request->boolean('autoClose', false),
- ];
- Cache::put("oauth-context:{$userId}", $context, now()->addMinutes(5));
-
- // Connecting an account for integrations purposes
- // Adding full scopes to the driver
- return response()->json([
- 'url' => $service->getDriver()->fullScopes()->getRedirectUrl(),
- ]);
- }
-
- public function handleRedirect(Request $request, OAuthProviderService $service)
- {
- $userId = Auth::id();
- $context = Cache::pull("oauth-context:{$userId}", [
- 'intention' => null,
- 'autoClose' => false
- ]);
- $autoClose = $context['autoClose'];
- $intention = $context['intention'];
-
- try {
- $driverUser = $service->getDriver()->getUser();
-
- $provider = OAuthProvider::query()
- ->updateOrCreate(
- [
- 'user_id' => $userId,
- 'provider' => $service,
- 'provider_user_id' => $driverUser->getId(),
- ],
- [
- 'access_token' => $driverUser->token,
- 'refresh_token' => $driverUser->refreshToken,
- 'name' => $driverUser->getName() ?? $driverUser->getNickname(),
- 'email' => $driverUser->getEmail(),
- 'scopes' => $driverUser->approvedScopes ?? [],
- ]
- );
-
- return response()->json([
- 'provider' => OAuthProviderResource::make($provider),
- 'autoClose' => $autoClose,
- 'intention' => $intention,
- ]);
- } catch (\Exception $e) {
- report($e);
- return response()->json(['message' => 'Failed to connect the account. Please try again.'], 400);
- }
- }
-
- public function handleWidgetRedirect(OAuthProviderService $service, Request $request)
- {
- $driver = $service->getDriver();
-
- if (!$driver instanceof \App\Integrations\OAuth\Drivers\Contracts\WidgetOAuthDriver) {
- abort(400, 'This provider does not support widget authentication');
- }
-
- $requestData = $request->all();
-
- if (!$driver->verifyWidgetData($requestData)) {
- abort(400, 'Invalid data signature');
- }
-
- $userData = $driver->getUserFromWidgetData($requestData);
-
- $provider = OAuthProvider::query()
- ->updateOrCreate(
- [
- 'user_id' => Auth::id(),
- 'provider' => $service,
- 'provider_user_id' => $userData['id'],
- ],
- [
- 'access_token' => $userData['access_token'],
- 'refresh_token' => $userData['refresh_token'] ?? '',
- 'name' => $userData['name'],
- 'email' => $userData['email'],
- 'scopes' => $userData['scopes']
- ]
- );
-
- return OAuthProviderResource::make($provider);
- }
-
public function destroy(OAuthProvider $provider)
{
$this->authorize('delete', $provider);
diff --git a/api/app/Http/Controllers/Settings/ProfileController.php b/api/app/Http/Controllers/Settings/ProfileController.php
index a02699965..b790711f1 100644
--- a/api/app/Http/Controllers/Settings/ProfileController.php
+++ b/api/app/Http/Controllers/Settings/ProfileController.php
@@ -6,6 +6,8 @@ use App\Http\Controllers\Controller;
use App\Models\Workspace;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Cache;
+use Illuminate\Support\Facades\RateLimiter;
+use Illuminate\Http\Exceptions\ThrottleRequestsException;
class ProfileController extends Controller
{
@@ -23,6 +25,21 @@ class ProfileController extends Controller
'email' => 'required|email|unique:users,email,' . $user->id,
]);
+ // Check if email is actually changing
+ $emailChanged = strtolower($request->email) !== strtolower($user->email);
+
+ // Apply throttling only if email is changing
+ if ($emailChanged) {
+ $key = 'profilechange:' . $user->id;
+ $attempts = RateLimiter::attempts($key);
+
+ if ($attempts >= 2) {
+ throw new ThrottleRequestsException('Too Many Attempts.');
+ }
+
+ RateLimiter::hit($key, 3600); // 1 hour
+ }
+
return tap($user)->update([
'name' => $request->name,
'email' => strtolower($request->email),
diff --git a/api/app/Http/Controllers/Settings/TokenController.php b/api/app/Http/Controllers/Settings/TokenController.php
index a601ced2f..eb3f4a22e 100644
--- a/api/app/Http/Controllers/Settings/TokenController.php
+++ b/api/app/Http/Controllers/Settings/TokenController.php
@@ -29,6 +29,7 @@ class TokenController
return response()->json([
'token' => $token->plainTextToken,
+ 'message' => 'Access token successfully created!',
]);
}
diff --git a/api/app/Http/Controllers/SubscriptionController.php b/api/app/Http/Controllers/SubscriptionController.php
index d93e63cd0..edfbe4a03 100644
--- a/api/app/Http/Controllers/SubscriptionController.php
+++ b/api/app/Http/Controllers/SubscriptionController.php
@@ -73,7 +73,11 @@ class SubscriptionController extends Controller
{
$user = Auth::user();
if (!$user->hasStripeId()) {
- $user->createAsStripeCustomer();
+ $user->createAsStripeCustomer([
+ 'metadata' => [
+ 'user_id' => $user->id,
+ ],
+ ]);
}
$user->updateStripeCustomer([
'email' => $request->email,
diff --git a/api/app/Http/Controllers/WorkspaceController.php b/api/app/Http/Controllers/WorkspaceController.php
index c5797d04e..3d2fb4bfa 100644
--- a/api/app/Http/Controllers/WorkspaceController.php
+++ b/api/app/Http/Controllers/WorkspaceController.php
@@ -59,7 +59,7 @@ class WorkspaceController extends Controller
$workspace->delete();
return $this->success([
- 'message' => 'Workspace deleted.',
+ 'message' => 'Workspace successfully deleted.',
'workspace_id' => $id,
]);
}
diff --git a/api/app/Http/Controllers/WorkspaceUserController.php b/api/app/Http/Controllers/WorkspaceUserController.php
index 690d38e78..6478fc4f3 100644
--- a/api/app/Http/Controllers/WorkspaceUserController.php
+++ b/api/app/Http/Controllers/WorkspaceUserController.php
@@ -63,6 +63,12 @@ class WorkspaceUserController extends Controller
private function inviteUser(Workspace $workspace, string $email, string $role)
{
+ if (!$workspace->is_pro) {
+ return $this->error([
+ 'message' => 'A Pro plan is required to invite users.'
+ ], 403);
+ }
+
if (
UserInvite::where('email', $email)
->where('workspace_id', $workspace->id)
@@ -76,10 +82,11 @@ class WorkspaceUserController extends Controller
}
// Send new invite
- UserInvite::inviteUser($email, $role, $workspace, now()->addDays(7));
+ $invite = UserInvite::inviteUser($email, $role, $workspace, now()->addDays(7));
return $this->success([
- 'message' => 'Registration invitation email sent to user.'
+ 'message' => 'Registration invitation email sent to user.',
+ 'invite' => $invite
]);
}
diff --git a/api/app/Http/Requests/AiGenerateFieldsRequest.php b/api/app/Http/Requests/AiGenerateFieldsRequest.php
new file mode 100644
index 000000000..2b3341e28
--- /dev/null
+++ b/api/app/Http/Requests/AiGenerateFieldsRequest.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace App\Http\Requests;
+
+use Illuminate\Foundation\Http\FormRequest;
+
+class AiGenerateFieldsRequest extends FormRequest
+{
+ /**
+ * Get the validation rules that apply to the request.
+ *
+ * @return array<string, mixed>
+ */
+ public function rules()
+ {
+ return [
+ 'fields_prompt' => 'required|string|max:4000',
+ 'current_form_structure' => 'nullable|array',
+ ];
+ }
+}
diff --git a/api/app/Http/Resources/WorkspaceResource.php b/api/app/Http/Resources/WorkspaceResource.php
index a7168796f..53786577f 100644
--- a/api/app/Http/Resources/WorkspaceResource.php
+++ b/api/app/Http/Resources/WorkspaceResource.php
@@ -19,6 +19,8 @@ class WorkspaceResource extends JsonResource
return array_merge(parent::toArray($request), [
'max_file_size' => $this->max_file_size / 1000000,
'is_readonly' => $this->isReadonlyUser($request->user()),
+ 'is_admin' => $this->isAdminUser($request->user()),
+ 'users_count' => $this->users_count,
]);
}
}
diff --git a/api/app/Integrations/Handlers/EmailIntegration.php b/api/app/Integrations/Handlers/EmailIntegration.php
index f6cfd34e4..60ee1d65a 100644
--- a/api/app/Integrations/Handlers/EmailIntegration.php
+++ b/api/app/Integrations/Handlers/EmailIntegration.php
@@ -10,6 +10,7 @@ use Illuminate\Support\Facades\Notification;
use App\Open\MentionParser;
use App\Service\Forms\FormSubmissionFormatter;
use Illuminate\Validation\ValidationException;
+use Illuminate\Support\Facades\Auth;
class EmailIntegration extends AbstractIntegrationHandler
{
@@ -39,6 +40,17 @@ class EmailIntegration extends AbstractIntegrationHandler
}
};
+ // Free plan users can only send to their own email address
+ $rules['send_to'][] = function ($attribute, $value, $fail) {
+ $currentUser = Auth::user();
+ $userEmail = $currentUser->email;
+ $sendToEmail = trim($value);
+
+ if ($sendToEmail !== $userEmail) {
+ $fail("You can only send email notification to your own email address ({$userEmail}). Please upgrade to the Pro plan to send to other email addresses.");
+ }
+ };
+
// Free plan users can only have a single email integration per form (avoid spam)
if (!request()->route('integrationid')) {
$existingEmailIntegrations = FormIntegration::where('form_id', $form->id)
diff --git a/api/app/Integrations/OAuth/Drivers/Contracts/OAuthDriver.php b/api/app/Integrations/OAuth/Drivers/Contracts/OAuthDriver.php
index 1ca92a19a..6f3ca898a 100644
--- a/api/app/Integrations/OAuth/Drivers/Contracts/OAuthDriver.php
+++ b/api/app/Integrations/OAuth/Drivers/Contracts/OAuthDriver.php
@@ -12,9 +12,9 @@ interface OAuthDriver
public function getUser(): User;
public function canCreateUser(): bool;
+
/**
- * Set up all the scopes required by OpnForm for various integrations.
- * This method configures the necessary permissions for the current OAuth driver.
+ * Get the appropriate scopes for a given intent (auth or integration).
*/
- public function fullScopes(): self;
+ public function getScopesForIntent(string $intent): array;
}
diff --git a/api/app/Integrations/OAuth/Drivers/OAuthGoogleDriver.php b/api/app/Integrations/OAuth/Drivers/OAuthGoogleDriver.php
index e340f7f62..e4d3f27ed 100644
--- a/api/app/Integrations/OAuth/Drivers/OAuthGoogleDriver.php
+++ b/api/app/Integrations/OAuth/Drivers/OAuthGoogleDriver.php
@@ -59,8 +59,12 @@ class OAuthGoogleDriver implements OAuthDriver
return $this;
}
- public function fullScopes(): OAuthDriver
+ public function getScopesForIntent(string $intent): array
{
- return $this->setScopes([Sheets::DRIVE_FILE]);
+ return match ($intent) {
+ 'auth' => ['openid', 'profile', 'email'],
+ 'integration' => ['openid', 'profile', 'email', Sheets::DRIVE_FILE],
+ default => ['openid', 'profile', 'email'],
+ };
}
}
diff --git a/api/app/Integrations/OAuth/Drivers/OAuthGoogleOneTapDriver.php b/api/app/Integrations/OAuth/Drivers/OAuthGoogleOneTapDriver.php
new file mode 100644
index 000000000..40fae5dd1
--- /dev/null
+++ b/api/app/Integrations/OAuth/Drivers/OAuthGoogleOneTapDriver.php
@@ -0,0 +1,266 @@
+<?php
+
+namespace App\Integrations\OAuth\Drivers;
+
+use App\Integrations\OAuth\Drivers\Contracts\OAuthDriver;
+use App\Integrations\OAuth\Drivers\Contracts\WidgetOAuthDriver;
+use Illuminate\Support\Facades\Cache;
+use Illuminate\Support\Facades\Http;
+use Laravel\Socialite\Contracts\User;
+
+class OAuthGoogleOneTapDriver implements OAuthDriver, WidgetOAuthDriver
+{
+ public function getRedirectUrl(): string
+ {
+ throw new \Exception('Google One Tap does not use redirect URLs');
+ }
+
+ public function setRedirectUrl(string $url): self
+ {
+ return $this;
+ }
+
+ public function setScopes(array $scopes): self
+ {
+ return $this;
+ }
+
+ public function getUser(): User
+ {
+ throw new \Exception('Use getUserFromWidgetData for Google One Tap');
+ }
+
+ public function canCreateUser(): bool
+ {
+ return true;
+ }
+
+ public function getScopesForIntent(string $intent): array
+ {
+ return ['openid', 'profile', 'email']; // One Tap only supports these
+ }
+
+ public function isWidgetBased(): bool
+ {
+ return true;
+ }
+
+ public function verifyWidgetData(array $data): bool
+ {
+ if (!isset($data['credential'])) {
+ return false;
+ }
+
+ try {
+ $this->verifyAndDecodeJWT($data['credential']);
+ return true;
+ } catch (\Exception $e) {
+ return false;
+ }
+ }
+
+ public function getUserFromWidgetData(array $data): array
+ {
+ $payload = $this->verifyAndDecodeJWT($data['credential']);
+
+ return [
+ 'id' => $payload['sub'],
+ 'name' => $payload['name'],
+ 'email' => $payload['email'],
+ 'provider_user_id' => $payload['sub'], // Google ID saved here!
+ 'access_token' => $data['credential'], // Store the JWT
+ 'refresh_token' => null,
+ 'avatar' => $payload['picture'] ?? null,
+ 'scopes' => ['openid', 'profile', 'email'],
+ ];
+ }
+
+ private function verifyAndDecodeJWT(string $jwt): array
+ {
+ // Split JWT into parts
+ $parts = explode('.', $jwt);
+ if (count($parts) !== 3) {
+ throw new \Exception('Invalid JWT format');
+ }
+
+ [$headerB64, $payloadB64, $signatureB64] = $parts;
+
+ // Decode header and payload
+ $header = $this->base64UrlDecode($headerB64);
+ $payload = $this->base64UrlDecode($payloadB64);
+
+ $headerData = json_decode($header, true);
+ $payloadData = json_decode($payload, true);
+
+ if (!$headerData || !$payloadData) {
+ throw new \Exception('Invalid JWT data');
+ }
+
+ // Basic payload validation
+ $this->validatePayload($payloadData);
+
+ // Verify signature
+ $this->verifySignature($headerB64 . '.' . $payloadB64, $signatureB64, $headerData);
+
+ return $payloadData;
+ }
+
+ private function base64UrlDecode(string $data): string
+ {
+ // Convert base64url to base64
+ $base64 = str_replace(['-', '_'], ['+', '/'], $data);
+
+ // Add padding if needed
+ $padLength = 4 - (strlen($base64) % 4);
+ if ($padLength < 4) {
+ $base64 .= str_repeat('=', $padLength);
+ }
+
+ return base64_decode($base64);
+ }
+
+ private function validatePayload(array $payload): void
+ {
+ // Check expiration
+ if (!isset($payload['exp']) || $payload['exp'] < time()) {
+ throw new \Exception('JWT has expired');
+ }
+
+ // Check issued at (not too far in future)
+ if (!isset($payload['iat']) || $payload['iat'] > time() + 300) {
+ throw new \Exception('JWT issued in future');
+ }
+
+ // Verify audience (your Google Client ID)
+ $expectedClientId = config('services.google.client_id');
+ if (!isset($payload['aud']) || $payload['aud'] !== $expectedClientId) {
+ throw new \Exception('Invalid audience');
+ }
+
+ // Verify issuer
+ if (!isset($payload['iss']) || !in_array($payload['iss'], ['https://accounts.google.com', 'accounts.google.com'])) {
+ throw new \Exception('Invalid issuer');
+ }
+
+ // Check required fields
+ if (!isset($payload['sub']) || !isset($payload['email'])) {
+ throw new \Exception('Missing required fields');
+ }
+ }
+
+ private function verifySignature(string $data, string $signature, array $header): void
+ {
+ if (!isset($header['kid']) || !isset($header['alg'])) {
+ throw new \Exception('Missing header information');
+ }
+
+ if ($header['alg'] !== 'RS256') {
+ throw new \Exception('Unsupported algorithm');
+ }
+
+ // Get Google's public keys
+ $publicKey = $this->getGooglePublicKey($header['kid']);
+
+ // Verify signature
+ $signatureRaw = $this->base64UrlDecode($signature);
+ $verified = openssl_verify($data, $signatureRaw, $publicKey, OPENSSL_ALGO_SHA256);
+
+ if ($verified !== 1) {
+ throw new \Exception('Invalid signature');
+ }
+ }
+
+ private function getGooglePublicKey(string $keyId): string
+ {
+ // Cache public keys for 1 hour
+ return Cache::remember("google_public_key_{$keyId}", 3600, function () use ($keyId) {
+ $response = Http::get('https://www.googleapis.com/oauth2/v3/certs');
+
+ if (!$response->successful()) {
+ throw new \Exception('Failed to fetch Google public keys');
+ }
+
+ $keys = $response->json();
+
+ if (!isset($keys['keys'])) {
+ throw new \Exception('Invalid keys response');
+ }
+
+ foreach ($keys['keys'] as $key) {
+ if ($key['kid'] === $keyId) {
+ // Convert JWK to PEM format
+ return $this->jwkToPem($key);
+ }
+ }
+
+ throw new \Exception('Key not found');
+ });
+ }
+
+ private function jwkToPem(array $jwk): string
+ {
+ if (!isset($jwk['n']) || !isset($jwk['e'])) {
+ throw new \Exception('Invalid JWK format');
+ }
+
+ // Decode base64url modulus and exponent
+ $n = $this->base64UrlDecode($jwk['n']);
+ $e = $this->base64UrlDecode($jwk['e']);
+
+ // Build the public key in DER format
+ $modulus = $this->unsignedBigInteger($n);
+ $exponent = $this->unsignedBigInteger($e);
+
+ // RSA public key DER structure
+ $rsaPublicKey = $this->derSequence($modulus . $exponent);
+
+ // Public key info structure
+ $rsaIdentifier = pack('H*', '300d06092a864886f70d0101010500'); // RSA identifier
+ $publicKeyInfo = $this->derSequence($rsaIdentifier . $this->derBitString($rsaPublicKey));
+
+ // Convert to PEM format
+ return "-----BEGIN PUBLIC KEY-----\n" .
+ chunk_split(base64_encode($publicKeyInfo), 64, "\n") .
+ "-----END PUBLIC KEY-----\n";
+ }
+
+ private function unsignedBigInteger(string $bytes): string
+ {
+ // Add leading zero if the first bit is set (to ensure positive integer)
+ if (ord($bytes[0]) & 0x80) {
+ $bytes = "\x00" . $bytes;
+ }
+
+ return $this->derInteger($bytes);
+ }
+
+ private function derInteger(string $bytes): string
+ {
+ return "\x02" . $this->derLength(strlen($bytes)) . $bytes;
+ }
+
+ private function derSequence(string $bytes): string
+ {
+ return "\x30" . $this->derLength(strlen($bytes)) . $bytes;
+ }
+
+ private function derBitString(string $bytes): string
+ {
+ return "\x03" . $this->derLength(strlen($bytes) + 1) . "\x00" . $bytes;
+ }
+
+ private function derLength(int $length): string
+ {
+ if ($length < 128) {
+ return chr($length);
+ }
+
+ $lengthBytes = '';
+ while ($length > 0) {
+ $lengthBytes = chr($length & 0xff) . $lengthBytes;
+ $length >>= 8;
+ }
+
+ return chr(0x80 | strlen($lengthBytes)) . $lengthBytes;
+ }
+}
diff --git a/api/app/Integrations/OAuth/Drivers/OAuthStripeDriver.php b/api/app/Integrations/OAuth/Drivers/OAuthStripeDriver.php
index 9901ae929..479628734 100644
--- a/api/app/Integrations/OAuth/Drivers/OAuthStripeDriver.php
+++ b/api/app/Integrations/OAuth/Drivers/OAuthStripeDriver.php
@@ -69,10 +69,10 @@ class OAuthStripeDriver implements OAuthDriver
return $this;
}
- public function fullScopes(): OAuthDriver
+ public function getScopesForIntent(string $intent): array
{
- return $this->setScopes([
- 'read_write',
- ]);
+ return match ($intent) {
+ default => ['read_write'],
+ };
}
}
diff --git a/api/app/Integrations/OAuth/Drivers/OAuthTelegramDriver.php b/api/app/Integrations/OAuth/Drivers/OAuthTelegramDriver.php
index abd1971b9..3d00ba1d7 100644
--- a/api/app/Integrations/OAuth/Drivers/OAuthTelegramDriver.php
+++ b/api/app/Integrations/OAuth/Drivers/OAuthTelegramDriver.php
@@ -37,9 +37,9 @@ class OAuthTelegramDriver implements WidgetOAuthDriver
return true;
}
- public function fullScopes(): self
+ public function getScopesForIntent(string $intent): array
{
- return $this;
+ return []; // Telegram widget doesn't use OAuth scopes
}
public function isWidgetBased(): bool
diff --git a/api/app/Integrations/OAuth/OAuthConnectionService.php b/api/app/Integrations/OAuth/OAuthConnectionService.php
new file mode 100644
index 000000000..167bd15cd
--- /dev/null
+++ b/api/app/Integrations/OAuth/OAuthConnectionService.php
@@ -0,0 +1,31 @@
+<?php
+
+namespace App\Integrations\OAuth;
+
+use App\Integrations\OAuth\Contracts\OAuthCompletionStrategy;
+use Illuminate\Http\JsonResponse;
+
+class OAuthConnectionService
+{
+ public function getRedirectUrl(OAuthProviderService $provider, array $scopes = []): string
+ {
+ $driver = $provider->getDriver();
+
+ if (!empty($scopes)) {
+ $driver->setScopes($scopes);
+ }
+
+ return $driver->getRedirectUrl();
+ }
+
+ public function handleCallback(OAuthProviderService $provider, OAuthCompletionStrategy $strategy): JsonResponse
+ {
+ try {
+ $driverUser = $provider->getDriver()->getUser();
+ return $strategy->execute($provider, $driverUser);
+ } catch (\Exception $e) {
+ report($e);
+ return response()->json(['message' => 'Failed to authenticate with the provider. Please try again.'], 400);
+ }
+ }
+}
diff --git a/api/app/Integrations/OAuth/OAuthProviderService.php b/api/app/Integrations/OAuth/OAuthProviderService.php
index 1233c1c06..a51b5c419 100644
--- a/api/app/Integrations/OAuth/OAuthProviderService.php
+++ b/api/app/Integrations/OAuth/OAuthProviderService.php
@@ -4,12 +4,14 @@ namespace App\Integrations\OAuth;
use App\Integrations\OAuth\Drivers\Contracts\OAuthDriver;
use App\Integrations\OAuth\Drivers\OAuthGoogleDriver;
+use App\Integrations\OAuth\Drivers\OAuthGoogleOneTapDriver;
use App\Integrations\OAuth\Drivers\OAuthStripeDriver;
use App\Integrations\OAuth\Drivers\OAuthTelegramDriver;
enum OAuthProviderService: string
{
case Google = 'google';
+ case GoogleOneTap = 'google_one_tap';
case Stripe = 'stripe';
case Telegram = 'telegram';
@@ -17,8 +19,31 @@ enum OAuthProviderService: string
{
return match ($this) {
self::Google => new OAuthGoogleDriver(),
+ self::GoogleOneTap => new OAuthGoogleOneTapDriver(),
self::Stripe => new OAuthStripeDriver(),
self::Telegram => new OAuthTelegramDriver(),
};
}
+
+ public function supportsIntent(string $intent): bool
+ {
+ return match ($this) {
+ self::Google => in_array($intent, ['auth', 'integration']),
+ self::GoogleOneTap => $intent === 'auth',
+ self::Stripe => $intent === 'integration',
+ self::Telegram => $intent === 'integration',
+ };
+ }
+
+ /**
+ * Get the normalized provider name for database storage.
+ * Both Google and GoogleOneTap should be stored as 'google' since they use the same OAuth provider.
+ */
+ public function getDatabaseProvider(): string
+ {
+ return match ($this) {
+ self::GoogleOneTap => 'google', // Override to normalize to 'google'
+ default => $this->value, // Use enum value by default
+ };
+ }
}
diff --git a/api/app/Jobs/Form/GenerateAiForm.php b/api/app/Jobs/Form/GenerateAiForm.php
index c359a34a0..fb5324e9c 100644
--- a/api/app/Jobs/Form/GenerateAiForm.php
+++ b/api/app/Jobs/Form/GenerateAiForm.php
@@ -17,6 +17,8 @@ class GenerateAiForm implements ShouldQueue
use Queueable;
use SerializesModels;
+ protected string $model = 'o4-mini';
+
/**
* Create a new job instance.
*
diff --git a/api/app/Jobs/Form/GenerateAiFormFields.php b/api/app/Jobs/Form/GenerateAiFormFields.php
new file mode 100644
index 000000000..eba9c2cd8
--- /dev/null
+++ b/api/app/Jobs/Form/GenerateAiFormFields.php
@@ -0,0 +1,77 @@
+<?php
+
+namespace App\Jobs\Form;
+
+use App\Models\Forms\AI\AiFormCompletion;
+use App\Service\AI\Prompts\Form\GenerateFormFieldsPrompt;
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Queue\SerializesModels;
+
+class GenerateAiFormFields implements ShouldQueue
+{
+ use Dispatchable;
+ use InteractsWithQueue;
+ use Queueable;
+ use SerializesModels;
+
+ /**
+ * Create a new job instance.
+ *
+ * @return void
+ */
+ public function __construct(public AiFormCompletion $completion)
+ {
+ }
+
+ /**
+ * Execute the job.
+ *
+ * @return void
+ */
+ public function handle()
+ {
+ $this->completion->update([
+ 'status' => AIFormCompletion::STATUS_PROCESSING,
+ ]);
+
+ try {
+ // Extract form context from the completion
+ $context = $this->completion->context ?? [];
+ $formTitle = $context['title'] ?? '';
+ $existingFields = $context['properties'] ?? [];
+
+ // Use the static run method to execute the prompt
+ $fieldsData = GenerateFormFieldsPrompt::run(
+ $this->completion->form_prompt,
+ $formTitle,
+ $existingFields
+ );
+
+ $this->completion->update([
+ 'status' => AIFormCompletion::STATUS_COMPLETED,
+ 'result' => $fieldsData
+ ]);
+ } catch (\Exception $e) {
+ $this->onError($e);
+ }
+ }
+
+ /**
+ * Handle a job failure.
+ */
+ public function failed(\Throwable $exception): void
+ {
+ $this->onError($exception);
+ }
+
+ private function onError(\Throwable $e)
+ {
+ $this->completion->update([
+ 'status' => AIFormCompletion::STATUS_FAILED,
+ 'error' => $e->getMessage(),
+ ]);
+ }
+}
diff --git a/api/app/Models/Forms/AI/AiFormCompletion.php b/api/app/Models/Forms/AI/AiFormCompletion.php
index c0b691063..0773ea4fe 100644
--- a/api/app/Models/Forms/AI/AiFormCompletion.php
+++ b/api/app/Models/Forms/AI/AiFormCompletion.php
@@ -3,6 +3,7 @@
namespace App\Models\Forms\AI;
use App\Jobs\Form\GenerateAiForm;
+use App\Jobs\Form\GenerateAiFormFields;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model;
@@ -11,13 +12,13 @@ class AiFormCompletion extends Model
use HasFactory;
public const STATUS_PENDING = 'pending';
-
public const STATUS_PROCESSING = 'processing';
-
public const STATUS_COMPLETED = 'completed';
-
public const STATUS_FAILED = 'failed';
+ public const TYPE_FORM = 'form';
+ public const TYPE_FIELDS = 'fields';
+
protected $table = 'ai_form_completions';
protected $fillable = [
@@ -26,17 +27,31 @@ class AiFormCompletion extends Model
'result',
'ip',
'error',
+ 'type',
+ 'context',
];
protected $attributes = [
'status' => self::STATUS_PENDING,
+ 'type' => self::TYPE_FORM,
];
+ protected function casts()
+ {
+ return [
+ 'context' => 'array',
+ ];
+ }
+
protected static function booted()
{
// Dispatch completion job on creation
static::created(function (self $completion) {
- GenerateAiForm::dispatch($completion);
+ if ($completion->type === self::TYPE_FORM) {
+ GenerateAIForm::dispatch($completion);
+ } elseif ($completion->type === self::TYPE_FIELDS) {
+ GenerateAiFormFields::dispatch($completion);
+ }
});
}
}
diff --git a/api/app/Models/User.php b/api/app/Models/User.php
index ff37aefbf..04a73a819 100644
--- a/api/app/Models/User.php
+++ b/api/app/Models/User.php
@@ -8,6 +8,7 @@ use App\Notifications\VerifyEmail;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Foundation\Auth\User as Authenticatable;
use Illuminate\Notifications\Notifiable;
+use Illuminate\Support\Facades\Hash;
use Laravel\Cashier\Billable;
use Laravel\Sanctum\HasApiTokens;
use Tymon\JWTAuth\Contracts\JWTSubject;
@@ -227,8 +228,8 @@ class User extends Authenticatable implements JWTSubject
public function getJWTCustomClaims()
{
return [
- 'ip' => \Hash::make(request()->ip()),
- 'ua' => \Hash::make(request()->userAgent()),
+ 'ip' => Hash::make(request()->ip()),
+ 'ua' => Hash::make(request()->userAgent()),
];
}
@@ -255,6 +256,9 @@ class User extends Authenticatable implements JWTSubject
{
parent::boot();
static::deleting(function (User $user) {
+ // Delete all OAuth providers for this user
+ $user->oauthProviders()->delete();
+
// Remove user's workspace if he's the only one with this workspace
foreach ($user->workspaces as $workspace) {
if ($workspace->users()->count() == 1) {
diff --git a/api/app/Models/Workspace.php b/api/app/Models/Workspace.php
index 5fc08a2d6..c44166f59 100644
--- a/api/app/Models/Workspace.php
+++ b/api/app/Models/Workspace.php
@@ -32,6 +32,7 @@ class Workspace extends Model implements CachableAttributes
'is_pro',
'is_trialing',
'is_enterprise',
+ 'users_count',
];
protected function casts(): array
@@ -49,6 +50,7 @@ class Workspace extends Model implements CachableAttributes
'submissions_count',
'max_file_size',
'custom_domain_count',
+ 'users_count',
];
public function getMaxFileSizeAttribute()
@@ -176,6 +178,13 @@ class Workspace extends Model implements CachableAttributes
});
}
+ public function getUsersCountAttribute()
+ {
+ return $this->remember('users_count', 15 * 60, function (): int {
+ return $this->users()->count();
+ });
+ }
+
/**
* Relationships
*/
@@ -218,6 +227,13 @@ class Workspace extends Model implements CachableAttributes
})->exists();
}
+ public function isAdminUser(?User $user)
+ {
+ return $user ? $this->users()
+ ->wherePivot('user_id', $user->id)
+ ->wherePivot('role', User::ROLE_ADMIN)
+ ->exists() : false;
+ }
public function isReadonlyUser(?User $user)
{
return $user ? $this->users()
diff --git a/api/app/Policies/OAuthProviderPolicy.php b/api/app/Policies/OAuthProviderPolicy.php
index 2f9ecc161..e6f84452a 100644
--- a/api/app/Policies/OAuthProviderPolicy.php
+++ b/api/app/Policies/OAuthProviderPolicy.php
@@ -77,6 +77,17 @@ class OAuthProviderPolicy
}
}
+ // Check if this is the user's primary OAuth provider and they don't have a password
+ if (
+ isset($user->meta['signup_provider']) &&
+ isset($user->meta['signup_provider_user_id']) &&
+ str_starts_with($user->meta['signup_provider'], $provider->provider->value) &&
+ $user->meta['signup_provider_user_id'] === $provider->provider_user_id &&
+ is_null($user->password)
+ ) {
+ return $this->denyWithStatus(400, 'You cannot remove your primary sign-in method. Please create a password first in your account settings.');
+ }
+
return $provider->user()->is($user);
}
diff --git a/api/app/Policies/WorkspacePolicy.php b/api/app/Policies/WorkspacePolicy.php
index d896a4793..fa64660c4 100644
--- a/api/app/Policies/WorkspacePolicy.php
+++ b/api/app/Policies/WorkspacePolicy.php
@@ -51,6 +51,11 @@ class WorkspacePolicy
*/
public function create(User $user)
{
+ // Check if user already has a workspace
+ if (!$user->is_pro && $user->workspaces()->count() > 0) {
+ return Response::deny('You have reached the limit for free workspaces. Upgrade to Pro to create additional workspaces.');
+ }
+
if ($token = $user->currentAccessToken()) {
return $token->can('workspaces-write');
}
@@ -79,10 +84,12 @@ class WorkspacePolicy
*/
public function delete(User $user, Workspace $workspace)
{
- $basePermission = !$workspace->owners->where('id', $user->id)->isEmpty() && $user->workspaces()->count() > 1;
+ if (!$user->ownsWorkspace($workspace)) {
+ return Response::deny('You cannot delete this workspace.');
+ }
- if (! $basePermission) {
- return false;
+ if ($user->workspaces()->count() <= 1) {
+ return Response::deny('You cannot delete your last workspace. Delete your account instead.');
}
if ($token = $user->currentAccessToken()) {
diff --git a/api/app/Service/AI/Prompts/Form/FormFieldSchemas.php b/api/app/Service/AI/Prompts/Form/FormFieldSchemas.php
new file mode 100644
index 000000000..a7583bf9a
--- /dev/null
+++ b/api/app/Service/AI/Prompts/Form/FormFieldSchemas.php
@@ -0,0 +1,397 @@
+<?php
+
+namespace App\Service\AI\Prompts\Form;
+
+use Illuminate\Support\Str;
+
+class FormFieldSchemas
+{
+ /**
+ * Base property schema that all field types extend
+ */
+ public const BASE_PROPERTY_SCHEMA = [
+ 'type' => 'object',
+ 'required' => ['name', 'help', 'hidden', 'required', 'placeholder', 'width'],
+ 'additionalProperties' => false,
+ 'properties' => [
+ 'name' => [
+ 'type' => 'string',
+ 'description' => 'The name/label of the field. Always use a name for the block - even for hidden fields & layout blocks (text fields, page breaks, dividers, etc).'
+ ],
+ 'help' => [
+ 'type' => 'string',
+ 'description' => 'Help text for the field (default: "" leave empty if not needed)'
+ ],
+ 'hidden' => [
+ 'type' => 'boolean',
+ 'description' => 'Whether the field is hidden (default: false)'
+ ],
+ 'required' => [
+ 'type' => 'boolean',
+ 'description' => 'Whether the field is required (default: false)'
+ ],
+ 'placeholder' => [
+ 'type' => 'string',
+ 'description' => 'Placeholder text for the field. Leave empty if not needed (default: "")'
+ ],
+ 'width' => [
+ 'type' => 'string',
+ 'enum' => ['full', '1/2', '1/3', '2/3', '1/4', '3/4'],
+ 'description' => 'Width of the field in the form layout. "full" takes the entire width, "1/2" takes half width, "1/3" takes a third, etc. (default: "full")',
+ ]
+ ]
+ ];
+
+ /**
+ * Complete field type definitions for all available form field types
+ */
+ public const FIELD_TYPE_DEFINITIONS = [
+ 'baseProperty' => self::BASE_PROPERTY_SCHEMA,
+ 'option' => [
+ 'type' => 'object',
+ 'required' => ['name', 'id'],
+ 'additionalProperties' => false,
+ 'properties' => [
+ 'name' => ['type' => 'string'],
+ 'id' => ['type' => 'string']
+ ]
+ ],
+ 'selectOptions' => [
+ 'type' => 'object',
+ 'required' => ['options'],
+ 'additionalProperties' => false,
+ 'properties' => [
+ 'options' => [
+ 'type' => 'array',
+ 'items' => ['$ref' => '#/definitions/option'],
+ 'description' => 'Options for select fields'
+ ]
+ ]
+ ],
+ 'textProperty' => [
+ 'type' => 'object',
+ 'required' => ['type', 'core', 'multi_lines', 'generates_uuid', 'max_char_limit', 'hide_field_name', 'show_char_limit'],
+ 'additionalProperties' => false,
+ 'properties' => [
+ 'type' => ['type' => 'string', 'enum' => ['text']],
+ 'multi_lines' => [
+ 'type' => 'boolean',
+ 'description' => 'Whether the text field should have multiple lines (default: false)',
+ ],
+ 'generates_uuid' => [
+ 'type' => 'boolean',
+ 'description' => 'Whether the field should generate a UUID (default: false)'
+ ],
+ 'max_char_limit' => [
+ 'type' => ['integer', 'string'],
+ 'description' => 'Maximum character limit for text fields (default: 500)'
+ ],
+ 'hide_field_name' => [
+ 'type' => 'boolean',
+ 'description' => 'Whether to hide the field name (default: false)'
+ ],
+ 'show_char_limit' => [
+ 'type' => 'boolean',
+ 'description' => 'Whether to show the character limit (default: false)'
+ ],
+ 'core' => ['$ref' => '#/definitions/baseProperty'],
+ ]
+ ],
+ 'richTextProperty' => [
+ 'type' => 'object',
+ 'required' => ['type', 'core', 'max_char_limit'],
+ 'additionalProperties' => false,
+ 'properties' => [
+ 'type' => ['type' => 'string', 'enum' => ['rich_text']],
+ 'max_char_limit' => [
+ 'type' => ['integer', 'string'],
+ 'description' => 'Maximum character limit for rich text fields (default: 1000)'
+ ],
+ 'core' => ['$ref' => '#/definitions/baseProperty'],
+ ]
+ ],
+ 'dateProperty' => [
+ 'type' => 'object',
+ 'required' => ['core', 'type', 'with_time'],
+ 'additionalProperties' => false,
+ 'properties' => [
+ 'type' => ['type' => 'string', 'enum' => ['date']],
+ 'core' => ['$ref' => '#/definitions/baseProperty'],
+ 'with_time' => [
+ 'type' => 'boolean',
+ 'description' => 'Whether to include time selection with the date (default: false)',
+ ]
+ ]
+ ],
+ 'urlProperty' => [
+ 'type' => 'object',
+ 'required' => ['core', 'type', 'max_char_limit'],
+ 'additionalProperties' => false,
+ 'properties' => [
+ 'type' => ['type' => 'string', 'enum' => ['url']],
+ 'core' => ['$ref' => '#/definitions/baseProperty'],
+ 'max_char_limit' => [
+ 'type' => ['integer', 'string'],
+ 'description' => 'Maximum character limit for URL fields (default: 500)'
+ ]
+ ]
+ ],
+ 'phoneNumberProperty' => [
+ 'type' => 'object',
+ 'required' => ['core', 'type'],
+ 'additionalProperties' => false,
+ 'properties' => [
+ 'type' => ['type' => 'string', 'enum' => ['phone_number']],
+ 'core' => ['$ref' => '#/definitions/baseProperty'],
+ ]
+ ],
+ 'emailProperty' => [
+ 'type' => 'object',
+ 'required' => ['core', 'type', 'max_char_limit'],
+ 'additionalProperties' => false,
+ 'properties' => [
+ 'type' => ['type' => 'string', 'enum' => ['email']],
+ 'core' => ['$ref' => '#/definitions/baseProperty'],
+ 'max_char_limit' => [
+ 'type' => ['integer', 'string'],
+ 'description' => 'Maximum character limit for email fields (default: 320)'
+ ]
+ ]
+ ],
+ 'checkboxProperty' => [
+ 'type' => 'object',
+ 'required' => ['core', 'type', 'use_toggle_switch'],
+ 'additionalProperties' => false,
+ 'properties' => [
+ 'type' => ['type' => 'string', 'enum' => ['checkbox']],
+ 'core' => ['$ref' => '#/definitions/baseProperty'],
+ 'use_toggle_switch' => [
+ 'type' => 'boolean',
+ 'description' => 'Whether to display the checkbox as a toggle switch (default: false)',
+ ]
+ ]
+ ],
+ 'selectProperty' => [
+ 'type' => 'object',
+ 'required' => ['core', 'type', 'select', 'without_dropdown'],
+ 'additionalProperties' => false,
+ 'properties' => [
+ 'type' => ['type' => 'string', 'enum' => ['select']],
+ 'core' => ['$ref' => '#/definitions/baseProperty'],
+ 'select' => ['$ref' => '#/definitions/selectOptions'],
+ 'without_dropdown' => [
+ 'type' => 'boolean',
+ 'description' => 'Whether to display select options as radio buttons instead of a dropdown using FlatSelectInput. Recommended for small choices (<5 options) (default: false)',
+ ]
+ ]
+ ],
+ 'multiSelectProperty' => [
+ 'type' => 'object',
+ 'required' => ['core', 'type', 'multi_select', 'without_dropdown'],
+ 'additionalProperties' => false,
+ 'properties' => [
+ 'type' => ['type' => 'string', 'enum' => ['multi_select']],
+ 'core' => ['$ref' => '#/definitions/baseProperty'],
+ 'multi_select' => ['$ref' => '#/definitions/selectOptions'],
+ 'without_dropdown' => [
+ 'type' => 'boolean',
+ 'description' => 'Whether to display multi-select options as checkboxes instead of a dropdown using FlatSelectInput. Recommended for small choices (<5 options) (default: false)',
+ ]
+ ]
+ ],
+ 'matrixProperty' => [
+ 'type' => 'object',
+ 'required' => ['core', 'type', 'rows', 'columns'],
+ 'additionalProperties' => false,
+ 'properties' => [
+ 'type' => ['type' => 'string', 'enum' => ['matrix']],
+ 'core' => ['$ref' => '#/definitions/baseProperty'],
+ 'rows' => [
+ 'type' => 'array',
+ 'items' => ['type' => 'string'],
+ 'description' => 'Rows for matrix fields (ex: ["Row 1"])'
+ ],
+ 'columns' => [
+ 'type' => 'array',
+ 'items' => ['type' => 'string'],
+ 'description' => 'Columns for matrix fields (ex: ["1", "2", "3"])'
+ ]
+ ]
+ ],
+ 'numberProperty' => [
+ 'type' => 'object',
+ 'required' => ['core', 'type'],
+ 'additionalProperties' => false,
+ 'properties' => [
+ 'type' => ['type' => 'string', 'enum' => ['number']],
+ 'core' => ['$ref' => '#/definitions/baseProperty'],
+ ]
+ ],
+ 'ratingProperty' => [
+ 'type' => 'object',
+ 'required' => ['core', 'type', 'rating_max_value'],
+ 'additionalProperties' => false,
+ 'properties' => [
+ 'type' => ['type' => 'string', 'enum' => ['rating']],
+ 'core' => ['$ref' => '#/definitions/baseProperty'],
+ 'rating_max_value' => [
+ 'type' => 'integer',
+ 'description' => 'Maximum rating for rating fields (default: 5)'
+ ]
+ ]
+ ],
+ 'scaleProperty' => [
+ 'type' => 'object',
+ 'required' => ['core', 'type', 'scale_min_value', 'scale_max_value', 'scale_step_value'],
+ 'additionalProperties' => false,
+ 'properties' => [
+ 'type' => ['type' => 'string', 'enum' => ['scale']],
+ 'core' => ['$ref' => '#/definitions/baseProperty'],
+ 'scale_min_value' => [
+ 'type' => 'integer',
+ 'description' => 'Minimum value for scale fields (default: 1)'
+ ],
+ 'scale_max_value' => [
+ 'type' => 'integer',
+ 'description' => 'Maximum value for scale fields (default: 5)'
+ ],
+ 'scale_step_value' => [
+ 'type' => 'integer',
+ 'description' => 'Step value for scale fields (default: 1)'
+ ]
+ ]
+ ],
+ 'sliderProperty' => [
+ 'type' => 'object',
+ 'required' => ['core', 'type', 'slider_min_value', 'slider_max_value', 'slider_step_value'],
+ 'additionalProperties' => false,
+ 'properties' => [
+ 'type' => ['type' => 'string', 'enum' => ['slider']],
+ 'core' => ['$ref' => '#/definitions/baseProperty'],
+ 'slider_min_value' => [
+ 'type' => 'integer',
+ 'description' => 'Minimum value for slider fields (default: 0)'
+ ],
+ 'slider_max_value' => [
+ 'type' => 'integer',
+ 'description' => 'Maximum value for slider fields (default: 50)'
+ ],
+ 'slider_step_value' => [
+ 'type' => 'integer',
+ 'description' => 'Step value for slider fields (default: 1)'
+ ]
+ ]
+ ],
+ 'filesProperty' => [
+ 'type' => 'object',
+ 'required' => ['core', 'type'],
+ 'additionalProperties' => false,
+ 'properties' => [
+ 'type' => ['type' => 'string', 'enum' => ['files']],
+ 'core' => ['$ref' => '#/definitions/baseProperty'],
+ ]
+ ],
+ 'signatureProperty' => [
+ 'type' => 'object',
+ 'required' => ['core', 'type'],
+ 'additionalProperties' => false,
+ 'properties' => [
+ 'type' => ['type' => 'string', 'enum' => ['signature']],
+ 'core' => ['$ref' => '#/definitions/baseProperty'],
+ ]
+ ],
+ 'barcodeProperty' => [
+ 'type' => 'object',
+ 'required' => ['core', 'type', 'decoders'],
+ 'additionalProperties' => false,
+ 'properties' => [
+ 'type' => ['type' => 'string', 'enum' => ['barcode']],
+ 'core' => ['$ref' => '#/definitions/baseProperty'],
+ 'decoders' => [
+ 'type' => 'array',
+ 'items' => ['type' => 'string'],
+ 'description' => 'Decoders for barcode fields (default: ["ean_reader", "ean_8_reader"])'
+ ]
+ ]
+ ],
+ 'nfTextProperty' => [
+ 'type' => 'object',
+ 'required' => ['core', 'type', 'content'],
+ 'additionalProperties' => false,
+ 'properties' => [
+ 'type' => ['type' => 'string', 'enum' => ['nf-text']],
+ 'core' => ['$ref' => '#/definitions/baseProperty'],
+ 'content' => [
+ 'type' => 'string',
+ 'description' => 'HTML content for text elements. Supports headers (<h1>, <h2>), formatting (<b>, <i>, <u>, <s>), links (<a>), lists (<ul>, <ol>), colors (<span style="color: #hexcode">), and paragraphs (<p>). Example: "<h1>Form Title</h1><p>Please fill out this form.</p>"'
+ ]
+ ]
+ ],
+ 'nfPageBreakProperty' => [
+ 'type' => 'object',
+ 'required' => ['core', 'type', 'next_btn_text', 'previous_btn_text'],
+ 'additionalProperties' => false,
+ 'properties' => [
+ 'type' => ['type' => 'string', 'enum' => ['nf-page-break']],
+ 'core' => ['$ref' => '#/definitions/baseProperty'],
+ 'next_btn_text' => [
+ 'type' => 'string',
+ 'description' => 'Text for the next button in page breaks (default: "Next")'
+ ],
+ 'previous_btn_text' => [
+ 'type' => 'string',
+ 'description' => 'Text for the previous button in page breaks (default: "Previous")'
+ ]
+ ]
+ ],
+ 'nfDividerProperty' => [
+ 'type' => 'object',
+ 'required' => ['core', 'type'],
+ 'additionalProperties' => false,
+ 'properties' => [
+ 'type' => ['type' => 'string', 'enum' => ['nf-divider']],
+ 'core' => ['$ref' => '#/definitions/baseProperty'],
+ ]
+ ],
+ 'nfImageProperty' => [
+ 'type' => 'object',
+ 'required' => ['core', 'type'],
+ 'additionalProperties' => false,
+ 'properties' => [
+ 'type' => ['type' => 'string', 'enum' => ['nf-image']],
+ 'core' => ['$ref' => '#/definitions/baseProperty'],
+ ]
+ ],
+ 'nfCodeProperty' => [
+ 'type' => 'object',
+ 'required' => ['core', 'type'],
+ 'additionalProperties' => false,
+ 'properties' => [
+ 'type' => ['type' => 'string', 'enum' => ['nf-code']],
+ 'core' => ['$ref' => '#/definitions/baseProperty'],
+ ]
+ ]
+ ];
+
+ public static function processFields(array $properties): array
+ {
+ $processedProperties = [];
+ foreach ($properties as $property) {
+ $newProperty = $property;
+ // Add a unique ID to each property
+ $newProperty['id'] = Str::uuid()->toString();
+
+ // Flatten core properties if they exist
+ if (isset($property['core']) && is_array($property['core'])) {
+ foreach ($property['core'] as $coreKey => $coreValue) {
+ $newProperty[$coreKey] = $coreValue;
+ }
+ // Remove the core property after flattening
+ unset($newProperty['core']);
+ }
+ $processedProperties[] = $newProperty;
+ }
+
+ return $processedProperties;
+ }
+}
diff --git a/api/app/Service/AI/Prompts/Form/GenerateFormFieldsPrompt.php b/api/app/Service/AI/Prompts/Form/GenerateFormFieldsPrompt.php
new file mode 100644
index 000000000..e7a1cfaf1
--- /dev/null
+++ b/api/app/Service/AI/Prompts/Form/GenerateFormFieldsPrompt.php
@@ -0,0 +1,201 @@
+<?php
+
+namespace App\Service\AI\Prompts\Form;
+
+use App\Service\AI\Prompts\Prompt;
+
+class GenerateFormFieldsPrompt extends Prompt
+{
+ protected ?float $temperature = null;
+
+ protected ?int $maxTokens = null;
+
+ protected string $model = 'o4-mini';
+
+ /**
+ * The prompt template for generating forms
+ */
+ public const PROMPT_TEMPLATE = <<<'EOD'
+ Generate form field(s) based on the description below.
+
+ <field_description>
+ {formPrompt}
+ </field_description>
+
+ <current_form_context>
+ Form Title: {formTitle}
+ Existing Fields: {existingFields}
+ </current_form_context>
+
+ Return an array of field objects that fit the context and complement the existing form structure. Consider the form's purpose and existing fields when generating new fields.
+
+ Available field types:
+ - text: Text input (use multi_lines: true for multi-line text)
+ - rich_text: Rich text input
+ - date: Date picker (use with_time: true to include time selection)
+ - url: URL input with validation
+ - phone_number: Phone number input
+ - email: Email input with validation
+ - checkbox: Single checkbox for yes/no (use use_toggle_switch: true for toggle switch)
+ - select: Dropdown selection (use without_dropdown: true for radio buttons, recommended for <5 options)
+ - multi_select: Multiple selection (use without_dropdown: true for checkboxes, recommended for <5 options)
+ - matrix: Matrix input with rows and columns
+ - number: Numeric input
+ - rating: Star rating
+ - scale: Numeric scale
+ - slider: Slider selection
+ - files: File upload
+ - signature: Signature pad
+ - barcode: Barcode scanner
+ - nf-text: Rich text content (not an input field)
+ - nf-page-break: Page break for multi-page forms
+ - nf-divider: Visual divider (not an input field)
+ - nf-image: Image element
+ - nf-code: Code block
+
+ HTML formatting for nf-text:
+ - Headers: <h1>, <h2> for section titles and subtitles
+ - Text formatting: <b> or <strong> for bold, <i> or <em> for italic, <u> for underline, <s> for strikethrough
+ - Links: <a href="url">link text</a> for hyperlinks
+ - Lists: <ul><li>item</li></ul> for bullet lists, <ol><li>item</li></ol> for numbered lists
+ - Colors: <span style="color: #hexcode">colored text</span> for colored text
+ - Paragraphs: <p>paragraph text</p> for text blocks with spacing
+ Use these HTML tags to create well-structured and visually appealing form content.
+
+ Field width options:
+ - width: "full" (default, takes entire width)
+ - width: "1/2" (takes half width)
+ - width: "1/3" (takes a third of the width)
+ - width: "2/3" (takes two thirds of the width)
+ - width: "1/4" (takes a quarter of the width)
+ - width: "3/4" (takes three quarters of the width)
+ Fields with width less than "full" will be placed on the same line if there's enough room. For example:
+ - Two 1/2 width fields will be placed side by side
+ - Three 1/3 width fields will be placed on the same line
+ - etc.
+ No need for lines width to be complete. Don't abuse putting multiple fields on the same line if it doesn't make sense. For First name and Last name, it works well for instance.
+
+ Field generation guidelines:
+ - Choose the most appropriate field type based on the data being collected
+ - Consider the existing form context and avoid duplicating fields
+ - Use logical field names that clearly describe the data being collected
+ - Add helpful placeholder text and help text for complex fields
+ - Set appropriate validation (required fields where necessary - do not add * to the field name if required - it's done automatically)
+ - Use appropriate width settings for better layout
+ - For select/multi-select fields, provide relevant options based on the context
+ - For number fields, consider if rating, scale, or slider would be more appropriate
+ - For rich text fields, consider if multi-line, matrix, or barcode input would be useful
+
+ Return an array of field objects that:
+ - Match the field description requirements
+ - Complement the existing form structure
+ - Use appropriate field types and configurations
+ - Include proper validation and help text (leave empty if not needed)
+ - Follow the form's overall purpose and flow
+ EOD;
+
+ /**
+ * JSON schema for form output
+ */
+ protected ?array $jsonSchema = [
+ 'type' => 'object',
+ 'required' => ['properties'],
+ 'additionalProperties' => false,
+ 'properties' => [
+ 'properties' => [
+ 'type' => 'array',
+ 'description' => 'Array of form fields and elements',
+ 'items' => [
+ 'anyOf' => [
+ ['$ref' => '#/definitions/textProperty'],
+ ['$ref' => '#/definitions/richTextProperty'],
+ ['$ref' => '#/definitions/dateProperty'],
+ ['$ref' => '#/definitions/urlProperty'],
+ ['$ref' => '#/definitions/phoneNumberProperty'],
+ ['$ref' => '#/definitions/emailProperty'],
+ ['$ref' => '#/definitions/checkboxProperty'],
+ ['$ref' => '#/definitions/selectProperty'],
+ ['$ref' => '#/definitions/multiSelectProperty'],
+ ['$ref' => '#/definitions/numberProperty'],
+ ['$ref' => '#/definitions/filesProperty'],
+ ['$ref' => '#/definitions/nfTextProperty'],
+ ['$ref' => '#/definitions/nfPageBreakProperty'],
+ ['$ref' => '#/definitions/nfDividerProperty'],
+ ['$ref' => '#/definitions/nfImageProperty'],
+ ['$ref' => '#/definitions/nfCodeProperty']
+ ]
+ ]
+ ]
+ ],
+ 'definitions' => FormFieldSchemas::FIELD_TYPE_DEFINITIONS
+ ];
+
+ public function __construct(
+ public string $formPrompt,
+ public string $formTitle = '',
+ public array $existingFields = []
+ ) {
+ parent::__construct();
+ }
+
+ protected function getSystemMessage(): ?string
+ {
+ return 'You are an AI assistant specialized in generating form fields. Create appropriate field objects that fit the context and complement existing form structures. Focus on choosing the right field types and configurations based on the data being collected.';
+ }
+
+ protected function getPromptTemplate(): string
+ {
+ return self::PROMPT_TEMPLATE;
+ }
+
+ /**
+ * Override the execute method to automatically process the output
+ */
+ public function execute(): array
+ {
+ $formData = parent::execute();
+ return $this->processOutput($formData);
+ }
+
+ /**
+ * Override getPromptVariables to handle complex formatting
+ */
+ protected function getPromptVariables(): array
+ {
+ $variables = parent::getPromptVariables();
+
+ // Add the formatted existing fields
+ $variables['{existingFields}'] = $this->formatExistingFields();
+
+ return $variables;
+ }
+
+ /**
+ * Format existing fields for display in the prompt
+ */
+ private function formatExistingFields(): string
+ {
+ if (empty($this->existingFields)) {
+ return 'No existing fields';
+ }
+
+ $formatted = [];
+ foreach ($this->existingFields as $field) {
+ $fieldInfo = $field['name'] ?? 'Unnamed field';
+ $fieldType = $field['type'] ?? 'Unknown type';
+ $formatted[] = "- {$fieldInfo} ({$fieldType})";
+ }
+
+ return implode("\n", $formatted);
+ }
+
+ /**
+ * Process the AI output to ensure it meets our requirements
+ */
+ public function processOutput(array $formFields): array
+ {
+ $properties = $formFields['properties'] ?? [];
+
+ return FormFieldSchemas::processFields($properties);
+ }
+}
diff --git a/api/app/Service/AI/Prompts/Form/GenerateFormPrompt.php b/api/app/Service/AI/Prompts/Form/GenerateFormPrompt.php
index 0fcb83c15..f92fc1f47 100644
--- a/api/app/Service/AI/Prompts/Form/GenerateFormPrompt.php
+++ b/api/app/Service/AI/Prompts/Form/GenerateFormPrompt.php
@@ -3,13 +3,14 @@
namespace App\Service\AI\Prompts\Form;
use App\Service\AI\Prompts\Prompt;
-use Illuminate\Support\Str;
class GenerateFormPrompt extends Prompt
{
- protected float $temperature = 0.81;
+ protected ?float $temperature = null;
- protected int $maxTokens = 3000;
+ protected ?int $maxTokens = null;
+
+ protected string $model = 'o4-mini';
/**
* The prompt template for generating forms
@@ -77,7 +78,7 @@ class GenerateFormPrompt extends Prompt
- A clear `title` (internal for form admin)
- `nf-text` blocks to add a title or text to the form using some basic html (h1, p, b, i, u etc)
- Logical field grouping
- - Required fields where necessary
+ - Required fields where necessary (do not add * to the field name if required - it's done automatically)
- Help text for complex fields
- Appropriate validation
- Customized submission text
@@ -158,364 +159,7 @@ class GenerateFormPrompt extends Prompt
]
]
],
- 'definitions' => [
- 'option' => [
- 'type' => 'object',
- 'required' => ['name', 'id'],
- 'additionalProperties' => false,
- 'properties' => [
- 'name' => ['type' => 'string'],
- 'id' => ['type' => 'string']
- ]
- ],
- 'selectOptions' => [
- 'type' => 'object',
- 'required' => ['options'],
- 'additionalProperties' => false,
- 'properties' => [
- 'options' => [
- 'type' => 'array',
- 'items' => ['$ref' => '#/definitions/option'],
- 'description' => 'Options for select fields'
- ]
- ]
- ],
- 'baseProperty' => [
- 'type' => 'object',
- 'required' => ['name', 'help', 'hidden', 'required', 'placeholder', 'width'],
- 'additionalProperties' => false,
- 'properties' => [
- 'name' => [
- 'type' => 'string',
- 'description' => 'The name/label of the field'
- ],
- 'help' => [
- 'type' => 'string',
- 'description' => 'Help text for the field (default: null)'
- ],
- 'hidden' => [
- 'type' => 'boolean',
- 'description' => 'Whether the field is hidden (default: false)'
- ],
- 'required' => [
- 'type' => 'boolean',
- 'description' => 'Whether the field is required (default: false)'
- ],
- 'placeholder' => [
- 'type' => 'string',
- 'description' => 'Placeholder text for the field. Leave empty if not needed (default: "")'
- ],
- 'width' => [
- 'type' => 'string',
- 'enum' => ['full', '1/2', '1/3', '2/3', '1/4', '3/4'],
- 'description' => 'Width of the field in the form layout. "full" takes the entire width, "1/2" takes half width, "1/3" takes a third, etc. (default: "full")',
- ]
- ]
- ],
- 'textProperty' => [
- 'type' => 'object',
- 'required' => ['type', 'core', 'multi_lines', 'generates_uuid', 'max_char_limit', 'hide_field_name', 'show_char_limit'],
- 'additionalProperties' => false,
- 'properties' => [
- 'type' => ['type' => 'string', 'enum' => ['text']],
- 'multi_lines' => [
- 'type' => 'boolean',
- 'description' => 'Whether the text field should have multiple lines (default: false)',
- ],
- 'generates_uuid' => [
- 'type' => 'boolean',
- 'description' => 'Whether the field should generate a UUID (default: false)'
- ],
- 'max_char_limit' => [
- 'type' => ['integer', 'string'],
- 'description' => 'Maximum character limit for text fields (default: 500)'
- ],
- 'hide_field_name' => [
- 'type' => 'boolean',
- 'description' => 'Whether to hide the field name (default: false)'
- ],
- 'show_char_limit' => [
- 'type' => 'boolean',
- 'description' => 'Whether to show the character limit (default: false)'
- ],
- 'core' => ['$ref' => '#/definitions/baseProperty'],
- ]
- ],
- 'richTextProperty' => [
- 'type' => 'object',
- 'required' => ['type', 'core', 'max_char_limit'],
- 'additionalProperties' => false,
- 'properties' => [
- 'type' => ['type' => 'string', 'enum' => ['rich_text']],
- 'max_char_limit' => [
- 'type' => ['integer', 'string'],
- 'description' => 'Maximum character limit for rich text fields (default: 1000)'
- ],
- 'core' => ['$ref' => '#/definitions/baseProperty'],
- ]
- ],
- 'dateProperty' => [
- 'type' => 'object',
- 'required' => ['core', 'type', 'with_time'],
- 'additionalProperties' => false,
- 'properties' => [
- 'type' => ['type' => 'string', 'enum' => ['date']],
- 'core' => ['$ref' => '#/definitions/baseProperty'],
- 'with_time' => [
- 'type' => 'boolean',
- 'description' => 'Whether to include time selection with the date (default: false)',
- ]
- ]
- ],
- 'urlProperty' => [
- 'type' => 'object',
- 'required' => ['core', 'type', 'max_char_limit'],
- 'additionalProperties' => false,
- 'properties' => [
- 'type' => ['type' => 'string', 'enum' => ['url']],
- 'core' => ['$ref' => '#/definitions/baseProperty'],
- 'max_char_limit' => [
- 'type' => ['integer', 'string'],
- 'description' => 'Maximum character limit for URL fields (default: 500)'
- ]
- ]
- ],
- 'phoneNumberProperty' => [
- 'type' => 'object',
- 'required' => ['core', 'type'],
- 'additionalProperties' => false,
- 'properties' => [
- 'type' => ['type' => 'string', 'enum' => ['phone_number']],
- 'core' => ['$ref' => '#/definitions/baseProperty'],
- ]
- ],
- 'emailProperty' => [
- 'type' => 'object',
- 'required' => ['core', 'type', 'max_char_limit'],
- 'additionalProperties' => false,
- 'properties' => [
- 'type' => ['type' => 'string', 'enum' => ['email']],
- 'core' => ['$ref' => '#/definitions/baseProperty'],
- 'max_char_limit' => [
- 'type' => ['integer', 'string'],
- 'description' => 'Maximum character limit for email fields (default: 320)'
- ]
- ]
- ],
- 'checkboxProperty' => [
- 'type' => 'object',
- 'required' => ['core', 'type', 'use_toggle_switch'],
- 'additionalProperties' => false,
- 'properties' => [
- 'type' => ['type' => 'string', 'enum' => ['checkbox']],
- 'core' => ['$ref' => '#/definitions/baseProperty'],
- 'use_toggle_switch' => [
- 'type' => 'boolean',
- 'description' => 'Whether to display the checkbox as a toggle switch (default: false)',
- ]
- ]
- ],
- 'selectProperty' => [
- 'type' => 'object',
- 'required' => ['core', 'type', 'select', 'without_dropdown'],
- 'additionalProperties' => false,
- 'properties' => [
- 'type' => ['type' => 'string', 'enum' => ['select']],
- 'core' => ['$ref' => '#/definitions/baseProperty'],
- 'select' => ['$ref' => '#/definitions/selectOptions'],
- 'without_dropdown' => [
- 'type' => 'boolean',
- 'description' => 'Whether to display select options as radio buttons instead of a dropdown using FlatSelectInput. Recommended for small choices (<5 options) (default: false)',
- ]
- ]
- ],
- 'multiSelectProperty' => [
- 'type' => 'object',
- 'required' => ['core', 'type', 'multi_select', 'without_dropdown'],
- 'additionalProperties' => false,
- 'properties' => [
- 'type' => ['type' => 'string', 'enum' => ['multi_select']],
- 'core' => ['$ref' => '#/definitions/baseProperty'],
- 'multi_select' => ['$ref' => '#/definitions/selectOptions'],
- 'without_dropdown' => [
- 'type' => 'boolean',
- 'description' => 'Whether to display multi-select options as checkboxes instead of a dropdown using FlatSelectInput. Recommended for small choices (<5 options) (default: false)',
- ]
- ]
- ],
- 'matrixProperty' => [
- 'type' => 'object',
- 'required' => ['core', 'type', 'rows', 'columns'],
- 'additionalProperties' => false,
- 'properties' => [
- 'type' => ['type' => 'string', 'enum' => ['matrix']],
- 'core' => ['$ref' => '#/definitions/baseProperty'],
- 'rows' => [
- 'type' => 'array',
- 'items' => ['type' => 'string'],
- 'description' => 'Rows for matrix fields (ex: ["Row 1"])'
- ],
- 'columns' => [
- 'type' => 'array',
- 'items' => ['type' => 'string'],
- 'description' => 'Columns for matrix fields (ex: ["1", "2", "3"])'
- ]
- ]
- ],
- 'numberProperty' => [
- 'type' => 'object',
- 'required' => ['core', 'type'],
- 'additionalProperties' => false,
- 'properties' => [
- 'type' => ['type' => 'string', 'enum' => ['number']],
- 'core' => ['$ref' => '#/definitions/baseProperty'],
- ]
- ],
- 'ratingProperty' => [
- 'type' => 'object',
- 'required' => ['core', 'type', 'rating_max_value'],
- 'additionalProperties' => false,
- 'properties' => [
- 'type' => ['type' => 'string', 'enum' => ['rating']],
- 'core' => ['$ref' => '#/definitions/baseProperty'],
- 'rating_max_value' => [
- 'type' => 'integer',
- 'description' => 'Maximum rating for rating fields (default: 5)'
- ]
- ]
- ],
- 'scaleProperty' => [
- 'type' => 'object',
- 'required' => ['core', 'type', 'scale_min_value', 'scale_max_value', 'scale_step_value'],
- 'additionalProperties' => false,
- 'properties' => [
- 'type' => ['type' => 'string', 'enum' => ['scale']],
- 'core' => ['$ref' => '#/definitions/baseProperty'],
- 'scale_min_value' => [
- 'type' => 'integer',
- 'description' => 'Minimum value for scale fields (default: 1)'
- ],
- 'scale_max_value' => [
- 'type' => 'integer',
- 'description' => 'Maximum value for scale fields (default: 5)'
- ],
- 'scale_step_value' => [
- 'type' => 'integer',
- 'description' => 'Step value for scale fields (default: 1)'
- ]
- ]
- ],
- 'sliderProperty' => [
- 'type' => 'object',
- 'required' => ['core', 'type', 'slider_min_value', 'slider_max_value', 'slider_step_value'],
- 'additionalProperties' => false,
- 'properties' => [
- 'type' => ['type' => 'string', 'enum' => ['slider']],
- 'core' => ['$ref' => '#/definitions/baseProperty'],
- 'slider_min_value' => [
- 'type' => 'integer',
- 'description' => 'Minimum value for slider fields (default: 0)'
- ],
- 'slider_max_value' => [
- 'type' => 'integer',
- 'description' => 'Maximum value for slider fields (default: 50)'
- ],
- 'slider_step_value' => [
- 'type' => 'integer',
- 'description' => 'Step value for slider fields (default: 1)'
- ]
- ]
- ],
- 'filesProperty' => [
- 'type' => 'object',
- 'required' => ['core', 'type'],
- 'additionalProperties' => false,
- 'properties' => [
- 'type' => ['type' => 'string', 'enum' => ['files']],
- 'core' => ['$ref' => '#/definitions/baseProperty'],
- ]
- ],
- 'signatureProperty' => [
- 'type' => 'object',
- 'required' => ['core', 'type'],
- 'additionalProperties' => false,
- 'properties' => [
- 'type' => ['type' => 'string', 'enum' => ['signature']],
- 'core' => ['$ref' => '#/definitions/baseProperty'],
- ]
- ],
- 'barcodeProperty' => [
- 'type' => 'object',
- 'required' => ['core', 'type', 'decoders'],
- 'additionalProperties' => false,
- 'properties' => [
- 'type' => ['type' => 'string', 'enum' => ['barcode']],
- 'core' => ['$ref' => '#/definitions/baseProperty'],
- 'decoders' => [
- 'type' => 'array',
- 'items' => ['type' => 'string'],
- 'description' => 'Decoders for barcode fields (default: ["ean_reader", "ean_8_reader"])'
- ]
- ]
- ],
- 'nfTextProperty' => [
- 'type' => 'object',
- 'required' => ['core', 'type', 'content'],
- 'additionalProperties' => false,
- 'properties' => [
- 'type' => ['type' => 'string', 'enum' => ['nf-text']],
- 'core' => ['$ref' => '#/definitions/baseProperty'],
- 'content' => [
- 'type' => 'string',
- 'description' => 'HTML content for text elements. Supports headers (<h1>, <h2>), formatting (<b>, <i>, <u>, <s>), links (<a>), lists (<ul>, <ol>), colors (<span style="color: #hexcode">), and paragraphs (<p>). Example: "<h1>Form Title</h1><p>Please fill out this form.</p>"'
- ]
- ]
- ],
- 'nfPageBreakProperty' => [
- 'type' => 'object',
- 'required' => ['core', 'type', 'next_btn_text', 'previous_btn_text'],
- 'additionalProperties' => false,
- 'properties' => [
- 'type' => ['type' => 'string', 'enum' => ['nf-page-break']],
- 'core' => ['$ref' => '#/definitions/baseProperty'],
- 'next_btn_text' => [
- 'type' => 'string',
- 'description' => 'Text for the next button in page breaks (default: "Next")'
- ],
- 'previous_btn_text' => [
- 'type' => 'string',
- 'description' => 'Text for the previous button in page breaks (default: "Previous")'
- ]
- ]
- ],
- 'nfDividerProperty' => [
- 'type' => 'object',
- 'required' => ['core', 'type'],
- 'additionalProperties' => false,
- 'properties' => [
- 'type' => ['type' => 'string', 'enum' => ['nf-divider']],
- 'core' => ['$ref' => '#/definitions/baseProperty'],
- ]
- ],
- 'nfImageProperty' => [
- 'type' => 'object',
- 'required' => ['core', 'type'],
- 'additionalProperties' => false,
- 'properties' => [
- 'type' => ['type' => 'string', 'enum' => ['nf-image']],
- 'core' => ['$ref' => '#/definitions/baseProperty'],
- ]
- ],
- 'nfCodeProperty' => [
- 'type' => 'object',
- 'required' => ['core', 'type'],
- 'additionalProperties' => false,
- 'properties' => [
- 'type' => ['type' => 'string', 'enum' => ['nf-code']],
- 'core' => ['$ref' => '#/definitions/baseProperty'],
- ]
- ]
- ]
+ 'definitions' => FormFieldSchemas::FIELD_TYPE_DEFINITIONS
];
public function __construct(
@@ -548,21 +192,8 @@ class GenerateFormPrompt extends Prompt
*/
public function processOutput(array $formData): array
{
- // Add unique identifiers to properties
if (isset($formData['properties']) && is_array($formData['properties'])) {
- foreach ($formData['properties'] as $index => $property) {
- // Add a unique ID to each property
- $formData['properties'][$index]['id'] = Str::uuid()->toString();
-
- // Flatten core properties if they exist
- if (isset($property['core']) && is_array($property['core'])) {
- foreach ($property['core'] as $coreKey => $coreValue) {
- $formData['properties'][$index][$coreKey] = $coreValue;
- }
- // Remove the core property after flattening
- unset($formData['properties'][$index]['core']);
- }
- }
+ $formData['properties'] = FormFieldSchemas::processFields($formData['properties']);
}
// Clean title data
@@ -571,8 +202,6 @@ class GenerateFormPrompt extends Prompt
$formData['title'] = preg_replace('/^["\'](.*)["\']$/', '$1', $formData['title']);
}
- ray($formData);
-
return $formData;
}
}
diff --git a/api/app/Service/AI/Prompts/Prompt.php b/api/app/Service/AI/Prompts/Prompt.php
index cb58efe18..8df2df11d 100644
--- a/api/app/Service/AI/Prompts/Prompt.php
+++ b/api/app/Service/AI/Prompts/Prompt.php
@@ -13,11 +13,11 @@ abstract class Prompt
protected ?array $jsonSchema = null;
- protected float $temperature = 0.7;
+ protected ?float $temperature = 0.7;
- protected int $maxTokens = 4096;
+ protected ?int $maxTokens = 4096;
- protected string $model = 'gpt-4o';
+ protected string $model = 'gpt-4.1';
protected bool $useStreaming = false;
diff --git a/api/app/Service/AI/Prompts/Template/GenerateTemplateMetadataPrompt.php b/api/app/Service/AI/Prompts/Template/GenerateTemplateMetadataPrompt.php
index 7e4095970..6be2b3903 100644
--- a/api/app/Service/AI/Prompts/Template/GenerateTemplateMetadataPrompt.php
+++ b/api/app/Service/AI/Prompts/Template/GenerateTemplateMetadataPrompt.php
@@ -8,9 +8,9 @@ use Illuminate\Support\Str;
class GenerateTemplateMetadataPrompt extends Prompt
{
- protected float $temperature = 0.81;
+ protected ?float $temperature = null;
- protected int $maxTokens = 3000;
+ protected ?int $maxTokens = null;
/**
* Available industries and types loaded from the database
diff --git a/api/app/Service/OAuth/OAuthProviderService.php b/api/app/Service/OAuth/OAuthProviderService.php
new file mode 100644
index 000000000..5517b769a
--- /dev/null
+++ b/api/app/Service/OAuth/OAuthProviderService.php
@@ -0,0 +1,47 @@
+<?php
+
+namespace App\Service\OAuth;
+
+use App\Integrations\OAuth\OAuthProviderService as OAuthProviderServiceEnum;
+use App\Models\OAuthProvider;
+use App\Models\User;
+use Illuminate\Http\Exceptions\HttpResponseException;
+
+class OAuthProviderService
+{
+ public function createOrUpdateProvider(User $user, OAuthProviderServiceEnum $providerService, array $userData): OAuthProvider
+ {
+ $provider = $providerService->getDatabaseProvider();
+ $providerUserId = $userData['provider_user_id'];
+
+ // Check if this OAuth provider account is already linked to a different user
+ $existingProvider = OAuthProvider::where('provider', $provider)
+ ->where('provider_user_id', $providerUserId)
+ ->where('user_id', '!=', $user->id)
+ ->first();
+
+ if ($existingProvider) {
+ throw new HttpResponseException(
+ response()->json([
+ 'message' => 'This ' . ucfirst($providerService->value) . ' account is already connected to another user.',
+ 'error' => 'oauth_provider_already_linked'
+ ], 409)
+ );
+ }
+
+ return OAuthProvider::updateOrCreate(
+ [
+ 'user_id' => $user->id,
+ 'provider' => $provider,
+ 'provider_user_id' => $providerUserId,
+ ],
+ [
+ 'access_token' => $userData['access_token'],
+ 'refresh_token' => $userData['refresh_token'] ?? '',
+ 'name' => $userData['name'],
+ 'email' => $userData['email'],
+ 'scopes' => $userData['scopes'] ?? [],
+ ]
+ );
+ }
+}
diff --git a/api/app/Service/OAuth/OAuthUserService.php b/api/app/Service/OAuth/OAuthUserService.php
new file mode 100644
index 000000000..e3d07e45e
--- /dev/null
+++ b/api/app/Service/OAuth/OAuthUserService.php
@@ -0,0 +1,78 @@
+<?php
+
+namespace App\Service\OAuth;
+
+use App\Integrations\OAuth\OAuthProviderService;
+use App\Models\User;
+use App\Models\Workspace;
+use Illuminate\Support\Facades\Cache;
+use Illuminate\Http\Exceptions\HttpResponseException;
+
+class OAuthUserService
+{
+ public function findOrCreateUser(array $userData, OAuthProviderService $providerService): User
+ {
+ $email = strtolower($userData['email']);
+ $user = User::whereEmail($email)->first();
+
+ if ($user) {
+ // Check if user has this specific OAuth provider linked
+ $hasOAuthProvider = $user->oauthProviders()
+ ->where('provider', $providerService->getDatabaseProvider())
+ ->where('provider_user_id', $userData['provider_user_id'])
+ ->exists();
+
+ if ($hasOAuthProvider) {
+ // User has this specific OAuth provider linked - allow authentication
+ return $user;
+ }
+
+ // User exists but doesn't have this OAuth provider linked and no password
+ // This prevents account takeover via different OAuth providers with same email
+ throw new HttpResponseException(
+ response()->json([
+ 'message' => 'An account with this email already exists. Please sign in with your original method or contact support.',
+ 'error' => 'email_already_exists_different_provider'
+ ], 409)
+ );
+ }
+
+ // No existing user - create new account
+ // Check if registration is allowed in self-hosted mode
+ if (config('app.self_hosted') && app()->environment() !== 'testing') {
+ abort(422, 'User registration is not allowed.');
+ }
+
+ // Get UTM data from context
+ $context = Cache::get("oauth-context:auth:" . session()->getId(), []);
+ $utmData = $context['utm_data'] ?? null;
+
+ $user = User::create([
+ 'name' => $userData['name'],
+ 'email' => $email,
+ 'email_verified_at' => now(),
+ 'utm_data' => is_string($utmData) ? json_decode($utmData, true) : $utmData,
+ 'meta' => [
+ 'signup_provider' => $providerService->value,
+ 'signup_provider_user_id' => $userData['provider_user_id'],
+ 'registration_ip' => request()->ip()
+ ],
+ ]);
+
+ // Create and sync workspace
+ $workspace = Workspace::create([
+ 'name' => 'My Workspace',
+ 'icon' => '🧪',
+ ]);
+
+ $user->workspaces()->sync([
+ $workspace->id => [
+ 'role' => User::ROLE_ADMIN,
+ ],
+ ], false);
+
+ $user->new_user = true;
+
+ return $user;
+ }
+}
diff --git a/api/app/Service/OpenAi/GptCompleter.php b/api/app/Service/OpenAi/GptCompleter.php
index e217777c5..bc7a2b080 100644
--- a/api/app/Service/OpenAi/GptCompleter.php
+++ b/api/app/Service/OpenAi/GptCompleter.php
@@ -85,7 +85,7 @@ class GptCompleter
return $this;
}
- public function completeChat(array $messages, int $maxTokens = 4096, float $temperature = 0.81, ?bool $exceptJson = null): self
+ public function completeChat(array $messages, ?int $maxTokens = 4096, ?float $temperature = 0.81, ?bool $exceptJson = null): self
{
if (! is_null($exceptJson)) {
$this->expectsJson = $exceptJson;
@@ -161,7 +161,7 @@ class GptCompleter
return $this->outputTokens;
}
- protected function computeChatCompletion(array $messages, int $maxTokens = 4096, float $temperature = 0.81): self
+ protected function computeChatCompletion(array $messages, ?int $maxTokens = 4096, ?float $temperature = 0.81): self
{
if (isset($this->systemMessage) && $messages[0]['role'] !== 'system') {
$messages = array_merge([[
@@ -173,10 +173,16 @@ class GptCompleter
$completionInput = [
'model' => $this->model,
'messages' => $messages,
- 'max_tokens' => $maxTokens,
- 'temperature' => $temperature,
];
+ if (!is_null($maxTokens)) {
+ $completionInput['max_tokens'] = $maxTokens;
+ }
+
+ if (!is_null($temperature)) {
+ $completionInput['temperature'] = $temperature;
+ }
+
if ($this->expectsJson && !isset($this->completionInput['response_format'])) {
$completionInput['response_format'] = [
'type' => 'json_object',
@@ -201,7 +207,6 @@ class GptCompleter
while ($attempt <= $this->retries) {
try {
- Log::debug('Open AI query: ' . json_encode($this->completionInput));
$response = $this->openAi->chat()->create($this->completionInput);
$this->inputTokens = $response->usage->promptTokens;
$this->outputTokens = $response->usage->completionTokens;
diff --git a/api/config/services.php b/api/config/services.php
index 16601cc51..a7618183c 100644
--- a/api/config/services.php
+++ b/api/config/services.php
@@ -73,14 +73,11 @@ return [
'google' => [
'client_id' => env('GOOGLE_CLIENT_ID'),
'client_secret' => env('GOOGLE_CLIENT_SECRET'),
- 'redirect' => env('GOOGLE_REDIRECT_URL'),
- 'auth_redirect' => env('GOOGLE_AUTH_REDIRECT_URL'),
-
+ 'redirect' => env('GOOGLE_REDIRECT_URL', front_url('/oauth/google/callback')),
'fonts_api_key' => env('GOOGLE_FONTS_API_KEY'),
],
'telegram' => [
- 'bot_id' => env('TELEGRAM_BOT_ID'),
'bot_token' => env('TELEGRAM_BOT_TOKEN'),
],
@@ -91,6 +88,6 @@ return [
'stripe' => [
'client_id' => env('STRIPE_CLIENT_ID'),
'client_secret' => env('STRIPE_CLIENT_SECRET', env('STRIPE_SECRET')),
- 'redirect' => env('STRIPE_REDIRECT_URI', front_url('/settings/connections/callback/stripe')),
+ 'redirect' => env('STRIPE_REDIRECT_URL', front_url('/oauth/stripe/callback')),
]
];
diff --git a/api/database/migrations/2025_06_20_095138_add_type_and_context_column_to_ai_form_completions_table.php b/api/database/migrations/2025_06_20_095138_add_type_and_context_column_to_ai_form_completions_table.php
new file mode 100644
index 000000000..6d4690f0b
--- /dev/null
+++ b/api/database/migrations/2025_06_20_095138_add_type_and_context_column_to_ai_form_completions_table.php
@@ -0,0 +1,29 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class () extends Migration {
+ /**
+ * Run the migrations.
+ */
+ public function up(): void
+ {
+ Schema::table('ai_form_completions', function (Blueprint $table) {
+ $table->enum('type', ['form', 'fields'])->default('form');
+ $table->json('context')->nullable();
+ });
+ }
+
+ /**
+ * Reverse the migrations.
+ */
+ public function down(): void
+ {
+ Schema::table('ai_form_completions', function (Blueprint $table) {
+ $table->dropColumn('type');
+ $table->dropColumn('context');
+ });
+ }
+};
diff --git a/api/routes/api.php b/api/routes/api.php
index a03659c7f..b1b085d15 100644
--- a/api/routes/api.php
+++ b/api/routes/api.php
@@ -64,9 +64,6 @@ Route::group(['middleware' => 'auth.multi'], function () {
});
Route::prefix('/providers')->name('providers.')->group(function () {
- Route::post('/connect/{service}', [OAuthProviderController::class, 'connect'])->name('connect');
- Route::post('/callback/{service}', [OAuthProviderController::class, 'handleRedirect'])->name('callback');
- Route::post('widget-callback/{service}', [OAuthProviderController::class, 'handleWidgetRedirect'])->name('widget.callback');
Route::delete('/{provider}', [OAuthProviderController::class, 'destroy'])->name('destroy');
});
});
@@ -132,17 +129,6 @@ Route::group(['middleware' => 'auth.multi'], function () {
[WorkspaceUserController::class, 'leaveWorkspace']
)->name('leave');
- Route::prefix('/databases')->name('databases.')->group(function () {
- Route::get(
- '/search/{search?}',
- [WorkspaceController::class, 'searchDatabases']
- )->name('search');
- Route::get(
- '/{database_id}',
- [WorkspaceController::class, 'getDatabase']
- )->name('show');
- });
-
Route::get(
'/forms',
[FormController::class, 'index']
@@ -285,10 +271,6 @@ Route::group(['middleware' => 'guest:api'], function () {
Route::post('email/verify/{user}', [VerificationController::class, 'verify'])->name('verification.verify');
Route::post('email/resend', [VerificationController::class, 'resend']);
-
- Route::post('oauth/{provider}', [OAuthController::class, 'redirect']);
- Route::post('oauth/connect/{provider}', [OAuthController::class, 'redirect'])->name('oauth.redirect');
- Route::post('oauth/{provider}/callback', [OAuthController::class, 'handleCallback'])->name('oauth.callback');
});
Route::group(['prefix' => 'appsumo'], function () {
@@ -296,6 +278,15 @@ Route::group(['prefix' => 'appsumo'], function () {
Route::post('webhook', [\App\Http\Controllers\Webhook\AppSumoController::class, 'handle'])->name('appsumo.webhook');
});
+/*
+ * OAuth routes (public - authentication handled in controller)
+ */
+Route::prefix('oauth')->name('oauth.')->group(function () {
+ Route::post('/connect/{provider}', [OAuthController::class, 'redirect'])->name('redirect');
+ Route::post('/{provider}/callback', [OAuthController::class, 'callback'])->name('callback');
+ Route::post('/widget-callback/{provider}', [OAuthController::class, 'handleWidgetCallback'])->name('widget.callback');
+});
+
/*
* Public Forms related routes
*/
@@ -322,6 +313,7 @@ Route::prefix('forms')->name('forms.')->group(function () {
// AI
Route::post('ai/generate', [\App\Http\Controllers\Forms\AiFormController::class, 'generateForm'])->name('ai.generate');
Route::get('ai/{aiFormCompletion}', [\App\Http\Controllers\Forms\AiFormController::class, 'show'])->name('ai.show');
+ Route::post('ai/generate-fields', [\App\Http\Controllers\Forms\AiFormController::class, 'generateFields'])->name('ai.generate-fields');
});
/**
diff --git a/api/tests/Feature/EmailChangeThrottlingTest.php b/api/tests/Feature/EmailChangeThrottlingTest.php
new file mode 100644
index 000000000..e6c14d82d
--- /dev/null
+++ b/api/tests/Feature/EmailChangeThrottlingTest.php
@@ -0,0 +1,117 @@
+<?php
+
+use App\Models\User;
+
+it('allows first two email changes within an hour', function () {
+ $user = User::factory()->create([
+ 'email' => '[email protected]'
+ ]);
+
+ $this->actingAs($user);
+
+ // First email change - should succeed
+ $response = $this->patchJson('/settings/profile', [
+ 'name' => 'Test User',
+ 'email' => '[email protected]',
+ ]);
+ $response->assertSuccessful();
+
+ // Second email change - should succeed
+ $response = $this->patchJson('/settings/profile', [
+ 'name' => 'Test User',
+ 'email' => '[email protected]',
+ ]);
+ $response->assertSuccessful();
+});
+
+it('blocks third email change within an hour', function () {
+ $user = User::factory()->create([
+ 'email' => '[email protected]'
+ ]);
+
+ $this->actingAs($user);
+
+ // First email change - should succeed
+ $response = $this->patchJson('/settings/profile', [
+ 'name' => 'Test User',
+ 'email' => '[email protected]',
+ ]);
+ $response->assertSuccessful();
+
+ // Second email change - should succeed
+ $response = $this->patchJson('/settings/profile', [
+ 'name' => 'Test User',
+ 'email' => '[email protected]',
+ ]);
+ $response->assertSuccessful();
+
+ // Third email change - should be blocked
+ $response = $this->patchJson('/settings/profile', [
+ 'name' => 'Test User',
+ 'email' => '[email protected]',
+ ]);
+ $response->assertStatus(429)
+ ->assertJson([
+ 'message' => 'Too Many Attempts.'
+ ]);
+});
+
+it('does not throttle when email is not changed', function () {
+ $user = User::factory()->create([
+ 'email' => '[email protected]'
+ ]);
+
+ $this->actingAs($user);
+
+ // Update name only - should not be throttled
+ $response = $this->patchJson('/settings/profile', [
+ 'name' => 'Updated Name',
+ 'email' => '[email protected]', // Same email
+ ]);
+ $response->assertSuccessful();
+
+ // Update name again - should still work
+ $response = $this->patchJson('/settings/profile', [
+ 'name' => 'Another Name',
+ 'email' => '[email protected]', // Same email
+ ]);
+ $response->assertSuccessful();
+});
+
+it('resets throttle counter after one hour', function () {
+ $user = User::factory()->create([
+ 'email' => '[email protected]'
+ ]);
+
+ $this->actingAs($user);
+
+ // First email change
+ $response = $this->patchJson('/settings/profile', [
+ 'name' => 'Test User',
+ 'email' => '[email protected]',
+ ]);
+ $response->assertSuccessful();
+
+ // Second email change
+ $response = $this->patchJson('/settings/profile', [
+ 'name' => 'Test User',
+ 'email' => '[email protected]',
+ ]);
+ $response->assertSuccessful();
+
+ // Third email change - should be blocked
+ $response = $this->patchJson('/settings/profile', [
+ 'name' => 'Test User',
+ 'email' => '[email protected]',
+ ]);
+ $response->assertStatus(429);
+
+ $this->travel(1)->hours();
+
+ // Should work again after cache is cleared
+ $response = $this->patchJson('/settings/profile', [
+ 'name' => 'Test User',
+ 'email' => '[email protected]',
+ ]);
+ $response->assertSuccessful();
+});
diff --git a/api/tests/Feature/Forms/EmailNotificationTest.php b/api/tests/Feature/Forms/EmailNotificationTest.php
index 43e702621..23461ffb5 100644
--- a/api/tests/Feature/Forms/EmailNotificationTest.php
+++ b/api/tests/Feature/Forms/EmailNotificationTest.php
@@ -9,7 +9,7 @@ it('send email with the submitted data', function () {
$workspace = $this->createUserWorkspace($user);
$form = $this->createForm($user, $workspace);
$integrationData = $this->createFormIntegration('email', $form->id, [
- 'send_to' => '[email protected]',
+ 'send_to' => $user->email,
'sender_name' => 'OpnForm',
'subject' => 'New form submission',
'email_content' => 'Hello there 👋 <br>Test body',
@@ -23,7 +23,7 @@ it('send email with the submitted data', function () {
$event = new \App\Events\Forms\FormSubmitted($form, $formData);
$mailable = new FormEmailNotification($event, $integrationData, 'mail');
$notifiable = new AnonymousNotifiable();
- $notifiable->route('mail', '[email protected]');
+ $notifiable->route('mail', $user->email);
$renderedMail = $mailable->toMail($notifiable);
expect($renderedMail->subject)->toBe('New form submission');
expect($renderedMail->replyTo[0][0])->toBe('[email protected]');
@@ -141,7 +141,7 @@ it('does not use custom sender email in non-self-hosted mode', function () {
$form = $this->createForm($user, $workspace);
$customSenderEmail = '[email protected]';
$integrationData = $this->createFormIntegration('email', $form->id, [
- 'send_to' => '[email protected]',
+ 'send_to' => $user->email,
'sender_name' => 'Custom Sender',
'sender_email' => $customSenderEmail,
'subject' => 'Custom Subject',
@@ -156,7 +156,7 @@ it('does not use custom sender email in non-self-hosted mode', function () {
$event = new \App\Events\Forms\FormSubmitted($form, $formData);
$mailable = new FormEmailNotification($event, $integrationData, 'mail');
$notifiable = new AnonymousNotifiable();
- $notifiable->route('mail', '[email protected]');
+ $notifiable->route('mail', $user->email);
$renderedMail = $mailable->toMail($notifiable);
expect($renderedMail->from[0])->toMatch('/^default\+\d+@example\.com$/');
@@ -175,7 +175,7 @@ it('send email with mention as sender name', function () {
});
$integrationData = $this->createFormIntegration('email', $form->id, [
- 'send_to' => '[email protected]',
+ 'send_to' => $user->email,
'sender_name' => '<span mention-field-id="' . $emailProperty['id'] . '" mention-field-name="' . $emailProperty['name'] . '" mention-fallback="" contenteditable="false" mention="true">' . $emailProperty['name'] . '</span>',
'subject' => 'New form submission',
'email_content' => 'Hello there 👋 <br>Test body',
@@ -191,7 +191,7 @@ it('send email with mention as sender name', function () {
$event = new \App\Events\Forms\FormSubmitted($form, $formData);
$mailable = new FormEmailNotification($event, $integrationData, 'mail');
$notifiable = new AnonymousNotifiable();
- $notifiable->route('mail', '[email protected]');
+ $notifiable->route('mail', $user->email);
$renderedMail = $mailable->toMail($notifiable);
expect($renderedMail->from[1])->toBe('[email protected]');
});
@@ -206,7 +206,7 @@ it('send email with mention as reply to', function () {
});
$integrationData = $this->createFormIntegration('email', $form->id, [
- 'send_to' => '[email protected]',
+ 'send_to' => $user->email,
'sender_name' => 'OpnForm',
'subject' => 'New form submission',
'email_content' => 'Hello there 👋 <br>Test body',
@@ -222,7 +222,7 @@ it('send email with mention as reply to', function () {
$event = new \App\Events\Forms\FormSubmitted($form, $formData);
$mailable = new FormEmailNotification($event, $integrationData, 'mail');
$notifiable = new AnonymousNotifiable();
- $notifiable->route('mail', '[email protected]');
+ $notifiable->route('mail', $user->email);
$renderedMail = $mailable->toMail($notifiable);
expect($renderedMail->replyTo[0][0])->toBe('[email protected]');
});
@@ -237,7 +237,7 @@ it('send email with empty reply to', function () {
});
$integrationData = $this->createFormIntegration('email', $form->id, [
- 'send_to' => '[email protected]',
+ 'send_to' => $user->email,
'sender_name' => 'OpnForm',
'subject' => 'New form submission',
'email_content' => 'Hello there 👋 <br>Test body',
@@ -253,7 +253,7 @@ it('send email with empty reply to', function () {
$event = new \App\Events\Forms\FormSubmitted($form, $formData);
$mailable = new FormEmailNotification($event, $integrationData, 'mail');
$notifiable = new AnonymousNotifiable();
- $notifiable->route('mail', '[email protected]');
+ $notifiable->route('mail', $user->email);
$renderedMail = $mailable->toMail($notifiable);
expect($renderedMail->replyTo[0][0])->toBe($form->creator->email);
});
diff --git a/api/tests/Feature/Integrations/Email/EmailIntegrationTest.php b/api/tests/Feature/Integrations/Email/EmailIntegrationTest.php
index 241c56398..f2cdd83ea 100644
--- a/api/tests/Feature/Integrations/Email/EmailIntegrationTest.php
+++ b/api/tests/Feature/Integrations/Email/EmailIntegrationTest.php
@@ -2,17 +2,17 @@
use App\Models\Integration\FormIntegration;
-test('free user can create one email integration', function () {
+test('free user can create one email integration to their own email', function () {
$user = $this->actingAsUser();
$workspace = $this->createUserWorkspace($user);
$form = $this->createForm($user, $workspace);
- // First email integration should succeed
+ // First email integration should succeed with user's own email
$response = $this->postJson(route('open.forms.integration.create', $form), [
'integration_id' => 'email',
'status' => true,
'settings' => [
- 'send_to' => '[email protected]',
+ 'send_to' => $user->email,
'sender_name' => 'Test Sender',
'subject' => 'Test Subject',
'email_content' => 'Test Content',
@@ -28,7 +28,7 @@ test('free user can create one email integration', function () {
'integration_id' => 'email',
'status' => true,
'settings' => [
- 'send_to' => '[email protected]',
+ 'send_to' => $user->email,
'sender_name' => 'Test Sender',
'subject' => 'Test Subject',
'email_content' => 'Test Content',
@@ -44,6 +44,34 @@ test('free user can create one email integration', function () {
]);
});
+test('free user cannot send to other email addresses', function () {
+ $user = $this->actingAsUser();
+ $workspace = $this->createUserWorkspace($user);
+ $form = $this->createForm($user, $workspace);
+
+ $response = $this->postJson(route('open.forms.integration.create', $form), [
+ 'integration_id' => 'email',
+ 'status' => true,
+ 'settings' => [
+ 'send_to' => '[email protected]',
+ 'sender_name' => 'Test Sender',
+ 'subject' => 'Test Subject',
+ 'email_content' => 'Test Content',
+ 'include_submission_data' => true
+ ]
+ ]);
+
+ $response->assertStatus(422)
+ ->assertJsonValidationErrors(['settings.send_to']);
+
+ // Check that the error message contains the expected text with user's email
+ $responseData = $response->json();
+ $errorMessage = $responseData['errors']['settings.send_to'][0];
+ expect($errorMessage)->toContain('You can only send email notification to your own email address');
+ expect($errorMessage)->toContain($user->email);
+ expect($errorMessage)->toContain('Please upgrade to the Pro plan to send to other email addresses.');
+});
+
test('pro user can create multiple email integrations', function () {
$user = $this->actingAsProUser();
$workspace = $this->createUserWorkspace($user);
@@ -133,17 +161,17 @@ test('pro user can add multiple emails', function () {
expect($integration->data->send_to)->toContain('[email protected]');
});
-test('free user can update their single email integration', function () {
+test('free user can update their single email integration to their own email', function () {
$user = $this->actingAsUser();
$workspace = $this->createUserWorkspace($user);
$form = $this->createForm($user, $workspace);
- // Create initial integration
+ // Create initial integration with user's email
$response = $this->postJson(route('open.forms.integration.create', $form), [
'integration_id' => 'email',
'status' => true,
'settings' => [
- 'send_to' => '[email protected]',
+ 'send_to' => $user->email,
'sender_name' => 'Test Sender',
'subject' => 'Test Subject',
'email_content' => 'Test Content',
@@ -154,12 +182,12 @@ test('free user can update their single email integration', function () {
$response->assertSuccessful();
$integrationId = $response->json('form_integration.id');
- // Update the integration
+ // Update the integration - still with user's email
$response = $this->putJson(route('open.forms.integration.update', [$form, $integrationId]), [
'integration_id' => 'email',
'status' => true,
'settings' => [
- 'send_to' => '[email protected]',
+ 'send_to' => $user->email,
'sender_name' => 'Updated Sender',
'subject' => 'Updated Subject',
'email_content' => 'Updated Content',
@@ -170,6 +198,51 @@ test('free user can update their single email integration', function () {
$response->assertSuccessful();
$integration = FormIntegration::find($integrationId);
- expect($integration->data->send_to)->toBe('[email protected]');
+ expect($integration->data->send_to)->toBe($user->email);
expect($integration->data->sender_name)->toBe('Updated Sender');
});
+
+test('free user cannot update integration to other email addresses', function () {
+ $user = $this->actingAsUser();
+ $workspace = $this->createUserWorkspace($user);
+ $form = $this->createForm($user, $workspace);
+
+ // Create initial integration with user's email
+ $response = $this->postJson(route('open.forms.integration.create', $form), [
+ 'integration_id' => 'email',
+ 'status' => true,
+ 'settings' => [
+ 'send_to' => $user->email,
+ 'sender_name' => 'Test Sender',
+ 'subject' => 'Test Subject',
+ 'email_content' => 'Test Content',
+ 'include_submission_data' => true
+ ]
+ ]);
+
+ $response->assertSuccessful();
+ $integrationId = $response->json('form_integration.id');
+
+ // Try to update to another email address - should fail
+ $response = $this->putJson(route('open.forms.integration.update', [$form, $integrationId]), [
+ 'integration_id' => 'email',
+ 'status' => true,
+ 'settings' => [
+ 'send_to' => '[email protected]',
+ 'sender_name' => 'Updated Sender',
+ 'subject' => 'Updated Subject',
+ 'email_content' => 'Updated Content',
+ 'include_submission_data' => true
+ ]
+ ]);
+
+ $response->assertStatus(422)
+ ->assertJsonValidationErrors(['settings.send_to']);
+
+ // Check that the error message contains the expected text with user's email
+ $responseData = $response->json();
+ $errorMessage = $responseData['errors']['settings.send_to'][0];
+ expect($errorMessage)->toContain('You can only send email notification to your own email address');
+ expect($errorMessage)->toContain($user->email);
+ expect($errorMessage)->toContain('Please upgrade to the Pro plan to send to other email addresses.');
+});
diff --git a/api/tests/Feature/RegisterTest.php b/api/tests/Feature/RegisterTest.php
index 95ecc6e7e..fe0eafa1f 100644
--- a/api/tests/Feature/RegisterTest.php
+++ b/api/tests/Feature/RegisterTest.php
@@ -20,7 +20,17 @@ it('can register', function () {
'g-recaptcha-response' => 'test-token', // Mock token for testing
])
->assertSuccessful()
- ->assertJsonStructure(['id', 'name', 'email']);
+ ->assertJsonStructure([
+ 'token',
+ 'token_type',
+ 'expires_in',
+ 'appsumo_license',
+ 'new_user',
+ 'user' => [
+ 'name',
+ 'email'
+ ]
+ ]);
$user = User::where('email', '[email protected]')->first();
expect($user)->not->toBeNull();
diff --git a/api/tests/Feature/WorkspaceTest.php b/api/tests/Feature/WorkspaceTest.php
index 72bf5ba6b..4ae20f097 100644
--- a/api/tests/Feature/WorkspaceTest.php
+++ b/api/tests/Feature/WorkspaceTest.php
@@ -1,8 +1,34 @@
<?php
-it('can create and delete Workspace', function () {
+it('can not create more than 1 workspace for free user', function () {
$user = $this->actingAsUser();
+ $this->postJson(route('open.workspaces.create'), [
+ 'name' => 'Workspace Test',
+ 'icon' => '🧪',
+ ])
+ ->assertSuccessful()
+ ->assertJson([
+ 'type' => 'success',
+ 'message' => 'Workspace created.',
+ ]);
+
+ expect($user->workspaces()->count())->toBe(1);
+
+ // Try to create another workspace
+ $this->postJson(route('open.workspaces.create'), [
+ 'name' => 'Workspace Test 2',
+ 'icon' => '🧪',
+ ])
+ ->assertStatus(403)
+ ->assertJson([
+ 'message' => 'You have reached the limit for free workspaces. Upgrade to Pro to create additional workspaces.',
+ ]);
+});
+
+it('can create and delete Workspace', function () {
+ $user = $this->actingAsProUser();
+
for ($i = 1; $i <= 3; $i++) {
$this->postJson(route('open.workspaces.create'), [
'name' => 'Workspace Test - ' . $i,
@@ -25,7 +51,7 @@ it('can create and delete Workspace', function () {
->assertSuccessful()
->assertJson([
'type' => 'success',
- 'message' => 'Workspace deleted.',
+ 'message' => 'Workspace successfully deleted.',
]);
} else {
// Last workspace can not delete
@@ -145,3 +171,19 @@ it('allows same workspace to update its own custom domain', function () {
$workspace->refresh();
expect($workspace->custom_domains)->toBe(['example.com']);
});
+
+it('includes users_count attribute', function () {
+ $user = $this->actingAsUser();
+ $workspace = $this->createUserWorkspace($user);
+
+ // Initially should have 1 user (the creator)
+ expect($workspace->users_count)->toBe(1);
+
+ // Add another user to the workspace
+ $user2 = \App\Models\User::factory()->create();
+ $workspace->users()->attach($user2, ['role' => 'admin']);
+
+ // Clear cache and check count
+ $workspace->flush();
+ expect($workspace->fresh()->users_count)->toBe(2);
+});
diff --git a/client/api/admin.js b/client/api/admin.js
new file mode 100644
index 000000000..f737050cc
--- /dev/null
+++ b/client/api/admin.js
@@ -0,0 +1,32 @@
+import { apiService } from './base'
+
+const BASE_PATH = '/moderator'
+
+export const adminApi = {
+ // User management
+ fetchUser: (identifier, options) => apiService.get(`${BASE_PATH}/fetch-user/${encodeURI(identifier)}`, options),
+ impersonate: (userId, options) => apiService.get(`${BASE_PATH}/impersonate/${userId}`, options),
+
+ // Template management
+ createTemplate: (data) => apiService.post(`${BASE_PATH}/create-template`, data),
+
+ // Subscription management
+ applyDiscount: (data) => apiService.patch(`${BASE_PATH}/apply-discount`, data),
+ extendTrial: (data) => apiService.patch(`${BASE_PATH}/extend-trial`, data),
+ cancelSubscription: (data) => apiService.patch(`${BASE_PATH}/cancellation-subscription`, data),
+ sendPasswordResetEmail: (data) => apiService.patch(`${BASE_PATH}/send-password-reset-email`, data),
+
+ // Billing management
+ billing: {
+ getEmail: (userId, options) => apiService.get(`${BASE_PATH}/billing/${userId}/email`, options),
+ updateEmail: (data) => apiService.patch(`${BASE_PATH}/billing/email`, data),
+ getSubscriptions: (userId, options) => apiService.get(`${BASE_PATH}/billing/${userId}/subscriptions`, options),
+ getPayments: (userId, options) => apiService.get(`${BASE_PATH}/billing/${userId}/payments`, options)
+ },
+
+ // Form management
+ forms: {
+ getDeleted: (userId, options) => apiService.get(`${BASE_PATH}/forms/${userId}/deleted-forms`, options),
+ restore: (slug) => apiService.patch(`${BASE_PATH}/forms/${slug}/restore`)
+ }
+}
\ No newline at end of file
diff --git a/client/api/auth.js b/client/api/auth.js
new file mode 100644
index 000000000..3ae7d8252
--- /dev/null
+++ b/client/api/auth.js
@@ -0,0 +1,22 @@
+import { apiService } from './base'
+
+
+export const authApi = {
+ // User operations
+ user: {
+ get: (options) => apiService.get('/user', options),
+ delete: () => apiService.delete('/user'),
+ updateCredentials: (data) => apiService.post('/update-credentials', data),
+ updateProfile: (data) => apiService.patch('/settings/profile', data)
+ },
+
+ // Authentication
+ login: (data) => apiService.post('/login', data),
+ register: (data) => apiService.post('/register', data),
+ logout: () => apiService.post('/logout'),
+
+ // OAuth
+ oauth: {
+ callback: (provider, data) => apiService.post(`/oauth/${provider}/callback`, data)
+ }
+}
\ No newline at end of file
diff --git a/client/api/base.js b/client/api/base.js
new file mode 100644
index 000000000..5bd6b8eab
--- /dev/null
+++ b/client/api/base.js
@@ -0,0 +1,84 @@
+import Form from '~/composables/lib/vForm/Form'
+
+export const apiService = {
+ // GET requests - supports both useFetch and $fetch
+ async get(endpoint, options = {}) {
+ const { server = false, ...fetchOptions } = options
+
+ if (server) {
+ // Use useFetch for SSR benefits (default)
+ const response = await useOpnApi(endpoint, fetchOptions)
+
+ if (response.pending.value) {
+ await response.refresh()
+ }
+
+ if (response.error.value) {
+ throw response.error.value
+ }
+
+ return response.data.value
+ } else {
+ // Use $fetch for simple client-side fetching
+ return await opnFetch(endpoint, fetchOptions)
+ }
+ },
+
+ // POST requests
+ async post(endpoint, data = null, options = {}) {
+ return await this.mutate(endpoint, {
+ method: 'POST',
+ body: data,
+ ...options
+ })
+ },
+
+ // PUT requests
+ async put(endpoint, data = null, options = {}) {
+ return await this.mutate(endpoint, {
+ method: 'PUT',
+ body: data,
+ ...options
+ })
+ },
+
+ // PATCH requests
+ async patch(endpoint, data = null, options = {}) {
+ return await this.mutate(endpoint, {
+ method: 'PATCH',
+ body: data,
+ ...options
+ })
+ },
+
+ // DELETE requests
+ async delete(endpoint, options = {}) {
+ return await this.mutate(endpoint, {
+ method: 'DELETE',
+ ...options
+ })
+ },
+
+ // Legacy fetch method (backward compatibility)
+ async fetch(endpoint, options = {}) {
+ return await this.get(endpoint, options)
+ },
+
+ // Mutation handler (for all non-GET requests)
+ async mutate(endpoint, options = {}) {
+ const { body, ...restOptions } = options
+
+ // If body is a Form instance, use its submit method
+ if (body instanceof Form) {
+ const method = (options.method || 'POST').toLowerCase()
+ return await body[method](endpoint, options)
+ }
+
+ // Otherwise use regular opnFetch
+ return await opnFetch(endpoint, {
+ method: options.method || 'POST',
+ body,
+ ...restOptions
+ })
+ }
+}
\ No newline at end of file
diff --git a/client/api/billing.js b/client/api/billing.js
new file mode 100644
index 000000000..fbffeca48
--- /dev/null
+++ b/client/api/billing.js
@@ -0,0 +1,16 @@
+import { apiService } from './base'
+
+const BASE_PATH = '/subscription'
+
+export const billingApi = {
+ // Subscription operations
+ getUsersCount: (options) => apiService.get(`${BASE_PATH}/users-count`, options),
+ getSubscription: (options) => apiService.get(BASE_PATH, options),
+ cancelSubscription: (subscriptionId) => apiService.post(`${BASE_PATH}/${subscriptionId}/cancel`),
+ updateCustomerDetails: (data) => apiService.put(`${BASE_PATH}/update-customer-details`, data),
+ getCheckoutUrl: (subscription, plan, trial, options) => {
+ const trialParam = trial ? `/${trial}` : ''
+ return apiService.get(`${BASE_PATH}/new/${subscription}/${plan}/checkout${trialParam}`, options)
+ },
+ getBillingPortal: (options) => apiService.get(`${BASE_PATH}/billing-portal`, options)
+}
\ No newline at end of file
diff --git a/client/api/content.js b/client/api/content.js
new file mode 100644
index 000000000..fc736f13a
--- /dev/null
+++ b/client/api/content.js
@@ -0,0 +1,13 @@
+import { apiService } from './base'
+
+export const contentApi = {
+ // Fonts
+ fonts: {
+ list: (options) => apiService.get('/fonts', options)
+ },
+
+ // Feature flags
+ featureFlags: {
+ list: (options) => apiService.get('/content/feature-flags', options)
+ }
+}
\ No newline at end of file
diff --git a/client/api/forms.js b/client/api/forms.js
new file mode 100644
index 000000000..7fc87f1cc
--- /dev/null
+++ b/client/api/forms.js
@@ -0,0 +1,68 @@
+import { apiService } from './base'
+
+export const formsApi = {
+ // Form operations
+ list: (workspaceId, options) => apiService.get(`/open/workspaces/${workspaceId}/forms`, options),
+ get: (slug, options) => apiService.get(`/open/forms/${slug}`, options),
+ getById: (id, options) => apiService.get(`/open/forms/${id}`, options),
+ publicGet: (slug, options) => apiService.get(`/forms/${slug}`, options),
+ publicGetById: (id, options) => apiService.get(`/forms/${id}`, options),
+
+ create: (data) => apiService.post('/open/forms', data),
+ update: (id, data) => apiService.put(`/open/forms/${id}`, data),
+ delete: (id) => apiService.delete(`/open/forms/${id}`),
+ duplicate: (id) => apiService.post(`/open/forms/${id}/duplicate`),
+
+ // Form utilities
+ regenerateLink: (id, option) => apiService.put(`/open/forms/${id}/regenerate-link/${option}`),
+ mobileEditorEmail: (id) => apiService.get(`/open/forms/${id}/mobile-editor-email`),
+ updateWorkspace: (id, workspaceId, data) => apiService.post(`/open/forms/${id}/workspace/${workspaceId}`, data),
+
+ // Form submissions
+ submissions: {
+ list: (formId, options) => apiService.get(`/open/forms/${formId}/submissions`, options),
+ get: (slug, submissionId, options) => apiService.get(`/forms/${slug}/submissions/${submissionId}`, options),
+ update: (formId, submissionId, data) => apiService.put(`/open/forms/${formId}/submissions/${submissionId}`, data),
+ delete: (formId, submissionId) => apiService.delete(`/open/forms/${formId}/submissions/${submissionId}`),
+ export: (formId, data) => apiService.post(`/open/forms/${formId}/submissions/export`, data),
+ answer: (slug, data, options) => apiService.post(`/forms/${slug}/answer`, data, options)
+ },
+
+ // Form stats
+ stats: (workspaceId, formId, options) => apiService.get(`/open/workspaces/${workspaceId}/form-stats/${formId}`, options),
+ statsDetails: (workspaceId, formId, options) => apiService.get(`/open/workspaces/${workspaceId}/form-stats-details/${formId}`, options),
+
+ // File operations
+ assets: {
+ upload: (data, options) => apiService.post('/open/forms/assets/upload', data, options),
+ view: (formId, filename, options) => apiService.get(`/open/forms/${formId}/uploaded-file/${filename}`, options)
+ },
+
+ // AI form generation
+ ai: {
+ generate: (data) => apiService.post('/forms/ai/generate', data),
+ generateFields: (data) => apiService.post('/forms/ai/generate-fields', data),
+ get: (generationId, options) => apiService.get(`/forms/ai/${generationId}`, options)
+ },
+
+ // Stripe/Payment
+ stripe: {
+ getAccount: (slug, options) => apiService.get(`/forms/${slug}/stripe-connect/get-account`, options),
+ createPaymentIntent: (slug, data) => apiService.post(`/forms/${slug}/stripe-connect/payment-intent`, data)
+ },
+
+ // Integrations
+ integrations: {
+ list: (formId, options) => apiService.get(`/open/forms/${formId}/integrations`, options),
+ create: (formId, data) => apiService.post(`/open/forms/${formId}/integration`, data),
+ update: (formId, integrationId, data) => apiService.put(`/open/forms/${formId}/integration/${integrationId}`, data),
+ delete: (formId, integrationId) => apiService.delete(`/open/forms/${formId}/integration/${integrationId}`),
+ events: (formId, integrationId, options) => apiService.get(`/open/forms/${formId}/integration/${integrationId}/events`, options)
+ },
+
+ // Zapier webhooks
+ zapier: {
+ store: (data) => apiService.post('/open/forms/webhooks/zapier', data),
+ delete: (id) => apiService.delete(`/open/forms/webhooks/zapier/${id}`)
+ }
+}
\ No newline at end of file
diff --git a/client/api/index.js b/client/api/index.js
new file mode 100644
index 000000000..fd6b7d6d4
--- /dev/null
+++ b/client/api/index.js
@@ -0,0 +1,11 @@
+export { apiService } from './base'
+export { workspaceApi } from './workspace'
+export { authApi } from './auth'
+export { formsApi } from './forms'
+export { templatesApi } from './templates'
+export { billingApi } from './billing'
+export { oauthApi } from './oauth'
+export { tokensApi } from './tokens'
+export { adminApi } from './admin'
+export { uploadsApi } from './uploads'
+export { contentApi } from './content'
\ No newline at end of file
diff --git a/client/api/oauth.js b/client/api/oauth.js
new file mode 100644
index 000000000..215d3124c
--- /dev/null
+++ b/client/api/oauth.js
@@ -0,0 +1,15 @@
+import { apiService } from './base'
+
+const OAUTH_BASE_PATH = '/oauth'
+
+export const oauthApi = {
+ // Provider operations
+ list: (options) => apiService.get('/open/providers', options),
+ connect: (service, data) => apiService.post(`${OAUTH_BASE_PATH}/connect/${service}`, { ...data, intent: 'integration' }),
+ callback: (service, data) => apiService.post(`${OAUTH_BASE_PATH}/${service}/callback`, data),
+ widgetCallback: (service, data) => apiService.post(`${OAUTH_BASE_PATH}/widget-callback/${service}`, data),
+ delete: (providerId) => apiService.delete(`/settings/providers/${providerId}`),
+
+ // OAuth flow (for authentication)
+ redirect: (provider, data) => apiService.post(`${OAUTH_BASE_PATH}/connect/${provider}`, { ...data, intent: 'auth' })
+}
\ No newline at end of file
diff --git a/client/api/templates.js b/client/api/templates.js
new file mode 100644
index 000000000..04adc4b81
--- /dev/null
+++ b/client/api/templates.js
@@ -0,0 +1,10 @@
+import { apiService as api } from './base'
+
+export const templatesApi = {
+ // Template operations
+ list: (params = {}) => api.get("/templates", { params }),
+ get: (slug) => api.get(`/templates/${slug}`),
+ create: (data) => api.post("/templates", data),
+ update: (id, data) => api.put(`/templates/${id}`, data),
+ delete: (id) => api.delete(`/templates/${id}`)
+}
\ No newline at end of file
diff --git a/client/api/tokens.js b/client/api/tokens.js
new file mode 100644
index 000000000..16e011858
--- /dev/null
+++ b/client/api/tokens.js
@@ -0,0 +1,10 @@
+import { apiService } from './base'
+
+const BASE_PATH = '/settings/tokens'
+
+export const tokensApi = {
+ // Token operations
+ list: (options) => apiService.get(BASE_PATH, options),
+ create: (data) => apiService.post(BASE_PATH, data),
+ delete: (tokenId) => apiService.delete(`${BASE_PATH}/${tokenId}`)
+}
\ No newline at end of file
diff --git a/client/api/uploads.js b/client/api/uploads.js
new file mode 100644
index 000000000..86f8ba0d4
--- /dev/null
+++ b/client/api/uploads.js
@@ -0,0 +1,9 @@
+import { apiService } from './base'
+
+export const uploadsApi = {
+ // File upload operations
+ uploadFile: (data, options) => apiService.post('/upload-file', data, options),
+
+ // Vapor signed URL (if using Laravel Vapor)
+ getSignedStorageUrl: (data) => apiService.post('/vapor/signed-storage-url', data)
+}
\ No newline at end of file
diff --git a/client/api/workspace.js b/client/api/workspace.js
new file mode 100644
index 000000000..e552b4ccc
--- /dev/null
+++ b/client/api/workspace.js
@@ -0,0 +1,31 @@
+import { apiService } from './base'
+
+const BASE_PATH = '/open/workspaces'
+
+export const workspaceApi = {
+ // Workspace operations
+ list: (options) => apiService.get(BASE_PATH, options),
+ create: (data) => apiService.post(`${BASE_PATH}/create`, data),
+ delete: (workspaceId) => apiService.delete(`${BASE_PATH}/${workspaceId}`),
+ leave: (workspaceId) => apiService.post(`${BASE_PATH}/${workspaceId}/leave`),
+
+ // User management
+ users: {
+ list: (workspaceId, options) => apiService.get(`${BASE_PATH}/${workspaceId}/users`, options),
+ add: (workspaceId, data) => apiService.post(`${BASE_PATH}/${workspaceId}/users/add`, data),
+ remove: (workspaceId, userId) => apiService.delete(`${BASE_PATH}/${workspaceId}/users/${userId}/remove`),
+ updateRole: (workspaceId, userId, data) => apiService.put(`${BASE_PATH}/${workspaceId}/users/${userId}/update-role`, data)
+ },
+
+ // Invite management
+ invites: {
+ list: (workspaceId, options) => apiService.get(`${BASE_PATH}/${workspaceId}/invites`, options),
+ resend: (workspaceId, inviteId) => apiService.post(`${BASE_PATH}/${workspaceId}/invites/${inviteId}/resend`),
+ cancel: (workspaceId, inviteId) => apiService.delete(`${BASE_PATH}/${workspaceId}/invites/${inviteId}/cancel`)
+ },
+
+ // Custom domains
+ customDomains: {
+ update: (workspaceId, data) => apiService.put(`${BASE_PATH}/${workspaceId}/custom-domains`, data)
+ }
+}
diff --git a/client/app.config.ts b/client/app.config.ts
index a7181a0b0..c8d70148e 100644
--- a/client/app.config.ts
+++ b/client/app.config.ts
@@ -1,16 +1,53 @@
export default defineAppConfig({
ui: {
- primary: 'blue',
- gray: 'slate',
+ colors: {
+ primary: 'blue',
+ secondary: 'blue',
+ success: 'green',
+ error: 'red',
+ warning: 'amber',
+ info: 'blue',
+ neutral: 'neutral',
+ form: 'form'
+ },
tabs: {
- wrapper:'space-y-0',
- list: {
- height: 'h-auto',
- tab: {
- height: 'h-[30px]'
- }
+ slots: {
+ root: 'space-y-0',
+ list: 'h-auto',
+ trigger: 'h-[30px]'
}
+ },
+
+ keyboard: {
+ defaultVariant: 'subtle',
+ },
+
+ icons: {
+ arrowLeft: 'i-heroicons-arrow-left',
+ arrowRight: 'i-heroicons-arrow-right',
+ check: 'i-heroicons-check',
+ chevronDoubleLeft: 'i-heroicons-chevron-double-left',
+ chevronDoubleRight: 'i-heroicons-chevron-double-right',
+ chevronDown: 'i-heroicons-chevron-down',
+ chevronLeft: 'i-heroicons-chevron-left',
+ chevronRight: 'i-heroicons-chevron-right',
+ chevronUp: 'i-heroicons-chevron-up',
+ close: 'i-heroicons-x-mark',
+ ellipsis: 'i-heroicons-ellipsis-horizontal',
+ external: 'i-heroicons-arrow-up-right',
+ folder: 'i-heroicons-folder',
+ folderOpen: 'i-heroicons-folder-open',
+ loading: 'i-heroicons-arrow-path',
+ minus: 'i-heroicons-minus',
+ plus: 'i-heroicons-plus',
+ search: 'i-heroicons-magnifying-glass'
+ },
+
+ table: {
+ slots: {
+ td: 'p-4 text-sm text-muted whitespace-normal [&:has([role=checkbox])]:pe-0'
+ },
}
}
})
diff --git a/client/app.vue b/client/app.vue
index 722d9fbd2..8d50cdb90 100644
--- a/client/app.vue
+++ b/client/app.vue
@@ -1,148 +1,74 @@
<template>
- <div
- id="app"
- class="bg-white dark:bg-notion-dark"
- >
- <transition
- enter-active-class="linear duration-200 overflow-hidden"
- enter-from-class="max-h-0"
- enter-to-class="max-h-screen"
- leave-active-class="linear duration-200 overflow-hidden"
- leave-from-class="max-h-screen"
- leave-to-class="max-h-0"
+ <AppProvider>
+ <div
+ id="app"
+ class="bg-white dark:bg-notion-dark"
>
- <div
- v-if="announcement && !isIframe"
- class="bg-nt-blue text-white text-center p-3 relative"
- >
- <a
- class="text-white font-semibold"
- href=""
- target="_blank"
- >🚨 OpnForm beta is over 🚨</a>
+ <NuxtLoadingIndicator color="#2563eb" />
+ <NuxtLayout>
+ <NuxtPage />
+ </NuxtLayout>
+
+ <ClientOnly>
<div
- role="button"
- class="text-white absolute right-0 top-0 p-3 cursor-pointer"
- @click="announcement = false"
+ class="fixed left-0 bottom-0 p-4"
>
- <svg
- xmlns="http://www.w3.org/2000/svg"
- class="h-6 w-6"
- viewBox="0 0 20 20"
- fill="currentColor"
- >
- <path
- fill-rule="evenodd"
- d="M10 18a8 8 0 100-16 8 8 0 000 16zM8.707 7.293a1 1 0 00-1.414 1.414L8.586 10l-1.293 1.293a1 1 0 101.414 1.414L10 11.414l1.293 1.293a1 1 0 001.414-1.414L11.414 10l1.293-1.293a1 1 0 00-1.414-1.414L10 8.586 8.707 7.293z"
- clip-rule="evenodd"
- />
- </svg>
+ <UButtonGroup size="sm">
+ <ToolsStopImpersonation />
+ </UButtonGroup>
</div>
- </div>
- </transition>
-
- <NuxtLoadingIndicator color="#2563eb" />
- <NuxtLayout>
- <NuxtPage />
- </NuxtLayout>
- <ToolsStopImpersonation />
+ </ClientOnly>
- <NotificationsWrapper />
- <ClientOnly>
- <feature-base />
- <SubscriptionModal />
- <QuickRegister />
- </ClientOnly>
- </div>
+ <ClientOnly>
+ <FeatureBase />
+ <GoogleOneTap />
+ <SubscriptionModal />
+ <QuickRegister />
+ </ClientOnly>
+ </div>
+ </AppProvider>
</template>
-<script>
-import { computed } from "vue"
-import { useAppStore } from "~/stores/app"
+<script setup>
import FeatureBase from "~/components/vendor/FeatureBase.vue"
+import GoogleOneTap from "~/components/vendor/GoogleOneTap.vue"
-export default {
- el: "#app",
-
- name: "OpnForm",
-
- components: { FeatureBase },
+const config = useRuntimeConfig()
- setup() {
- const config = useRuntimeConfig()
- useOpnSeoMeta({
- title: "Beautiful forms & Surveys",
- description:
- "Create beautiful forms for free. Unlimited fields, unlimited submissions. It's free and it takes less than 1 minute to create your first form.",
- ogImage: "/img/social-preview.jpg",
- robots: () => {
- return config.public.env === "production" ? null : "noindex, nofollow"
- },
- })
- useHead({
- titleTemplate: (titleChunk) => {
- return titleChunk ? `${titleChunk} - OpnForm` : "OpnForm"
- },
- meta: [
- {
- name: 'apple-mobile-web-app-capable',
- content: 'yes'
- },
- {
- name: 'apple-mobile-web-app-status-bar-style',
- content: 'black-translucent'
- },
- ],
- link: [
- {
- rel: 'apple-touch-icon',
- type: 'image/png',
- href: '/favicon.ico'
- }
- ],
- htmlAttrs: () => ({
- dir: 'ltr'
- })
- })
-
- const appStore = useAppStore()
-
- return {
- layout: computed(() => appStore.layout),
- isIframe: useIsIframe(),
- }
+// SEO and head configuration
+useOpnSeoMeta({
+ title: "Beautiful forms & Surveys",
+ description:
+ "Create beautiful forms for free. Unlimited fields, unlimited submissions. It's free and it takes less than 1 minute to create your first form.",
+ ogImage: "/img/social-preview.jpg",
+ robots: () => {
+ return config.public.env === "production" ? null : "noindex, nofollow"
},
+})
- data: () => ({
- announcement: false,
- alert: {
- type: null,
- autoClose: 0,
- message: "",
- confirmationProceed: null,
- confirmationCancel: null,
- },
- navbarHidden: false,
- }),
-
- computed: {
- isOnboardingPage() {
- return this.$route.name === "onboarding"
- },
- },
-
- mounted() {
- useCrisp().onCrispInit()
- useCrisp().showChat()
+useHead({
+ titleTemplate: (titleChunk) => {
+ return titleChunk ? `${titleChunk} - OpnForm` : "OpnForm"
},
-
- methods: {
- workspaceAdded() {
- this.$router.push({ name: "home" })
+ meta: [
+ {
+ name: 'apple-mobile-web-app-capable',
+ content: 'yes'
},
- hideNavbar(hidden = true) {
- this.navbarHidden = hidden
+ {
+ name: 'apple-mobile-web-app-status-bar-style',
+ content: 'black-translucent'
},
- },
-}
+ ],
+ link: [
+ {
+ rel: 'apple-touch-icon',
+ type: 'image/png',
+ href: '/favicon.ico'
+ }
+ ],
+ htmlAttrs: () => ({
+ dir: 'ltr'
+ })
+})
</script>
diff --git a/client/components/app/AppProvider.vue b/client/components/app/AppProvider.vue
new file mode 100644
index 000000000..b918e7a2d
--- /dev/null
+++ b/client/components/app/AppProvider.vue
@@ -0,0 +1,60 @@
+<template>
+ <UApp :toaster="toasterConfig">
+ <slot />
+ </UApp>
+</template>
+
+<script setup>
+import { computed, onMounted } from "vue"
+import { useAppStore } from "~/stores/app"
+
+const appStore = useAppStore()
+
+// Get Crisp chat state from the store
+const crispChatOpened = computed(() => appStore.crisp.chatOpened)
+const crispHidden = computed(() => appStore.crisp.hidden)
+
+// Configure toaster positioning based on Crisp chat state
+const toasterConfig = computed(() => {
+ const baseConfig = {
+ position: 'bottom-right',
+ duration: 5000,
+ expand: true,
+ }
+
+ // Dynamically adjust the UI class based on Crisp chat state
+ if (crispHidden.value) {
+ // Crisp is hidden: normal bottom-right position
+ return {
+ ...baseConfig,
+ ui: {
+ viewport: 'end-4 bottom-4',
+ },
+ }
+ }
+
+ if (crispChatOpened.value) {
+ // Crisp chat is opened: keep default bottom-right (chat overlay already shifted)
+ return {
+ ...baseConfig,
+ ui: {
+ viewport: 'end-4 bottom-4',
+ },
+ }
+ }
+
+ // Crisp chat is closed but visible: move toasts above the chat button
+ return {
+ ...baseConfig,
+ ui: {
+ viewport: 'end-4 bottom-24',
+ },
+ }
+})
+
+// Lifecycle
+onMounted(() => {
+ useCrisp().onCrispInit()
+ useCrisp().showChat()
+})
+</script>
\ No newline at end of file
diff --git a/client/components/app/Breadcrumb.vue b/client/components/app/Breadcrumb.vue
new file mode 100644
index 000000000..7a22e7176
--- /dev/null
+++ b/client/components/app/Breadcrumb.vue
@@ -0,0 +1,85 @@
+<template>
+ <section
+ class="sticky flex items-center inset-x-0 top-0 z-10 py-3 bg-white border-b border-neutral-200"
+ >
+ <div class="hidden md:flex flex-grow">
+ <slot name="left" />
+ </div>
+ <div class="px-4 mx-auto sm:px-6 lg:px-8 max-w-7xl">
+ <div class="flex items-center justify-center gap-4">
+ <div
+ v-if="displayHome"
+ class="flex items-center gap-4"
+ >
+ <NuxtLink
+ class="flex items-center text-neutral-400 hover:text-neutral-500"
+ :to="{ name: authenticated ? 'home' : 'index' }"
+ >
+ <Icon
+ name="i-heroicons-home"
+ class="flex-shrink-0 w-5 h-5"
+ />
+ <span class="sr-only">Home</span>
+ </NuxtLink>
+ <Icon
+ name="i-heroicons-chevron-right"
+ class="flex-shrink-0 w-5 h-5 text-neutral-400"
+ />
+ </div>
+
+ <div
+ v-for="(item, index) in path"
+ :key="index"
+ class="flex items-center gap-4"
+ >
+ <NuxtLink
+ v-if="item.to"
+ class="flex items-center text-sm font-semibold text-neutral-500 hover:text-neutral-700 truncate"
+ :to="item.to"
+ >
+ {{ item.name }}
+ </NuxtLink>
+ <div
+ v-else
+ class="flex items-center text-sm font-semibold sm:w-full w-36 text-blue-500 truncate"
+ >
+ {{ item.name }}
+ </div>
+ <Icon
+ v-if="index !== path.length - 1"
+ name="i-heroicons-chevron-right"
+ class="flex-shrink-0 w-5 h-5 text-neutral-400"
+ />
+ </div>
+ </div>
+ </div>
+ <div class="hidden md:flex flex-grow justify-end">
+ <slot name="right" />
+ </div>
+ </section>
+</template>
+
+<script setup>
+import { ref, computed } from 'vue'
+
+// Props
+defineProps({
+ /**
+ * Array of path items with structure:
+ * [{ name: string, to?: RouteLocationRaw }]
+ */
+ path: {
+ type: Array,
+ default: () => []
+ },
+})
+
+// Composables
+const { isAuthenticated } = useIsAuthenticated()
+
+// Reactive data
+const displayHome = ref(true)
+
+// Computed properties
+const authenticated = computed(() => isAuthenticated.value)
+</script>
diff --git a/client/components/global/Collapse.vue b/client/components/app/Collapse.vue
similarity index 89%
rename from client/components/global/Collapse.vue
rename to client/components/app/Collapse.vue
index e520c6969..6def4b1d7 100644
--- a/client/components/global/Collapse.vue
+++ b/client/components/app/Collapse.vue
@@ -8,7 +8,7 @@
<slot name="title" />
</div>
<div
- class="text-gray-400 hover:text-gray-600 absolute -right-2 cursor-pointer p-2"
+ class="text-neutral-400 hover:text-neutral-600 absolute -right-2 cursor-pointer p-2"
@click="trigger"
>
<svg
@@ -38,7 +38,7 @@
</template>
<script setup>
-import VTransition from "./transitions/VTransition.vue"
+import VTransition from "../global/transitions/VTransition.vue"
import { ref, defineProps, defineEmits } from "vue"
const props = defineProps({
diff --git a/client/components/global/EditableTag.vue b/client/components/app/EditableTag.vue
similarity index 91%
rename from client/components/global/EditableTag.vue
rename to client/components/app/EditableTag.vue
index 505fa24bc..292d2abef 100644
--- a/client/components/global/EditableTag.vue
+++ b/client/components/app/EditableTag.vue
@@ -4,7 +4,7 @@
ref="parentRef"
tabindex="0"
:class="{
- 'hover:bg-gray-100 dark:hover:bg-gray-800 rounded px-2 cursor-pointer':
+ 'hover:bg-neutral-100 dark:hover:bg-neutral-800 rounded-sm px-2 cursor-pointer':
!editing,
}"
class="relative"
@@ -25,7 +25,7 @@
<input
ref="editInputRef"
v-model="content"
- class="absolute inset-0 focus:outline-none bg-white rounded-md transition-colors px-2"
+ class="absolute inset-0 focus:outline-hidden bg-white rounded-sm transition-colors px-2"
:class="[{ 'bg-blue-50': editing }, contentClass]"
@blur="editing = false"
@keyup.enter="editing = false"
diff --git a/client/components/global/ErrorBoundary.vue b/client/components/app/ErrorBoundary.vue
similarity index 100%
rename from client/components/global/ErrorBoundary.vue
rename to client/components/app/ErrorBoundary.vue
diff --git a/client/components/global/ProTag.vue b/client/components/app/ProTag.vue
similarity index 59%
rename from client/components/global/ProTag.vue
rename to client/components/app/ProTag.vue
index 49c1be24f..d5514eb16 100644
--- a/client/components/global/ProTag.vue
+++ b/client/components/app/ProTag.vue
@@ -6,7 +6,7 @@
>
<div
v-track.pro_tag_click="{title:upgradeModalTitle}"
- class="bg-nt-blue text-white px-2 text-xs uppercase inline rounded-full font-semibold cursor-pointer"
+ class="bg-blue-500 text-white px-2 text-xs uppercase inline rounded-full font-semibold cursor-pointer"
@click.stop="onClick"
>
PRO
@@ -26,11 +26,9 @@ const props = defineProps({
}
})
-const subscriptionModalStore = useSubscriptionModalStore()
-const authStore = useAuthStore()
-const workspacesStore = useWorkspacesStore()
-const user = computed(() => authStore.user)
-const workspace = computed(() => workspacesStore.getCurrent)
+const { openSubscriptionModal } = useAppModals()
+const { data: user } = useAuth().user()
+const { current: workspace } = useCurrentWorkspace()
const shouldDisplayProTag = computed(() => {
if (!useFeatureFlag('billing.enabled')) return false
@@ -39,7 +37,9 @@ const shouldDisplayProTag = computed(() => {
})
function onClick () {
- subscriptionModalStore.setModalContent(props.upgradeModalTitle, props.upgradeModalDescription)
- subscriptionModalStore.openModal()
+ openSubscriptionModal({
+ modal_title: props.upgradeModalTitle,
+ modal_description: props.upgradeModalDescription
+ })
}
</script>
diff --git a/client/components/global/Steps.vue b/client/components/app/Steps.vue
similarity index 73%
rename from client/components/global/Steps.vue
rename to client/components/app/Steps.vue
index 9ef0b1c24..b0714fb32 100644
--- a/client/components/global/Steps.vue
+++ b/client/components/app/Steps.vue
@@ -4,23 +4,23 @@
:class="{ 'border-b-2': borderBottom }"
>
<div
- class="uppercase tracking-wide text-xs font-bold dark:text-gray-400 text-gray-500 mb-1 leading-tight"
+ class="uppercase tracking-wide text-xs font-bold dark:text-neutral-400 text-neutral-500 mb-1 leading-tight"
>
Step: {{ Math.min(current + 1, steps.length) }} of {{ steps.length }}
</div>
<div class="flex flex-col md:flex-row md:items-center md:justify-between">
<div class="flex-1">
<div
- class="text-lg font-bold dark:text-gray-300 text-gray-700 leading-tight"
+ class="text-lg font-bold dark:text-neutral-300 text-neutral-700 leading-tight"
>
{{ steps[current] ? steps[current] : "Complete!" }}
</div>
</div>
<div class="flex items-center md:w-64">
- <div class="w-full bg-gray-100 dark:bg-gray-700 rounded-full mr-2">
+ <div class="w-full bg-neutral-100 dark:bg-neutral-700 rounded-full mr-2">
<div
- class="rounded-full bg-nt-blue text-xs leading-none h-2 text-center text-white transition-all"
+ class="rounded-full bg-blue-500 text-xs leading-none h-2 text-center text-white transition-all"
:style="{
width: parseInt((current / steps.length) * 100) + '%',
'min-width': '8px',
@@ -28,7 +28,7 @@
/>
</div>
<div
- class="text-xs w-10 text-gray-600 dark:text-gray-400"
+ class="text-xs w-10 text-neutral-600 dark:text-neutral-400"
v-text="parseInt((current / steps.length) * 100) + '%'"
/>
</div>
diff --git a/client/components/dashboard/UpgradeBanner.vue b/client/components/dashboard/UpgradeBanner.vue
new file mode 100644
index 000000000..a19a98f9e
--- /dev/null
+++ b/client/components/dashboard/UpgradeBanner.vue
@@ -0,0 +1,57 @@
+<template>
+ <UAlert
+ v-if="showBanner"
+ class="mt-8 p-4"
+ icon="i-heroicons-sparkles-solid"
+ color="primary"
+ variant="subtle"
+ title="Discover our Pro plan"
+ description="Remove OpnForm branding, customize forms further, use your custom domain, integrate with your favorite tools, invite users, and more!"
+ :actions="[
+ {
+ label: 'Try for free',
+ onClick: () => openSubscriptionModal({modal_title: 'Try our Pro plan for free today!'})
+ },
+ {
+ label: 'Close',
+ color: 'neutral',
+ variant: 'outline',
+ onClick: dismissBanner
+ }
+ ]"
+ />
+</template>
+
+<script setup>
+const COOKIE_NAME = 'upgrade_banner_dismissed'
+const COOKIE_EXPIRY_DAYS = 7
+
+// Composables
+const { openSubscriptionModal } = useAppModals()
+
+// Cookie state
+const dismissedCookie = useCookie(COOKIE_NAME, {
+ default: () => false,
+ maxAge: COOKIE_EXPIRY_DAYS * 24 * 60 * 60 * 1000, // 7 days in milliseconds
+ sameSite: 'lax',
+ secure: true,
+ httpOnly: false
+})
+
+// Computed
+const { current: workspace } = useCurrentWorkspace()
+const isSelfHosted = computed(() => useFeatureFlag('self_hosted'))
+
+const showBanner = computed(() => {
+ return (
+ !dismissedCookie.value &&
+ workspace.value &&
+ !workspace.value.is_pro &&
+ !isSelfHosted.value
+ )
+})
+
+const dismissBanner = () => {
+ dismissedCookie.value = true
+}
+</script>
\ No newline at end of file
diff --git a/client/components/dashboard/UserDropdown.vue b/client/components/dashboard/UserDropdown.vue
new file mode 100644
index 000000000..f47430727
--- /dev/null
+++ b/client/components/dashboard/UserDropdown.vue
@@ -0,0 +1,97 @@
+<template>
+ <UDropdownMenu
+ v-if="user"
+ :items="dropdownItems"
+ :ui="{
+ content: 'w-56'
+ }"
+ arrow
+ >
+ <slot :user="user" />
+
+ <template #user-info>
+ <div class="flex items-center gap-3">
+ <img
+ :src="user.photo_url"
+ :alt="user.name"
+ class="w-8 h-8 rounded-full"
+ >
+ <div class="flex-1 min-w-0">
+ <p class="text-sm font-medium text-neutral-800 truncate">
+ {{ user.name }}
+ </p>
+ <p class="text-xs text-neutral-500 truncate">
+ {{ user.email }}
+ </p>
+ </div>
+ </div>
+ </template>
+ </UDropdownMenu>
+
+
+</template>
+
+<script setup>
+import { computed } from "vue"
+
+const { openUserSettings } = useAppModals()
+
+const { user: userQuery, logout: logoutMutationFactory } = useAuth()
+const { data: user } = userQuery()
+
+// Create logout mutation
+const logoutMutation = logoutMutationFactory()
+
+const logout = () => {
+ // Logout mutation handles cache clearing and navigation automatically
+ logoutMutation.mutateAsync()
+}
+
+const dropdownItems = computed(() => {
+ if (!user.value) return []
+
+ const items = []
+
+ // User info header
+ items.push([
+ {
+ slot: 'user-info',
+ type: 'label'
+ }
+ ])
+
+ // Navigation items
+ const navItems = []
+
+ // Settings
+ navItems.push({
+ label: 'Settings',
+ icon: 'i-heroicons-cog-6-tooth',
+ onSelect: () => openUserSettings('account')
+ })
+
+ // Admin - only show for moderators
+ if (user.value.moderator) {
+ navItems.push({
+ label: 'Admin',
+ icon: 'i-heroicons-shield-check',
+ to: { name: 'admin' }
+ })
+ }
+
+ if (navItems.length > 0) {
+ items.push(navItems)
+ }
+
+ // Logout
+ items.push([
+ {
+ label: 'Logout',
+ icon: 'i-heroicons-arrow-right-start-on-rectangle',
+ onSelect: logout
+ }
+ ])
+
+ return items
+})
+</script>
\ No newline at end of file
diff --git a/client/components/dashboard/WorkspaceDropdown.vue b/client/components/dashboard/WorkspaceDropdown.vue
new file mode 100644
index 000000000..fd444ea5f
--- /dev/null
+++ b/client/components/dashboard/WorkspaceDropdown.vue
@@ -0,0 +1,203 @@
+<template>
+ <UDropdownMenu
+ v-model:open="isDropdownOpen"
+ v-if="user && workspaces && workspaces.length >= 1"
+ :items="dropdownItems"
+ :content="content"
+ v-bind="$attrs"
+ arrow
+ >
+ <slot :workspace="workspace" />
+
+ <template #workspace-info>
+ <div>
+ <div class="flex items-center gap-3">
+ <WorkspaceIcon size="size-8" :workspace="workspace" />
+ <div class="flex-1 min-w-0">
+ <p class="text-sm font-medium text-neutral-800 truncate">
+ {{ workspace.name }}
+ </p>
+ <p class="text-xs text-neutral-500">
+ {{ workspacePlanText }} • {{ memberCountText }}
+ </p>
+ </div>
+ </div>
+ <div class="mt-2 flex items-center gap-2">
+ <UButton
+ icon="i-heroicons-cog-6-tooth"
+ size="xs"
+ color="neutral"
+ variant="outline"
+ @click="openSettings"
+ label="Settings"
+ />
+ <UButton
+ v-if="workspace.is_admin"
+ icon="i-heroicons-user-plus"
+ size="xs"
+ color="neutral"
+ variant="outline"
+ @click="openInviteUserModal"
+ label="Invite Members"
+ />
+ </div>
+ </div>
+ </template>
+
+ <template #item-leading="{ item }">
+ <WorkspaceIcon
+ v-if="item.workspace"
+ :workspace="item.workspace"
+ size="size-5"
+ />
+ </template>
+ </UDropdownMenu>
+
+ <!-- Create Workspace Modal -->
+ <CreateWorkspaceModal
+ v-model="showCreateModal"
+ @created="onWorkspaceCreated"
+ @close="showCreateModal = false"
+ />
+
+ <WorkspacesSettingsInviteUser
+ v-model="showInviteUserModal"
+ @user-added="onUserAdded"
+ />
+</template>
+
+<script setup>
+import { computed, ref } from "vue"
+import WorkspaceIcon from "~/components/workspaces/WorkspaceIcon.vue"
+import CreateWorkspaceModal from "~/components/workspaces/CreateWorkspaceModal.vue"
+import WorkspacesSettingsInviteUser from '~/components/workspaces/settings/InviteUser.vue'
+
+
+defineProps({
+ content: {
+ type: Object,
+ default: () => ({
+ side: 'bottom',
+ align: 'start'
+ })
+ }
+})
+
+const { openSubscriptionModal } = useAppModals()
+const router = useRouter()
+const route = useRoute()
+const appStore = useAppStore()
+
+const { data: user } = useAuth().user()
+const { data: workspaces } = useWorkspaces().list()
+const { current: workspace } = useCurrentWorkspace()
+
+// Extract composable methods in setup context
+const { invalidateAll: invalidateForms } = useForms()
+const { invalidateAll: invalidateWorkspaces } = useWorkspaces()
+
+// Modal state
+const showCreateModal = ref(false)
+const showInviteUserModal = ref(false)
+
+// Dropdown state
+const isDropdownOpen = ref(false)
+
+// Computed text for workspace plan
+const workspacePlanText = computed(() => {
+ if (!workspace.value) return ''
+ return workspace.value.is_pro ? 'Pro Plan' : 'Free Plan'
+})
+
+// Computed text for member count
+const memberCountText = computed(() => {
+ if (!workspace.value || !workspace.value.users_count) return '1 member'
+ const count = workspace.value.users_count
+ return count === 1 ? '1 member' : `${count} members`
+})
+
+const switchWorkspace = (workspaceToSwitch) => {
+ if (workspaceToSwitch.id === workspace.value.id) {
+ return
+ }
+ appStore.setCurrentId(workspaceToSwitch.id)
+ invalidateForms()
+
+ if (route.name !== "home") {
+ router.push({ name: "home" })
+ }
+}
+
+const createNewWorkspace = () => {
+ if (!user.value.is_pro && workspaces.value.length >= 1) {
+ openSubscriptionModal({ modal_title: 'Upgrade to create additional workspaces', modal_description: 'Try our Pro plan for free today, and unlock all of our features such as collaboration, multiple workspaces, custom domains, forms analytics, integrations, and more!' })
+ return
+ }
+ showCreateModal.value = true
+}
+
+const onWorkspaceCreated = (_newWorkspace) => {
+ // Member count is now included in workspace data automatically
+}
+
+const onUserAdded = () => {
+ invalidateWorkspaces()
+}
+
+const openSettings = () => {
+ isDropdownOpen.value = false
+ useAppModals().openWorkspaceSettings('information')
+}
+
+const openInviteUserModal = () => {
+ isDropdownOpen.value = false
+
+ if (workspace.value && !workspace.value.is_pro) {
+ openSubscriptionModal({ modal_title: 'Upgrade to invite users to your workspace' })
+ return
+ }
+
+ showInviteUserModal.value = true
+}
+
+const dropdownItems = computed(() => {
+ if (!user.value || !workspaces.value) return []
+
+ const items = []
+
+ // Workspace info header (only show if we have a current workspace)
+ if (workspace.value) {
+ items.push([
+ {
+ slot: 'workspace-info',
+ type: 'label'
+ }
+ ])
+ }
+
+ // Workspace selector section (only show if multiple workspaces)
+ if (workspaces.value.length > 1) {
+ const workspaceItems = workspaces.value.map(worksp => ({
+ label: worksp.name,
+ labelClass: workspace.value?.id === worksp?.id ? 'font-medium text-primary-700' : '',
+ onSelect: () => switchWorkspace(worksp),
+ workspace: worksp // Add workspace data for the slot
+ }))
+
+ items.push(workspaceItems)
+ }
+
+ // Create workspace action
+ items.push([
+ {
+ label: 'Create Workspace',
+ icon: 'i-heroicons-plus',
+ onSelect: createNewWorkspace
+ }
+ ])
+
+ return items
+})
+</script>
+
+<style></style>
diff --git a/client/components/forms/CodeInput.client.vue b/client/components/forms/CodeInput.client.vue
deleted file mode 100644
index 7239f4de0..000000000
--- a/client/components/forms/CodeInput.client.vue
+++ /dev/null
@@ -1,61 +0,0 @@
-<template>
- <input-wrapper v-bind="inputWrapperProps">
- <template #label>
- <slot name="label" />
- </template>
-
- <template #help>
- <slot name="help" />
- </template>
-
- <div
- :class="[
- theme.CodeInput.input,
- theme.CodeInput.borderRadius,
- {
- '!ring-red-500 !ring-2 !border-transparent': hasError,
- '!cursor-not-allowed !bg-gray-200 dark:!bg-gray-800': disabled,
- },
- ]"
- >
- <codemirror
- :id="id ? id : name"
- v-model="compVal"
- :disabled="disabled ? true : null"
- :extensions="extensions"
- :style="inputStyle"
- :name="name"
- :tab-size="4"
- :placeholder="placeholder"
- />
- </div>
-
- <template #error>
- <slot name="error" />
- </template>
- </input-wrapper>
-</template>
-
-<script>
-import { Codemirror } from "vue-codemirror"
-
-import { html } from "@codemirror/lang-html"
-
-import { inputProps, useFormInput } from "./useFormInput.js"
-import InputWrapper from "./components/InputWrapper.vue"
-
-export default {
- components: { InputWrapper, Codemirror },
- props: {
- ...inputProps,
- },
-
- setup(props, context) {
- const extensions = [html()]
- return {
- ...useFormInput(props, context),
- extensions,
- }
- },
-}
-</script>
diff --git a/client/components/forms/LogicConfirmationModal.vue b/client/components/forms/LogicConfirmationModal.vue
deleted file mode 100644
index 8174f2cdd..000000000
--- a/client/components/forms/LogicConfirmationModal.vue
+++ /dev/null
@@ -1,103 +0,0 @@
-<template>
- <Modal
- :show="isVisible"
- compact-header
- icon-color="yellow"
- @close="$emit('cancel')"
- >
- <template #title>
- Incomplete Form Logic
- </template>
- <template #icon>
- <Icon
- name="heroicons:exclamation-triangle"
- class="h-7 w-7"
- />
- </template>
-
- <p class=" text-gray-700">
- Some logic rules are incomplete or invalid and will be cleaned up to ensure that the form works correctly.
- </p>
-
- <div class="mt-4 space-y-3">
- <template
- v-for="error in groupedErrors"
- :key="error.fieldId"
- >
- <div class="rounded-lg bg-yellow-50 p-3">
- <div class="flex items-center">
- <Icon
- name="heroicons:exclamation-triangle"
- class="h-5 w-5 text-yellow-400"
- />
- <h4 class="ml-2 text-sm font-medium text-yellow-800">
- Field: {{ error.fieldName }}
- </h4>
- </div>
- <div class="mt-2 text-sm text-yellow-700">
- <ul class="list-disc pl-5 space-y-1">
- <li
- v-for="(message, index) in error.messages"
- :key="index"
- >
- {{ message }}
- </li>
- </ul>
- </div>
- </div>
- </template>
- </div>
-
- <template #footer>
- <div class="flex justify-end space-x-3">
- <UButton
- variant="outline"
- @click="$emit('cancel')"
- >
- Cancel
- </UButton>
- <UButton
- color="blue"
- @click="$emit('confirm')"
- >
- Save Anyway (Remove Invalid Logic)
- </UButton>
- </div>
- </template>
- </Modal>
-</template>
-
-<script setup>
-const props = defineProps({
- isVisible: {
- type: Boolean,
- required: true
- },
- errors: {
- type: Array,
- required: true
- }
-})
-
-defineEmits(['cancel', 'confirm'])
-
-// Group errors by field and format messages
-const groupedErrors = computed(() => {
- const errorMap = new Map()
-
- props.errors.forEach(error => {
- if (!errorMap.has(error.fieldId)) {
- errorMap.set(error.fieldId, {
- fieldId: error.fieldId,
- fieldName: error.fieldName,
- messages: []
- })
- }
-
- const group = errorMap.get(error.fieldId)
- group.messages.push(error.message)
- })
-
- return Array.from(errorMap.values())
-})
-</script>
\ No newline at end of file
diff --git a/client/components/forms/RichTextAreaInput.client.vue b/client/components/forms/RichTextAreaInput.client.vue
deleted file mode 100644
index 9b97fab2e..000000000
--- a/client/components/forms/RichTextAreaInput.client.vue
+++ /dev/null
@@ -1,230 +0,0 @@
-<template>
- <InputWrapper
- v-bind="inputWrapperProps"
- wrapper-class="not-draggable"
- >
- <template #label>
- <slot name="label" />
- </template>
-
- <div
- class="rich-editor resize-y notranslate"
- :class="[
- {
- '!ring-red-500 !ring-2 !border-transparent': hasError,
- '!cursor-not-allowed !bg-gray-200 dark:!bg-gray-800': disabled,
- 'focus-within:ring-2 focus-within:ring-opacity-100 focus-within:border-transparent': !hasError && !disabled
- },
- theme.RichTextAreaInput.input,
- theme.RichTextAreaInput.borderRadius,
- theme.default.fontSize,
- ]"
- :style="{
- '--font-size': theme.default.fontSize,
- ...inputStyle
- }"
- >
- <QuillyEditor
- :id="id ? id : name"
- ref="editor"
- v-model="compVal"
- :options="quillOptions"
- :disabled="disabled"
- :style="inputStyle"
- @ready="onEditorReady"
- />
- </div>
-
- <template
- v-if="$slots.help"
- #help
- >
- <slot name="help" />
- </template>
-
- <template
- v-if="maxCharLimit && showCharLimit"
- #bottom_after_help
- >
- <small :class="theme.default.help">
- {{ charCount }}/{{ maxCharLimit }}
- </small>
- </template>
-
- <template
- v-if="$slots.error"
- #error
- >
- <slot name="error" />
- </template>
-
- <MentionDropdown
- v-if="enableMentions && mentionState"
- :mention-state="mentionState"
- :mentions="mentions"
- />
- </InputWrapper>
-</template>
-
-<script setup>
-import Quill from 'quill'
-import { inputProps, useFormInput } from './useFormInput.js'
-import InputWrapper from './components/InputWrapper.vue'
-import QuillyEditor from './components/QuillyEditor.vue'
-import MentionDropdown from './components/MentionDropdown.vue'
-import registerMentionExtension from '~/lib/quill/quillMentionExtension.js'
-
-const props = defineProps({
- ...inputProps,
- maxCharLimit: { type: Number, required: false, default: null },
- editorOptions: {
- type: Object,
- default: () => ({})
- },
- enableMentions: {
- type: Boolean,
- default: false
- },
- mentions: {
- type: Array,
- default: () => []
- }
-})
-
-const emit = defineEmits(['update:modelValue'])
-
-const { compVal, inputStyle, hasError, inputWrapperProps } = useFormInput(props, { emit })
-const editor = ref(null)
-const mentionState = ref(null)
-
-// Add this watch to clean up empty HTML content
-watch(compVal, (val) => {
- if (val && val.replace(/<[^>]*>/g, '').trim() === '') {
- compVal.value = null
- }
-}, { immediate: true })
-
-// Initialize mention extension
-if (props.enableMentions) {
- // Register the mention extension with Quill
- mentionState.value = registerMentionExtension(Quill)
-}
-
-// Handle editor ready event
-const onEditorReady = (quillInstance) => {
- // If we have a mention module, get its state
- if (props.enableMentions && quillInstance) {
- const mentionModule = quillInstance.getModule('mention')
- if (mentionModule && mentionModule.state) {
- mentionState.value = mentionModule.state
- }
- }
-}
-
-const quillOptions = computed(() => {
- const defaultOptions = {
- placeholder: props.placeholder || '',
- theme: 'snow',
- modules: {
- toolbar: [
- [{ 'header': 1 }, { 'header': 2 }],
- ['bold', 'italic', 'underline', 'strike'],
- ['link'],
- [{ list: 'ordered' }, { list: 'bullet' }],
- [{ color: [] }],
- ],
- keyboard: {
- bindings: {
- tab: {
- key: 9,
- handler (range) {
- this.quill.insertText(range.index, ' ', 'user')
- }
- }
- }
- }
- }
- }
-
- const mergedOptions = { ...defaultOptions, ...props.editorOptions, modules: { ...defaultOptions.modules, ...props.editorOptions.modules } }
-
- if (props.enableMentions) {
- mergedOptions.modules.mention = true
- if (!mergedOptions.modules.toolbar) {
- mergedOptions.modules.toolbar = []
- }
- mergedOptions.modules.toolbar.push(['mention'])
- }
-
- return mergedOptions
-})
-
-const charCount = computed(() => {
- return compVal.value ? compVal.value.replace(/<[^>]*>/g, '').trim().length : 0
-})
-</script>
-
-<style lang="scss">
-.rich-editor {
- .ql-container {
- border-bottom: 0px !important;
- border-right: 0px !important;
- border-left: 0px !important;
- font-size: var(--font-size);
-
- .ql-editor {
- min-height: 100px !important;
- }
- }
-
- .ql-toolbar {
- border-top: 0px !important;
- border-right: 0px !important;
- border-left: 0px !important;
- }
-
- .ql-header {
- @apply rounded-md;
- }
-
- .ql-editor.ql-blank:before {
- @apply text-gray-400 dark:text-gray-500 not-italic;
- }
-
- .ql-snow .ql-toolbar .ql-picker-item.ql-selected,
- .ql-snow .ql-toolbar .ql-picker-item:hover,
- .ql-snow .ql-toolbar .ql-picker-label.ql-active,
- .ql-snow .ql-toolbar .ql-picker-label:hover,
- .ql-snow .ql-toolbar button.ql-active,
- .ql-snow .ql-toolbar button:focus,
- .ql-snow .ql-toolbar button:hover,
- .ql-snow.ql-toolbar .ql-picker-item.ql-selected,
- .ql-snow.ql-toolbar .ql-picker-item:hover,
- .ql-snow.ql-toolbar .ql-picker-label.ql-active,
- .ql-snow.ql-toolbar .ql-picker-label:hover,
- .ql-snow.ql-toolbar button.ql-active,
- .ql-snow.ql-toolbar button:focus,
- .ql-snow.ql-toolbar button:hover {
- @apply text-nt-blue;
- }
-}
-
-.ql-mention {
- padding-top: 0px !important;
-}
-.ql-mention::after {
- content: '@';
- font-size: 16px;
-}
-
-
-.rich-editor, .mention-input {
- span[mention] {
- @apply inline-flex items-center align-baseline leading-tight text-sm relative bg-blue-100 text-blue-800 border border-blue-200 rounded-md px-1 py-0.5 mx-0.5;
- max-width: 200px;
- white-space: nowrap;
- overflow: hidden;
- text-overflow: ellipsis;
- }
-}
-</style>
\ No newline at end of file
diff --git a/client/components/forms/CheckboxInput.vue b/client/components/forms/core/CheckboxInput.vue
similarity index 92%
rename from client/components/forms/CheckboxInput.vue
rename to client/components/forms/core/CheckboxInput.vue
index 37ddc6159..1634a9e1c 100644
--- a/client/components/forms/CheckboxInput.vue
+++ b/client/components/forms/core/CheckboxInput.vue
@@ -68,14 +68,13 @@
</template>
<script>
-import { inputProps, useFormInput } from './useFormInput.js'
+import { inputProps, useFormInput } from '../useFormInput.js'
import VCheckbox from './components/VCheckbox.vue'
-import InputWrapper from './components/InputWrapper.vue'
export default {
name: 'CheckboxInput',
- components: { InputWrapper, VCheckbox },
+ components: {VCheckbox },
props: {
...inputProps,
value: { type: [Boolean, String, Number, Object], required: false },
diff --git a/client/components/forms/ColorInput.vue b/client/components/forms/core/ColorInput.vue
similarity index 70%
rename from client/components/forms/ColorInput.vue
rename to client/components/forms/core/ColorInput.vue
index f7a7dcd4b..3a5443f29 100644
--- a/client/components/forms/ColorInput.vue
+++ b/client/components/forms/core/ColorInput.vue
@@ -36,22 +36,14 @@
</input-wrapper>
</template>
-<script>
-import InputWrapper from "./components/InputWrapper.vue"
-import { inputProps, useFormInput } from "./useFormInput.js"
+<script setup>
+import { inputProps, useFormInput } from "../useFormInput.js"
-export default {
- name: "ColorInput",
- components: { InputWrapper },
+const props = defineProps({
+ ...inputProps,
+})
- props: {
- ...inputProps,
- },
+const emit = defineEmits(['update:modelValue', 'focus', 'blur'])
- setup(props, context) {
- return {
- ...useFormInput(props, context),
- }
- },
-}
+const { compVal, inputWrapperProps} = useFormInput(props, { emit })
</script>
diff --git a/client/components/forms/FlatSelectInput.vue b/client/components/forms/core/FlatSelectInput.vue
similarity index 91%
rename from client/components/forms/FlatSelectInput.vue
rename to client/components/forms/core/FlatSelectInput.vue
index f8cce527c..ed2b74970 100644
--- a/client/components/forms/FlatSelectInput.vue
+++ b/client/components/forms/core/FlatSelectInput.vue
@@ -7,7 +7,7 @@
<Loader
v-if="loading"
key="loader"
- class="h-6 w-6 text-nt-blue mx-auto"
+ class="h-6 w-6 text-blue-500 mx-auto"
/>
<div
v-else
@@ -17,7 +17,7 @@
theme.default.borderRadius,
{
'!ring-red-500 !ring-2 !border-transparent': hasError,
- '!cursor-not-allowed !bg-gray-200 dark:!bg-gray-800': disabled,
+ '!cursor-not-allowed !bg-neutral-200 dark:!bg-neutral-800': disabled,
},
]"
>
@@ -29,12 +29,13 @@
:key="option[optionKey]"
:role="multiple?'checkbox':'radio'"
:aria-checked="isSelected(option[optionKey])"
+ class="relative"
:class="[
theme.FlatSelectInput.spacing.vertical,
theme.FlatSelectInput.fontSize,
theme.FlatSelectInput.option,
{
- '!cursor-not-allowed !bg-gray-200 dark:!bg-gray-800': disableOptions.includes(option[optionKey]),
+ '!cursor-not-allowed !bg-neutral-200 dark:!bg-neutral-800': disableOptions.includes(option[optionKey]),
},
]"
@click="onSelect(option[optionKey])"
@@ -77,7 +78,7 @@
theme.FlatSelectInput.spacing.vertical,
theme.FlatSelectInput.fontSize,
theme.FlatSelectInput.option,
- '!text-gray-500 !cursor-not-allowed'
+ '!text-neutral-500 !cursor-not-allowed'
]"
>
{{ $t('forms.select.noOptionAvailable') }}
@@ -94,8 +95,7 @@
</template>
<script>
-import {inputProps, useFormInput} from "./useFormInput.js"
-import InputWrapper from "./components/InputWrapper.vue"
+import {inputProps, useFormInput} from "../useFormInput.js"
import RadioButtonIcon from "./components/RadioButtonIcon.vue"
import CheckboxIcon from "./components/CheckboxIcon.vue"
@@ -104,7 +104,7 @@ import CheckboxIcon from "./components/CheckboxIcon.vue"
*/
export default {
name: "FlatSelectInput",
- components: {InputWrapper, RadioButtonIcon, CheckboxIcon},
+ components: {RadioButtonIcon, CheckboxIcon},
props: {
...inputProps,
diff --git a/client/components/forms/OptionSelectorInput.vue b/client/components/forms/core/OptionSelectorInput.vue
similarity index 95%
rename from client/components/forms/OptionSelectorInput.vue
rename to client/components/forms/core/OptionSelectorInput.vue
index 0b225b9c7..b675a7791 100644
--- a/client/components/forms/OptionSelectorInput.vue
+++ b/client/components/forms/core/OptionSelectorInput.vue
@@ -26,10 +26,10 @@
{
// Background colors
'bg-form/10': isSelected(option),
- 'hover:bg-gray-100': !isSelected(option),
+ 'hover:bg-neutral-100': !isSelected(option),
// Border colors
'border-form': isSelected(option),
- 'border-gray-300': !isSelected(option),
+ 'border-neutral-300': !isSelected(option),
// Border radius for seamless mode
'rounded-lg': !seamless,
'first:rounded-l-lg': seamless,
@@ -42,7 +42,7 @@
]"
>
<button
- class="flex flex-col items-center justify-center p-1.5 transition-colors text-gray-500 focus:outline-none w-full h-full"
+ class="flex flex-col items-center justify-center p-1.5 transition-colors text-neutral-500 focus:outline-hidden w-full h-full"
:class="[
option.class ? (typeof option.class === 'function' ? option.class(isSelected(option)) : option.class) : {},
{
@@ -94,8 +94,7 @@
<script setup>
import { ref, computed, watch, nextTick } from 'vue'
-import { inputProps, useFormInput } from './useFormInput.js'
-import InputWrapper from './components/InputWrapper.vue'
+import { inputProps, useFormInput } from '../useFormInput.js'
/**
* OptionSelectorInput.vue
diff --git a/client/components/forms/ScaleInput.vue b/client/components/forms/core/ScaleInput.vue
similarity index 95%
rename from client/components/forms/ScaleInput.vue
rename to client/components/forms/core/ScaleInput.vue
index c75e53636..b8148b04b 100644
--- a/client/components/forms/ScaleInput.vue
+++ b/client/components/forms/core/ScaleInput.vue
@@ -35,12 +35,11 @@
</template>
<script>
-import { inputProps, useFormInput } from "./useFormInput.js"
-import InputWrapper from "./components/InputWrapper.vue"
+import { inputProps, useFormInput } from "../useFormInput.js"
export default {
name: "ScaleInput",
- components: { InputWrapper },
+ components: { },
props: {
...inputProps,
diff --git a/client/components/forms/SelectInput.vue b/client/components/forms/core/SelectInput.vue
similarity index 97%
rename from client/components/forms/SelectInput.vue
rename to client/components/forms/core/SelectInput.vue
index 54b601ee8..5915dd5b3 100644
--- a/client/components/forms/SelectInput.vue
+++ b/client/components/forms/core/SelectInput.vue
@@ -101,15 +101,14 @@
</template>
<script>
-import { inputProps, useFormInput } from './useFormInput.js'
-import InputWrapper from './components/InputWrapper.vue'
+import { inputProps, useFormInput } from '../useFormInput.js'
/**
* Options: {name,value} objects
*/
export default {
name: 'SelectInput',
- components: { InputWrapper },
+ components: {},
props: {
...inputProps,
diff --git a/client/components/forms/SliderInput.vue b/client/components/forms/core/SliderInput.vue
similarity index 93%
rename from client/components/forms/SliderInput.vue
rename to client/components/forms/core/SliderInput.vue
index 96ff0353a..4c146463e 100644
--- a/client/components/forms/SliderInput.vue
+++ b/client/components/forms/core/SliderInput.vue
@@ -45,12 +45,11 @@
</template>
<script>
-import { inputProps, useFormInput } from "./useFormInput.js"
-import InputWrapper from "./components/InputWrapper.vue"
+import { inputProps, useFormInput } from "../useFormInput.js"
export default {
name: "SliderInput",
- components: { InputWrapper },
+ components: { },
props: {
...inputProps,
diff --git a/client/components/forms/TextAreaInput.vue b/client/components/forms/core/TextAreaInput.vue
similarity index 87%
rename from client/components/forms/TextAreaInput.vue
rename to client/components/forms/core/TextAreaInput.vue
index 87dda1ffa..93498c8b9 100644
--- a/client/components/forms/TextAreaInput.vue
+++ b/client/components/forms/core/TextAreaInput.vue
@@ -16,7 +16,7 @@
theme.default.fontSize,
{
'!ring-red-500 !ring-2 !border-transparent': hasError,
- '!cursor-not-allowed !bg-gray-200 dark:!bg-gray-800': disabled,
+ '!cursor-not-allowed !bg-neutral-200 dark:!bg-neutral-800': disabled,
},
]"
class="resize-y block"
@@ -52,12 +52,11 @@
</template>
<script>
-import {inputProps, useFormInput} from "./useFormInput.js"
-import InputWrapper from "./components/InputWrapper.vue"
+import {inputProps, useFormInput} from "../useFormInput.js"
export default {
name: "TextAreaInput",
- components: {InputWrapper},
+ components: {},
mixins: [],
props: {
diff --git a/client/components/forms/TextBlock.vue b/client/components/forms/core/TextBlock.vue
similarity index 86%
rename from client/components/forms/TextBlock.vue
rename to client/components/forms/core/TextBlock.vue
index a95851487..19339b1fa 100644
--- a/client/components/forms/TextBlock.vue
+++ b/client/components/forms/core/TextBlock.vue
@@ -6,6 +6,8 @@
</template>
<script setup>
+ import { useParseMention } from '@/composables/components/useParseMention'
+
const props = defineProps({
content: {
type: String,
diff --git a/client/components/forms/TextInput.vue b/client/components/forms/core/TextInput.vue
similarity index 91%
rename from client/components/forms/TextInput.vue
rename to client/components/forms/core/TextInput.vue
index d5a50999d..cc7963865 100644
--- a/client/components/forms/TextInput.vue
+++ b/client/components/forms/core/TextInput.vue
@@ -20,7 +20,7 @@
theme.default.fontSize,
{
'!ring-red-500 !ring-2 !border-transparent': hasError,
- '!cursor-not-allowed !bg-gray-200 dark:!bg-gray-800': disabled,
+ '!cursor-not-allowed !bg-neutral-200 dark:!bg-neutral-800': disabled,
},
]"
:name="name"
@@ -61,12 +61,11 @@
</template>
<script>
-import {inputProps, useFormInput} from "./useFormInput.js"
-import InputWrapper from "./components/InputWrapper.vue"
+import {inputProps, useFormInput} from "../useFormInput.js"
export default {
name: "TextInput",
- components: {InputWrapper},
+ components: {},
props: {
...inputProps,
diff --git a/client/components/forms/ToggleSwitchInput.vue b/client/components/forms/core/ToggleSwitchInput.vue
similarity index 88%
rename from client/components/forms/ToggleSwitchInput.vue
rename to client/components/forms/core/ToggleSwitchInput.vue
index aa2cc4c3e..0186ce84f 100644
--- a/client/components/forms/ToggleSwitchInput.vue
+++ b/client/components/forms/core/ToggleSwitchInput.vue
@@ -5,7 +5,7 @@
</template>
<div class="flex space-x-2 items-center">
- <UToggle
+ <USwitch
:id="id ? id : name"
v-model="compVal"
:disabled="disabled ? true : null"
@@ -69,14 +69,13 @@
</template>
<script>
-import {inputProps, useFormInput} from "./useFormInput.js"
-import InputWrapper from "./components/InputWrapper.vue"
-import InputHelp from "~/components/forms/components/InputHelp.vue"
+import {inputProps, useFormInput} from "../useFormInput.js"
+import InputHelp from "~/components/forms/core/components/InputHelp.vue"
export default {
name: "ToggleSwitchInput",
- components: {InputHelp, InputWrapper},
+ components: {InputHelp},
props: {
...inputProps,
},
diff --git a/client/components/forms/VForm.vue b/client/components/forms/core/VForm.vue
similarity index 100%
rename from client/components/forms/VForm.vue
rename to client/components/forms/core/VForm.vue
diff --git a/client/components/forms/components/CheckboxIcon.vue b/client/components/forms/core/components/CheckboxIcon.vue
similarity index 100%
rename from client/components/forms/components/CheckboxIcon.vue
rename to client/components/forms/core/components/CheckboxIcon.vue
diff --git a/client/components/forms/components/InputHelp.vue b/client/components/forms/core/components/InputHelp.vue
similarity index 90%
rename from client/components/forms/components/InputHelp.vue
rename to client/components/forms/core/components/InputHelp.vue
index ff4dd8bde..5233b5bce 100644
--- a/client/components/forms/components/InputHelp.vue
+++ b/client/components/forms/core/components/InputHelp.vue
@@ -27,7 +27,7 @@
<script setup>
const slots = useSlots()
const props = defineProps({
- helpClasses: { type: String, default: "text-gray-400 dark:text-gray-500" },
+ helpClasses: { type: String, default: "text-neutral-500" },
help: { type: String, required: false },
})
diff --git a/client/components/forms/components/InputLabel.vue b/client/components/forms/core/components/InputLabel.vue
similarity index 100%
rename from client/components/forms/components/InputLabel.vue
rename to client/components/forms/core/components/InputLabel.vue
diff --git a/client/components/forms/components/InputWrapper.vue b/client/components/forms/core/components/InputWrapper.vue
similarity index 97%
rename from client/components/forms/components/InputWrapper.vue
rename to client/components/forms/core/components/InputWrapper.vue
index a39ce27e4..e6be640f2 100644
--- a/client/components/forms/components/InputWrapper.vue
+++ b/client/components/forms/core/components/InputWrapper.vue
@@ -15,11 +15,12 @@
/>
</VTransition>
</slot>
- <VTransition name="fadeHeight">
+
<slot
v-if="helpPosition === 'above_input'"
name="help"
>
+ <VTransition name="fadeHeight">
<InputHelp
:help="help"
:help-classes="theme.default.help"
@@ -28,15 +29,15 @@
<slot name="bottom_after_help" />
</template>
</InputHelp>
- </slot>
</VTransition>
+ </slot>
<slot />
- <VTransition name="fadeHeightDown">
<slot
v-if="helpPosition === 'below_input'"
name="help"
>
+ <VTransition name="fadeHeightDown">
<InputHelp
:help="help"
:help-classes="theme.default.help"
@@ -45,16 +46,18 @@
<slot name="bottom_after_help" />
</template>
</InputHelp>
+ </VTransition>
</slot>
<slot name="error">
+ <VTransition name="fadeHeightDown">
<has-error
v-if="hasValidation && form"
:form="form"
:field-id="name"
:field-name="label"
/>
- </slot>
</VTransition>
+ </slot>
</div>
</template>
diff --git a/client/components/forms/components/RadioButtonIcon.vue b/client/components/forms/core/components/RadioButtonIcon.vue
similarity index 100%
rename from client/components/forms/components/RadioButtonIcon.vue
rename to client/components/forms/core/components/RadioButtonIcon.vue
diff --git a/client/components/forms/components/VCheckbox.vue b/client/components/forms/core/components/VCheckbox.vue
similarity index 55%
rename from client/components/forms/components/VCheckbox.vue
rename to client/components/forms/core/components/VCheckbox.vue
index 66844c6d0..4516c77b0 100644
--- a/client/components/forms/components/VCheckbox.vue
+++ b/client/components/forms/core/components/VCheckbox.vue
@@ -6,14 +6,14 @@
:value="value"
:name="name"
type="checkbox"
- class="rounded border-gray-500 w-10 h-10 cursor-pointer checkbox"
- :class="theme.CheckboxInput.size"
+ class="rounded border-neutral-500 size-6 checkbox"
+ :class="[theme.CheckboxInput.size,{'cursor-pointer': !disabled}]"
:style="{ '--accent-color': color }"
:disabled="disabled ? true : null"
>
<label
:for="id || name"
- class="text-gray-700 dark:text-gray-300 ml-2"
+ class="text-neutral-700 dark:text-neutral-300 ml-2"
:class="{ '!cursor-not-allowed': disabled }"
>
<slot />
@@ -22,32 +22,39 @@
</template>
<script setup>
-import { defineEmits, defineOptions, defineProps, onMounted, ref, watch, } from "vue"
-import CachedDefaultTheme from "~/lib/forms/themes/CachedDefaultTheme.js"
+import {
+ defineEmits,
+ defineOptions,
+ defineProps,
+ onMounted,
+ ref,
+ watch,
+} from 'vue'
+import CachedDefaultTheme from '~/lib/forms/themes/CachedDefaultTheme.js'
defineOptions({
- name: "VCheckbox",
+ name: 'VCheckbox',
})
const props = defineProps({
id: { type: String, default: null },
- name: { type: String, default: "checkbox" },
+ name: { type: String, default: 'checkbox' },
modelValue: { type: [Boolean, String], default: false },
value: { type: [Boolean, String, Number, Object], required: false },
disabled: { type: Boolean, default: false },
theme: {
- type: Object, default: () => {
- const theme = inject("theme", null)
- if (theme) {
- return theme.value
+ type: Object, default: () => {
+ const theme = inject('theme', null)
+ if (theme) {
+ return theme.value
+ }
+ return CachedDefaultTheme.getInstance()
}
- return CachedDefaultTheme.getInstance()
- }
- },
+ },
color: { type: String, default: null },
})
-const emit = defineEmits(["update:modelValue", "click"])
+const emit = defineEmits(['update:modelValue', 'click'])
const internalValue = ref(props.modelValue)
@@ -68,15 +75,19 @@ watch(
watch(
() => internalValue.value,
(val, oldVal) => {
- if (val === 0 || val === "0") val = false
- if (val === 1 || val === "1") val = true
+ if (val === 0 || val === '0')
+ val = false
+ if (val === 1 || val === '1')
+ val = true
- if (val !== oldVal) emit("update:modelValue", val)
+ if (val !== oldVal)
+ emit('update:modelValue', val)
},
)
onMounted(() => {
- if (internalValue.value === null) internalValue.value = false
+ if (internalValue.value === null)
+ internalValue.value = false
})
</script>
<style>
diff --git a/client/components/forms/components/VSelect.vue b/client/components/forms/core/components/VSelect.vue
similarity index 78%
rename from client/components/forms/components/VSelect.vue
rename to client/components/forms/core/components/VSelect.vue
index dc851723a..c4e283a7a 100644
--- a/client/components/forms/components/VSelect.vue
+++ b/client/components/forms/core/components/VSelect.vue
@@ -5,15 +5,15 @@
:class="[{ 'w-0': multiple, 'min-w-full': multiple }]"
>
<div
- class="inline-block w-full flex overflow-hidden"
+ class="w-full flex overflow-hidden"
:style="inputStyle"
:class="[
theme.SelectInput.input,
theme.SelectInput.borderRadius,
{
- '!ring-red-500 !ring-2 !border-transparent': hasError,
- '!cursor-not-allowed !bg-gray-200 dark:!bg-gray-800': disabled,
- 'focus-within:ring-2 focus-within:ring-opacity-100 focus-within:border-transparent': !hasError && !disabled
+ 'ring-red-500! ring-2! border-transparent!': hasError,
+ '!cursor-not-allowed bg-neutral-200! dark:bg-neutral-800!': disabled,
+ 'focus-within:ring-2 focus-within:ring-form/100 focus-within:border-transparent': !hasError && !disabled
},
inputClass
]"
@@ -23,7 +23,7 @@
aria-haspopup="listbox"
aria-expanded="true"
aria-labelledby="listbox-label"
- class="cursor-pointer w-full flex-grow relative focus:outline-none"
+ class="cursor-pointer w-full grow relative focus:outline-hidden min-w-0 truncate"
:class="[
theme.SelectInput.spacing.horizontal,
theme.SelectInput.spacing.vertical
@@ -46,7 +46,7 @@
<Loader
v-if="loading"
key="loader"
- class="h-6 w-6 text-nt-blue mx-auto"
+ class="h-6 w-6 text-form mx-auto"
/>
<div
v-else-if="modelValue"
@@ -65,7 +65,7 @@
>
<slot name="placeholder">
<div
- class="text-gray-400 dark:text-gray-500 w-full ltr:text-left rtl:!text-right truncate ltr:pr-3 rtl:pl-3 rtl:!pr-0"
+ class="text-neutral-400 dark:text-neutral-500 w-full ltr:text-left rtl:text-right! truncate ltr:pr-3 rtl:pl-3 rtl:pr-0!"
:class="[
{ 'py-1': multiple && !loading },
theme.SelectInput.fontSize
@@ -78,28 +78,28 @@
</transition>
</div>
<div
- class="absolute inset-y-0 ltr:right-6 rtl:left-6 w-10 pointer-events-none -z-[1]"
- :class="[disabled ? 'bg-gradient-to-r from-transparent to-gray-200 dark:to-gray-800' : theme.SelectInput.chevronGradient]"
+ class="absolute inset-y-0 ltr:right-6 rtl:left-6 w-10 pointer-events-none -z-1"
+ :class="[disabled ? 'bg-linear-to-r from-transparent to-neutral-200 dark:to-neutral-800' : theme.SelectInput.chevronGradient]"
/>
<span
- class="absolute inset-y-0 ltr:right-0 rtl:left-0 rtl:!right-auto flex items-center ltr:pr-2 rtl:pl-2 rtl:!pr-0 pointer-events-none"
- :class="[disabled ? 'bg-gray-200 dark:bg-gray-800' : theme.SelectInput.background]"
+ class="absolute inset-y-0 ltr:right-0 rtl:left-0 rtl:right-auto! flex items-center ltr:pr-2 rtl:pl-2 rtl:pr-0! pointer-events-none"
+ :class="[disabled ? 'bg-neutral-200 dark:bg-neutral-800' : theme.SelectInput.background]"
>
<Icon
name="heroicons:chevron-up-down-16-solid"
- class="h-5 w-5 text-gray-500"
+ class="h-5 w-5 text-neutral-500"
/>
</span>
</button>
<button
v-if="clearable && showClearButton && !disabled && !isEmpty"
- class="hover:bg-gray-50 dark:hover:bg-gray-900 ltr:border-l rtl:!border-l-0 rtl:border-r px-2 flex items-center"
+ class="hover:bg-neutral-50 dark:hover:bg-neutral-900 ltr:border-l rtl:border-l-0! rtl:border-r px-2 flex items-center shrink-0"
:class="[theme.SelectInput.spacing.vertical]"
@click.prevent="clear()"
>
<Icon
name="heroicons:x-mark-20-solid"
- class="w-5 h-5 text-gray-500"
+ class="w-5 h-5 text-neutral-500"
width="2em"
dynamic
/>
@@ -114,7 +114,7 @@
<ul
tabindex="-1"
role="listbox"
- class="leading-6 shadow-xs overflow-auto focus:outline-none sm:text-sm sm:leading-5 relative"
+ class="leading-6 shadow-xs overflow-auto focus:outline-hidden sm:text-sm sm:leading-5 relative"
:class="[
{ 'max-h-42': !isSearchable, 'max-h-48': isSearchable },
theme.SelectInput.fontSize
@@ -122,32 +122,32 @@
>
<div
v-if="isSearchable"
- class="sticky top-0 z-10 flex border-b border-gray-300"
+ class="sticky top-0 z-10 flex border-b bg-white dark:bg-notion-dark-light"
>
<input
v-model="searchTerm"
type="text"
- class="flex-grow ltr:pl-3 ltr:pr-7 rtl:!pr-3 rtl:pl-7 py-2 w-full focus:outline-none dark:text-white"
+ class="grow ltr:pl-3 ltr:pr-7 rtl:pr-3! rtl:pl-7 py-2 w-full focus:outline-hidden dark:text-white"
:placeholder="allowCreation ? $t('forms.select.searchOrTypeToCreateNew') : $t('forms.select.search')"
>
<div
v-if="!searchTerm"
- class="flex absolute ltr:right-0 rtl:left-0 rtl:!right-auto inset-y-0 items-center px-2 justify-center pointer-events-none"
+ class="flex absolute ltr:right-0 rtl:left-0 rtl:right-auto! inset-y-0 items-center px-2 justify-center pointer-events-none"
>
<Icon
name="heroicons:magnifying-glass-solid"
- class="h-5 w-5 text-gray-500 dark:text-gray-400"
+ class="h-5 w-5 text-neutral-500 dark:text-neutral-400"
/>
</div>
<div
v-else
role="button"
- class="flex absolute ltr:right-0 rtl:!right-auto rtl:left-0 inset-y-0 items-center px-2 justify-center"
+ class="flex absolute ltr:right-0 rtl:right-auto! rtl:left-0 inset-y-0 items-center px-2 justify-center"
@click="searchTerm = ''"
>
<Icon
name="heroicons:backspace"
- class="h-5 w-5 rtl:rotate-180 text-gray-500 dark:text-gray-400"
+ class="h-5 w-5 rtl:rotate-180 text-neutral-500 dark:text-neutral-400"
/>
</div>
</div>
@@ -155,7 +155,7 @@
v-if="loading"
class="w-full py-2 flex justify-center"
>
- <Loader class="h-6 w-6 text-nt-blue mx-auto" />
+ <Loader class="h-6 w-6 text-blue-500 mx-auto" />
</div>
<div
v-if="filteredOptions.length > 0"
@@ -173,7 +173,7 @@
theme.SelectInput.spacing.vertical,
{ 'pr-9': multiple},
]"
- class="text-gray-900 select-none relative cursor-pointer group hover:bg-gray-100 dark:hover:bg-gray-900 rounded focus:outline-none"
+ class="text-neutral-900 select-none relative cursor-pointer group hover:bg-neutral-100 dark:hover:bg-neutral-900 rounded-sm focus:outline-hidden"
@click="select(item)"
>
<slot
@@ -183,28 +183,33 @@
/>
</li>
</div>
- <p
+ <slot
v-else-if="!loading && !(allowCreation && searchTerm)"
- class="w-full text-gray-500 text-center py-2"
+ name="empty-placeholder"
>
- {{ (allowCreation ? $t('forms.select.typeSomethingToAddAnOption') : $t('forms.select.noOptionAvailable')) }}.
- </p>
+ <p
+ class="w-full text-neutral-500 text-center py-2"
+ >
+ {{ (allowCreation ? $t('forms.select.typeSomethingToAddAnOption') : $t('forms.select.noOptionAvailable')) }}.
+ </p>
+ </slot>
<div
v-if="allowCreation && searchTerm"
- class="border-t border-gray-300 p-1"
+ class="border-t border-neutral-300 p-1"
>
<li
role="option"
:style="optionStyle"
:class="[{ 'px-3 pr-9': multiple, 'px-3': !multiple },dropdownClass,theme.SelectInput.option]"
- class="text-gray-900 select-none relative py-2 cursor-pointer group hover:bg-gray-100 dark:hover:bg-gray-900 rounded focus:outline-none"
+ class="text-neutral-900 select-none relative py-2 cursor-pointer group hover:bg-neutral-100 dark:hover:bg-neutral-900 rounded-sm focus:outline-hidden"
@click="createOption(searchTerm)"
>
- {{ $t('forms.select.create') }} <span class="px-2 bg-gray-100 border border-gray-300 rounded group-hover-text-black">{{
+ {{ $t('forms.select.create') }} <span class="px-2 bg-neutral-100 border border-neutral-300 rounded-sm group-hover-text-black">{{
searchTerm
}}</span>
</li>
</div>
+ <slot name="after-options" />
</ul>
</collapsible>
</div>
diff --git a/client/components/forms/validation/HasError.vue b/client/components/forms/core/validation/HasError.vue
similarity index 100%
rename from client/components/forms/validation/HasError.vue
rename to client/components/forms/core/validation/HasError.vue
diff --git a/client/components/forms/BarcodeInput.vue b/client/components/forms/heavy/BarcodeInput.vue
similarity index 83%
rename from client/components/forms/BarcodeInput.vue
rename to client/components/forms/heavy/BarcodeInput.vue
index a7f1414ea..8f3b627dc 100644
--- a/client/components/forms/BarcodeInput.vue
+++ b/client/components/forms/heavy/BarcodeInput.vue
@@ -20,7 +20,7 @@
<div
v-else-if="scannedValue"
- class="flex items-center justify-between border border-gray-300 dark:border-gray-600 w-full bg-white text-gray-700 dark:bg-notion-dark-light dark:text-gray-300 rounded-lg px-4 py-2"
+ class="flex items-center justify-between border border-neutral-300 dark:border-neutral-600 w-full bg-white text-neutral-700 dark:bg-notion-dark-light dark:text-neutral-300 rounded-lg px-4 py-2"
>
<div class="flex-1 break-all">
{{ scannedValue }}
@@ -28,7 +28,7 @@
<button
v-if="!disabled"
type="button"
- class="pt-1 text-gray-400 hover:text-gray-600"
+ class="pt-1 text-neutral-400 hover:text-neutral-600"
@click="clearValue"
>
<Icon
@@ -51,7 +51,7 @@
theme.fileInput.fontSize,
theme.fileInput.minHeight,
{'border-red-500 border-2':hasError},
- 'focus:outline-none focus:ring-2'
+ 'focus:outline-hidden focus:ring-2'
]"
tabindex="0"
role="button"
@@ -62,14 +62,14 @@
<div class="flex w-full items-center justify-center">
<div class="text-center">
<template v-if="!scannedValue && !isScanning">
- <div class="text-gray-500 w-full flex justify-center">
+ <div class="text-neutral-500 w-full flex justify-center">
<Icon
name="i-material-symbols-barcode-scanner-rounded"
class="w-6 h-6"
/>
</div>
- <p class="mt-2 text-sm text-gray-500 font-medium select-none">
+ <p class="mt-2 text-sm text-neutral-500 font-medium select-none">
{{ $t('forms.barcodeInput.clickToOpenCamera') }}
</p>
</template>
@@ -84,13 +84,12 @@
</template>
<script>
-import { inputProps, useFormInput } from './useFormInput.js'
-import InputWrapper from './components/InputWrapper.vue'
+import { inputProps, useFormInput } from '../useFormInput.js'
import CameraUpload from './components/CameraUpload.vue'
export default {
name: 'BarcodeInput',
- components: { InputWrapper, CameraUpload },
+ components: { CameraUpload },
props: {
...inputProps,
diff --git a/client/components/forms/heavy/CodeInput.client.vue b/client/components/forms/heavy/CodeInput.client.vue
new file mode 100644
index 000000000..b286e7cb0
--- /dev/null
+++ b/client/components/forms/heavy/CodeInput.client.vue
@@ -0,0 +1,149 @@
+<template>
+ <input-wrapper v-bind="inputWrapperProps">
+ <template #label>
+ <slot name="label" />
+ </template>
+
+ <template #help>
+ <slot name="help" />
+ </template>
+
+ <div
+ :class="[
+ 'h-40 max-h-96 overflow-y-auto relative',
+ theme.CodeInput.input,
+ theme.CodeInput.borderRadius,
+ {
+ '!ring-red-500 !ring-2 !border-transparent': hasError,
+ '!cursor-not-allowed !bg-neutral-200 dark:!bg-neutral-800': disabled,
+ },
+ ]"
+ >
+ <!-- Fullscreen button -->
+ <UTooltip text="Open in fullscreen" :popper="{ placement: 'left' }">
+ <UButton
+ v-if="allowFullscreen"
+ @click="openFullscreen"
+ :disabled="disabled"
+ variant="ghost"
+ color="neutral"
+ size="xs"
+ icon="i-heroicons-arrows-pointing-out"
+ class="absolute top-2 right-2 z-10 !bg-white/80 dark:!bg-neutral-800/80 hover:!bg-white dark:hover:!bg-neutral-800 !opacity-70 hover:!opacity-100 disabled:!opacity-30"
+ :ui="{ rounded: 'rounded-md' }"
+ />
+ </UTooltip>
+
+ <ClientOnly>
+ <codemirror
+ :id="id ? id : name"
+ v-model="compVal"
+ :disabled="disabled ? true : null"
+ :extensions="extensions"
+ :style="inputStyle"
+ :name="name"
+ :tab-size="4"
+ :placeholder="placeholder"
+ />
+ <template #fallback>
+ <USkeleton class="w-full h-10" />
+ </template>
+ </ClientOnly>
+
+ <UModal v-if="allowFullscreen" v-model:open="isFullscreen" fullscreen>
+ <template #content>
+ <div class="flex flex-col h-full">
+ <div class="flex items-center justify-between p-4 border-b">
+ <div>
+ <h3 class="text-lg font-medium text-neutral-900 dark:text-white">
+ {{ label || 'Code Editor' }}
+ </h3>
+ </div>
+ <UButton
+ @click="closeFullscreen"
+ variant="outline"
+ color="neutral"
+ size="sm"
+ icon="i-heroicons-x-mark"
+ :ui="{ rounded: 'rounded-md' }"
+ label="Exit fullscreen"
+ />
+ </div>
+
+ <!-- Editor -->
+ <div class="flex-1 overflow-hidden">
+ <ClientOnly>
+ <codemirror
+ v-model="compVal"
+ :disabled="disabled ? true : null"
+ :extensions="extensions"
+ :style="{ height: '100%' }"
+ :name="name"
+ :tab-size="4"
+ :placeholder="placeholder"
+ />
+ <template #fallback>
+ <USkeleton class="w-full h-full" />
+ </template>
+ </ClientOnly>
+ </div>
+ </div>
+ </template>
+ </UModal>
+ </div>
+
+ <template #error>
+ <slot name="error" />
+ </template>
+ </input-wrapper>
+</template>
+
+<script setup>
+import { Codemirror } from "vue-codemirror"
+import { html } from "@codemirror/lang-html"
+import { inputProps, useFormInput } from "../useFormInput.js"
+
+const props = defineProps({
+ ...inputProps,
+ allowFullscreen: {
+ type: Boolean,
+ default: false,
+ },
+})
+
+const emit = defineEmits(['update:modelValue', 'focus', 'blur'])
+
+const extensions = [html()]
+const isFullscreen = ref(false)
+
+const openFullscreen = () => {
+ isFullscreen.value = true
+ console.log('openFullscreen')
+}
+
+const closeFullscreen = () => {
+ isFullscreen.value = false
+ console.log('closeFullscreen')
+}
+
+// Handle keyboard shortcuts
+defineShortcuts({
+ escape: {
+ usingInput: true,
+ handler: () => {
+ if (isFullscreen.value) {
+ closeFullscreen()
+ }
+ }
+ }
+})
+
+// Get form input composable
+const { compVal, inputWrapperProps, hasError, disabled, inputStyle, id, name } = useFormInput(props, { emit })
+</script>
+
+<style>
+.v-codemirror, .cm-editor {
+ height: 100%;
+}
+</style>
diff --git a/client/components/forms/DateInput.vue b/client/components/forms/heavy/DateInput.vue
similarity index 82%
rename from client/components/forms/DateInput.vue
rename to client/components/forms/heavy/DateInput.vue
index d81de9c53..af75e6b5d 100644
--- a/client/components/forms/DateInput.vue
+++ b/client/components/forms/heavy/DateInput.vue
@@ -6,8 +6,9 @@
<UPopover
v-model:open="pickerOpen"
+ arrow
:disabled="props.disabled"
- :popper="{ placement: 'bottom-start' }"
+ :content="{ side: 'bottom', align: 'center' }"
>
<button
ref="datepicker"
@@ -17,7 +18,7 @@
>
<div class="flex items-stretch min-w-0">
<div
- class="flex-grow min-w-0 flex items-center gap-x-2"
+ class="grow min-w-0 flex items-center gap-x-2"
:class="[
props.theme.DateInput.spacing.horizontal,
props.theme.DateInput.spacing.vertical,
@@ -26,13 +27,13 @@
>
<Icon
name="heroicons:calendar-20-solid"
- class="w-4 h-4 flex-shrink-0"
+ class="w-4 h-4 shrink-0"
dynamic
/>
- <div class="flex-grow truncate overflow-hidden flex items-center">
+ <div class="grow truncate overflow-hidden flex items-center">
<p
v-if="formattedDatePreview"
- class="flex-grow truncate"
+ class="grow truncate"
>
{{ formattedDatePreview }}
</p>
@@ -46,12 +47,12 @@
</div>
<button
v-if="fromDate && !props.disabled"
- class="hover:bg-gray-50 dark:hover:bg-gray-900 ltr:border-l rtl:border-r px-2 flex items-center"
+ class="hover:bg-neutral-50 dark:hover:bg-neutral-900 ltr:border-l rtl:border-r px-2 flex items-center"
@click.prevent="clear()"
>
<Icon
name="heroicons:x-mark-20-solid"
- class="w-5 h-5 text-gray-500"
+ class="w-5 h-5 text-neutral-500"
width="2em"
dynamic
/>
@@ -59,8 +60,9 @@
</div>
</button>
- <template #panel>
+ <template #content>
<DatePicker
+ class="rounded-md"
v-if="props.dateRange"
v-model.range="modeledValue"
:mode="props.withTime ? 'dateTime' : 'date'"
@@ -70,11 +72,13 @@
:min-date="minDate"
:max-date="maxDate"
:is-dark="props.isDark"
- color="form-color"
+ color="form"
:locale="props.locale"
@update:model-value="updateModelValue"
+ :style="datePickerStyles"
/>
<DatePicker
+ class="rounded-md"
v-else
v-model="modeledValue"
:mode="props.withTime ? 'dateTime' : 'date'"
@@ -84,9 +88,10 @@
:min-date="minDate"
:max-date="maxDate"
:is-dark="props.isDark"
- color="form-color"
+ color="form"
:locale="props.locale"
@update:model-value="updateModelValue"
+ :style="datePickerStyles"
/>
</template>
</UPopover>
@@ -101,8 +106,7 @@
</template>
<script setup>
-import { inputProps, useFormInput } from './useFormInput.js'
-import InputWrapper from './components/InputWrapper.vue'
+import { inputProps, useFormInput } from '../useFormInput.js'
import { getCurrentInstance } from 'vue'
import { DatePicker } from 'v-calendar'
import 'v-calendar/dist/style.css'
@@ -131,6 +135,17 @@ const twColors = computed(() => {
return tailwindcssPaletteGenerator(props.color).primary
})
+const datePickerStyles = computed(() => {
+ if (!twColors.value) {
+ return {}
+ }
+ const styles = {}
+ for (const shade in twColors.value) {
+ styles[`--vc-accent-${shade}`] = twColors.value[shade]
+ }
+ return styles
+})
+
const modeledValue = computed({
get () {
return props.dateRange ? { start: fromDate.value, end: toDate.value } : fromDate.value
@@ -146,7 +161,7 @@ const modeledValue = computed({
})
const updateModelValue = () => {
- if (!props.withTime && !props.dateRange) {
+ if (!props.withTime && !props.dateRange && modeledValue.value) {
pickerOpen.value = false
}
}
@@ -154,13 +169,13 @@ const updateModelValue = () => {
const inputClasses = computed(() => {
const classes = [props.theme.DateInput.input, props.theme.DateInput.borderRadius]
if (props.disabled) {
- classes.push('!cursor-not-allowed !bg-gray-200 dark:!bg-gray-800')
+ classes.push('!cursor-not-allowed bg-neutral-200! dark:bg-neutral-800!')
}
if (input.hasError.value) {
- classes.push('!ring-red-500 !ring-2 !border-transparent')
+ classes.push('ring-red-500! ring-2! border-transparent!')
}
if (!props.disabled && !input.hasError.value && pickerOpen.value) {
- classes.push('ring-2 ring-opacity-100 border-transparent')
+ classes.push('ring-2 ring-form/100 border-transparent')
}
return classes.join(' ')
})
@@ -260,19 +275,4 @@ onMounted(() => {
handleCompValChange()
setInputColor()
})
-</script>
-
-<style>
-.vc-form-color {
- --vc-accent-50: v-bind('twColors[50]');
- --vc-accent-100: v-bind('twColors[100]');
- --vc-accent-200: v-bind('twColors[200]');
- --vc-accent-300: v-bind('twColors[300]');
- --vc-accent-400: v-bind('twColors[400]');
- --vc-accent-500: v-bind('twColors[500]');
- --vc-accent-600: v-bind('twColors[600]');
- --vc-accent-700: v-bind('twColors[700]');
- --vc-accent-800: v-bind('twColors[800]');
- --vc-accent-900: v-bind('twColors[900]');
-}
-</style>
+</script>
\ No newline at end of file
diff --git a/client/components/forms/FileInput.vue b/client/components/forms/heavy/FileInput.vue
similarity index 90%
rename from client/components/forms/FileInput.vue
rename to client/components/forms/heavy/FileInput.vue
index 004428a20..e31aeaf28 100644
--- a/client/components/forms/FileInput.vue
+++ b/client/components/forms/heavy/FileInput.vue
@@ -25,7 +25,7 @@
class="flex flex-col w-full items-center justify-center transition-colors duration-40"
:class="[
{'!cursor-not-allowed':disabled, 'cursor-pointer':!disabled,
- '!bg-gray-200 dark:!bg-gray-800': disabled,
+ '!bg-neutral-200 dark:!bg-neutral-800': disabled,
[theme.fileInput.inputHover.light + ' dark:'+theme.fileInput.inputHover.dark]: uploadDragoverEvent,
['hover:'+theme.fileInput.inputHover.light +' dark:hover:'+theme.fileInput.inputHover.dark]: !loading},
theme.fileInput.input,
@@ -35,7 +35,7 @@
theme.fileInput.fontSize,
theme.fileInput.minHeight,
{'border-red-500 border-2':hasError},
- 'focus:outline-none focus:ring-2'
+ 'focus:outline-hidden focus:ring-2'
]"
tabindex="0"
role="button"
@@ -49,10 +49,10 @@
<div class="flex w-full items-center justify-center">
<div
v-if="loading"
- class="text-gray-600 dark:text-gray-400"
+ class="text-neutral-600 dark:text-neutral-400"
>
<Loader class="mx-auto h-6 w-6" />
- <p class="mt-2 text-center text-sm text-gray-500">
+ <p class="mt-2 text-center text-sm text-neutral-500">
{{ $t('forms.fileInput.uploadingFile') }}
</p>
</div>
@@ -80,7 +80,7 @@
/>
</div>
<template v-else>
- <div class="text-gray-500 w-full flex justify-center">
+ <div class="text-neutral-500 w-full flex justify-center">
<svg
xmlns="http://www.w3.org/2000/svg"
fill="none"
@@ -97,10 +97,10 @@
</svg>
</div>
- <p class="mt-2 text-sm text-gray-500 font-medium select-none">
+ <p class="mt-2 text-sm text-neutral-500 font-medium select-none">
{{ $t('forms.fileInput.chooseFiles', { n: multiple ? 1 : 0 }) }}
</p>
- <p class="mt-1 text-xs text-gray-400 dark:text-gray-400 select-none">
+ <p class="mt-1 text-xs text-neutral-400 dark:text-neutral-400 select-none">
{{ $t('forms.fileInput.sizeLimit', mbLimit) }}
</p>
</template>
@@ -112,7 +112,8 @@
v-if="cameraUpload"
icon="i-heroicons-camera"
:loading="loading"
- color="white"
+ color="neutral"
+ variant="outline"
class="px-2"
@click.stop="openWebcam"
/>
@@ -129,15 +130,15 @@
</template>
<script>
-import {inputProps, useFormInput} from './useFormInput.js'
-import InputWrapper from './components/InputWrapper.vue'
+import {inputProps, useFormInput} from '../useFormInput.js'
import UploadedFile from './components/UploadedFile.vue'
import CameraUpload from './components/CameraUpload.vue'
import {storeFile} from "~/lib/file-uploads.js"
+import { formsApi } from '~/api'
export default {
name: 'FileInput',
- components: {InputWrapper, UploadedFile, CameraUpload},
+ components: {UploadedFile, CameraUpload},
mixins: [],
props: {
...inputProps,
@@ -274,12 +275,9 @@ export default {
}
if (this.moveToFormAssets) {
// Move file to permanent storage for form assets
- opnFetch('/open/forms/assets/upload', {
- method: 'POST',
- body: {
- type: 'files',
- url: file.name.split('.').slice(0, -1).join('.') + '_' + response.uuid + '.' + response.extension
- }
+ formsApi.assets.upload({
+ type: 'files',
+ url: file.name.split('.').slice(0, -1).join('.') + '_' + response.uuid + '.' + response.extension
}).then(moveFileResponseData => {
this.files.push({
file: file,
diff --git a/client/components/forms/ImageInput.vue b/client/components/forms/heavy/ImageInput.vue
similarity index 56%
rename from client/components/forms/ImageInput.vue
rename to client/components/forms/heavy/ImageInput.vue
index 0ff8cf997..72e6cd025 100644
--- a/client/components/forms/ImageInput.vue
+++ b/client/components/forms/heavy/ImageInput.vue
@@ -24,7 +24,7 @@
>
<div
v-if="currentUrl == null"
- class="text-gray-600 dark:text-gray-400 flex justify-center"
+ class="text-neutral-600 dark:text-neutral-400 flex justify-center"
>
<Icon
name="heroicons:cloud-arrow-up"
@@ -37,17 +37,17 @@
</div>
<div
v-else
- class=" text-gray-600 dark:text-gray-400 flex"
+ class=" text-neutral-600 dark:text-neutral-400 flex"
>
<div class="flex-grow">
<img
:src="tmpFile ?? currentUrl"
- class="h-5 rounded shadow-md border"
+ class="h-5 rounded-sm shadow-sm border"
>
</div>
<a
href="#"
- class="text-gray-500 hover:text-red-500 flex items-center"
+ class="text-neutral-500 hover:text-red-500 flex items-center"
@click.prevent="clearUrl"
>
<Icon
@@ -67,87 +67,82 @@
</template>
<!-- Modal -->
- <modal
- :show="showUploadModal"
- @close="showUploadModal = false"
+ <UModal
+ v-model:open="showUploadModal"
+ title="Upload an image"
+ :ui="{ content: 'sm:max-w-xl' }"
>
- <h2 class="text-lg font-semibold">
- Upload an image
- </h2>
-
- <div class="max-w-3xl mx-auto lg:max-w-none">
- <div
- class="sm:mt-5 sm:grid sm:grid-cols-1 sm:gap-4 sm:items-start sm:pt-5"
- >
- <div class="mt-2 sm:mt-0 sm:col-span-2 mb-5">
- <div
- v-cloak
- class="w-full flex justify-center items-center px-6 pt-5 pb-6 border-2 border-gray-300 border-dashed rounded-md h-128"
- @dragover.prevent="onUploadDragoverEvent($event)"
- @drop.prevent="onUploadDropEvent($event)"
- >
+ <template #body>
+ <div class="max-w-3xl mx-auto lg:max-w-none">
+ <div class="sm:grid sm:grid-cols-1 sm:gap-4 sm:items-start">
+ <div class="sm:col-span-2 mb-5">
<div
- v-if="loading"
- class="text-gray-600 dark:text-gray-400"
+ v-cloak
+ class="w-full flex justify-center items-center px-6 pt-5 pb-6 border-2 border-neutral-300 border-dashed rounded-md h-128"
+ @dragover.prevent="onUploadDragoverEvent($event)"
+ @drop.prevent="onUploadDropEvent($event)"
>
- <loader class="h-5 w-5 mx-auto m-10" />
- <p class="text-center mt-6">
- Uploading your file...
- </p>
- </div>
- <template v-else>
<div
- class="absolute rounded-full bg-gray-100 h-20 w-20 z-10 transition-opacity duration-500 ease-in-out"
- :class="{
- 'opacity-100': uploadDragoverTracking,
- 'opacity-0': !uploadDragoverTracking,
- }"
- />
- <div class="relative z-20 text-center">
- <input
- ref="actual-input"
- class="hidden"
- type="file"
- :name="name"
- accept="image/png, image/gif, image/jpeg, image/bmp, image/svg+xml"
- @change="manualFileUpload"
- >
- <Icon
- name="heroicons:cloud-arrow-up"
- class="x-auto h-24 w-24 text-gray-200"
- />
- <p class="mt-5 text-sm text-gray-600">
- <button
- type="button"
- class="font-semibold text-nt-blue hover:text-nt-blue-dark focus:outline-none focus:underline transition duration-150 ease-in-out"
- @click="openFileUpload"
- >
- Upload your image,
- </button>
- use drag and drop or paste it
- </p>
- <p class="mt-1 text-xs text-gray-500">
- .jpg, .jpeg, .png, .bmp, .gif, .svg up to 5mb
+ v-if="loading"
+ class="text-neutral-600 dark:text-neutral-400"
+ >
+ <loader class="h-5 w-5 mx-auto m-10" />
+ <p class="text-center mt-6">
+ Uploading your file...
</p>
</div>
- </template>
+ <template v-else>
+ <div
+ class="absolute rounded-full bg-neutral-100 h-20 w-20 z-10 transition-opacity duration-500 ease-in-out"
+ :class="{
+ 'opacity-100': uploadDragoverTracking,
+ 'opacity-0': !uploadDragoverTracking,
+ }"
+ />
+ <div class="relative z-20 text-center">
+ <input
+ ref="actual-input"
+ class="hidden"
+ type="file"
+ :name="name"
+ accept="image/png, image/gif, image/jpeg, image/bmp, image/svg+xml"
+ @change="manualFileUpload"
+ >
+ <Icon
+ name="heroicons:cloud-arrow-up"
+ class="x-auto h-24 w-24 text-neutral-200"
+ />
+ <p class="mt-5 text-sm text-neutral-600">
+ <button
+ type="button"
+ class="font-semibold text-blue-500 hover:text-blue-800 focus:outline-hidden focus:underline transition duration-150 ease-in-out"
+ @click="openFileUpload"
+ >
+ Upload your image,
+ </button>
+ use drag and drop or paste it
+ </p>
+ <p class="mt-1 text-xs text-neutral-500">
+ .jpg, .jpeg, .png, .bmp, .gif, .svg up to 5mb
+ </p>
+ </div>
+ </template>
+ </div>
</div>
</div>
</div>
- </div>
- </modal>
+ </template>
+ </UModal>
</InputWrapper>
</template>
<script>
-import { inputProps, useFormInput } from "./useFormInput.js"
-import InputWrapper from "./components/InputWrapper.vue"
-import Modal from "../global/Modal.vue"
+import { inputProps, useFormInput } from "../useFormInput.js"
import { storeFile } from "~/lib/file-uploads.js"
+import { formsApi } from '~/api'
export default {
- name: "ImageInput",
- components: { InputWrapper, Modal },
+ components: { },
mixins: [],
props: {
...inputProps,
@@ -224,16 +219,13 @@ export default {
storeFile(this.file)
.then((response) => {
// Move file to permanent storage for form assets
- opnFetch("/open/forms/assets/upload", {
- method: "POST",
- body: {
- url:
- this.file.name.split(".").slice(0, -1).join(".") +
- "_" +
- response.uuid +
- "." +
- response.extension,
- },
+ formsApi.assets.upload({
+ url:
+ this.file.name.split(".").slice(0, -1).join(".") +
+ "_" +
+ response.uuid +
+ "." +
+ response.extension,
})
.then((moveFileResponseData) => {
if (!this.multiple) {
diff --git a/client/components/forms/heavy/LogicConfirmationModal.vue b/client/components/forms/heavy/LogicConfirmationModal.vue
new file mode 100644
index 000000000..6b4243035
--- /dev/null
+++ b/client/components/forms/heavy/LogicConfirmationModal.vue
@@ -0,0 +1,105 @@
+<template>
+ <UModal
+ v-model:open="isOpen"
+ :ui="{ content: 'sm:max-w-lg' }"
+ title="Incomplete Form Logic"
+ >
+ <template #body>
+ <p class="text-neutral-700">
+ Some logic rules are incomplete or invalid and will be cleaned up to ensure that the form works correctly.
+ </p>
+
+ <div class="mt-4 space-y-3">
+ <template
+ v-for="error in groupedErrors"
+ :key="error.fieldId"
+ >
+ <div class="rounded-lg bg-yellow-50 p-3">
+ <div class="flex items-center">
+ <Icon
+ name="heroicons:exclamation-triangle"
+ class="h-5 w-5 text-yellow-400"
+ />
+ <h4 class="ml-2 text-sm font-medium text-yellow-800">
+ Field: {{ error.fieldName }}
+ </h4>
+ </div>
+ <div class="mt-2 text-sm text-yellow-700">
+ <ul class="list-disc pl-5 space-y-1">
+ <li
+ v-for="(message, index) in error.messages"
+ :key="index"
+ >
+ {{ message }}
+ </li>
+ </ul>
+ </div>
+ </div>
+ </template>
+ </div>
+ </template>
+
+ <template #footer>
+ <div class="flex justify-end space-x-3">
+ <UButton
+ variant="outline"
+ @click="closeModal"
+ >
+ Cancel
+ </UButton>
+ <UButton
+ color="primary"
+ @click="$emit('confirm')"
+ >
+ Save Anyway (Remove Invalid Logic)
+ </UButton>
+ </div>
+ </template>
+ </UModal>
+</template>
+
+<script setup>
+const props = defineProps({
+ isVisible: {
+ type: Boolean,
+ required: true
+ },
+ errors: {
+ type: Array,
+ required: true
+ }
+})
+
+// Modal state
+const isOpen = computed({
+ get: () => props.isVisible,
+ set: (value) => emit('cancel', value)
+})
+
+// Methods
+const closeModal = () => {
+ isOpen.value = false
+}
+
+const emit = defineEmits(['cancel', 'confirm'])
+
+// Group errors by field and format messages
+const groupedErrors = computed(() => {
+ const errorMap = new Map()
+
+ props.errors.forEach(error => {
+ if (!errorMap.has(error.fieldId)) {
+ errorMap.set(error.fieldId, {
+ fieldId: error.fieldId,
+ fieldName: error.fieldName,
+ messages: []
+ })
+ }
+
+ const group = errorMap.get(error.fieldId)
+ group.messages.push(error.message)
+ })
+
+ return Array.from(errorMap.values())
+})
+</script>
\ No newline at end of file
diff --git a/client/components/forms/MatrixInput.vue b/client/components/forms/heavy/MatrixInput.vue
similarity index 89%
rename from client/components/forms/MatrixInput.vue
rename to client/components/forms/heavy/MatrixInput.vue
index 9d832c1d8..c081ca1bb 100644
--- a/client/components/forms/MatrixInput.vue
+++ b/client/components/forms/heavy/MatrixInput.vue
@@ -34,7 +34,7 @@
<tr
v-for="row, rowIndex in rows"
:key="rowIndex"
- class="border-t border-gray-300"
+ class="border-t border-neutral-300"
>
<td class="ltr:text-left rtl:text-right w-auto max-w-24 overflow-hidden">
<div class="w-full p-2 text-sm">
@@ -49,13 +49,13 @@
theme.MatrixInput.cell,
theme.MatrixInput.cellHover,
{
- '!cursor-not-allowed !bg-gray-200 dark:!bg-gray-800 hover:!bg-gray-200 dark:hover:!bg-gray-800': disabled,
+ '!cursor-not-allowed !bg-neutral-200 dark:!bg-neutral-800 hover:!bg-neutral-200 dark:hover:!bg-neutral-800': disabled,
},
]"
>
<div
v-if="compVal"
- class="w-full flex items-center justify-center"
+ class="w-full flex items-center justify-center relative"
role="radio"
:aria-checked="compVal[row] === column"
:class="[
@@ -90,9 +90,8 @@
</template>
<script setup>
import { watch } from "vue"
-import { inputProps, useFormInput } from "./useFormInput.js"
-import InputWrapper from "./components/InputWrapper.vue"
-import RadioButtonIcon from "./components/RadioButtonIcon.vue"
+import { inputProps, useFormInput } from "../useFormInput.js"
+import RadioButtonIcon from "../core/components/RadioButtonIcon.vue"
const props = defineProps({
...inputProps,
diff --git a/client/components/forms/MentionInput.vue b/client/components/forms/heavy/MentionInput.vue
similarity index 81%
rename from client/components/forms/MentionInput.vue
rename to client/components/forms/heavy/MentionInput.vue
index f14ad6120..10cb60ed9 100644
--- a/client/components/forms/MentionInput.vue
+++ b/client/components/forms/heavy/MentionInput.vue
@@ -4,11 +4,6 @@
<slot name="label" />
</template>
- <MentionDropdown
- :mention-state="mentionState"
- :mentions="mentions"
- />
-
<div class="relative">
<div
ref="editableDiv"
@@ -23,17 +18,35 @@
theme.default.fontSize,
{
'!ring-red-500 !ring-2 !border-transparent': hasError,
- '!cursor-not-allowed !bg-gray-200 dark:!bg-gray-800': disabled,
+ '!cursor-not-allowed !bg-neutral-200 dark:!bg-neutral-800': disabled,
},
'pr-12'
]"
:placeholder="placeholder"
@input="onInput"
/>
+ <MentionDropdown
+ v-if="!disabled"
+ :mention-state="mentionState"
+ :mentions="mentions"
+ :disabled="disabled"
+ >
+ <UButton
+ type="button"
+ color="neutral"
+ variant="outline"
+ class="absolute right-1 top-1/2 transform -translate-y-1/2 p-1 px-2"
+ icon="i-heroicons-at-symbol-16-solid"
+ @click="openMentionDropdown"
+ />
+ </MentionDropdown>
<UButton
+ v-else
+ :disabled="disabled"
type="button"
- color="white"
- class="absolute right-2 top-1/2 transform -translate-y-1/2 p-1 px-2"
+ color="neutral"
+ variant="soft"
+ class="absolute right-1 top-1/2 transform -translate-y-1/2 p-1 px-2"
icon="i-heroicons-at-symbol-16-solid"
@click="openMentionDropdown"
/>
@@ -57,8 +70,7 @@
<script setup>
import { ref, onMounted, watch, reactive } from 'vue'
-import { inputProps, useFormInput } from './useFormInput.js'
-import InputWrapper from './components/InputWrapper.vue'
+import { inputProps, useFormInput } from '../useFormInput.js'
import MentionDropdown from './components/MentionDropdown.vue'
const props = defineProps({
@@ -72,7 +84,7 @@ const emit = defineEmits(['update:modelValue'])
const { compVal, inputStyle, hasError, inputWrapperProps } = useFormInput(props, { emit })
const editableDiv = ref(null)
const savedRange = ref(null)
-const subscriptionModalStore = useSubscriptionModalStore()
+const { openSubscriptionModal } = useAppModals()
// Create a reactive state object for the mention dropdown
const mentionState = reactive({
@@ -125,9 +137,8 @@ const insertMention = (mention) => {
}
const openMentionDropdown = () => {
- if (props.disableMention) {
- subscriptionModalStore.setModalContent('Upgrade to Pro', 'Upgrade to Pro to use mentions')
- subscriptionModalStore.openModal()
+ if (props.disableMention || props.disabled) {
+ openSubscriptionModal({ modal_title: 'Upgrade to Pro', modal_description: 'Upgrade to Pro to use mentions' })
return
}
@@ -201,22 +212,4 @@ defineExpose({
content: attr(placeholder);
color: #9ca3af;
}
-
-.mention-input span[mention] {
- max-width: 150px;
- overflow: hidden;
- text-overflow: ellipsis;
- white-space: nowrap;
- display: inline-flex;
- align-items: center;
- background-color: #dbeafe;
- color: #1e40af;
- border: 1px solid #bfdbfe;
- border-radius: 0.25rem;
- padding: 0 0.25rem;
- font-size: 0.875rem;
- line-height: 1.25rem;
- position: relative;
- vertical-align: baseline;
-}
</style>
diff --git a/client/components/forms/PaymentInput.client.vue b/client/components/forms/heavy/PaymentInput.client.vue
similarity index 93%
rename from client/components/forms/PaymentInput.client.vue
rename to client/components/forms/heavy/PaymentInput.client.vue
index 68fa2c73f..a412a4df0 100644
--- a/client/components/forms/PaymentInput.client.vue
+++ b/client/components/forms/heavy/PaymentInput.client.vue
@@ -13,19 +13,19 @@
theme.default.fontSize,
{
'!ring-red-500 !ring-2 !border-transparent': hasError,
- '!cursor-not-allowed !bg-gray-200 dark:!bg-gray-800': disabled,
+ '!cursor-not-allowed !bg-neutral-200 dark:!bg-neutral-800': disabled,
},
- 'dark:bg-gray-900 dark:border-gray-700 dark:text-gray-200'
+ 'dark:bg-neutral-900 dark:border-neutral-700 dark:text-neutral-200'
]"
>
<div v-if="!oauthProviderId">
<div class="space-y-4 mt-3">
<div class="animate-pulse flex flex-col gap-3">
- <div class="h-6 bg-gray-200 dark:bg-gray-800 rounded-md" />
- <div class="h-6 bg-gray-200 dark:bg-gray-800 rounded-md" />
- <div class="h-6 bg-gray-200 dark:bg-gray-800 rounded-md" />
+ <div class="h-6 bg-neutral-200 dark:bg-neutral-800 rounded-md" />
+ <div class="h-6 bg-neutral-200 dark:bg-neutral-800 rounded-md" />
+ <div class="h-6 bg-neutral-200 dark:bg-neutral-800 rounded-md" />
</div>
- <p class="text-sm text-gray-500 dark:text-gray-400 text-center">
+ <p class="text-sm text-neutral-500 dark:text-neutral-400 text-center">
Connect Stripe account to continue
</p>
</div>
@@ -79,10 +79,10 @@
theme.default.spacing.vertical,
theme.default.fontSize,
]"
- class="mb-4 flex border border-gray-300 dark:border-gray-600 items-center justify-between bg-gray-50 dark:bg-gray-800"
+ class="mb-4 flex border border-neutral-300 dark:border-neutral-600 items-center justify-between bg-neutral-50 dark:bg-neutral-800"
>
- <span class="text-sm font-medium text-gray-700 dark:text-gray-300">{{ $t('forms.payment.amount_to_pay') }}</span>
- <span class="text-sm font-medium text-gray-900 dark:text-gray-100">{{ currencySymbol }}{{ amount }}</span>
+ <span class="text-sm font-medium text-neutral-700 dark:text-neutral-300">{{ $t('forms.payment.amount_to_pay') }}</span>
+ <span class="text-sm font-medium text-neutral-900 dark:text-neutral-100">{{ currencySymbol }}{{ amount }}</span>
</div>
<StripeElements
ref="stripeElementsRef"
@@ -104,10 +104,10 @@
theme.default.fontSize,
theme.PaymentInput?.cardContainer || '',
{
- [theme.PaymentInput?.focusRing || 'ring-2 ring-primary-500 border-transparent']: isCardFocused && !hasError,
+ [theme.PaymentInput?.focusRing || 'ring-2 ring-form border-transparent']: isCardFocused && !hasError,
'!ring-red-500 !ring-2 !border-transparent': hasError
},
- 'dark:bg-gray-800 dark:border-gray-700'
+ 'dark:bg-neutral-800 dark:border-neutral-700'
]"
>
<StripeElement
@@ -150,7 +150,7 @@
</div>
<div v-else class="flex flex-col items-center justify-center py-4">
<Loader class="mx-auto h-6 w-6" />
- <p class="text-sm text-gray-500 mt-2">Initializing payment system...</p>
+ <p class="text-sm text-neutral-500 mt-2">Initializing payment system...</p>
</div>
</div>
</template>
@@ -172,8 +172,7 @@
<script setup>
import { ref, computed, watch, onMounted, nextTick } from 'vue'
-import { inputProps, useFormInput } from './useFormInput.js'
-import InputWrapper from './components/InputWrapper.vue'
+import { inputProps, useFormInput } from '../useFormInput.js'
import { loadStripe } from '@stripe/stripe-js'
import { StripeElements, StripeElement } from 'vue-stripe-js'
import stripeCurrencies from "~/data/stripe_currencies.json"
@@ -415,8 +414,8 @@ const currencySymbol = computed(() => {
})
const cardOptions = computed(() => {
- const darkPlaceholderColor = props.theme.default?.input?.includes('dark:placeholder-gray-500') ? '#6B7280' : '#9CA3AF'
- const lightPlaceholderColor = props.theme.default?.input?.includes('placeholder-gray-400') ? '#9CA3AF' : '#A0AEC0'
+ const darkPlaceholderColor = props.theme.default?.input?.includes('dark:placeholder-neutral-500') ? '#6B7280' : '#9CA3AF'
+ const lightPlaceholderColor = props.theme.default?.input?.includes('placeholder-neutral-400') ? '#9CA3AF' : '#A0AEC0'
return {
hidePostalCode: true,
diff --git a/client/components/forms/PhoneInput.vue b/client/components/forms/heavy/PhoneInput.vue
similarity index 55%
rename from client/components/forms/PhoneInput.vue
rename to client/components/forms/heavy/PhoneInput.vue
index 0673435d3..e2b34ef99 100644
--- a/client/components/forms/PhoneInput.vue
+++ b/client/components/forms/heavy/PhoneInput.vue
@@ -1,5 +1,7 @@
<template>
- <input-wrapper v-bind="inputWrapperProps">
+ <input-wrapper
+ v-bind="inputWrapperProps"
+ >
<template #label>
<slot name="label" />
</template>
@@ -14,9 +16,9 @@
v-model="selectedCountryCode"
:class="theme.PhoneInput.countrySelectWidth"
dropdown-class="max-w-[300px]"
- input-class="ltr-only:rounded-r-none rtl:!rounded-l-none"
+ input-class="ltr-only:rounded-r-none rtl:rounded-l-none!"
:data="countries"
- :disabled="disabled || countries.length === 1 ? true : null"
+ :disabled="(disabled || countries.length===1)?true:null"
:searchable="true"
:search-keys="['name']"
:option-key="'code'"
@@ -28,10 +30,10 @@
@update:model-value="onChangeCountryCode"
>
<template #option="props">
- <div class="flex items-center space-x-2 max-w-full">
+ <div class="flex items-center gap-2 max-w-full">
<country-flag
size="normal"
- class="!-mt-[9px] rounded"
+ class="-mt-[9px]! rounded"
:country="props.option.code"
/>
<span class="grow truncate">{{ props.option.name }}</span>
@@ -40,12 +42,13 @@
</template>
<template #selected="props">
<div
- class="flex items-center space-x-2 justify-center overflow-hidden"
+ class="flex items-center gap-2 justify-center overflow-hidden"
:class="theme.PhoneInput.maxHeight"
>
<country-flag
- size="normal"
- class="!-mt-[9px] rounded"
+ :size="theme.PhoneInput.flagSize"
+ class="rounded-lg!"
+ :class="theme.PhoneInput.flag"
:country="props.option.code"
/>
<span class="text-sm">{{ props.option.dial_code }}</span>
@@ -56,18 +59,14 @@
v-model="inputVal"
type="text"
class="inline-flex-grow ltr-only:border-l-0 ltr-only:!rounded-l-none rtl:border-r-0 rtl:rounded-r-none"
- :disabled="disabled ? true : null"
+ :disabled="disabled?true:null"
:class="[
theme.PhoneInput.input,
theme.PhoneInput.spacing.horizontal,
theme.PhoneInput.spacing.vertical,
theme.PhoneInput.fontSize,
theme.PhoneInput.borderRadius,
- {
- '!ring-red-500 !ring-2': hasError,
- '!cursor-not-allowed !bg-gray-200 dark:!bg-gray-800': disabled,
- },
- ]"
+ { 'ring-red-500! ring-2! border-transparent!': hasError, '!cursor-not-allowed bg-neutral-200! dark:bg-neutral-800!': disabled }]"
:placeholder="placeholder"
:style="inputStyle"
@input="onInput"
@@ -85,40 +84,39 @@
</template>
<script>
-import { inputProps, useFormInput } from "./useFormInput.js"
-import InputWrapper from "./components/InputWrapper.vue"
-import countryCodes from "~/data/country_codes.json"
-import CountryFlag from "vue-country-flag-next"
-import parsePhoneNumber from "libphonenumber-js"
+import { inputProps, useFormInput } from '../useFormInput.js'
+import countryCodes from '~/data/country_codes.json'
+import CountryFlag from 'vue-country-flag-next'
+import parsePhoneNumber from 'libphonenumber-js'
export default {
- phone: "PhoneInput",
- components: { InputWrapper, CountryFlag },
+ phone: 'PhoneInput',
+ components: { CountryFlag },
props: {
...inputProps,
canOnlyCountry: { type: Boolean, default: false },
- unavailableCountries: { type: Array, default: () => [] },
+ unavailableCountries: { type: Array, default: () => [] }
},
- setup(props, context) {
+ setup (props, context) {
return {
- ...useFormInput(props, context),
+ ...useFormInput(props, context)
}
},
- data() {
+ data () {
return {
selectedCountryCode: null,
- inputVal: null,
+ inputVal: null
}
},
computed: {
- countries() {
+ countries () {
return countryCodes.filter((item) => {
return !this.unavailableCountries.includes(item.code)
})
- },
+ }
},
watch: {
@@ -126,39 +124,27 @@ export default {
handler(val) {
if (!this.selectedCountryCode) return
- if (val && val.startsWith("0")) {
+ if (val && val.startsWith('0')) {
val = val.substring(1)
}
if (this.canOnlyCountry) {
- this.compVal = val
- ? this.selectedCountryCode.code +
- this.selectedCountryCode.dial_code +
- val
- : this.selectedCountryCode.code +
- this.selectedCountryCode.dial_code
+ this.compVal = (val) ? this.selectedCountryCode.code + this.selectedCountryCode.dial_code + val : this.selectedCountryCode.code + this.selectedCountryCode.dial_code
} else {
- this.compVal = val
- ? this.selectedCountryCode.code +
- this.selectedCountryCode.dial_code +
- val
- : null
+ this.compVal = (val) ? this.selectedCountryCode.code + this.selectedCountryCode.dial_code + val : null
}
- },
+ }
},
- compVal() {
+ compVal () {
this.initState()
},
- selectedCountryCode(newVal, oldVal) {
+ selectedCountryCode (newVal, oldVal) {
if (this.compVal && newVal && oldVal) {
- this.compVal = this.compVal.replace(
- oldVal.code + oldVal.dial_code,
- newVal.code + newVal.dial_code,
- )
+ this.compVal = this.compVal.replace(oldVal.code + oldVal.dial_code, newVal.code + newVal.dial_code)
}
- },
+ }
},
- mounted() {
+ mounted () {
if (this.compVal) {
this.initState()
}
@@ -171,51 +157,40 @@ export default {
},
methods: {
- getCountryBy(code = "US", type = "code") {
- if (!code) code = "US" // Default US
- return (
- this.countries.find((item) => {
- return item[type] === code
- }) ?? null
- )
+ getCountryBy (code = 'US', type = 'code') {
+ if (!code) code = 'US' // Default US
+ return this.countries.find((item) => {
+ return item[type] === code
+ }) ?? null
},
- onInput(event) {
- this.inputVal = event?.target?.value.replace(/[^0-9]/g, "")
+ onInput (event) {
+ this.inputVal = event?.target?.value.replace(/[^0-9]/g, '')
+
},
- onChangeCountryCode() {
+ onChangeCountryCode () {
if (!this.selectedCountryCode && this.countries.length > 0) {
this.selectedCountryCode = this.countries[0]
}
- if (
- this.canOnlyCountry &&
- (this.inputVal === null || this.inputVal === "" || !this.inputVal)
- ) {
- this.compVal =
- this.selectedCountryCode.code + this.selectedCountryCode.dial_code
+ if (this.canOnlyCountry && (this.inputVal === null || this.inputVal === '' || !this.inputVal)) {
+ this.compVal = this.selectedCountryCode.code + this.selectedCountryCode.dial_code
}
},
- initState() {
+ initState () {
if (this.compVal === null) {
return
}
- if (!this.compVal?.startsWith("+")) {
- this.selectedCountryCode = this.getCountryBy(
- this.compVal.substring(2, 0),
- )
+ if (!this.compVal?.startsWith('+')) {
+ this.selectedCountryCode = this.getCountryBy(this.compVal.substring(2, 0))
}
const phoneObj = parsePhoneNumber(this.compVal)
if (phoneObj !== undefined && phoneObj) {
- if (
- !this.selectedCountryCode &&
- phoneObj.country !== undefined &&
- phoneObj.country
- ) {
+ if (!this.selectedCountryCode && phoneObj.country !== undefined && phoneObj.country) {
this.selectedCountryCode = this.getCountryBy(phoneObj.country)
}
this.inputVal = phoneObj.nationalNumber
}
- },
- },
+ }
+ }
}
</script>
diff --git a/client/components/forms/RatingInput.vue b/client/components/forms/heavy/RatingInput.vue
similarity index 88%
rename from client/components/forms/RatingInput.vue
rename to client/components/forms/heavy/RatingInput.vue
index 2a8b25251..3ac36115d 100644
--- a/client/components/forms/RatingInput.vue
+++ b/client/components/forms/heavy/RatingInput.vue
@@ -8,7 +8,7 @@
<div
v-for="i in starsCount"
:key="i"
- class="cursor-pointer inline-block text-gray-200 dark:text-gray-800"
+ class="cursor-pointer inline-block text-neutral-200 dark:text-neutral-800"
:class="{
'!text-yellow-400 active-star': i <= compVal,
'!text-yellow-200 !dark:text-yellow-800 hover-star':
@@ -37,12 +37,11 @@
</template>
<script>
-import { inputProps, useFormInput } from "./useFormInput.js"
-import InputWrapper from "./components/InputWrapper.vue"
+import { inputProps, useFormInput } from "../useFormInput.js"
export default {
name: "RatingInput",
- components: { InputWrapper },
+ components: {},
props: {
...inputProps,
diff --git a/client/components/forms/heavy/RichTextAreaInput.client.vue b/client/components/forms/heavy/RichTextAreaInput.client.vue
new file mode 100644
index 000000000..eb46b8719
--- /dev/null
+++ b/client/components/forms/heavy/RichTextAreaInput.client.vue
@@ -0,0 +1,399 @@
+<template>
+ <InputWrapper
+ v-bind="inputWrapperProps"
+ wrapper-class="not-draggable"
+ >
+ <template #label>
+ <slot name="label" />
+ </template>
+
+ <div
+ class="rich-editor resize-y notranslate relative"
+ :class="[
+ {
+ 'ring-red-500! ring-2! border-transparent!': hasError,
+ '!cursor-not-allowed bg-neutral-200! dark:bg-neutral-800!': disabled,
+ 'focus-within:ring-2 focus-within:ring-form/100 focus-within:border-transparent': !hasError && !disabled
+ },
+ theme.RichTextAreaInput.input,
+ theme.RichTextAreaInput.borderRadius,
+ theme.default.fontSize,
+ ]"
+ :style="{
+ '--font-size': theme.default.fontSize,
+ ...inputStyle
+ }"
+ >
+ <MentionDropdown
+ v-if="enableMentions && mentionState"
+ :mention-state="mentionState"
+ :mentions="mentions"
+ :content="{ position: 'bottom', align: 'start' }"
+ >
+ <span class="absolute left-4 bottom-2" />
+ </MentionDropdown>
+
+ <ClientOnly>
+ <QuillyEditor
+ :id="id ? id : name"
+ ref="editor"
+ v-if="!isFullscreen"
+ v-model="compVal"
+ :options="quillOptions"
+ :disabled="disabled"
+ :style="inputStyle"
+ @ready="onEditorReady"
+ />
+ <template #fallback>
+ <USkeleton class="w-full h-10" />
+ </template>
+ </ClientOnly>
+ </div>
+
+ <!-- Fullscreen Modal -->
+ <UModal v-if="allowFullscreen" v-model:open="isFullscreen" fullscreen>
+ <template #content>
+ <div class="flex flex-col h-full">
+ <div class="flex items-center justify-between p-4 border-b">
+ <div>
+ <h3 class="text-lg font-medium text-neutral-900 dark:text-white">
+ {{ label || 'Rich Text Editor' }}
+ </h3>
+ </div>
+ <UButton
+ @click="closeFullscreen"
+ variant="ghost"
+ size="sm"
+ icon="i-heroicons-x-mark"
+ :ui="{ rounded: 'rounded-md' }"
+ title="Exit fullscreen"
+ />
+ </div>
+
+ <!-- Editor Container for Fullscreen -->
+ <div class="flex-1 overflow-hidden">
+ <div class="rich-editor h-full" style="resize: none;">
+ <MentionDropdown
+ v-if="enableMentions && mentionState"
+ :mention-state="mentionState"
+ :mentions="mentions"
+ :content="{ position: 'bottom', align: 'start' }"
+ >
+ <span class="absolute right-4 top-24" />
+ </MentionDropdown>
+
+ <ClientOnly>
+ <QuillyEditor
+ v-model="compVal"
+ :options="modalQuillOptions"
+ :disabled="disabled"
+ :style="{ height: '100%' }"
+ @ready="onEditorReady"
+ />
+ <template #fallback>
+ <USkeleton class="w-full h-full" />
+ </template>
+ </ClientOnly>
+ </div>
+ </div>
+ </div>
+ </template>
+ </UModal>
+
+ <template
+ v-if="$slots.help"
+ #help
+ >
+ <slot name="help" />
+ </template>
+
+ <template
+ v-if="maxCharLimit && showCharLimit"
+ #bottom_after_help
+ >
+ <small :class="theme.default.help">
+ {{ charCount }}/{{ maxCharLimit }}
+ </small>
+ </template>
+
+ <template
+ v-if="$slots.error"
+ #error
+ >
+ <slot name="error" />
+ </template>
+ </InputWrapper>
+</template>
+
+<script setup>
+import Quill from 'quill'
+import { inputProps, useFormInput } from '../useFormInput.js'
+import QuillyEditor from './components/QuillyEditor.vue'
+import MentionDropdown from './components/MentionDropdown.vue'
+import registerMentionExtension from '~/lib/quill/quillMentionExtension.js'
+
+// Global icon registration - only happens once
+if (import.meta.client) {
+ const icons = Quill.import("ui/icons")
+ if (!icons["fullscreen"]) {
+ icons["fullscreen"] = `<svg viewBox="0 0 18 18" width="14" height="14">
+ <path fill="none" class="ql-stroke" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="M2.8 2.8v3.4m0-3.4h3.4m-3.4 0L6.8 6.8M2.8 15.2v-3.4m0 3.4h3.4m-3.4 0L6.8 11.2M15.2 2.8h-3.4m3.4 0v3.4m0-3.4L11.2 6.8m4 8.4h-3.4m3.4 0v-3.4m0 3.4L11.2 11.2"/>
+ </svg>`
+ }
+}
+
+const props = defineProps({
+ ...inputProps,
+ maxCharLimit: { type: Number, required: false, default: null },
+ editorOptions: {
+ type: Object,
+ default: () => ({})
+ },
+ enableMentions: {
+ type: Boolean,
+ default: false
+ },
+ mentions: {
+ type: Array,
+ default: () => []
+ },
+ allowFullscreen: {
+ type: Boolean,
+ default: false
+ }
+})
+const emit = defineEmits(['update:modelValue'])
+
+const { compVal, inputStyle, hasError, inputWrapperProps } = useFormInput(props, { emit })
+const editor = ref(null)
+const mentionState = ref(null)
+
+// Fullscreen functionality
+const isFullscreen = ref(false)
+
+const openFullscreen = () => {
+ isFullscreen.value = true
+}
+
+const closeFullscreen = () => {
+ isFullscreen.value = false
+}
+
+// Handle keyboard shortcuts
+defineShortcuts({
+ escape: {
+ usingInput: true,
+ handler: () => {
+ if (isFullscreen.value) {
+ closeFullscreen()
+ }
+ }
+ }
+})
+
+// Add this watch to clean up empty HTML content
+watch(compVal, (val) => {
+ if (val && val.replace(/<[^>]*>/g, '').trim() === '') {
+ compVal.value = null
+ }
+}, { immediate: true })
+
+// Initialize mention extension and fullscreen icon
+if (import.meta.client) {
+ if (props.enableMentions) {
+ // Register the mention extension with Quill
+ mentionState.value = registerMentionExtension(Quill)
+ }
+}
+
+// Handle editor ready event
+const onEditorReady = (quillInstance) => {
+ // If we have a mention module, get its state
+ if (props.enableMentions && quillInstance) {
+ const mentionModule = quillInstance.getModule('mention')
+ if (mentionModule && mentionModule.state) {
+ mentionState.value = mentionModule.state
+ }
+ }
+}
+
+const quillOptions = computed(() => {
+ const defaultOptions = {
+ placeholder: props.placeholder || '',
+ theme: 'snow',
+ modules: {
+ toolbar: [
+ [{ 'header': 1 }, { 'header': 2 }],
+ ['bold', 'italic', 'underline', 'strike'],
+ ['link'],
+ [{ list: 'ordered' }, { list: 'bullet' }],
+ [{ color: [] }],
+ ],
+ keyboard: {
+ bindings: {
+ tab: {
+ key: 9,
+ handler (range) {
+ this.quill.insertText(range.index, ' ', 'user')
+ }
+ }
+ }
+ }
+ }
+ }
+
+ const mergedOptions = { ...defaultOptions, ...props.editorOptions, modules: { ...defaultOptions.modules, ...props.editorOptions.modules } }
+
+ // Add fullscreen button to toolbar if enabled
+ if (props.allowFullscreen) {
+ mergedOptions.modules.toolbar.push(['fullscreen'])
+
+ // Set up toolbar with handlers
+ mergedOptions.modules.toolbar = {
+ container: mergedOptions.modules.toolbar,
+ handlers: {
+ fullscreen: () => {
+ openFullscreen()
+ }
+ }
+ }
+ }
+
+ if (props.enableMentions) {
+ mergedOptions.modules.mention = true
+ if (!mergedOptions.modules.toolbar.container) {
+ mergedOptions.modules.toolbar.container = mergedOptions.modules.toolbar
+ }
+ mergedOptions.modules.toolbar.container.push(['mention'])
+ }
+
+ return mergedOptions
+})
+
+const modalQuillOptions = computed(() => {
+ const defaultOptions = {
+ placeholder: props.placeholder || '',
+ theme: 'snow',
+ modules: {
+ toolbar: [
+ [{ 'header': 1 }, { 'header': 2 }],
+ ['bold', 'italic', 'underline', 'strike'],
+ ['link'],
+ [{ list: 'ordered' }, { list: 'bullet' }],
+ [{ color: [] }],
+ ],
+ keyboard: {
+ bindings: {
+ tab: {
+ key: 9,
+ handler (range) {
+ this.quill.insertText(range.index, ' ', 'user')
+ }
+ }
+ }
+ }
+ }
+ }
+
+ const mergedOptions = { ...defaultOptions, ...props.editorOptions, modules: { ...defaultOptions.modules, ...props.editorOptions.modules } }
+
+ // NOTE: No fullscreen button for modal editor
+
+ if (props.enableMentions) {
+ mergedOptions.modules.mention = true
+ if (!mergedOptions.modules.toolbar) {
+ mergedOptions.modules.toolbar = []
+ }
+ mergedOptions.modules.toolbar.push(['mention'])
+ }
+
+ return mergedOptions
+})
+
+const charCount = computed(() => {
+ return compVal.value ? compVal.value.replace(/<[^>]*>/g, '').trim().length : 0
+})
+
+const showCharLimit = computed(() => {
+ return props.maxCharLimit && props.maxCharLimit > 0
+})
+</script>
+
+<style lang="scss">
+.rich-editor {
+ .ql-container {
+ border-bottom: 0px !important;
+ border-right: 0px !important;
+ border-left: 0px !important;
+ font-size: var(--font-size);
+
+ .ql-editor {
+ min-height: 100px !important;
+ }
+ }
+
+ .ql-toolbar {
+ border-top: 0px !important;
+ border-right: 0px !important;
+ border-left: 0px !important;
+ border-bottom: 1px solid var(--color-neutral-300);
+ :where(.dark) & {
+ border-bottom: 1px solid var(--color-neutral-600);
+ }
+ }
+
+ .ql-header {
+ @apply rounded-md;
+ }
+
+ .ql-editor.ql-blank:before {
+ @apply text-neutral-400 dark:text-neutral-500 not-italic;
+ }
+
+ .ql-snow .ql-toolbar .ql-picker-item.ql-selected,
+ .ql-snow .ql-toolbar .ql-picker-item:hover,
+ .ql-snow .ql-toolbar .ql-picker-label.ql-active,
+ .ql-snow .ql-toolbar .ql-picker-label:hover,
+ .ql-snow .ql-toolbar button.ql-active,
+ .ql-snow .ql-toolbar button:focus,
+ .ql-snow .ql-toolbar button:hover,
+ .ql-snow.ql-toolbar .ql-picker-item.ql-selected,
+ .ql-snow.ql-toolbar .ql-picker-item:hover,
+ .ql-snow.ql-toolbar .ql-picker-label.ql-active,
+ .ql-snow.ql-toolbar .ql-picker-label:hover,
+ .ql-snow.ql-toolbar button.ql-active,
+ .ql-snow.ql-toolbar button:focus,
+ .ql-snow.ql-toolbar button:hover {
+ @apply text-blue-500;
+ }
+}
+
+.ql-mention {
+ padding-top: 0px !important;
+}
+.ql-mention::after {
+ content: '@';
+ font-size: 16px;
+}
+
+
+.rich-editor, .mention-input {
+ span[mention] {
+ @apply inline-flex items-center align-baseline leading-tight text-sm relative bg-blue-100 text-blue-800 border border-blue-200 rounded-md px-1 py-0.5 mx-0.5;
+ max-width: 200px;
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ }
+}
+
+/* Fullscreen editor styles */
+.rich-editor.h-full .ql-container {
+ height: calc(100% - 42px) !important; /* Subtract toolbar height */
+}
+
+.rich-editor.h-full .ql-editor {
+ height: 100% !important;
+ min-height: 100% !important;
+}
+</style>
\ No newline at end of file
diff --git a/client/components/forms/SignatureInput.vue b/client/components/forms/heavy/SignatureInput.vue
similarity index 91%
rename from client/components/forms/SignatureInput.vue
rename to client/components/forms/heavy/SignatureInput.vue
index 686af68cc..513c7c810 100644
--- a/client/components/forms/SignatureInput.vue
+++ b/client/components/forms/heavy/SignatureInput.vue
@@ -15,17 +15,17 @@
theme.SignatureInput.borderRadius,
{
'!ring-red-500 !ring-2 !border-transparent': hasError,
- '!cursor-not-allowed !bg-gray-200 dark:!bg-gray-800': disabled,
+ '!cursor-not-allowed !bg-neutral-200 dark:!bg-neutral-800': disabled,
},
]"
class="flex flex-wrap items-center justify-center gap-4"
>
<div
v-if="loading"
- class="text-gray-600 dark:text-gray-400"
+ class="text-neutral-600 dark:text-neutral-400"
>
<Loader class="mx-auto h-6 w-6" />
- <p class="mt-2 text-center text-sm text-gray-500">
+ <p class="mt-2 text-center text-sm text-neutral-500">
{{ $t('forms.fileInput.uploadingFile') }}
</p>
</div>
@@ -52,7 +52,7 @@
theme.SignatureInput.borderRadius,
{
'!ring-red-500 !ring-2 !border-transparent': hasError,
- '!cursor-not-allowed !bg-gray-200 dark:!bg-gray-800': disabled,
+ '!cursor-not-allowed !bg-neutral-200 dark:!bg-neutral-800': disabled,
},
]"
height="150px"
@@ -98,13 +98,12 @@
<script>
import { VueSignaturePad } from 'vue-signature-pad'
-import { inputProps, useFormInput } from './useFormInput.js'
-import InputWrapper from './components/InputWrapper.vue'
+import { inputProps, useFormInput } from '../useFormInput.js'
import { storeFile } from '~/lib/file-uploads.js'
export default {
name: 'SignatureInput',
- components: { InputWrapper, VueSignaturePad },
+ components: { VueSignaturePad },
props: {
...inputProps,
diff --git a/client/components/forms/components/CameraUpload.vue b/client/components/forms/heavy/components/CameraUpload.vue
similarity index 95%
rename from client/components/forms/components/CameraUpload.vue
rename to client/components/forms/heavy/components/CameraUpload.vue
index 434e5a291..6ba37065c 100644
--- a/client/components/forms/components/CameraUpload.vue
+++ b/client/components/forms/heavy/components/CameraUpload.vue
@@ -12,7 +12,7 @@
{ hidden: !isCapturing },
theme.fileInput.minHeight,
theme.fileInput.borderRadius,
- 'w-full h-full object-cover bg-gray-500'
+ 'w-full h-full object-cover bg-neutral-500'
]"
webkit-playsinline
/>
@@ -55,7 +55,7 @@
>
<span
v-if="!isBarcodeMode"
- class="cursor-pointer rounded-full w-12 h-12 border-2 grid place-content-center bg-white/20 backdrop-blur-sm shadow-md"
+ class="cursor-pointer rounded-full w-12 h-12 border-2 grid place-content-center bg-white/20 backdrop-blur-xs shadow-sm"
@click="processCapturedImage"
>
<span
@@ -63,7 +63,7 @@
/>
</span>
<span
- class="text-white cursor-pointer bg-black/40 rounded-full backdrop-blur-sm shadow-md w-12 h-12 grid place-content-center"
+ class="text-white cursor-pointer bg-black/40 rounded-full backdrop-blur-xs shadow-sm w-12 h-12 grid place-content-center"
@click="cancelCamera"
>
<Icon
@@ -73,7 +73,7 @@
</span>
<span
v-if="isMobileDevice"
- class="text-white cursor-pointer bg-black/40 rounded-full backdrop-blur-sm shadow-md w-12 h-12 grid place-content-center"
+ class="text-white cursor-pointer bg-black/40 rounded-full backdrop-blur-xs shadow-sm w-12 h-12 grid place-content-center"
@click="switchCamera"
>
<Icon
@@ -85,7 +85,7 @@
</div>
<div
v-else-if="cameraPermissionStatus === 'blocked'"
- class="absolute p-5 top-0 inset-x-0 flex flex-col items-center justify-center space-y-4 text-center border border-gray-400/30 h-full"
+ class="absolute p-5 top-0 inset-x-0 flex flex-col items-center justify-center space-y-4 text-center border border-neutral-400/30 h-full"
:class="[theme.fileInput.borderRadius]"
@click="openCameraUpload"
>
@@ -100,7 +100,8 @@
{{ $t('forms.cameraUpload.allowCameraPermissionDescription') }}
</p>
<UButton
- color="white"
+ color="neutral"
+ variant="outline"
@click.stop="cancelCamera"
>
{{ $t('forms.cameraUpload.gotIt') }}
@@ -109,7 +110,7 @@
<div
v-else-if="cameraPermissionStatus === 'loading'"
- class="absolute p-5 top-0 inset-x-0 flex flex-col items-center justify-center space-y-4 text-center border border-gray-400/30 h-full"
+ class="absolute p-5 top-0 inset-x-0 flex flex-col items-center justify-center space-y-4 text-center border border-neutral-400/30 h-full"
:class="[theme.fileInput.borderRadius]"
>
<div class="w-6 h-6">
@@ -118,7 +119,7 @@
</div>
<div
v-else
- class="absolute p-5 top-0 inset-x-0 flex flex-col items-center justify-center space-y-4 text-center border border-gray-400/30 h-full"
+ class="absolute p-5 top-0 inset-x-0 flex flex-col items-center justify-center space-y-4 text-center border border-neutral-400/30 h-full"
:class="[theme.fileInput.borderRadius]"
@click="openCameraUpload"
>
@@ -133,7 +134,8 @@
{{ $t('forms.cameraUpload.cameraDeviceErrorDescription') }}
</p>
<UButton
- color="white"
+ color="neutral"
+ variant="outline"
@click.stop="cancelCamera"
>
{{ $t('forms.cameraUpload.goBack') }}
diff --git a/client/components/forms/components/CaptchaInput.vue b/client/components/forms/heavy/components/CaptchaInput.vue
similarity index 100%
rename from client/components/forms/components/CaptchaInput.vue
rename to client/components/forms/heavy/components/CaptchaInput.vue
diff --git a/client/components/forms/components/CaptchaWrapper.vue b/client/components/forms/heavy/components/CaptchaWrapper.vue
similarity index 100%
rename from client/components/forms/components/CaptchaWrapper.vue
rename to client/components/forms/heavy/components/CaptchaWrapper.vue
diff --git a/client/components/forms/components/HCaptchaV2.vue b/client/components/forms/heavy/components/HCaptchaV2.vue
similarity index 100%
rename from client/components/forms/components/HCaptchaV2.vue
rename to client/components/forms/heavy/components/HCaptchaV2.vue
diff --git a/client/components/forms/components/MentionDropdown.vue b/client/components/forms/heavy/components/MentionDropdown.vue
similarity index 88%
rename from client/components/forms/components/MentionDropdown.vue
rename to client/components/forms/heavy/components/MentionDropdown.vue
index 8909c4e6f..51b01788a 100644
--- a/client/components/forms/components/MentionDropdown.vue
+++ b/client/components/forms/heavy/components/MentionDropdown.vue
@@ -2,11 +2,12 @@
<UPopover
ref="popover"
v-model:open="mentionState.open"
- class="h-0"
+ :content="content"
+ arrow
@close="cancel"
>
- <span class="hidden" />
- <template #panel>
+ <slot></slot>
+ <template #content>
<div class="p-2 max-h-[300px] flex flex-col">
<div class="flex items-center border-b -mx-2 px-2">
<div class="font-semibold w-1/2 mb-2 flex-grow">
@@ -14,20 +15,20 @@
</div>
<input
v-model="fallbackValue"
- class="p-1 mb-2 text-sm w-1/2 border rounded-md hover:bg-gray-50"
+ class="p-1 mb-2 text-sm w-1/2 border rounded-md hover:bg-neutral-50"
placeholder="Fallback value"
>
</div>
<div class="overflow-scroll pt-2">
<div class="w-full max-w-xs mb-2">
- <div class="text-sm text-gray-500 mb-1">
+ <div class="text-sm text-neutral-500 mb-1">
Select a field
</div>
<div class="space-y-1">
<div
v-for="field in filteredMentions"
:key="field.id"
- class="flex items-center p-2 rounded-md cursor-pointer hover:bg-gray-100"
+ class="flex items-center p-2 rounded-md cursor-pointer hover:bg-neutral-100"
:class="{ 'bg-blue-50 border border-blue-100 inset-0': selectedField?.id === field.id, 'border border-transparent': selectedField?.id !== field.id }"
@click="selectField(field)"
@dblclick="selectField(field, true)"
@@ -36,7 +37,7 @@
:type="field.type"
class="mr-2"
/>
- <p class="text-sm text-gray-700 truncate">
+ <p class="text-sm text-neutral-700 truncate">
{{ field.name }}
</p>
</div>
@@ -56,7 +57,8 @@
</UButton>
<UButton
size="sm"
- color="gray"
+ color="neutral"
+ variant="outline"
@click="cancel"
>
Cancel
@@ -68,7 +70,6 @@
</template>
<script setup>
-import { ref, computed, watch } from 'vue'
import BlockTypeIcon from '~/components/open/forms/components/BlockTypeIcon.vue'
import blocksTypes from '~/data/blocks_types.json'
@@ -80,7 +81,11 @@ const props = defineProps({
mentions: {
type: Array,
required: true
- }
+ },
+ content: {
+ type: Object,
+ default: () => ({ side: 'bottom', align: 'end' })
+ },
})
defineShortcuts({
diff --git a/client/components/forms/components/QuillyEditor.vue b/client/components/forms/heavy/components/QuillyEditor.vue
similarity index 83%
rename from client/components/forms/components/QuillyEditor.vue
rename to client/components/forms/heavy/components/QuillyEditor.vue
index 1d0a43f75..5da85185b 100644
--- a/client/components/forms/components/QuillyEditor.vue
+++ b/client/components/forms/heavy/components/QuillyEditor.vue
@@ -8,7 +8,7 @@
<script setup>
import Quill from 'quill'
import 'quill/dist/quill.snow.css'
-import '../../../lib/quill/quillPatches'
+import '~/lib/quill/quillPatches'
import { onMounted, onBeforeUnmount, ref, watch } from 'vue'
const props = defineProps({
@@ -19,6 +19,10 @@ const props = defineProps({
options: {
type: Object,
default: () => ({})
+ },
+ disabled: {
+ type: Boolean,
+ default: false
}
})
@@ -67,7 +71,7 @@ const initializeQuill = () => {
...(props.options.modules || {})
}
}
-
+
// Initialize Quill with merged options
quillInstance = new Quill(container.value, mergedOptions)
@@ -128,11 +132,31 @@ watch(model, (newValue, oldValue) => {
}
})
+watch(() => props.disabled, (newValue) => {
+ if (newValue) {
+ quillInstance.disable()
+ } else {
+ quillInstance.enable()
+ }
+})
+
onBeforeUnmount(() => {
if (quillInstance) {
quillInstance.off('selection-change')
quillInstance.off('text-change')
quillInstance.off('editor-change')
+
+ // Properly destroy the Quill instance
+ if (container.value && container.value.parentNode) {
+ // Find the toolbar - it's a sibling of the container
+ const toolbar = container.value.parentNode.querySelector('.ql-toolbar')
+ if (toolbar) {
+ toolbar.remove()
+ }
+
+ // Clear the container content but don't remove the container itself
+ container.value.remove()
+ }
}
quillInstance = null
})
diff --git a/client/components/forms/components/RecaptchaV2.vue b/client/components/forms/heavy/components/RecaptchaV2.vue
similarity index 91%
rename from client/components/forms/components/RecaptchaV2.vue
rename to client/components/forms/heavy/components/RecaptchaV2.vue
index 3f2adc405..a44e7d481 100644
--- a/client/components/forms/components/RecaptchaV2.vue
+++ b/client/components/forms/heavy/components/RecaptchaV2.vue
@@ -175,4 +175,17 @@ defineExpose({
await renderRecaptcha()
}
})
-</script>
\ No newline at end of file
+</script>
+
+<style>
+/* Global CSS to ensure reCAPTCHA iframes always have pointer events enabled */
+/* This targets iframes injected anywhere in the DOM by Google's reCAPTCHA script */
+iframe[src*="google.com/recaptcha/api2/bframe"] {
+ pointer-events: auto !important;
+}
+
+/* Backup selector for any reCAPTCHA iframe */
+iframe[title*="recaptcha"] {
+ pointer-events: auto !important;
+}
+</style>
\ No newline at end of file
diff --git a/client/components/forms/components/UploadedFile.vue b/client/components/forms/heavy/components/UploadedFile.vue
similarity index 90%
rename from client/components/forms/components/UploadedFile.vue
rename to client/components/forms/heavy/components/UploadedFile.vue
index f0bd361e2..cc57121ff 100644
--- a/client/components/forms/components/UploadedFile.vue
+++ b/client/components/forms/heavy/components/UploadedFile.vue
@@ -18,7 +18,7 @@
class="h-20 flex items-center justify-center"
>
<svg
- class="w-10 h-10 text-gray-500"
+ class="w-10 h-10 text-neutral-500"
xmlns="http://www.w3.org/2000/svg"
fill="none"
viewBox="0 0 24 24"
@@ -33,13 +33,13 @@
</svg>
</div>
<div class="flex gap-2 items-center border-t py-1 px-2">
- <p class="flex-grow text-left truncate text-gray-500 text-xs">
+ <p class="flex-grow text-left truncate text-neutral-500 text-xs">
{{ file.file.name }}
</p>
<a
v-if="showRemove"
href="javascript:void(0);"
- class="flex text-gray-400 rounded hover:bg-neutral-50 hover:text-red-500 dark:text-gray-600 p-1"
+ class="flex text-neutral-400 rounded-sm hover:bg-neutral-50 hover:text-red-500 dark:text-neutral-600 p-1"
role="button"
title="Remove"
@click.stop="$emit('remove')"
diff --git a/client/components/forms/validation/Alert.js b/client/components/forms/validation/Alert.js
deleted file mode 100644
index b8b2ae597..000000000
--- a/client/components/forms/validation/Alert.js
+++ /dev/null
@@ -1,21 +0,0 @@
-export default {
- props: {
- form: {
- type: Object,
- required: true,
- },
-
- dismissible: {
- type: Boolean,
- default: true,
- },
- },
-
- methods: {
- dismiss() {
- if (this.dismissible) {
- this.form.clear()
- }
- },
- },
-}
diff --git a/client/components/forms/validation/AlertError.vue b/client/components/forms/validation/AlertError.vue
deleted file mode 100644
index b1304d056..000000000
--- a/client/components/forms/validation/AlertError.vue
+++ /dev/null
@@ -1,45 +0,0 @@
-<template>
- <div
- v-if="form.errors.any()"
- class="alert alert-danger alert-dismissible"
- role="alert"
- >
- <button
- v-if="dismissible"
- type="button"
- class="close"
- aria-label="Close"
- @click="dismiss"
- >
- <span aria-hidden="true">&times;</span>
- </button>
-
- <slot>
- <div
- v-if="form.errors.has('error')"
- v-html="form.errors.get('error')"
- />
- <div
- v-else
- v-html="message"
- />
- </slot>
- </div>
-</template>
-
-<script>
-import Alert from "./Alert.js"
-
-export default {
- name: "AlertError",
-
- extends: Alert,
-
- props: {
- message: {
- type: String,
- default: "There were some problems with your input.",
- },
- },
-}
-</script>
diff --git a/client/components/forms/validation/AlertSuccess.vue b/client/components/forms/validation/AlertSuccess.vue
deleted file mode 100644
index 27710ed11..000000000
--- a/client/components/forms/validation/AlertSuccess.vue
+++ /dev/null
@@ -1,46 +0,0 @@
-<template>
- <transition name="fade">
- <div
- v-if="form.successful"
- class="bg-green-200 border-green-600 text-green-600 border-l-4 p-4 relative rounded-lg"
- role="alert"
- >
- <button
- v-if="dismissible"
- type="button"
- class="absolute right-2 top-0 -mr-1 flex-shrink-0 flex p-2 rounded-md focus:outline-none focus:ring-2 focus:ring-green-500 sm:-mr-2"
- @click.prevent="dismiss()"
- >
- <span class="sr-only"> Dismiss </span>
- <svg
- xmlns="http://www.w3.org/2000/svg"
- width="16"
- height="16"
- fill="currentColor"
- class="h-6 w-6 text-green-500"
- viewBox="0 0 1792 1792"
- >
- <path
- d="M1490 1322q0 40-28 68l-136 136q-28 28-68 28t-68-28l-294-294-294 294q-28 28-68 28t-68-28l-136-136q-28-28-28-68t28-68l294-294-294-294q-28-28-28-68t28-68l136-136q28-28 68-28t68 28l294 294 294-294q28-28 68-28t68 28l136 136q28 28 28 68t-28 68l-294 294 294 294q28 28 28 68z"
- />
- </svg>
- </button>
- <p class="font-bold">
- Success
- </p>
- <div v-html="message" />
- </div>
- </transition>
-</template>
-
-<script>
-import Alert from "./Alert.js"
-
-export default {
- name: "AlertSuccess",
- extends: Alert,
- props: {
- message: { type: String, default: "" },
- },
-}
-</script>
diff --git a/client/components/global/Badge.vue b/client/components/global/Badge.vue
deleted file mode 100644
index 18aad7712..000000000
--- a/client/components/global/Badge.vue
+++ /dev/null
@@ -1,66 +0,0 @@
-<template>
- <div :class="classes">
- <Icon
- v-if="beforeIcon"
- :name="beforeIcon"
- :class="iconClasses"
- />
- <slot />
- <Icon
- v-if="afterIcon"
- :name="afterIcon"
- :class="iconClasses"
- />
- </div>
-</template>
-
-<script setup>
-import { default as _has } from "lodash/has"
-
-const props = defineProps({
- color: {
- type: String,
- default: "green",
- },
- beforeIcon: {
- type: String,
- default: null,
- },
- afterIcon: {
- type: String,
- default: null,
- },
-})
-
-const baseClasses = {
- green: ["bg-green-100", "border", "border-green-300", "text-green-700"],
- red: ["bg-red-100", "border", "border-red-300", "text-red-700"],
- gray: ["bg-gray-100", "border", "border-gray-300", "text-gray-700"],
-}
-
-const iconBaseClasses = {
- green: ["text-green-500"],
- red: ["text-red-500"],
- gray: ["text-gray-500"],
-}
-
-const activeColor = computed(() => {
- return _has(baseClasses, props.color) ? props.color : "gray"
-})
-
-const classes = computed(() => {
- const classes = [
- "border",
- "text-xs",
- "px-2",
- "inline-flex",
- "items-center",
- "rounded-full",
- ].concat(baseClasses[activeColor.value])
- return classes.join(" ")
-})
-
-const iconClasses = computed(() => {
- return iconBaseClasses[activeColor.value].concat(["w-2 h-2 mr-1"]).join(" ")
-})
-</script>
diff --git a/client/components/global/Breadcrumb.vue b/client/components/global/Breadcrumb.vue
deleted file mode 100644
index 072eed013..000000000
--- a/client/components/global/Breadcrumb.vue
+++ /dev/null
@@ -1,120 +0,0 @@
-<template>
- <section
- class="sticky flex items-center inset-x-0 top-0 z-10 py-3 bg-white border-b border-gray-200"
- >
- <div class="hidden md:flex flex-grow">
- <slot name="left" />
- </div>
- <div class="px-4 mx-auto sm:px-6 lg:px-8 max-w-7xl">
- <div class="flex items-center justify-center space-x-4">
- <div
- v-if="displayHome"
- class="flex items-center"
- >
- <NuxtLink
- class="text-gray-400 hover:text-gray-500"
- :to="{ name: authenticated ? 'home' : 'index' }"
- >
- <svg
- class="flex-shrink-0 w-5 h-5"
- viewBox="0 0 20 20"
- fill="currentColor"
- aria-hidden="true"
- >
- <path
- fill-rule="evenodd"
- d="M9.293 2.293a1 1 0 011.414 0l7 7A1 1 0 0117 11h-1v6a1 1 0 01-1 1h-2a1 1 0 01-1-1v-3a1 1 0 00-1-1H9a1 1 0 00-1 1v3a1 1 0 01-1 1H5a1 1 0 01-1-1v-6H3a1 1 0 01-.707-1.707l7-7z"
- clip-rule="evenodd"
- />
- </svg>
- <span class="sr-only">Home</span>
- </NuxtLink>
- <svg
- class="flex-shrink-0 w-5 h-5 text-gray-400 ml-4"
- viewBox="0 0 20 20"
- fill="currentColor"
- aria-hidden="true"
- >
- <path
- fill-rule="evenodd"
- d="M7.21 14.77a.75.75 0 01.02-1.06L11.168 10 7.23 6.29a.75.75 0 111.04-1.08l4.5 4.25a.75.75 0 010 1.08l-4.5 4.25a.75.75 0 01-1.06-.02z"
- clip-rule="evenodd"
- />
- </svg>
- </div>
-
- <div
- v-for="(item, index) in path"
- :key="index"
- class="flex items-center"
- >
- <NuxtLink
- v-if="item.route"
- class="text-sm font-semibold text-gray-500 hover:text-gray-700 truncate"
- :to="item.route"
- >
- {{ item.label }}
- </NuxtLink>
- <div
- v-else
- class="text-sm font-semibold sm:w-full w-36 text-blue-500 truncate"
- >
- {{ item.label }}
- </div>
- <div v-if="index !== path.length - 1">
- <svg
- class="flex-shrink-0 w-5 h-5 text-gray-400 ml-4"
- viewBox="0 0 20 20"
- fill="currentColor"
- aria-hidden="true"
- >
- <path
- fill-rule="evenodd"
- d="M7.21 14.77a.75.75 0 01.02-1.06L11.168 10 7.23 6.29a.75.75 0 111.04-1.08l4.5 4.25a.75.75 0 010 1.08l-4.5 4.25a.75.75 0 01-1.06-.02z"
- clip-rule="evenodd"
- />
- </svg>
- </div>
- </div>
- </div>
- </div>
- <div class="hidden md:flex flex-grow justify-end">
- <slot name="right" />
- </div>
- </section>
-</template>
-
-<script>
-import { computed } from "vue"
-import { useAuthStore } from "../../stores/auth"
-
-export default {
- name: "Breadcrumb",
- props: {
- /**
- * route: Route object
- * label: Label
- */
- path: { type: Array },
- },
-
- setup() {
- const authStore = useAuthStore()
- return {
- authenticated: computed(() => authStore.check),
- }
- },
-
- data() {
- return {
- displayHome: true,
- }
- },
-
- computed: {},
-
- mounted() {},
-
- methods: {},
-}
-</script>
diff --git a/client/components/global/Card.vue b/client/components/global/Card.vue
deleted file mode 100644
index 68be43a0a..000000000
--- a/client/components/global/Card.vue
+++ /dev/null
@@ -1,31 +0,0 @@
-<template>
- <div
- class="flex flex-col w-full bg-white rounded-lg shadow"
- :class="{ 'px-4 py-8 sm:px-6 md:px-8 lg:px-10': padding }"
- >
- <div
- v-if="title"
- class="self-center mb-6 text-xl font-light text-gray-900 sm:text-3xl font-bold dark:text-white"
- >
- {{ title }}
- </div>
- <slot />
- </div>
-</template>
-
-<script>
-export default {
- name: "Card",
-
- props: {
- padding: {
- type: Boolean,
- default: true,
- },
- title: {
- type: String,
- default: null,
- },
- },
-}
-</script>
diff --git a/client/components/global/ClientOnlyWrapper.vue b/client/components/global/ClientOnlyWrapper.vue
new file mode 100644
index 000000000..f18bf7f78
--- /dev/null
+++ b/client/components/global/ClientOnlyWrapper.vue
@@ -0,0 +1,20 @@
+<template>
+ <ClientOnly v-if="clientOnly">
+ <slot />
+ <template #fallback>
+ <slot name="fallback" />
+ </template>
+ </ClientOnly>
+ <template v-else>
+ <slot />
+ </template>
+</template>
+
+<script setup>
+defineProps({
+ clientOnly: {
+ type: Boolean,
+ default: false
+ }
+})
+</script>
\ No newline at end of file
diff --git a/client/components/global/Dropdown.vue b/client/components/global/Dropdown.vue
deleted file mode 100644
index b2d5baa87..000000000
--- a/client/components/global/Dropdown.vue
+++ /dev/null
@@ -1,69 +0,0 @@
-<template>
- <div
- ref="dropdown"
- class="relative"
- >
- <slot
- name="trigger"
- :toggle="toggle"
- :open="open"
- :close="close"
- />
-
- <collapsible
- v-model="isOpen"
- :class="dropdownClass"
- @click-away="onClickAway"
- >
- <div
- class="py-1"
- role="menu"
- aria-orientation="vertical"
- aria-labelledby="options-menu"
- >
- <slot />
- </div>
- </collapsible>
- </div>
-</template>
-
-<script setup>
-import { ref } from "vue"
-import Collapsible from "./transitions/Collapsible.vue"
-
-defineProps({
- dropdownClass: {
- type: String,
- default:
- "origin-top-right absolute right-0 mt-2 w-56 rounded-md shadow-lg bg-white dark:bg-gray-800 ring-1 ring-black ring-opacity-5 z-20",
- },
-})
-
-const isOpen = ref(false)
-const dropdown = ref(null)
-
-const open = () => {
- isOpen.value = true
-}
-
-const close = () => {
- isOpen.value = false
-}
-
-const toggle = () => {
- isOpen.value = !isOpen.value
-}
-
-const onClickAway = (event) => {
- // Check that event target isn't children of dropdown
- if (dropdown.value && !dropdown.value.contains(event.target)) {
- close(event)
- }
-}
-
-defineExpose({
- open,
- close,
- toggle,
-})
-</script>
diff --git a/client/components/global/Modal.vue b/client/components/global/Modal.vue
deleted file mode 100644
index cb5ca5c57..000000000
--- a/client/components/global/Modal.vue
+++ /dev/null
@@ -1,241 +0,0 @@
-<template>
- <Teleport to="body">
- <transition @leave="onLeave">
- <div
- v-if="show"
- ref="backdrop"
- :class="[{ 'backdrop-blur-sm': backdropBlur }, twMerge('fixed z-40 top-0 inset-0 px-2 sm:px-4 flex items-top justify-center bg-gray-700/75 w-full h-screen overflow-y-scroll', $attrs.class)]"
- @click.self="close"
- >
- <div
- ref="content"
- class="self-start bg-white dark:bg-notion-dark w-full relative my-2 sm:my-6 rounded-xl shadow-xl"
- :class="maxWidthClass"
- >
- <div
- v-if="closeable"
- class="absolute top-4 right-4"
- >
- <button
- class="text-gray-500 hover:text-gray-900 cursor-pointer"
- @click="close()"
- >
- <svg
- class="h-6 w-6"
- viewBox="0 0 24 24"
- fill="none"
- xmlns="http://www.w3.org/2000/svg"
- >
- <path
- d="M18 6L6 18M6 6L18 18"
- stroke="currentColor"
- stroke-width="2"
- stroke-linecap="round"
- stroke-linejoin="round"
- />
- </svg>
- </button>
- </div>
- <div
- v-if="_has($slots, 'icon') || _has($slots, 'title')"
- class="flex border-b pb-4"
- :class="[
- {
- 'flex-col sm:items-start': !compactHeader,
- 'items-center justify-center py-6 gap-x-4': compactHeader,
- },
- headerInnerPadding,
- ]"
- >
- <div
- v-if="_has($slots, 'icon')"
- :class="{ 'w-full mb-4 flex justify-center': !compactHeader }"
- >
- <div
- class="w-14 h-14 rounded-full flex justify-center items-center"
- :class="'bg-' + iconColor + '-100 text-' + iconColor + '-600'"
- >
- <slot name="icon" />
- </div>
- </div>
- <div
- class="mt-3 text-center sm:mt-0"
- :class="{ 'w-full': !compactHeader }"
- >
- <h2
- v-if="_has($slots, 'title')"
- class="text-2xl font-semibold text-center text-gray-900"
- >
- <slot name="title" />
- </h2>
- </div>
- </div>
-
- <div
- class="w-full"
- :class="innerPadding"
- >
- <slot />
- </div>
-
- <div
- v-if="_has($slots, 'footer')"
- class="bg-gray-50 border-t rounded-b-xl text-right"
- :class="footerInnerPadding"
- >
- <slot name="footer" />
- </div>
- </div>
- </div>
- </transition>
- </Teleport>
-</template>
-
-<script setup>
-import { watch } from 'vue'
-import { default as _has } from 'lodash/has'
-import {twMerge} from 'tailwind-merge'
-
-const props = defineProps({
- show: {
- type: Boolean,
- default: false
- },
- backdropBlur: {
- type: Boolean,
- default: false
- },
- iconColor: {
- type: String,
- default: 'blue'
- },
- maxWidth: {
- type: String,
- default: '2xl'
- },
- innerPadding: {
- type: String,
- default: 'p-6'
- },
- headerInnerPadding: {
- type: String,
- default: 'p-6'
- },
- footerInnerPadding: {
- type: String,
- default: 'p-6'
- },
- closeable: {
- type: Boolean,
- default: true
- },
- compactHeader: {
- default: false,
- type: Boolean
- }
-})
-
-const emit = defineEmits(['close'])
-
-useHead({
- bodyAttrs: computed(() => {
- return {
- class: {
- 'overflow-hidden': props.show
- }
- }
- })
-})
-
-const closeOnEscape = (e) => {
- if (e.key === 'Escape' && props.show) {
- close()
- }
-}
-
-onMounted(() => {
- if (import.meta.server) return
- document.addEventListener('keydown', closeOnEscape)
- initMotions()
-})
-
-onBeforeUnmount(() => {
- if (import.meta.server) return
- document.removeEventListener('keydown', closeOnEscape)
-})
-
-const maxWidthClass = computed(() => {
- return {
- sm: 'sm:max-w-sm',
- md: 'sm:max-w-md',
- lg: 'sm:max-w-lg',
- xl: 'sm:max-w-xl',
- '2xl': 'max-w-2xl',
- 'screen-lg': 'max-w-screen-lg'
- }[props.maxWidth]
-})
-
-const motionFadeIn = {
- initial: {
- opacity: 0,
- transition: {
- delay: 100,
- duration: 200,
- ease: 'easeIn'
- }
- },
- enter: {
- opacity: 1,
- transition: {
- duration: 200
- }
- }
-}
-
-const motionSlideBottom = {
- initial: {
- y: 150,
- opacity: 0,
- transition: {
- ease: 'easeIn',
- duration: 200
- }
- },
- enter: {
- y: 0,
- opacity: 1,
- transition: {
- duration: 250,
- ease: 'easeOut',
- delay: 100
- }
- }
-}
-
-const onLeave = (el, done) => {
- contentMotion.value.leave(() => {})
- backdropMotion.value.leave(done)
-}
-
-const close = () => {
- if (props.closeable) {
- emit('close')
- }
-}
-
-const backdrop = ref(null)
-const content = ref(null)
-const backdropMotion = ref(null)
-const contentMotion = ref(null)
-
-const initMotions = () => {
- if (props.show) {
- nextTick(() => {
- backdropMotion.value = useMotion(backdrop.value, motionFadeIn)
- contentMotion.value = useMotion(content.value, motionSlideBottom)
- })
- }
-}
-
-watch(() => props.show, initMotions)
-</script>
diff --git a/client/components/global/Navbar.vue b/client/components/global/Navbar.vue
index 1a5082c15..2cb02d44d 100644
--- a/client/components/global/Navbar.vue
+++ b/client/components/global/Navbar.vue
@@ -4,8 +4,8 @@
class="bg-white dark:bg-notion-dark border-b"
>
<div class="max-w-7xl mx-auto px-8">
- <div class="flex items-center justify-between h-16">
- <div class="flex items-center">
+ <div class="flex items-center justify-between h-14">
+ <div class="flex items-center gap-2">
<NuxtLink
:to="{ name: user ? 'home' : 'index' }"
class="flex-shrink-0 font-semibold hover:no-underline flex items-center"
@@ -13,13 +13,28 @@
<img
src="/img/logo.svg"
alt="notion tools logo"
- class="w-8 h-8"
+ class="w-6 h-6"
>
<span
class="ml-2 text-md hidden sm:inline text-black dark:text-white"
>OpnForm</span>
</NuxtLink>
- <workspace-dropdown class="ml-6" />
+ <WorkspaceDropdown class="ml-6">
+ <template #default="{ workspace }">
+ <button
+ v-if="workspace"
+ :class="navLinkClasses"
+ class="flex items-center"
+ >
+ <WorkspaceIcon :workspace="workspace" />
+ <p
+ class="hidden md:block max-w-10 truncate text-sm ml-2 text-neutral-800 dark:text-neutral-200"
+ >
+ {{ workspace.name }}
+ </p>
+ </button>
+ </template>
+ </WorkspaceDropdown>
</div>
<div
class="hidden md:flex gap-x-2 ml-auto"
@@ -85,7 +100,7 @@
</NuxtLink>
</div>
<div
- class="hidden md:block pl-5 border-gray-300 border-r h-5"
+ class="hidden md:block pl-5 border-neutral-300 border-r h-5"
/>
<div
class="block"
@@ -93,18 +108,14 @@
<div class="flex items-center">
<div class="ml-4 relative">
<div class="relative inline-block text-left">
- <dropdown
- v-if="user"
- dusk="nav-dropdown"
- >
- <template #trigger="{ toggle }">
+ <UserDropdown v-if="user">
+ <template #default="{ user }">
<button
id="dropdown-menu-button"
type="button"
:class="navLinkClasses"
class="flex items-center"
dusk="nav-dropdown-button"
- @click.stop="toggle()"
>
<img
:src="user.photo_url"
@@ -115,122 +126,7 @@
</p>
</button>
</template>
-
- <NuxtLink
- v-if="userOnboarded"
- :to="{ name: 'home' }"
- class="block px-4 py-2 text-md text-gray-700 hover:bg-gray-100 hover:no-underline transition-colors hover:text-gray-900 dark:text-gray-100 dark:hover:text-white dark:hover:bg-gray-600 flex items-center"
- >
- <svg
- xmlns="http://www.w3.org/2000/svg"
- class="w-4 h-4 mr-2"
- fill="none"
- viewBox="0 0 24 24"
- stroke="currentColor"
- >
- <path
- stroke-linecap="round"
- stroke-linejoin="round"
- stroke-width="2"
- d="M19 11H5m14 0a2 2 0 012 2v6a2 2 0 01-2 2H5a2 2 0 01-2-2v-6a2 2 0 012-2m14 0V9a2 2 0 00-2-2M5 11V9a2 2 0 012-2m0 0V5a2 2 0 012-2h6a2 2 0 012 2v2M7 7h10"
- />
- </svg>
- My Forms
- </NuxtLink>
-
- <NuxtLink
- v-if="userOnboarded"
- :to="{ name: 'templates-my-templates' }"
- class="block px-4 py-2 text-md text-gray-700 hover:bg-gray-100 hover:no-underline transition-colors hover:text-gray-900 dark:text-gray-100 dark:hover:text-white dark:hover:bg-gray-600 flex items-center"
- >
- <svg
- xmlns="http://www.w3.org/2000/svg"
- class="w-4 h-4 mr-2"
- fill="none"
- viewBox="0 0 24 24"
- stroke-width="1.5"
- stroke="currentColor"
- >
- <path
- stroke-linecap="round"
- stroke-linejoin="round"
- d="M19.5 14.25v-2.625a3.375 3.375 0 00-3.375-3.375h-1.5A1.125 1.125 0 0113.5 7.125v-1.5a3.375 3.375 0 00-3.375-3.375H8.25m0 12.75h7.5m-7.5 3H12M10.5 2.25H5.625c-.621 0-1.125.504-1.125 1.125v17.25c0 .621.504 1.125 1.125 1.125h12.75c.621 0 1.125-.504 1.125-1.125V11.25a9 9 0 00-9-9z"
- />
- </svg>
- My Templates
- </NuxtLink>
-
- <NuxtLink
- :to="{ name: 'settings-profile' }"
- class="block px-4 py-2 text-md text-gray-700 hover:bg-gray-100 hover:no-underline transition-colors hover:text-gray-900 dark:text-gray-100 dark:hover:text-white dark:hover:bg-gray-600 flex items-center"
- >
- <svg
- class="w-4 h-4 mr-2"
- xmlns="http://www.w3.org/2000/svg"
- fill="none"
- viewBox="0 0 24 24"
- stroke="currentColor"
- >
- <path
- stroke-linecap="round"
- stroke-linejoin="round"
- stroke-width="2"
- d="M10.325 4.317c.426-1.756 2.924-1.756 3.35 0a1.724 1.724 0 002.573 1.066c1.543-.94 3.31.826 2.37 2.37a1.724 1.724 0 001.065 2.572c1.756.426 1.756 2.924 0 3.35a1.724 1.724 0 00-1.066 2.573c.94 1.543-.826 3.31-2.37 2.37a1.724 1.724 0 00-2.572 1.065c-.426 1.756-2.924 1.756-3.35 0a1.724 1.724 0 00-2.573-1.066c-1.543.94-3.31-.826-2.37-2.37a1.724 1.724 0 00-1.065-2.572c-1.756-.426-1.756-2.924 0-3.35a1.724 1.724 0 001.066-2.573c-.94-1.543.826-3.31 2.37-2.37.996.608 2.296.07 2.572-1.065z"
- />
- <path
- stroke-linecap="round"
- stroke-linejoin="round"
- stroke-width="2"
- d="M15 12a3 3 0 11-6 0 3 3 0 016 0z"
- />
- </svg>
- Settings
- </NuxtLink>
-
- <NuxtLink
- v-if="user.moderator"
- :to="{ name: 'settings-admin' }"
- class="block px-4 py-2 text-md text-gray-700 hover:bg-gray-100 hover:no-underline transition-colors hover:text-gray-900 dark:text-gray-100 dark:hover:text-white dark:hover:bg-gray-600 flex items-center"
- >
- <svg
- xmlns="http://www.w3.org/2000/svg"
- fill="none"
- viewBox="0 0 24 24"
- stroke-width="1.5"
- stroke="currentColor"
- class="w-4 h-4 mr-2"
- >
- <path
- stroke-linecap="round"
- stroke-linejoin="round"
- d="M9 12.75 11.25 15 15 9.75m-3-7.036A11.959 11.959 0 0 1 3.598 6 11.99 11.99 0 0 0 3 9.749c0 5.592 3.824 10.29 9 11.623 5.176-1.332 9-6.03 9-11.622 0-1.31-.21-2.571-.598-3.751h-.152c-3.196 0-6.1-1.248-8.25-3.285Z"
- />
- </svg>
- Admin
- </NuxtLink>
-
- <a
- href="#"
- class="block px-4 py-2 text-md text-gray-700 hover:no-underline transition-colors hover:bg-gray-100 hover:text-gray-900 dark:text-gray-100 dark:hover:text-white dark:hover:bg-gray-600 flex items-center"
- @click.prevent="logout"
- >
- <svg
- class="w-4 h-4 mr-2"
- xmlns="http://www.w3.org/2000/svg"
- fill="none"
- viewBox="0 0 24 24"
- stroke="currentColor"
- >
- <path
- stroke-linecap="round"
- stroke-linejoin="round"
- stroke-width="2"
- d="M17 16l4-4m0 0l-4-4m4 4H7m6 4v1a3 3 0 01-3 3H6a3 3 0 01-3-3V7a3 3 0 013-3h4a3 3 0 013 3v1"
- />
- </svg>
- Logout
- </a>
- </dropdown>
+ </UserDropdown>
<div
v-else
class="flex gap-2"
@@ -239,22 +135,24 @@
v-if="$route.name !== 'login'"
:to="{ name: 'login' }"
:class="navLinkClasses"
- active-class="text-gray-800 dark:text-white"
+ active-class="text-neutral-800 dark:text-white"
>
Login
</NuxtLink>
- <v-button
+ <TrackClick
+ class="flex items-center"
v-if="!isSelfHosted"
- v-track.nav_create_form_click
- size="small"
- class="shrink-0"
- :to="{ name: 'forms-create-guest' }"
- color="outline-blue"
- :arrow="true"
+ name="nav_create_form_click"
>
- Create a form
- </v-button>
+ <UButton
+ :to="{ name: 'forms-create-guest' }"
+ variant="outline"
+ color="primary"
+ trailing-icon="i-heroicons-arrow-right"
+ label="Create a form"
+ />
+ </TrackClick>
</div>
</div>
</div>
@@ -265,93 +163,63 @@
</nav>
</template>
-<script>
-import { computed } from "vue"
-import Dropdown from "~/components/global/Dropdown.vue"
-import WorkspaceDropdown from "./WorkspaceDropdown.vue"
-import opnformConfig from "~/opnform.config.js"
-import { useRuntimeConfig } from "#app"
-import { useFeatureFlag } from "~/composables/useFeatureFlag"
+<script setup>
+import { computed } from 'vue'
+import { useRoute } from '#imports'
-export default {
- components: {
- WorkspaceDropdown,
- Dropdown,
- },
+import WorkspaceDropdown from '../dashboard/WorkspaceDropdown.vue'
+import WorkspaceIcon from '~/components/workspaces/WorkspaceIcon.vue'
+import UserDropdown from '../dashboard/UserDropdown.vue'
- async setup() {
- const { openHelpdesk } = useCrisp()
- const authStore = useAuthStore()
- return {
- authStore,
- openHelpdesk,
- opnformConfig,
- appStore: useAppStore(),
- formsStore: useFormsStore(),
- workspacesStore: useWorkspacesStore(),
- config: useRuntimeConfig(),
- user: computed(() => authStore.user),
- isIframe: useIsIframe(),
- isSelfHosted: computed(() => useFeatureFlag('self_hosted')),
- }
- },
+import opnformConfig from '~/opnform.config.js'
+import { useFeatureFlag } from '~/composables/useFeatureFlag'
+import TrackClick from '~/components/global/TrackClick.vue'
- data: () => ({
- navLinkClasses: 'border border-transparent hover:border-gray-200 text-gray-500 hover:text-gray-800 hover:no-underline dark:hover:text-white py-2 px-3 hover:bg-gray-50 rounded-md text-sm font-medium transition-colors w-full md:w-auto text-center md:text-left'
- }),
- computed: {
- helpUrl() {
- return this.opnformConfig.links.help_url
- },
- form() {
- if (this.$route.name && this.$route.name.startsWith("forms-slug")) {
- return this.formsStore.getByKey(this.$route.params.slug)
- }
- return null
- },
- workspace() {
- return this.workspacesStore.getCurrent
- },
- hasNavbar() {
- if (this.isIframe) return false
+// Stores & composables
+const { current: workspace } = useCurrentWorkspace()
+const appStore = useAppStore()
- if (this.$route.name && this.$route.name === "forms-slug") {
- if (this.form || import.meta.server) {
- return false
- } else {
- // Form not found/404 case - show the navbar
- return true
- }
- }
- return !this.appStore.navbarHidden
- },
- userOnboarded() {
- return this.user && this.user.has_forms === true
- },
- hasNewChanges() {
- if (import.meta.server || !window.Featurebase || !this.appStore.featureBaseEnabled) return false
- return window.Featurebase("unviewed_changelog_count") > 0
- },
- },
+const { data: user } = useAuth().user()
+const isIframe = useIsIframe()
+const isSelfHosted = computed(() => useFeatureFlag('self_hosted'))
+const route = useRoute()
- methods: {
- openChangelog() {
- if (import.meta.server || !window.Featurebase) return
- window.Featurebase("manually_open_changelog_popup")
- },
- async logout() {
- // Log out the user.
- this.authStore.logout()
+// Get current form for forms-slug routes
+const isFormSlugRoute = computed(() => route.name && route.name.startsWith('forms-slug'))
+const formSlug = computed(() => isFormSlugRoute.value ? route.params.slug : null)
+const { data: form } = useForms().detail(formSlug.value, {
+ enabled: computed(() => !!formSlug.value)
+})
- // Reset store
- this.workspacesStore.resetState()
- this.formsStore.resetState()
+// Constants / classes
+const navLinkClasses =
+ 'border border-transparent hover:border-neutral-200 text-neutral-500 hover:text-neutral-800 hover:no-underline dark:hover:text-white py-1.5 px-3 hover:bg-neutral-50 rounded-md text-sm font-medium transition-colors w-full md:w-auto text-center md:text-left'
- // Redirect to login.
- const router = useRouter()
- router.push({ name: "login" })
- },
- },
+// Computed values
+const helpUrl = computed(() => opnformConfig.links.help_url)
+
+const hasNavbar = computed(() => {
+ if (isIframe.value) return false
+
+ if (route.name && route.name === 'forms-slug') {
+ if (form.value || import.meta.server) {
+ return false
+ }
+ // Form not found/404 case - show the navbar
+ return true
+ }
+ return true
+})
+
+const hasNewChanges = computed(() => {
+ if (import.meta.server || !window.Featurebase || !appStore.featureBaseEnabled) return false
+ return window.Featurebase('unviewed_changelog_count') > 0
+})
+
+// Methods
+function openChangelog() {
+ if (import.meta.server || !window.Featurebase) return
+ window.Featurebase('manually_open_changelog_popup')
}
</script>
diff --git a/client/components/global/NavigationList.vue b/client/components/global/NavigationList.vue
new file mode 100644
index 000000000..0d395a35f
--- /dev/null
+++ b/client/components/global/NavigationList.vue
@@ -0,0 +1,176 @@
+<!--
+ NavigationList Component
+
+ A reusable component for rendering navigation items with keyboard shortcuts,
+ tracking, and loading states.
+
+ Usage:
+ <NavigationList
+ :items="navigationItems"
+ :loading="isLoading"
+ :skeleton-filter="(item) => item.showSkeleton"
+ tracking-name="sidebar_nav_click"
+ :tracking-properties="(item) => ({ label: item.label })"
+ button-class="w-full justify-start"
+ @item-click="handleItemClick"
+ />
+
+ Item Structure:
+ {
+ label: string,
+ icon?: string,
+ to?: object,
+ active?: boolean,
+ kbd?: string[],
+ onClick?: function,
+ ...buttonProps
+ }
+-->
+<template>
+ <ul
+ :class="[
+ 'space-y-1',
+ listClass
+ ]"
+ :style="listClass.includes('overflow-x-auto') ? 'scrollbar-width: none; -ms-overflow-style: none;' : ''"
+ >
+ <li v-for="item in items" :key="item.label || item.id">
+ <!-- Loading skeleton -->
+ <USkeleton
+ v-if="loading && shouldShowSkeleton(item)"
+ class="h-9 w-full rounded-md"
+ />
+
+ <!-- Regular navigation item -->
+ <component
+ v-else
+ :is="trackingEnabled ? TrackClick : 'div'"
+ :name="trackingName"
+ :properties="getTrackingProperties(item)"
+ >
+ <UButton
+ v-bind="getButtonProps(item)"
+ :class="buttonClass"
+ @click="handleClick(item)"
+ >
+ <template #trailing v-if="item.kbd">
+ <span class="hidden sm:flex ml-auto">
+ <UKbd v-for="kbd in item.kbd" :key="kbd" :value="kbd" />
+ </span>
+ </template>
+ </UButton>
+ </component>
+ </li>
+ </ul>
+</template>
+
+<script setup>
+import TrackClick from '~/components/global/TrackClick.vue'
+
+const props = defineProps({
+ items: {
+ type: Array,
+ required: true
+ },
+ loading: {
+ type: Boolean,
+ default: false
+ },
+ skeletonFilter: {
+ type: Function,
+ default: null
+ },
+ trackingEnabled: {
+ type: Boolean,
+ default: true
+ },
+ trackingName: {
+ type: String,
+ default: 'navigation_click'
+ },
+ trackingProperties: {
+ type: [Object, Function],
+ default: () => ({})
+ },
+ buttonClass: {
+ type: String,
+ default: 'w-full justify-start'
+ },
+ listClass: {
+ type: String,
+ default: ''
+ }
+})
+
+const emit = defineEmits(['item-click'])
+
+// Setup keyboard shortcuts
+const shortcuts = computed(() => {
+ const shortcutMap = {}
+
+ props.items.forEach(item => {
+ if (item.kbd && item.kbd.length > 0) {
+ // Handle single key shortcuts (like 'n') and combinations
+ const shortcut = item.kbd.join('').toLowerCase()
+ shortcutMap[shortcut] = {
+ handler: () => handleClick(item)
+ }
+ }
+ })
+
+ return shortcutMap
+})
+
+// Register shortcuts
+defineShortcuts(shortcuts)
+
+function shouldShowSkeleton(item) {
+ if (typeof props.skeletonFilter === 'function') {
+ return props.skeletonFilter(item)
+ }
+ return true
+}
+
+function getTrackingProperties(item) {
+ if (typeof props.trackingProperties === 'function') {
+ return props.trackingProperties(item)
+ }
+ return {
+ label: item.label,
+ ...props.trackingProperties
+ }
+}
+
+function getButtonProps(item) {
+ // Create a copy of the item without the onClick handler
+ // eslint-disable-next-line no-unused-vars
+ const { onClick, ...buttonProps } = item
+ return buttonProps
+}
+
+function handleClick(item) {
+ // Call the item's onClick handler if it exists
+ if (typeof item.onClick === 'function') {
+ item.onClick()
+ }
+ // Handle navigation for items with 'to' property
+ else if (item.to) {
+ // Use navigateTo for internal navigation
+ navigateTo(item.to)
+ }
+ // Handle external links
+ else if (item.href) {
+ window.open(item.href, item.target || '_self')
+ }
+
+ // Emit the click event for parent components
+ emit('item-click', item)
+}
+</script>
+
+<style scoped>
+/* Hide scrollbar for Chrome, Safari and Opera */
+ul::-webkit-scrollbar {
+ display: none;
+}
+</style>
\ No newline at end of file
diff --git a/client/components/global/Notifications.vue b/client/components/global/Notifications.vue
deleted file mode 100644
index 90161b001..000000000
--- a/client/components/global/Notifications.vue
+++ /dev/null
@@ -1,140 +0,0 @@
-<template>
- <div
- class="fixed top-0 bottom-24 right-0 flex gap-y-4 items-start justify-end z-50 pointer-events-auto"
- >
- <NuxtNotifications>
- <template #body="props">
- <div class="p-2">
- <div
- class="flex max-w-sm w-full mx-auto bg-white shadow-md rounded-lg overflow-hidden relative"
- >
- <div
- class="flex justify-center items-center w-12"
- :class="notifTypes[props.item.type].background"
- v-html="notifTypes[props.item.type].svg"
- />
-
- <div class="-mx-3 py-2 px-4">
- <div class="mx-3">
- <span
- :class="notifTypes[props.item.type].text"
- class="font-semibold pr-6"
- >{{ props.item.title }}</span>
- <p class="text-gray-600 text-sm">
- {{ props.item.text }}
- </p>
- <div
- v-if="props.item.type == 'confirm'"
- class="w-full flex gap-2 mt-1"
- >
- <v-button
- color="blue"
- size="small"
- @click.prevent="
- props.item.data.success();
- props.close();
- "
- >
- Yes
- </v-button>
- <v-button
- color="white"
- size="small"
- @click.prevent="
- props.item.data.failure();
- props.close();
- "
- >
- No
- </v-button>
- </div>
- </div>
- </div>
-
- <button
- class="absolute top-0 right-0 px-2 py-2 cursor-pointer"
- @click="props.close()"
- >
- <svg
- class="fill-current h-6 w-6 text-gray-300 hover:text-gray-500"
- role="button"
- xmlns="http://www.w3.org/2000/svg"
- viewBox="0 0 20 20"
- >
- <title>Close</title>
- <path
- d="M14.348 14.849a1.2 1.2 0 0 1-1.697 0L10 11.819l-2.651 3.029a1.2 1.2 0 1 1-1.697-1.697l2.758-3.15-2.759-3.152a1.2 1.2 0 1 1 1.697-1.697L10 8.183l2.651-3.031a1.2 1.2 0 1 1 1.697 1.697l-2.758 3.152 2.758 3.15a1.2 1.2 0 0 1 0 1.698z"
- />
- </svg>
- </button>
- </div>
- </div>
- </template>
- </NuxtNotifications>
- </div>
-</template>
-
-<script>
-export default {
- name: "Notifications",
-
- data() {
- return {
- notifTypes: {
- success: {
- background: "bg-green-500",
- text: "text-green-500",
- svg:
- '<svg xmlns="http://www.w3.org/2000/svg" class="h-6 w-6 fill-current text-white" viewBox="0 0 20 20" fill="currentColor">' +
- ' <path fill-rule="evenodd" d="M10 18a8 8 0 100-16 8 8 0 000 16zm3.707-9.293a1 1 0 00-1.414-1.414L9 10.586 7.707 9.293a1 1 0 00-1.414 1.414l2 2a1 1 0 001.414 0l4-4z" clip-rule="evenodd" />' +
- " </svg>",
- },
- warning: {
- background: "bg-yellow-500",
- text: "text-yellow-500",
- svg:
- "<svg" +
- ' class="h-6 w-6 fill-current text-white"' +
- ' viewBox="0 0 40 40"' +
- ' xmlns="http://www.w3.org/2000/svg"' +
- " >" +
- " <path" +
- ' d="M20 3.33331C10.8 3.33331 3.33337 10.8 3.33337 20C3.33337 29.2 10.8 36.6666 20 36.6666C29.2 36.6666 36.6667 29.2 36.6667 20C36.6667 10.8 29.2 3.33331 20 3.33331ZM21.6667 28.3333H18.3334V25H21.6667V28.3333ZM21.6667 21.6666H18.3334V11.6666H21.6667V21.6666Z"' +
- " />" +
- " </svg>",
- },
- error: {
- background: "bg-red-500",
- text: "text-red-500",
- svg:
- "<svg" +
- ' class="h-6 w-6 fill-current text-white"' +
- ' viewBox="0 0 40 40"' +
- ' xmlns="http://www.w3.org/2000/svg"' +
- " >" +
- " <path" +
- ' d="M20 3.33331C10.8 3.33331 3.33337 10.8 3.33337 20C3.33337 29.2 10.8 36.6666 20 36.6666C29.2 36.6666 36.6667 29.2 36.6667 20C36.6667 10.8 29.2 3.33331 20 3.33331ZM21.6667 28.3333H18.3334V25H21.6667V28.3333ZM21.6667 21.6666H18.3334V11.6666H21.6667V21.6666Z"' +
- " />" +
- " </svg>",
- },
- confirm: {
- background: "bg-blue-500",
- text: "text-blue-500",
- svg:
- '<svg xmlns="http://www.w3.org/2000/svg" class="h-6 w-6 fill-current text-white" viewBox="0 0 20 20" fill="currentColor">' +
- ' <path fill-rule="evenodd" d="M18 10a8 8 0 11-16 0 8 8 0 0116 0zm-7-4a1 1 0 11-2 0 1 1 0 012 0zM9 9a1 1 0 000 2v3a1 1 0 001 1h1a1 1 0 100-2v-3a1 1 0 00-1-1H9z" clip-rule="evenodd" />' +
- " </svg>",
- },
- info: {
- background: "bg-blue-500",
- text: "text-blue-500",
- svg:
- '<svg xmlns="http://www.w3.org/2000/svg" class="h-6 w-6 fill-current text-white" viewBox="0 0 20 20" fill="currentColor">' +
- ' <path fill-rule="evenodd" d="M18 10a8 8 0 11-16 0 8 8 0 0116 0zm-7-4a1 1 0 11-2 0 1 1 0 012 0zM9 9a1 1 0 000 2v3a1 1 0 001 1h1a1 1 0 100-2v-3a1 1 0 00-1-1H9z" clip-rule="evenodd" />' +
- " </svg>",
- },
- },
- }
- },
-}
-</script>
diff --git a/client/components/global/NotificationsWrapper.vue b/client/components/global/NotificationsWrapper.vue
deleted file mode 100644
index 646007bf9..000000000
--- a/client/components/global/NotificationsWrapper.vue
+++ /dev/null
@@ -1,35 +0,0 @@
-<template>
- <UNotifications
- :ui="{
- strategy: 'override',
- position,
- }"
- >
- <template #title="{ title }">
- <span v-html="title" />
- </template>
-
- <template #description="{ description }">
- <span v-html="description" />
- </template>
- </UNotifications>
-</template>
-
-<script setup>
-// fixed flex flex-col justify-end z-[55] bottom-0 end-0 w-full sm:w-96
-// fixed flex flex-col justify-end z-[55] top-auto bottom-0 w-full sm:w-96
-const appStore = useAppStore()
-const crispChatOpened = computed(() => appStore.crisp.chatOpened)
-const crispHidden = computed(() => appStore.crisp.hidden)
-
-const position = computed(() => {
- if (crispHidden.value) {
- return 'end-0 bottom-0'
- } else {
- if (crispChatOpened.value) {
- return 'bottom-0'
- }
- return 'end-0 bottom-20'
- }
-})
-</script>
diff --git a/client/components/global/NotionPage.vue b/client/components/global/NotionPage.vue
index b2ebf8afb..42ed14e74 100644
--- a/client/components/global/NotionPage.vue
+++ b/client/components/global/NotionPage.vue
@@ -72,7 +72,7 @@ export default {
@import "vue-notion/src/styles.css";
.notion-blue {
- @apply text-nt-blue;
+ @apply text-blue-500;
}
.notion-spacer {
diff --git a/client/components/global/ScrollShadow.vue b/client/components/global/ScrollShadow.vue
deleted file mode 100644
index 2733d549f..000000000
--- a/client/components/global/ScrollShadow.vue
+++ /dev/null
@@ -1,209 +0,0 @@
-<template>
- <div
- class="scroll-shadow max-w-full"
- :class="[$style.wrap, { 'w-max': !shadow.left && !shadow.right }]"
- >
- <div
- ref="scrollContainer"
- :class="[$style['scroll-container'], { 'no-scrollbar': hideScrollbar }]"
- :style="{ width: width ? width : 'auto', height }"
- @scroll.passive="throttled.toggleShadow"
- >
- <slot />
- <span
- :class="[$style['shadow-top'], shadow.top && $style['is-active']]"
- :style="{
- top: shadowTopOffset + 'px',
- }"
- />
- <span
- :class="[$style['shadow-right'], shadow.right && $style['is-active']]"
- />
- <span
- :class="[$style['shadow-bottom'], shadow.bottom && $style['is-active']]"
- />
- <span
- :class="[$style['shadow-left'], shadow.left && $style['is-active']]"
- />
- </div>
- </div>
-</template>
-
-<script>
-import throttle from "lodash/throttle"
-function newResizeObserver(callback) {
- // Skip this feature for browsers which
- // do not support ResizeObserver.
- // https://caniuse.com/#search=resizeobserver
- if (typeof ResizeObserver === "undefined") return
-
- return new ResizeObserver((e) => e.map(callback))
-}
-
-export default {
- name: "ScrollShadow",
- props: {
- hideScrollbar: {
- type: Boolean,
- default: false,
- },
- shadowTopOffset: {
- type: Number,
- default: 0,
- },
- },
- data() {
- return {
- width: undefined,
- height: undefined,
- shadow: {
- top: false,
- right: false,
- bottom: false,
- left: false,
- },
- scrollContainerObserver: null,
- wrapObserver: null,
- throttled: {},
- }
- },
- mounted() {
- this.throttled.toggleShadow = throttle(this.toggleShadow, 100)
- this.throttled.calcDimensions = throttle(this.calcDimensions, 100)
-
- window.addEventListener("resize", this.throttled.calcDimensions)
-
- // Check if shadows are necessary after the element is resized.
- const scrollContainerObserver = newResizeObserver(
- this.throttled.toggleShadow,
- )
- if (scrollContainerObserver) {
- scrollContainerObserver.observe(this.$refs.scrollContainer)
- }
-
- // Recalculate the container dimensions when the wrapper is resized.
- this.wrapObserver = newResizeObserver(this.throttled.calcDimensions)
- if (this.wrapObserver) {
- this.wrapObserver.observe(this.$el)
- }
- },
- unmounted() {
- window.removeEventListener("resize", this.throttled.calcDimensions)
- // Cleanup when the component is unmounted.
- this.wrapObserver.disconnect()
- if (this.scrollContainerObserver) {
- this.scrollContainerObserver.disconnect()
- }
- },
- methods: {
- async calcDimensions() {
- // Reset dimensions for correctly recalculating parent dimensions.
- this.width = undefined
- this.height = undefined
- await this.$nextTick()
-
- this.width = `${this.$el.clientWidth}px`
- this.height = `${this.$el.clientHeight}px`
- },
- // Check if shadows are needed.
- toggleShadow() {
- if (!this.$refs.scrollContainer) return
- const hasHorizontalScrollbar =
- this.$refs.scrollContainer.clientWidth <
- this.$refs.scrollContainer.scrollWidth
- const hasVerticalScrollbar =
- this.$refs.scrollContainer.clientHeight <
- this.$refs.scrollContainer.scrollHeight
-
- const scrolledFromLeft =
- this.$refs.scrollContainer.offsetWidth +
- this.$refs.scrollContainer.scrollLeft
- const scrolledFromTop =
- this.$refs.scrollContainer.offsetHeight +
- this.$refs.scrollContainer.scrollTop
-
- const scrolledToTop = this.$refs.scrollContainer.scrollTop === 0
- const scrolledToRight =
- scrolledFromLeft >= this.$refs.scrollContainer.scrollWidth
- const scrolledToBottom =
- scrolledFromTop >= this.$refs.scrollContainer.scrollHeight
- const scrolledToLeft = this.$refs.scrollContainer.scrollLeft === 0
-
- this.$nextTick(() => {
- this.shadow.top = hasVerticalScrollbar && !scrolledToTop
- this.shadow.right = hasHorizontalScrollbar && !scrolledToRight
- this.shadow.bottom = hasVerticalScrollbar && !scrolledToBottom
- this.shadow.left = hasHorizontalScrollbar && !scrolledToLeft
- })
- },
- },
-}
-</script>
-
-<style lang="scss" module>
-.wrap {
- overflow: hidden;
- position: relative;
-}
-
-.scroll-container {
- overflow: auto;
-}
-
-.shadow-top,
-.shadow-right,
-.shadow-bottom,
-.shadow-left {
- position: absolute;
- border-radius: 6em;
- opacity: 0;
- transition: opacity 0.2s;
- pointer-events: none;
-}
-
-.shadow-top,
-.shadow-bottom {
- right: 0;
- left: 0;
- height: 1em;
- border-top-right-radius: 0;
- border-top-left-radius: 0;
- background-image: linear-gradient(rgba(#555, 0.1) 0%, rgba(#fff, 0) 100%);
-}
-
-.shadow-top {
- top: 0;
-}
-
-.shadow-bottom {
- bottom: 0;
- transform: rotate(180deg);
-}
-
-.shadow-right,
-.shadow-left {
- top: 0;
- bottom: 0;
- width: 1em;
- border-top-left-radius: 0;
- border-bottom-left-radius: 0;
- background-image: linear-gradient(
- 90deg,
- rgba(#555, 0.1) 0%,
- rgba(#fff, 0) 100%
- );
-}
-
-.shadow-right {
- right: 0;
- transform: rotate(180deg);
-}
-
-.shadow-left {
- left: 0;
-}
-
-.is-active {
- opacity: 1;
-}
-</style>
diff --git a/client/components/global/Settings/SettingsSection.vue b/client/components/global/Settings/SettingsSection.vue
deleted file mode 100644
index 990d44d3f..000000000
--- a/client/components/global/Settings/SettingsSection.vue
+++ /dev/null
@@ -1,40 +0,0 @@
-<template>
- <div
- v-if="isActive"
- class="settings-section"
- >
- <h3 class="text-xl font-medium mb-1">
- {{ name }}
- </h3>
- <slot />
- </div>
-</template>
-
-<script setup>
-import { inject, computed, onMounted, onBeforeUnmount } from 'vue'
-
-const props = defineProps({
- name: {
- type: String,
- required: true
- },
- icon: {
- type: String,
- required: true
- }
-})
-
-const activeSection = inject('activeSection', ref(''))
-const registerSection = inject('registerSection', () => {})
-const unregisterSection = inject('unregisterSection', () => {})
-
-const isActive = computed(() => activeSection.value === props.name)
-
-onMounted(() => {
- registerSection(props.name, props.icon)
-})
-
-onBeforeUnmount(() => {
- unregisterSection(props.name)
-})
-</script>
\ No newline at end of file
diff --git a/client/components/global/Settings/SettingsSubSection.vue b/client/components/global/Settings/SettingsSubSection.vue
deleted file mode 100644
index d105cd1b8..000000000
--- a/client/components/global/Settings/SettingsSubSection.vue
+++ /dev/null
@@ -1,30 +0,0 @@
-<template>
- <div class="mb-8 flex">
- <div class="w-1/3 pr-8">
- <h3 class="text-lg font-semibold mb-1">
- {{ title }}
- </h3>
- <p class="text-sm text-gray-500">
- {{ description }}
- </p>
- </div>
- <div class="w-2/3">
- <UCard class="divide-y divide-gray-200">
- <slot />
- </UCard>
- </div>
- </div>
-</template>
-
- <script setup>
- defineProps({
- title: {
- type: String,
- required: true
- },
- description: {
- type: String,
- required: true
- }
- })
- </script>
\ No newline at end of file
diff --git a/client/components/global/Settings/SettingsWrapper.vue b/client/components/global/Settings/SettingsWrapper.vue
deleted file mode 100644
index be9fa1ef2..000000000
--- a/client/components/global/Settings/SettingsWrapper.vue
+++ /dev/null
@@ -1,62 +0,0 @@
-<template>
- <div class="flex flex-grow h-full relative">
- <!-- Sidebar -->
- <nav class="w-64 flex-shrink-0 overflow-y-auto border-r p-4 sticky top-0 bg-gray-50">
- <ul class="space-y-2">
- <li
- v-for="section in sections"
- :key="section.name"
- >
- <UButton
- :icon="section.icon"
- :label="section.name"
- :color="activeSection === section.name ? 'primary' : 'gray'"
- :variant="activeSection === section.name ? 'soft' : 'ghost'"
- class="w-full justify-start"
-
- @click="activeSection = section.name"
- />
- </li>
- </ul>
- </nav>
-
- <!-- Main content -->
- <div class="flex items-start h-full px-4 md:px-8 py-4 flex-grow">
- <slot />
- </div>
- </div>
-</template>
-
-<script setup>
-import { ref, provide } from 'vue'
-
-const sections = ref([])
-const activeSection = ref('')
-
-const registerSection = (name, icon) => {
- const existingIndex = sections.value.findIndex(section => section.name === name)
- if (existingIndex !== -1) {
- sections.value[existingIndex] = { name, icon }
- } else {
- sections.value.push({ name, icon })
- if (sections.value.length === 1) {
- activeSection.value = name
- }
- }
-}
-
-const unregisterSection = (name) => {
- const index = sections.value.findIndex(section => section.name === name)
- if (index !== -1) {
- sections.value.splice(index, 1)
- if (activeSection.value === name && sections.value.length > 0) {
- activeSection.value = sections.value[0].name
- }
- }
-}
-
-// Provide active section and registration function to child components
-provide('activeSection', activeSection)
-provide('registerSection', registerSection)
-provide('unregisterSection', unregisterSection)
-</script>
\ No newline at end of file
diff --git a/client/components/global/TrackClick.vue b/client/components/global/TrackClick.vue
new file mode 100644
index 000000000..aca669a64
--- /dev/null
+++ b/client/components/global/TrackClick.vue
@@ -0,0 +1,26 @@
+<template>
+ <span @click="track">
+ <slot />
+ </span>
+</template>
+
+<script setup>
+const props = defineProps({
+ name: {
+ type: String,
+ required: true,
+ },
+ properties: {
+ type: Object,
+ default: () => ({}),
+ },
+})
+
+const { logEvent } = useAmplitude()
+
+function track() {
+ if (props.name) {
+ logEvent(props.name, props.properties)
+ }
+}
+</script>
\ No newline at end of file
diff --git a/client/components/global/VButton.vue b/client/components/global/VButton.vue
deleted file mode 100644
index ea56dca70..000000000
--- a/client/components/global/VButton.vue
+++ /dev/null
@@ -1,227 +0,0 @@
-<template>
- <NuxtLink
- v-if="href"
- :class="btnClasses"
- :href="href"
- :target="target"
- >
- <slot />
- </NuxtLink>
- <button
- v-else-if="!to"
- :type="nativeType"
- :disabled="loading ? true : null"
- :class="btnClasses"
- >
- <template v-if="!loading">
- <span class="no-underline mx-auto">
- <slot />
- </span>
- <svg
- v-if="arrow"
- class="ml-2 w-3 h-3 inline"
- viewBox="0 0 12 12"
- fill="none"
- xmlns="http://www.w3.org/2000/svg"
- >
- <path
- d="M1 11L11 1M11 1H1M11 1V11"
- stroke="currentColor"
- stroke-width="2"
- stroke-linecap="round"
- stroke-linejoin="round"
- />
- </svg>
- </template>
- <Loader
- v-else
- class="h-6 w-6 mx-auto"
- :class="`text-${colorShades['text']}`"
- />
- </button>
- <NuxtLink
- v-else
- :class="btnClasses"
- :to="to"
- :target="target"
- >
- <span class="no-underline mx-auto">
- <slot />
- </span>
- <svg
- v-if="arrow"
- class="ml-2 w-3 h-3 inline"
- viewBox="0 0 12 12"
- fill="none"
- xmlns="http://www.w3.org/2000/svg"
- >
- <path
- d="M1 11L11 1M11 1H1M11 1V11"
- stroke="currentColor"
- stroke-width="2"
- stroke-linecap="round"
- stroke-linejoin="round"
- />
- </svg>
- </NuxtLink>
-</template>
-
-<script>
-export default {
- name: "VButton",
-
- props: {
- color: {
- type: String,
- default: "blue",
- },
-
- size: {
- type: String,
- default: "medium",
- },
-
- nativeType: {
- type: String,
- default: null,
- },
-
- loading: {
- type: Boolean,
- default: false,
- },
-
- arrow: {
- type: Boolean,
- default: false,
- },
-
- to: {
- type: Object,
- default: null,
- },
-
- href: {
- type: String,
- default: null,
- },
-
- target: {
- type: String,
- default: "_self",
- },
- },
-
- computed: {
- btnClasses() {
- const sizes = this.sizes
- const colorShades = this.colorShades
- return `v-btn ${sizes["p-y"]} ${sizes["p-x"]}
- ${colorShades?.main} ${colorShades?.hover} ${colorShades?.ring} ${colorShades["ring-offset"]}
- ${colorShades?.text} transition ease-in duration-200 text-center text-${sizes?.font} font-medium focus:outline-none focus:ring-2
- focus:ring-offset-2 rounded-lg flex items-center hover:no-underline`
- },
- colorShades() {
- if (this.color === "blue") {
- return {
- main: "bg-blue-600",
- hover: "hover:bg-blue-700",
- ring: "focus:ring-blue-500",
- "ring-offset": "focus:ring-offset-blue-200",
- text: "text-white",
- }
- } else if (this.color === "outline-blue") {
- return {
- main: "bg-transparent border border-blue-600",
- hover: "hover:bg-blue-600",
- ring: "focus:ring-blue-500",
- "ring-offset": "focus:ring-offset-blue-200",
- text: "text-blue-600 hover:text-white",
- }
- } else if (this.color === "outline-gray") {
- return {
- main: "bg-transparent border border-gray-300",
- hover: "hover:bg-gray-500",
- ring: "focus:ring-gray-500",
- "ring-offset": "focus:ring-offset-gray-200",
- text: "text-gray-500 hover:text-white",
- }
- } else if (this.color === "outline-red") {
- return {
- main: "bg-white border border-gray-300 text-red-700",
- hover: "hover:bg-gray-100 hover:text-red-500",
- ring: "focus:ring-gray-500",
- "ring-offset": "focus:ring-offset-gray-200",
- text: "text-gray-500",
- }
- } else if (this.color === "red") {
- return {
- main: "bg-red-600",
- hover: "hover:bg-red-700",
- ring: "focus:ring-red-500",
- "ring-offset": "focus:ring-offset-red-200",
- text: "text-white",
- }
- } else if (this.color === "gray") {
- return {
- main: "bg-gray-600",
- hover: "hover:bg-gray-700",
- ring: "focus:ring-gray-500",
- "ring-offset": "focus:ring-offset-gray-200",
- text: "text-white",
- }
- } else if (this.color === "light-gray") {
- return {
- main: "bg-gray-50 border border-gray-300",
- hover: "hover:bg-gray-100",
- ring: "focus:ring-gray-500",
- "ring-offset": "focus:ring-offset-gray-300",
- text: "text-gray-700",
- }
- } else if (this.color === "green") {
- return {
- main: "bg-green-600",
- hover: "hover:bg-green-700",
- ring: "focus:ring-green-500",
- "ring-offset": "focus:ring-offset-green-200",
- text: "text-white",
- }
- } else if (this.color === "yellow") {
- return {
- main: "bg-yellow-600",
- hover: "hover:bg-yellow-700",
- ring: "focus:ring-yellow-500",
- "ring-offset": "focus:ring-offset-yellow-200",
- text: "text-white",
- }
- } else if (this.color === "white") {
- return {
- main: "bg-transparent border border-gray-300",
- hover: "hover:bg-gray-200",
- ring: "focus:ring-white-500",
- "ring-offset": "focus:ring-offset-white-200",
- text: "text-gray-700",
- }
- }else{
-
- console.error("Unknown color")
- return null
- }
- },
- sizes() {
- if (this.size === "small") {
- return {
- font: "sm",
- "p-y": "py-1",
- "p-x": "px-2",
- }
- }
- return {
- font: "base",
- "p-y": "py-2",
- "p-x": "px-4",
- }
- },
- },
-}
-</script>
diff --git a/client/components/global/WorkspaceDropdown.vue b/client/components/global/WorkspaceDropdown.vue
deleted file mode 100644
index b9f6320b4..000000000
--- a/client/components/global/WorkspaceDropdown.vue
+++ /dev/null
@@ -1,96 +0,0 @@
-<template>
- <Dropdown
- v-if="user && workspaces && workspaces.length > 1"
- ref="dropdown"
- dropdown-class="origin-top-left absolute left-0 mt-2 w-56 rounded-md shadow-lg bg-white dark:bg-gray-800 ring-1 ring-black ring-opacity-5 z-50"
- dusk="workspace-dropdown"
- >
- <template
- v-if="workspace"
- #trigger="{ toggle }"
- >
- <div
- class="flex items-center cursor border border-transparent hover:border-gray-200 py-2 px-3 hover:bg-gray-50 rounded-md transition-colors"
- role="button"
- @click.stop="toggle()"
- >
- <WorkspaceIcon :workspace="workspace" />
- <p
- class="hidden md:block max-w-10 truncate text-sm ml-2 text-gray-800 dark:text-gray-200"
- >
- {{ workspace.name }}
- </p>
- </div>
- </template>
-
- <div class="px-1">
- <a
- v-for="worksp in workspaces"
- :key="worksp.id"
- href="#"
- class="px-4 py-2 text-md rounded text-gray-700 hover:no-underline hover:bg-neutral-50 hover:text-gray-900 dark:text-gray-100 dark:hover:text-white dark:hover:bg-gray-600 flex items-center"
- :class="{
- 'bg-blue-100 dark:bg-blue-900 hover:bg-blue-200':
- workspace?.id === worksp?.id,
- }"
- @click.prevent="switchWorkspace(worksp)"
- >
- <WorkspaceIcon :workspace="worksp" />
- <p class="ml-4 truncate text-sm">{{ worksp.name }}</p>
- </a>
- </div>
- </Dropdown>
-</template>
-
-<script>
-import { computed } from "vue"
-import Dropdown from "~/components/global/Dropdown.vue"
-import WorkspaceIcon from "~/components/workspaces/WorkspaceIcon.vue"
-
-export default {
- name: "WorkspaceDropdown",
- components: {
- WorkspaceIcon,
- Dropdown,
- },
-
- setup() {
- const authStore = useAuthStore()
- const formsStore = useFormsStore()
- const workspacesStore = useWorkspacesStore()
- return {
- formsStore,
- workspacesStore,
- user: computed(() => authStore.user),
- workspaces: computed(() => workspacesStore.getAll),
- loading: computed(() => workspacesStore.loading),
- }
- },
-
- computed: {
- workspace() {
- return this.workspacesStore.getCurrent
- },
- },
-
- watch: {},
-
- mounted() {},
-
- methods: {
- switchWorkspace(workspace) {
- this.workspacesStore.setCurrentId(workspace.id)
- this.formsStore.resetState()
- this.formsStore.loadAll(workspace.id)
- const router = useRouter()
- const route = useRoute()
- if (route.name !== "home") {
- router.push({ name: "home" })
- }
- this.formsStore.loadAll(workspace.id)
- },
- },
-}
-</script>
-
-<style></style>
diff --git a/client/components/layouts/AppSidebar.vue b/client/components/layouts/AppSidebar.vue
new file mode 100644
index 000000000..b12505016
--- /dev/null
+++ b/client/components/layouts/AppSidebar.vue
@@ -0,0 +1,138 @@
+<template>
+ <BaseSidebar>
+ <!-- Header Slot -->
+ <template #header>
+ <!-- Workspace Dropdown -->
+ <div class="grow">
+ <WorkspaceDropdown>
+ <template #default="{ workspace }">
+ <button
+ v-if="workspace"
+ class="flex items-center gap-2 p-2 rounded-md hover:bg-neutral-200 transition-colors min-w-32 text-left"
+ >
+ <WorkspaceIcon :workspace="workspace" />
+ <div class="flex-1 min-w-0">
+ <p class="text-sm font-medium text-neutral-800 truncate">
+ {{ workspace.name }}
+ </p>
+ </div>
+ </button>
+ </template>
+ </WorkspaceDropdown>
+ </div>
+
+ <!-- User Dropdown -->
+ <div class="flex gap-2 items-center">
+ <UserDropdown>
+ <template #default="{ user }">
+ <button
+ class="flex items-center gap-2 p-2 rounded-md hover:bg-neutral-200 transition-colors"
+ >
+ <img
+ :src="user?.photo_url"
+ class="rounded-full w-6 h-6"
+ :alt="user?.name"
+ >
+ </button>
+ </template>
+ </UserDropdown>
+ </div>
+ </template>
+
+ <!-- Navigation Slot -->
+ <template #navigation>
+ <div
+ v-for="(section, index) in navigationSections"
+ :key="section.name || 'main'"
+ :class="[
+ index !== navigationSections.length - 1 ? 'mb-6' : '',
+ // Push Product and Help sections to bottom
+ index === 1 ? 'mt-auto' : ''
+ ]"
+ >
+ <!-- Section Title (if exists) -->
+ <h3
+ v-if="section.name"
+ class="text-xs font-medium text-neutral-400 tracking-wider mb-2 px-3"
+ >
+ {{ section.name }}
+ </h3>
+
+ <!-- Section Items -->
+ <NavigationList
+ :items="section.items"
+ tracking-name="sidebar_nav_click"
+ :tracking-properties="(item) => ({ label: item.label })"
+ />
+ </div>
+ </template>
+ </BaseSidebar>
+</template>
+
+<script setup>
+import BaseSidebar from "~/components/layouts/BaseSidebar.vue"
+import WorkspaceDropdown from "~/components/dashboard/WorkspaceDropdown.vue"
+import WorkspaceIcon from "~/components/workspaces/WorkspaceIcon.vue"
+import UserDropdown from "~/components/dashboard/UserDropdown.vue"
+import NavigationList from "~/components/global/NavigationList.vue"
+import { useSharedNavigation } from "~/composables/components/useSharedNavigation"
+
+const route = useRoute()
+
+const { sharedNavigationSections, createNavItem } = useSharedNavigation()
+
+const { current: workspace } = useCurrentWorkspace()
+const isSelfHosted = computed(() => useFeatureFlag('self_hosted'))
+const { openSubscriptionModal } = useAppModals()
+
+// Check if current route matches a prefix
+function isActiveRoute(prefix) {
+ if (!prefix) return false
+ return route.name?.startsWith(prefix)
+}
+
+// Navigation sections structure
+const navigationSections = computed(() => [
+ // Section 1: Main navigation (no name)
+ {
+ name: null,
+ items: [
+ createNavItem({
+ label: 'Create Form',
+ icon: 'i-heroicons-plus',
+ to: { name: 'forms-create' },
+ active: isActiveRoute('forms-create'),
+ color: 'primary',
+ variant: 'ghost',
+ kbd: ['N'],
+ }),
+ createNavItem({
+ label: 'Home',
+ icon: 'i-heroicons-home',
+ to: { name: 'home' },
+ active: isActiveRoute('home')
+ }),
+ createNavItem({
+ label: 'Templates',
+ icon: 'i-heroicons-document-duplicate',
+ to: { name: 'templates-my-templates' },
+ active: isActiveRoute('templates')
+ }),
+ // Show upgrade for non-pro users
+ ...(workspace.value && !workspace.value.is_pro && !isSelfHosted.value ? [createNavItem({
+ label: 'Try our Pro plan',
+ icon: 'i-heroicons-sparkles-solid',
+ onClick: () => {
+ useAmplitude().logEvent('app_sidebar_upgrade_click')
+ openSubscriptionModal({
+ modal_title: 'Try our Pro plan for free today!',
+ })
+ },
+ color: 'primary' // Override default color
+ })] : [])
+ ]
+ },
+ // Add shared navigation sections (Product and Help)
+ ...sharedNavigationSections.value
+])
+</script>
\ No newline at end of file
diff --git a/client/components/layouts/BaseSidebar.vue b/client/components/layouts/BaseSidebar.vue
new file mode 100644
index 000000000..6ba4508c8
--- /dev/null
+++ b/client/components/layouts/BaseSidebar.vue
@@ -0,0 +1,112 @@
+<template>
+ <aside
+ :class="[
+ 'bg-neutral-100 border-neutral-200 flex flex-col transition-all duration-300 ease-in-out z-[60]',
+ isMobileMenuOpen
+ ? 'fixed inset-0'
+ : 'sticky top-0 w-full h-[49px] overflow-hidden sm:flex sm:fixed sm:h-full sm:w-58 sm:border-r',
+ ]"
+ >
+ <!-- Top Section - Only show if there's header content or on mobile -->
+ <div
+ v-if="hasHeaderContent || isMobileMenuOpen"
+ class="p-1 border-b border-neutral-200 h-[49px]"
+ >
+ <div class="flex items-center justify-between gap-1 w-full">
+ <!-- Header Content Slot -->
+ <slot name="header" :isMobileMenuOpen="isMobileMenuOpen" />
+
+ <div class="grow" v-if="hasMobileHeaderContent">
+ <slot name="mobile-header" :isMobileMenuOpen="isMobileMenuOpen" />
+ </div>
+
+ <!-- Mobile Menu Toggle -->
+ <div :class="{ 'sm:hidden': !isMobileMenuOpen }">
+ <UButton
+ square
+ size="xl"
+ class="hover:bg-neutral-200/80"
+ :icon="isMobileMenuOpen ? 'i-heroicons-x-mark' : 'i-heroicons-bars-3'"
+ variant="ghost"
+ color="neutral"
+ @click="isMobileMenuOpen = !isMobileMenuOpen"
+ />
+ </div>
+ </div>
+ </div>
+
+ <!-- Mobile Menu Toggle (when header is hidden on desktop) -->
+ <div
+ v-else
+ class="sm:hidden p-1 border-b border-neutral-200 h-[49px] flex items-center justify-start gap-2"
+ >
+ <div class="grow">
+ <slot name="mobile-header" :isMobileMenuOpen="isMobileMenuOpen" />
+ </div>
+ <UButton
+ square
+ size="xl"
+ class="hover:bg-neutral-200/80"
+ icon="i-heroicons-bars-3"
+ variant="ghost"
+ color="neutral"
+ @click="isMobileMenuOpen = !isMobileMenuOpen"
+ />
+ </div>
+
+ <!-- Navigation Content -->
+ <nav
+ class="flex-1 p-2 overflow-y-auto flex flex-col"
+ :class="{ 'hidden': !isMobileMenuOpen, 'sm:flex': true }"
+ >
+ <slot name="navigation" :isMobileMenuOpen="isMobileMenuOpen" />
+ </nav>
+
+ <!-- Footer -->
+ <div
+ class="p-2 border-t border-neutral-200"
+ :class="{ 'hidden': !isMobileMenuOpen, 'sm:block': true }"
+ >
+ <slot name="footer" :isMobileMenuOpen="isMobileMenuOpen">
+ <p class="text-xs text-neutral-400 text-center">
+ <span class="font-bold"><NuxtLink class="text-neutral-400" :to="{ name: 'home' }">OpnForm</NuxtLink></span>
+ <span class="text-neutral-500" v-if="version"> v{{ version }}</span>
+ </p>
+ </slot>
+ </div>
+ </aside>
+</template>
+
+<script setup>
+const slots = useSlots()
+
+const isMobileMenuOpen = ref(false)
+const version = computed(() => useFeatureFlag('version'))
+
+// Check if header slot has content
+const hasHeaderContent = computed(() => {
+ return !!(slots.header && slots.header().length > 0)
+})
+
+const hasMobileHeaderContent = computed(() => {
+ return !!(slots['mobile-header'] && slots['mobile-header']().length > 0)
+})
+
+// Handle body overflow when mobile menu is open
+watchEffect(() => {
+ if (import.meta.client) {
+ document.body.classList.toggle('overflow-hidden', isMobileMenuOpen.value)
+ }
+})
+
+onUnmounted(() => {
+ if (import.meta.client) {
+ document.body.classList.remove('overflow-hidden')
+ }
+})
+
+// Expose the mobile menu state to parent components
+defineExpose({
+ isMobileMenuOpen
+})
+</script>
\ No newline at end of file
diff --git a/client/components/layouts/FormSidebar.vue b/client/components/layouts/FormSidebar.vue
new file mode 100644
index 000000000..2cbdb29bc
--- /dev/null
+++ b/client/components/layouts/FormSidebar.vue
@@ -0,0 +1,144 @@
+<template>
+ <BaseSidebar>
+
+ <template #mobile-header>
+ <h1 class="sm:hidden text-base font-medium text-neutral-500 tracking-wider px-2 truncate">
+ {{ loading ? 'Loading...' : form?.title }}
+ </h1>
+ </template>
+
+ <!-- Navigation Slot -->
+ <template #navigation>
+ <div
+ v-for="(section, index) in navigationSections"
+ :key="section.name || 'main'"
+ :class="[
+ index !== navigationSections.length - 1 ? 'mb-6' : '',
+ // Push Product and Help sections to bottom
+ index === 1 ? 'mt-auto' : ''
+ ]"
+ >
+ <!-- Section Title (if exists) -->
+ <h3
+ v-if="section.name"
+ class="text-xs font-medium text-neutral-400 tracking-wider mb-2 px-3"
+ >
+ {{ section.name }}
+ </h3>
+
+ <!-- Section Items -->
+ <NavigationList
+ :items="section.items"
+ :loading="loading"
+ :skeleton-filter="(item) => section.name === null && item.label !== 'Dashboard'"
+ tracking-name="sidebar_nav_click"
+ :tracking-properties="(item) => ({ label: item.label, form_id: form?.id })"
+ />
+ </div>
+ </template>
+ </BaseSidebar>
+</template>
+
+<script setup>
+import BaseSidebar from "~/components/layouts/BaseSidebar.vue"
+import NavigationList from "~/components/global/NavigationList.vue"
+import { useSharedNavigation } from "~/composables/components/useSharedNavigation"
+
+const props = defineProps({
+ form: {
+ type: Object,
+ required: false
+ },
+ loading: {
+ type: Boolean,
+ default: false
+ }
+})
+
+const route = useRoute()
+const { sharedNavigationSections, createNavItem } = useSharedNavigation()
+
+const { current: workspace } = useCurrentWorkspace()
+
+// Check if current route matches a prefix
+function isActiveRoute(routeName) {
+ if (!routeName) return false
+ return route.name === routeName
+}
+
+// Form navigation items
+const formNavigationItems = computed(() => [
+ // Dashboard back button - always show
+ createNavItem({
+ label: 'Dashboard',
+ icon: 'i-heroicons-arrow-left',
+ to: { name: 'home' },
+ active: false
+ }),
+ // Show skeleton placeholders when loading, otherwise show real items
+ ...(props.loading ? [
+ // These will be rendered as skeletons via the template
+ createNavItem({
+ label: 'Submissions',
+ icon: 'i-heroicons-document-text',
+ to: '#',
+ active: false
+ }),
+ createNavItem({
+ label: 'Integrations',
+ icon: 'i-heroicons-puzzle-piece',
+ to: '#',
+ active: false
+ }),
+ createNavItem({
+ label: 'Analytics',
+ icon: 'i-heroicons-chart-bar',
+ to: '#',
+ active: false
+ }),
+ createNavItem({
+ label: 'Share',
+ icon: 'i-heroicons-share',
+ to: '#',
+ active: false
+ })
+ ] : [
+ createNavItem({
+ label: 'Submissions',
+ icon: 'i-heroicons-document-text',
+ to: { name: 'forms-slug-show-submissions', params: { slug: props.form.slug } },
+ active: isActiveRoute('forms-slug-show-submissions')
+ }),
+ // Hide integrations for read-only workspaces
+ ...(workspace.value?.is_readonly ? [] : [createNavItem({
+ label: 'Integrations',
+ icon: 'i-heroicons-puzzle-piece',
+ to: { name: 'forms-slug-show-integrations', params: { slug: props.form.slug } },
+ active: isActiveRoute('forms-slug-show-integrations')
+ })]),
+ createNavItem({
+ label: 'Analytics',
+ icon: 'i-heroicons-chart-bar',
+ to: { name: 'forms-slug-show-stats', params: { slug: props.form.slug } },
+ active: isActiveRoute('forms-slug-show-stats')
+ }),
+ createNavItem({
+ label: 'Share',
+ icon: 'i-heroicons-share',
+ to: { name: 'forms-slug-show-share', params: { slug: props.form.slug } },
+ active: isActiveRoute('forms-slug-show-share')
+ })
+ ])
+])
+
+// Navigation sections structure
+const navigationSections = computed(() => [
+ // Section 1: Form navigation (no name)
+ {
+ name: null,
+ items: formNavigationItems.value
+ },
+ // Add shared navigation sections (Product and Help)
+ ...sharedNavigationSections.value
+])
+</script>
\ No newline at end of file
diff --git a/client/components/open/components/EditSubmissionModal.vue b/client/components/open/components/EditSubmissionModal.vue
index b339fdde9..0ad74ed7f 100644
--- a/client/components/open/components/EditSubmissionModal.vue
+++ b/client/components/open/components/EditSubmissionModal.vue
@@ -1,30 +1,30 @@
<template>
- <modal
- :show="show"
- max-width="lg"
- @close="emit('close')"
+ <UModal
+ v-model:open="isModalOpen"
+ title="Edit Submission"
>
- <open-form
- v-if="form"
- :form-manager="formManager"
- :theme="theme"
- @submit="updateForm"
- >
- <template #submit-btn="{ loading }">
- <v-button
- :loading="loading"
- class="mt-2 px-8 mx-1"
- @click.prevent="updateForm"
- >
- Update Submission
- </v-button>
- </template>
- </open-form>
- </modal>
+ <template #body>
+ <OpenForm
+ v-if="form"
+ :form-manager="formManager"
+ :theme="theme"
+ @submit="updateForm"
+ >
+ <template #submit-btn="{ loading }">
+ <UButton
+ class="mt-4"
+ :loading="loading"
+ @click.prevent="updateForm"
+ label="Update Submission"
+ />
+ </template>
+ </OpenForm>
+ </template>
+ </UModal>
</template>
<script setup>
-import { ref, defineProps, defineEmits } from "vue"
+import { ref, defineProps, defineEmits, computed } from "vue"
import OpenForm from "../forms/OpenForm.vue"
import CachedDefaultTheme from "~/lib/forms/themes/CachedDefaultTheme.js"
import { FormMode } from "~/lib/forms/FormModeStrategy.js"
@@ -45,6 +45,18 @@ const props = defineProps({
submission: { type: Object },
})
+// Modal state
+const isModalOpen = computed({
+ get() {
+ return props.show
+ },
+ set(value) {
+ if (!value) {
+ emit("close")
+ }
+ }
+})
+
// Set up form manager with proper mode
let formManager = null
const setupFormManager = () => {
diff --git a/client/components/open/components/RecordOperations.vue b/client/components/open/components/RecordOperations.vue
index d1815ab53..05dc22661 100644
--- a/client/components/open/components/RecordOperations.vue
+++ b/client/components/open/components/RecordOperations.vue
@@ -1,23 +1,31 @@
<template>
- <UButtonGroup
- size="xs"
- orientation="horizontal"
- >
- <UButton
- v-track.edit_record_click
- size="sm"
- color="white"
- icon="heroicons:pencil-square"
- @click="showEditSubmissionModal = true"
- />
- <UButton
- v-track.delete_record_click
- size="sm"
- color="white"
- icon="heroicons:trash"
- @click="onDeleteClick"
- />
- </UButtonGroup>
+ <div class="flex gap-1">
+ <TrackClick
+ name="edit_record_click"
+ :properties="{}"
+ >
+ <UButton
+ size="xs"
+ color="neutral"
+ variant="outline"
+ icon="heroicons:pencil-square"
+ @click="showEditSubmissionModal = true"
+ />
+ </TrackClick>
+ <TrackClick
+ name="delete_record_click"
+ :properties="{}"
+ >
+ <UButton
+ size="xs"
+ color="error"
+ variant="outline"
+ icon="heroicons:trash"
+ @click="onDeleteClick"
+ />
+ </TrackClick>
+ </div>
+
<EditSubmissionModal
:show="showEditSubmissionModal"
:form="form"
@@ -27,65 +35,43 @@
/>
</template>
-<script>
+<script setup>
import EditSubmissionModal from "./EditSubmissionModal.vue"
+import TrackClick from "~/components/global/TrackClick.vue"
+import { formsApi } from "~/api/forms"
-export default {
- components: { EditSubmissionModal },
- props: {
- form: {
- type: Object,
- required: true,
- },
- structure: {
- type: Array,
- default: () => [],
- },
- submission: {
- type: Object,
- default: () => {},
- },
+const props = defineProps({
+ form: {
+ type: Object,
+ required: true,
},
- emits: ["updated", "deleted"],
- setup() {
- return {
- useAlert: useAlert(),
- }
- },
- data() {
- return {
- showEditSubmissionModal: false,
- }
- },
- computed: {},
- mounted() {},
- methods: {
- onDeleteClick() {
- this.useAlert.confirm(
- "Do you really want to delete this record?",
- this.deleteRecord,
- )
- },
- async deleteRecord() {
- opnFetch(
- "/open/forms/" +
- this.form.id +
- "/submissions/" +
- this.submission.id,
- { method: "DELETE" },
- )
- .then(async (data) => {
- if (data.type === "success") {
- this.$emit("deleted", this.submission)
- this.useAlert.success(data.message)
- } else {
- this.useAlert.error("Something went wrong!")
- }
- })
- .catch((error) => {
- this.useAlert.error(error.data.message)
- })
- },
+ submission: {
+ type: Object,
+ default: () => {},
},
+})
+
+const emit = defineEmits(["updated", "deleted"])
+
+const alert = useAlert()
+const showEditSubmissionModal = ref(false)
+
+const onDeleteClick = () => {
+ alert.confirm("Do you really want to delete this record?", deleteRecord)
+}
+
+const deleteRecord = () => {
+ formsApi.submissions.delete(props.form.id, props.submission.id)
+ .then((data) => {
+ if (data.type === "success") {
+ emit("deleted", props.submission)
+ alert.success(data.message)
+ } else {
+ alert.error("Something went wrong!")
+ }
+ })
+ .catch((error) => {
+ alert.error(error.data.message)
+ })
}
</script>
diff --git a/client/components/open/editors/EditorOptionsPanel.vue b/client/components/open/editors/EditorOptionsPanel.vue
index 836ac6091..c53b5c4ad 100644
--- a/client/components/open/editors/EditorOptionsPanel.vue
+++ b/client/components/open/editors/EditorOptionsPanel.vue
@@ -7,7 +7,7 @@
<div class="flex items-center pr-8 space-x-2">
<div
class="mr-3"
- :class="{ 'text-blue-600': show, 'text-gray-500': !show }"
+ :class="{ 'text-blue-600': show, 'text-neutral-500': !show }"
>
<slot name="icon" />
</div>
@@ -26,8 +26,8 @@
</template>
<script>
-import Collapse from "~/components/global/Collapse.vue"
-import ProTag from "~/components/global/ProTag.vue"
+import Collapse from "~/components/app/Collapse.vue"
+import ProTag from "~/components/app/ProTag.vue"
export default {
name: "EditorOptionsPanel",
diff --git a/client/components/open/editors/EditorRightSidebar.vue b/client/components/open/editors/EditorRightSidebar.vue
index f456a6450..e3eb35629 100644
--- a/client/components/open/editors/EditorRightSidebar.vue
+++ b/client/components/open/editors/EditorRightSidebar.vue
@@ -4,7 +4,7 @@
v-if="show"
ref="sidebar"
:class="widthClass"
- class="absolute shadow-lg shadow-gray-800/30 top-0 h-[calc(100vh-53px)] right-0 lg:shadow-none lg:relative bg-white w-full md:w-1/2 lg:w-2/5 border-l overflow-y-scroll flex-shrink-0 z-30"
+ class="absolute shadow-lg shadow-neutral-800/30 top-0 h-[calc(100vh-53px)] right-0 lg:shadow-none lg:relative bg-white w-full md:w-1/2 lg:w-2/5 border-l overflow-y-scroll flex-shrink-0 z-30"
>
<slot />
</div>
diff --git a/client/components/open/editors/FontCard.vue b/client/components/open/editors/FontCard.vue
index 3c186c888..d19fda520 100644
--- a/client/components/open/editors/FontCard.vue
+++ b/client/components/open/editors/FontCard.vue
@@ -1,7 +1,7 @@
<template>
<div
- class="flex flex-col p-3 rounded-md shadow border-gray-200 border-[0.5px] justify-between w-full cursor-pointer hover:ring ring-blue-300 relative"
- :class="{'ring': isSelected }"
+ class="flex flex-col p-3 rounded-md shadow border-neutral-200 border-[0.5px] transition-colors justify-between w-full cursor-pointer ring-blue-300 relative"
+ :class="{'ring bg-blue-100': isSelected, 'bg-white hover:ring-2 hover:bg-blue-50': !isSelected}"
@click="$emit('select-font')"
>
<template v-if="isVisible">
@@ -28,7 +28,7 @@
/>
</div>
- <div class="text-gray-400 flex justify-between">
+ <div class="text-neutral-400 flex justify-between">
<p class="text-xs">
{{ fontName }}
</p>
@@ -36,7 +36,7 @@
<Icon
v-if="isSelected"
name="heroicons:check-circle-16-solid"
- class="w-5 h-5 text-nt-blue absolute bottom-4 right-4"
+ class="w-5 h-5 text-blue-500 absolute bottom-4 right-4"
/>
</div>
</template>
diff --git a/client/components/open/editors/GoogleFontPicker.vue b/client/components/open/editors/GoogleFontPicker.vue
index 0a1b7a21b..14f87967c 100644
--- a/client/components/open/editors/GoogleFontPicker.vue
+++ b/client/components/open/editors/GoogleFontPicker.vue
@@ -1,66 +1,55 @@
<template>
- <modal
- :show="show"
- :compact-header="true"
- @close="$emit('close')"
+ <UModal
+ v-model:open="isOpen"
+ :ui="{ content: 'sm:max-w-2xl' }"
+ title="Google fonts"
>
- <template #icon>
- <Icon
- name="ci:font"
- class="w-10 h-10 text-blue"
- />
- </template>
- <template #title>
- Google fonts
- </template>
-
- <div v-if="loading">
- <Loader class="h-6 w-6 text-nt-blue mx-auto" />
- </div>
- <div v-else>
- <text-input
- v-model="search"
-
- name="search"
- placeholder="Search fonts"
- />
-
- <div
- ref="scrollContainer"
- class="grid grid-cols-3 gap-2 p-5 mb-5 overflow-y-scroll max-h-[24rem] border rounded-md"
- >
- <FontCard
- v-for="(fontName, index) in enrichedFonts"
- :key="fontName"
- :ref="el => setFontRef(el, index)"
- :font-name="fontName"
- :is-visible="visible[index]"
- :is-selected="selectedFont === fontName"
- @select-font="selectedFont = fontName"
- />
+ <template #body>
+ <div v-if="loading">
+ <Loader class="h-6 w-6 text-blue-500 mx-auto" />
</div>
+ <div v-else>
+ <text-input
+ v-model="search"
+ name="search"
+ placeholder="Search fonts"
+ />
- <div class="flex">
- <UButton
- size="md"
- color="white"
- class="mr-2"
- @click="$emit('apply', null)"
+ <div
+ ref="scrollContainer"
+ class="grid grid-cols-3 gap-2 p-5 mb-5 overflow-y-scroll max-h-[24rem] border rounded-md bg-neutral-50"
>
- Reset
- </UButton>
- <UButton
- size="md"
- :disabled="!selectedFont"
- block
- class="flex-1"
- @click="$emit('apply', selectedFont)"
- >
- Apply
- </UButton>
+ <FontCard
+ v-for="(fontName, index) in enrichedFonts"
+ :key="fontName"
+ :ref="el => setFontRef(el, index)"
+ :font-name="fontName"
+ :is-visible="visible[index]"
+ :is-selected="selectedFont === fontName"
+ @select-font="selectedFont = fontName"
+ />
+ </div>
</div>
- </div>
- </modal>
+ </template>
+
+ <template #footer>
+ <UButton
+ size="md"
+ color="neutral"
+ variant="outline"
+ @click="$emit('apply', null)"
+ >
+ Reset
+ </UButton>
+ <UButton
+ size="md"
+ :disabled="!selectedFont"
+ @click="$emit('apply', selectedFont)"
+ >
+ Apply
+ </UButton>
+ </template>
+ </UModal>
</template>
<script setup>
@@ -68,6 +57,7 @@ import { defineEmits } from "vue"
import Fuse from "fuse.js"
import { refDebounced, useElementVisibility } from "@vueuse/core"
import FontCard from './FontCard.vue'
+import { contentApi } from "~/api"
const props = defineProps({
show: {
@@ -80,7 +70,18 @@ const props = defineProps({
},
})
-defineEmits(['close','apply'])
+// Modal state
+const isOpen = computed({
+ get: () => props.show,
+ set: (value) => {
+ if (!value) {
+ emit('close')
+ }
+ }
+})
+
+const emit = defineEmits(['close', 'apply'])
+
const loading = ref(false)
const fonts = ref([])
const selectedFont = ref(props.font || null)
@@ -117,7 +118,7 @@ const fetchFonts = async () => {
if (props.show) {
selectedFont.value = props.font || null
loading.value = true
- opnFetch('/fonts/').then((data) => {
+ contentApi.fonts.list().then((data) => {
fonts.value = data || []
loading.value = false
initializeVisibilityTracking()
diff --git a/client/components/open/editors/UndoRedo.vue b/client/components/open/editors/UndoRedo.vue
index 527a0214f..db28bb204 100644
--- a/client/components/open/editors/UndoRedo.vue
+++ b/client/components/open/editors/UndoRedo.vue
@@ -4,29 +4,31 @@
orientation="horizontal"
class="shadow-none"
>
- <UTooltip
- text="Undo"
- :shortcuts="[metaSymbol,'Z']"
+ <UTooltip
+ text="Undo"
+ :kbds="['meta','Z']"
:popper="{ placement: 'left' }"
>
<UButton
:disabled="!canUndo"
- color="white"
+ color="neutral"
+ variant="outline"
icon="i-material-symbols-undo"
- class="disabled:text-gray-500 shadow-none"
+ class="disabled:text-neutral-500 shadow-none"
@click="undo"
/>
</UTooltip>
- <UTooltip
- text="Redo"
- :shortcuts="[metaSymbol,'Shift','Z']"
+ <UTooltip
+ text="Redo"
+ :kbds="['meta','Shift','Z']"
:popper="{ placement: 'right' }"
>
<UButton
:disabled="!canRedo"
icon="i-material-symbols-redo"
- color="white"
- class="disabled:text-gray-500 shadow-none"
+ color="neutral"
+ variant="outline"
+ class="disabled:text-neutral-500 shadow-none"
@click="redo"
/>
</UTooltip>
@@ -34,10 +36,17 @@
</template>
<script setup>
-const workingFormStore = useWorkingFormStore()
+const props = defineProps({
+ editor: { type: String, default: 'form' }
+})
+
+let workingStore = useWorkingFormStore()
+if (props.editor === 'view') {
+ workingStore = useWorkingViewStore()
+}
-const { undo, redo, clearHistory } = workingFormStore
-const { canUndo, canRedo } = storeToRefs(workingFormStore)
+const { undo, redo, clearHistory } = workingStore
+const { canUndo, canRedo } = storeToRefs(workingStore)
defineShortcuts({
meta_z: {
@@ -53,10 +62,7 @@ defineShortcuts({
}
}
})
-const { metaSymbol } = useShortcuts()
-
onMounted(() => {
setTimeout(() => { clearHistory() }, 500)
})
-
</script>
diff --git a/client/components/open/forms/FormProgressbar.vue b/client/components/open/forms/FormProgressbar.vue
index 602e1b53d..20c985422 100644
--- a/client/components/open/forms/FormProgressbar.vue
+++ b/client/components/open/forms/FormProgressbar.vue
@@ -4,7 +4,7 @@
v-if="isIframe"
class="mb-4 p-2"
>
- <div class="w-full h-2 bg-gray-200 dark:bg-gray-600 relative border rounded-full overflow-hidden">
+ <div class="w-full h-2 bg-neutral-200 dark:bg-neutral-600 relative border rounded-full overflow-hidden">
<div
class="h-full transition-all duration-300 rounded-r-full"
:class="{ 'w-0': formProgress === 0 }"
@@ -16,7 +16,7 @@
v-else
class="fixed top-0 left-0 right-0 z-50"
>
- <div class="w-full h-[0.2rem] bg-gray-200 dark:bg-gray-600 relative overflow-hidden">
+ <div class="w-full h-[0.2rem] bg-neutral-200 dark:bg-neutral-600 relative overflow-hidden">
<div
class="h-full transition-all duration-300"
:class="{ 'w-0': formProgress === 0 }"
diff --git a/client/components/open/forms/OpenCompleteForm.vue b/client/components/open/forms/OpenCompleteForm.vue
index fca579c6a..98259d637 100644
--- a/client/components/open/forms/OpenCompleteForm.vue
+++ b/client/components/open/forms/OpenCompleteForm.vue
@@ -3,7 +3,7 @@
v-if="form"
class="open-complete-form"
:dir="form?.layout_rtl ? 'rtl' : 'ltr'"
- :style="{ '--font-family': form.font_family, 'direction': form?.layout_rtl ? 'rtl' : 'ltr', '--form-color': form.color, '--form': form.color }"
+ :style="formStyle"
>
<ClientOnly>
<Teleport to="head">
@@ -20,12 +20,12 @@
<v-transition name="fade" mode="out-in">
<div v-if="isAutoSubmit" key="auto-submit" class="text-center p-6">
- <Loader class="h-6 w-6 text-nt-blue mx-auto" />
+ <Loader class="h-6 w-6 text-blue-500 mx-auto" />
</div>
<div v-else key="form-content">
<div v-if="isPublicFormPage && form.is_password_protected">
- <p class="form-description text-gray-700 dark:text-gray-300 px-2">
+ <p class="form-description text-neutral-700 dark:text-neutral-300 px-2">
{{ t('forms.password_protected') }}
</p>
<div class="form-group flex flex-wrap w-full">
@@ -41,8 +41,7 @@
</div>
<div class="flex flex-wrap justify-center w-full text-center">
<open-form-button
- :theme="theme"
- :color="form.color"
+ :form="form"
class="my-4"
@click="passwordEntered"
>
@@ -54,8 +53,8 @@
<div v-if="!form.is_password_protected && form.password && !hidePasswordDisabledMsg"
class="m-2 my-4">
<UAlert
- :close-button="{ icon: 'i-heroicons-x-mark-20-solid', color: 'gray', variant: 'link', padded: false }"
- color="amber"
+ :close-button="{ icon: 'i-heroicons-x-mark-20-solid', color: 'neutral', variant: 'link', padded: false }"
+ color="warning"
variant="subtle"
icon="i-material-symbols-info-outline"
@close="hidePasswordDisabledMsg = true"
@@ -67,7 +66,7 @@
<UAlert
v-if="isPublicFormPage && (form.is_closed || form.visibility=='closed')"
icon="i-heroicons-lock-closed-20-solid"
- color="amber"
+ color="warning"
variant="subtle"
class="m-2 my-4"
>
@@ -82,7 +81,7 @@
<UAlert
v-else-if="isPublicFormPage && form.max_number_of_submissions_reached"
icon="i-heroicons-lock-closed-20-solid"
- color="amber"
+ color="warning"
variant="subtle"
class="m-2 my-4"
>
@@ -100,6 +99,7 @@
class="mb-4 mx-2"
:form="form"
:specify-form-owner="true"
+ :use-cookie-dismissal="true"
/>
<v-transition name="fade" v-if="form && !form.is_password_protected">
@@ -116,8 +116,7 @@
<template #submit-btn="{loading}">
<open-form-button
:loading="loading || isProcessing"
- :theme="theme"
- :color="form.color"
+ :form="form"
class="mt-2 px-8 mx-1"
:class="submitButtonClass"
@click.prevent="triggerSubmit"
@@ -126,18 +125,7 @@
</open-form-button>
</template>
</open-form>
- <p
- v-if="!form.no_branding"
- class="text-center w-full mt-2"
- >
- <a
- href="https://opnform.com?utm_source=form&utm_content=powered_by"
- class="text-gray-400 hover:text-gray-500 dark:text-gray-600 dark:hover:text-gray-500 cursor-pointer hover:underline text-xs"
- target="_blank"
- >
- {{ t('forms.powered_by') }} <span class="font-semibold">{{ t('app.name') }}</span>
- </a>
- </p>
+ <PoweredBy v-if="!form.no_branding && formModeStrategy.display.showBranding" :color="form.color" />
</div>
<div
v-else
@@ -146,7 +134,7 @@
>
<TextBlock
v-if="form.submitted_text"
- class="form-description text-gray-700 dark:text-gray-300 whitespace-pre-wrap"
+ class="form-description text-neutral-700 dark:text-neutral-300 whitespace-pre-wrap"
:content="form.submitted_text"
:mentions-allowed="true"
:form="form"
@@ -154,8 +142,7 @@
/>
<open-form-button
v-if="form.re_fillable"
- :theme="theme"
- :color="form.color"
+ :form="form"
class="my-4"
@click="restart"
>
@@ -168,19 +155,19 @@
<a
target="_parent"
:href="form.share_url+'?submission_id='+submissionId"
- class="text-nt-blue hover:underline"
+ class="text-blue-500 hover:underline"
>
{{ form.editable_submissions_button_text }}
</a>
</p>
<p
- v-if="!form.no_branding"
+ v-if="!form.no_branding && formModeStrategy.display.showBranding"
class="mt-5"
>
<a
target="_parent"
href="https://opnform.com/?utm_source=form&utm_content=create_form_free"
- class="text-nt-blue hover:underline"
+ class="text-blue-500 hover:underline"
>
{{ t('forms.create_form_free') }}
</a>
@@ -199,19 +186,20 @@
<script setup>
import { useFormManager } from '~/lib/forms/composables/useFormManager'
-import { FormMode } from "~/lib/forms/FormModeStrategy.js"
+import { FormMode, createFormModeStrategy } from "~/lib/forms/FormModeStrategy.js"
import ThemeBuilder from "~/lib/forms/themes/ThemeBuilder.js"
import OpenForm from './OpenForm.vue'
import OpenFormButton from './OpenFormButton.vue'
import FormCleanings from '../../pages/forms/show/FormCleanings.vue'
import VTransition from '~/components/global/transitions/VTransition.vue'
import FirstSubmissionModal from '~/components/open/forms/components/FirstSubmissionModal.vue'
-import TextBlock from '~/components/forms/TextBlock.vue'
+import PoweredBy from '../../pages/forms/show/PoweredBy.vue'
import { useForm } from '~/composables/useForm'
import { useAlert } from '~/composables/useAlert'
import { useI18n } from 'vue-i18n'
import { useIsIframe } from '~/composables/useIsIframe'
import Loader from '~/components/global/Loader.vue'
+import { tailwindcssPaletteGenerator } from '~/lib/colors.js'
const props = defineProps({
form: { type: Object, required: true },
@@ -231,10 +219,9 @@ const emit = defineEmits(['submitted', 'password-entered', 'restarted'])
const { t, setLocale } = useI18n()
const route = useRoute()
-const authStore = useAuthStore()
const alert = useAlert()
const workingFormStore = useWorkingFormStore()
-
+const { data: user } = useAuth().user()
const passwordForm = useForm({ password: null })
const hidePasswordDisabledMsg = ref(false)
const submissionId = ref(route.query.submission_id || null)
@@ -246,6 +233,8 @@ const queryString = route.fullPath.split('?')[1] || ''
// Check for auto_submit parameter during setup
const isAutoSubmit = ref(import.meta.client && window.location.href.includes('auto_submit=true'))
+const formModeStrategy = computed(() => createFormModeStrategy(props.mode))
+
// Create a reactive reference directly from the prop
const darkModeRef = toRef(props, 'darkMode')
// Create a reactive reference for the mode prop
@@ -258,6 +247,7 @@ const theme = computed(() => {
borderRadius: props.form.border_radius
}).getAllComponents()
})
+provide('theme', theme)
let formManager = null
if (props.form) {
@@ -320,7 +310,8 @@ const getFontUrl = computed(() => {
})
const isFormOwner = computed(() => {
- return authStore.check && props.form && props.form.creator_id === authStore.user.id
+ const { isAuthenticated } = useIsAuthenticated()
+ return isAuthenticated.value && props.form && props.form.creator_id === user.value.id
})
const isFormSubmitted = computed(() => formManager?.state.isSubmitted ?? false)
@@ -331,6 +322,25 @@ const shouldDisplayForm = computed(() => {
return (!props.form.is_closed && !props.form.max_number_of_submissions_reached) || formManager?.strategy?.value.admin?.showAdminControls
})
+const formStyle = computed(() => {
+ const baseStyle = {
+ '--font-family': props.form.font_family,
+ 'direction': props.form?.layout_rtl ? 'rtl' : 'ltr',
+ '--form-color': props.form.color,
+ '--color-form': props.form.color
+ }
+
+ // Generate color palette variants
+ if (props.form.color) {
+ const colorPalette = tailwindcssPaletteGenerator(props.form.color).primary
+ Object.entries(colorPalette).forEach(([shade, colorValue]) => {
+ baseStyle[`--color-form-${shade}`] = colorValue
+ })
+ }
+
+ return baseStyle
+})
+
watch(() => props.form.language, (newLanguage) => {
if (newLanguage && typeof newLanguage === 'string') {
setLocale(newLanguage)
@@ -361,7 +371,7 @@ const handleScrollToError = () => {
})
}
-const triggerSubmit = async () => {
+const triggerSubmit = () => {
if (!formManager || isProcessing.value) return
formManager.submit({
@@ -379,12 +389,13 @@ const triggerSubmit = async () => {
}
emit('submitted', true)
- } else {
+ } else {
console.warn('Form submission failed via composable, but no error thrown?')
alert.error(t('forms.submission_error'))
}
})
.catch(error => {
+ console.error(error)
if (error.response && error.response.status === 422 && error.data) {
useAlert().formValidationError(error.data)
} else if (error.message) {
@@ -396,12 +407,13 @@ const triggerSubmit = async () => {
})
}
-const restart = async () => {
+const restart = () => {
if (!formManager) return
- await formManager.restart()
- submittedData.value = null
- submissionId.value = null
- emit('restarted', true)
+ formManager.restart().then(() => {
+ submittedData.value = null
+ submissionId.value = null
+ emit('restarted', true)
+ })
}
const passwordEntered = () => {
diff --git a/client/components/open/forms/OpenForm.vue b/client/components/open/forms/OpenForm.vue
index a56d8b7af..6bca48af7 100644
--- a/client/components/open/forms/OpenForm.vue
+++ b/client/components/open/forms/OpenForm.vue
@@ -21,7 +21,7 @@
item-key="id"
class="grid grid-cols-12 relative transition-all w-full"
:class="[
- draggingNewBlock ? 'rounded-md bg-blue-50 dark:bg-gray-800' : '',
+ draggingNewBlock ? 'rounded-md bg-blue-50 dark:bg-neutral-800' : '',
]"
ghost-class="ghost-item"
filter=".not-draggable"
@@ -54,8 +54,7 @@
<open-form-button
v-if="formPageIndex>0 && previousFieldsPageBreak"
native-type="button"
- :color="form.color"
- :theme="theme"
+ :form="form"
class="mt-2 px-8 mx-1"
@click="handlePreviousClick"
>
@@ -70,8 +69,7 @@
<open-form-button
v-else-if="currentFieldsPageBreak"
native-type="button"
- :color="form.color"
- :theme="theme"
+ :form="form"
class="mt-2 px-8 mx-1"
:loading="isProcessing"
@click.stop="handleNextClick"
@@ -85,7 +83,7 @@
v-if="hasPaymentBlock"
class="mt-6 flex justify-center w-full"
>
- <p class="text-xs text-gray-400 dark:text-gray-500 flex text-center max-w-md">
+ <p class="text-xs text-neutral-400 dark:text-neutral-500 flex text-center max-w-md">
{{ $t('forms.payment.payment_disclaimer') }}
</p>
</div>
@@ -96,7 +94,7 @@
<script setup>
import draggable from 'vuedraggable'
import OpenFormButton from './OpenFormButton.vue'
-import CaptchaWrapper from '~/components/forms/components/CaptchaWrapper.vue'
+import CaptchaWrapper from '~/components/forms/heavy/components/CaptchaWrapper.vue'
import OpenFormField from './OpenFormField.vue'
import FormProgressbar from './FormProgressbar.vue'
import { useWorkingFormStore } from '~/stores/working_form'
@@ -143,9 +141,10 @@ const handlePreviousClick = () => {
if (import.meta.client) window.scrollTo({ top: 0, behavior: 'smooth' })
}
-const handleNextClick = async () => {
- await props.formManager.nextPage()
- if (import.meta.client) window.scrollTo({ top: 0, behavior: 'smooth' })
+const handleNextClick = () => {
+ props.formManager.nextPage().then(() => {
+ if (import.meta.client) window.scrollTo({ top: 0, behavior: 'smooth' })
+ })
}
const handleDragDropped = (data) => {
diff --git a/client/components/open/forms/OpenFormButton.vue b/client/components/open/forms/OpenFormButton.vue
index cfe35c478..c6d15ee14 100644
--- a/client/components/open/forms/OpenFormButton.vue
+++ b/client/components/open/forms/OpenFormButton.vue
@@ -1,102 +1,78 @@
<template>
- <button
+ <UButton
+ color="form"
:type="nativeType"
:disabled="loading ? true : null"
- :class="[`py-${sizes['p-y']} px-${sizes['p-x']} text-${sizes['font']}`,theme.Button.body,theme.Button.borderRadius]"
- :style="buttonStyle"
- class="btn"
+ :loading="loading"
+ :class="['btn', buttonClass]"
+ :size="buttonSize"
>
- <template v-if="!loading">
- <slot />
- </template>
- <Loader
- v-else
- class="h-6 w-6 text-white mx-auto"
- />
- </button>
+ <slot />
+ </UButton>
</template>
-<script>
-import CachedDefaultTheme from "~/lib/forms/themes/CachedDefaultTheme.js"
-export default {
- name: "OpenFormButton",
-
- props: {
- color: {
- type: String,
- required: true,
- },
-
- size: {
- type: String,
- default: "medium",
- },
-
- nativeType: {
- type: String,
- default: "submit",
- },
-
- loading: {
- type: Boolean,
- default: false,
- },
-
- theme: {
- type: Object, default: () => {
- const theme = inject("theme", null)
- if (theme) {
- return theme.value
- }
- return CachedDefaultTheme.getInstance()
- }
- },
+<script setup>
+const props = defineProps({
+ form: {
+ type: Object,
+ required: true,
},
-
- computed: {
- buttonStyle() {
- return {
- backgroundColor: this.color,
- color: this.getTextColor(this.color),
- "--tw-ring-color": this.color,
- }
- },
- sizes() {
- if (this.size === "small") {
- return {
- font: "sm",
- "p-y": "1",
- "p-x": "2",
- }
- }
- return {
- font: "base",
- "p-y": "2",
- "p-x": "4",
- }
- },
+ nativeType: {
+ type: String,
+ default: "submit",
},
-
- methods: {
- getTextColor(bgColor, lightColor = "#FFFFFF", darkColor = "#000000") {
- if (!bgColor) {
- return darkColor
- }
- const color =
- bgColor.charAt(0) === "#" ? bgColor.substring(1, 7) : bgColor
- const r = parseInt(color.substring(0, 2), 16) // hexToR
- const g = parseInt(color.substring(2, 4), 16) // hexToG
- const b = parseInt(color.substring(4, 6), 16) // hexToB
- const uicolors = [r / 255, g / 255, b / 255]
- const c = uicolors.map((col) => {
- if (col <= 0.03928) {
- return col / 12.92
- }
- return Math.pow((col + 0.055) / 1.055, 2.4)
- })
- const L = 0.2126 * c[0] + 0.7152 * c[1] + 0.0722 * c[2]
- return L > 0.45 ? darkColor : lightColor
- },
+ loading: {
+ type: Boolean,
+ default: false,
},
+})
+
+const getTextClass = (bgColor, lightColor = "text-white", darkColor = "text-neutral-900") => {
+ if (!bgColor) {
+ return darkColor
+ }
+ const color =
+ bgColor.charAt(0) === "#" ? bgColor.substring(1, 7) : bgColor
+ const r = parseInt(color.substring(0, 2), 16) // hexToR
+ const g = parseInt(color.substring(2, 4), 16) // hexToG
+ const b = parseInt(color.substring(4, 6), 16) // hexToB
+ const uicolors = [r / 255, g / 255, b / 255]
+ const c = uicolors.map((col) => {
+ if (col <= 0.03928) {
+ return col / 12.92
+ }
+ return Math.pow((col + 0.055) / 1.055, 2.4)
+ })
+ const L = 0.2126 * c[0] + 0.7152 * c[1] + 0.0722 * c[2]
+ return L > 0.45 ? darkColor : lightColor
}
+
+const buttonClass = computed(() => {
+ const classes = [
+ getTextClass(props.form.color),
+ ]
+
+
+ // Add border radius classes
+ if (props.form.border_radius) {
+ const radiusClasses = {
+ 'none': 'rounded-none',
+ 'full': 'rounded-full'
+ }
+ if (radiusClasses[props.form.border_radius]) {
+ classes.push(radiusClasses[props.form.border_radius])
+ }
+ }
+
+ return classes
+})
+
+const buttonSize = computed(() => {
+ return {
+ 'sm': 'md',
+ 'md': 'lg',
+ 'lg': 'xl'
+ }[props.form.size]
+})
+
</script>
diff --git a/client/components/open/forms/OpenFormField.vue b/client/components/open/forms/OpenFormField.vue
index e8a42fe3f..922eb19b8 100644
--- a/client/components/open/forms/OpenFormField.vue
+++ b/client/components/open/forms/OpenFormField.vue
@@ -7,11 +7,12 @@
:class="[
getFieldWidthClasses(field),
{
- 'group/nffield hover:bg-gray-100/50 relative hover:z-10 transition-colors hover:border-gray-200 dark:hover:!bg-gray-900 border-dashed border border-transparent box-border dark:hover:border-blue-900 rounded-md': isAdminPreview,
+ 'group/nffield hover:bg-neutral-100/50 relative hover:z-10 transition-colors hover:border-neutral-200 dark:hover:!bg-neutral-900 border-dashed border border-transparent box-border dark:hover:border-blue-900 rounded-md': isAdminPreview,
'cursor-pointer':workingFormStore.showEditFieldSidebar && isAdminPreview,
- 'bg-blue-50 hover:!bg-blue-50 dark:bg-gray-800 rounded-md': beingEdited,
+ 'bg-blue-50 hover:!bg-blue-50 dark:bg-neutral-800 rounded-md': beingEdited,
}]"
@click="setFieldAsSelected"
+ @dblclick="fieldDoubleClick"
>
<div
class="-m-[1px] w-full max-w-full mx-auto"
@@ -22,12 +23,12 @@
class="absolute translate-y-full lg:translate-y-0 -bottom-1 left-1/2 -translate-x-1/2 lg:-translate-x-full lg:-left-1 lg:top-1 lg:bottom-0 hidden group-hover/nffield:block z-10"
>
<div
- class="flex lg:flex-col bg-white !bg-white dark:!bg-white border rounded-md shadow-sm z-50 p-[1px] relative"
+ class="flex lg:flex-col bg-white !bg-white dark:!bg-white border rounded-sm shadow-xs z-50 p-[1px] relative"
>
<div
- class="p-1 hover:!text-blue-500 dark:hover:!text-blue-500 hover:bg-blue-50 cursor-pointer !text-gray-500 dark:!text-gray-500 flex items-center justify-center rounded-md"
+ class="p-1 hover:!text-blue-500 dark:hover:!text-blue-500 hover:bg-blue-50 cursor-pointer !text-neutral-500 dark:!text-neutral-500 flex items-center justify-center rounded-md"
role="button"
- @click.prevent="openAddFieldSidebar"
+ @click.stop.prevent="openAddFieldSidebar"
>
<UTooltip
text="Add new field"
@@ -36,14 +37,14 @@
>
<Icon
name="i-heroicons-plus-circle-20-solid"
- class="w-5 h-5 !text-gray-500 dark:!text-gray-500 hover:!text-blue-500 dark:hover:!text-blue-500"
+ class="w-5 h-5 !text-neutral-500 dark:!text-neutral-500 hover:!text-blue-500 dark:hover:!text-blue-500"
/>
</UTooltip>
</div>
<div
- class="p-1 hover:!text-blue-500 dark:hover:!text-blue-500 hover:bg-blue-50 cursor-pointer flex items-center justify-center text-center !text-gray-500 dark:!text-gray-500 rounded-md"
+ class="p-1 hover:!text-blue-500 dark:hover:!text-blue-500 hover:bg-blue-50 cursor-pointer flex items-center justify-center text-center !text-neutral-500 dark:!text-neutral-500 rounded-md"
role="button"
- @click.prevent="editFieldOptions"
+ @click.stop.prevent="editFieldOptions"
>
<UTooltip
text="Edit field settings"
@@ -52,14 +53,14 @@
>
<Icon
name="heroicons:cog-8-tooth-20-solid"
- class="w-5 h-5 !text-gray-500 dark:!text-gray-500 hover:!text-blue-500 dark:hover:!text-blue-500"
+ class="w-5 h-5 !text-neutral-500 dark:!text-neutral-500 hover:!text-blue-500 dark:hover:!text-blue-500"
/>
</UTooltip>
</div>
<div
class="p-1 hover:!text-red-600 dark:hover:!text-red-600 hover:bg-red-50 cursor-pointer flex items-center justify-center text-center !text-red-500 dark:!text-red-500 rounded-md"
role="button"
- @click.prevent="removeField"
+ @click.stop.prevent="removeField"
>
<UTooltip
text="Delete field"
@@ -74,14 +75,25 @@
</div>
</div>
</div>
- <component
- :is="getFieldComponents"
- v-if="getFieldComponents"
- v-bind="inputProperties(field)"
- :required="isFieldRequired"
- :disabled="isFieldDisabled"
- :is-admin-preview="isAdminPreview"
- />
+ <div v-if="fieldComponentInfo && fieldComponentInfo.component">
+ <ClientOnlyWrapper :client-only="fieldComponentInfo.clientOnly">
+ <Suspense>
+ <component
+ :is="fieldComponentInfo.component"
+ v-bind="inputProperties(field)"
+ :required="isFieldRequired"
+ :disabled="isFieldDisabled"
+ :is-admin-preview="isAdminPreview"
+ />
+ <template #fallback>
+ <USkeleton class="w-full h-16 my-1.5" />
+ </template>
+ </Suspense>
+ <template #fallback>
+ <USkeleton class="w-full h-16 my-1.5" />
+ </template>
+ </ClientOnlyWrapper>
+ </div>
<template v-else>
<div
v-if="field.type === 'nf-text' && field.content"
@@ -90,6 +102,7 @@
class="nf-text w-full my-1.5 break-words whitespace-break-spaces"
:class="[getFieldAlignClasses(field)]"
v-html="field.content"
+ @dblclick="editFieldOptions"
/>
<div
v-if="field.type === 'nf-code' && field.content"
@@ -135,7 +148,7 @@
class="hidden group-hover/nffield:flex translate-x-full absolute right-0 top-0 h-full w-5 flex-col justify-center pl-1 pt-3"
>
<div
- class="flex items-center bg-gray-100 dark:bg-gray-800 border rounded-md h-12 text-gray-500 dark:text-gray-400 dark:border-gray-500 cursor-grab handle min-h-[40px]"
+ class="flex items-center bg-neutral-100 dark:bg-neutral-800 border rounded-md h-12 text-neutral-500 dark:text-neutral-400 dark:border-neutral-500 cursor-grab handle min-h-[40px]"
>
<Icon
name="clarity:drag-handle-line"
@@ -153,6 +166,7 @@ import CachedDefaultTheme from "~/lib/forms/themes/CachedDefaultTheme.js"
import { default as _has } from 'lodash/has'
import { FormMode, createFormModeStrategy } from "~/lib/forms/FormModeStrategy.js"
import { useWorkingFormStore } from '~/stores/working_form'
+import { useComponentRegistry } from '~/composables/components/useComponentRegistry'
// Define props
const props = defineProps({
@@ -179,52 +193,54 @@ const enableDisabledFields = computed(() => props.formManager?.strategy?.value?.
// Setup stores and reactive state
const workingFormStore = useWorkingFormStore()
+const { getFormComponent } = useComponentRegistry()
const selectedFieldIndex = computed(() => workingFormStore.selectedFieldIndex)
const showEditFieldSidebar = computed(() => workingFormStore.showEditFieldSidebar)
const strategy = computed(() => props.formManager?.strategy?.value || createFormModeStrategy(FormMode.LIVE))
const isAdminPreview = computed(() => strategy.value?.admin?.showAdminControls || false)
// Computed properties
-const getFieldComponents = computed(() => {
+const fieldComponentInfo = computed(() => {
const field = props.field
+ let componentName
+
if (field.type === 'text' && field.multi_lines) {
- return 'TextAreaInput'
- }
- if (field.type === 'url' && field.file_upload) {
- return 'FileInput'
- }
- if (['select', 'multi_select'].includes(field.type) && field.without_dropdown) {
- return 'FlatSelectInput'
- }
- if (field.type === 'checkbox' && field.use_toggle_switch) {
- return 'ToggleSwitchInput'
- }
- if (field.type === 'signature') {
- return 'SignatureInput'
- }
- if (field.type === 'phone_number' && !field.use_simple_text_input) {
- return 'PhoneInput'
+ componentName = 'TextAreaInput'
+ } else if (field.type === 'url' && field.file_upload) {
+ componentName = 'FileInput'
+ } else if (['select', 'multi_select'].includes(field.type) && field.without_dropdown) {
+ componentName = 'FlatSelectInput'
+ } else if (field.type === 'checkbox' && field.use_toggle_switch) {
+ componentName = 'ToggleSwitchInput'
+ } else if (field.type === 'signature') {
+ componentName = 'SignatureInput'
+ } else if (field.type === 'phone_number' && !field.use_simple_text_input) {
+ componentName = 'PhoneInput'
+ } else {
+ componentName = {
+ text: 'TextInput',
+ rich_text: 'RichTextAreaInput',
+ number: 'TextInput',
+ rating: 'RatingInput',
+ scale: 'ScaleInput',
+ slider: 'SliderInput',
+ select: 'SelectInput',
+ multi_select: 'SelectInput',
+ date: 'DateInput',
+ files: 'FileInput',
+ checkbox: 'CheckboxInput',
+ url: 'TextInput',
+ email: 'TextInput',
+ phone_number: 'TextInput',
+ matrix: 'MatrixInput',
+ barcode: 'BarcodeInput',
+ payment: 'PaymentInput',
+ code: 'CodeInput'
+ }[field.type]
}
- return {
- text: 'TextInput',
- rich_text: 'RichTextAreaInput',
- number: 'TextInput',
- rating: 'RatingInput',
- scale: 'ScaleInput',
- slider: 'SliderInput',
- select: 'SelectInput',
- multi_select: 'SelectInput',
- date: 'DateInput',
- files: 'FileInput',
- checkbox: 'CheckboxInput',
- url: 'TextInput',
- email: 'TextInput',
- phone_number: 'TextInput',
- matrix: 'MatrixInput',
- barcode: 'BarcodeInput',
- payment: 'PaymentInput'
- }[field.type]
+ // Let the component registry handle whether to return a string or an async component
+ return getFormComponent(componentName)
})
const isPublicFormPage = computed(() => useRoute().name === 'forms-slug')
@@ -261,6 +277,11 @@ function setFieldAsSelected() {
workingFormStore.openSettingsForField(props.field)
}
+function fieldDoubleClick() {
+ if (!isAdminPreview.value) return
+ workingFormStore.openSettingsForField(props.field)
+}
+
function openAddFieldSidebar() {
if (!isAdminPreview.value) return
workingFormStore.openAddFieldSidebar(props.field)
diff --git a/client/components/open/forms/components/AIFormLoadingMessages.vue b/client/components/open/forms/components/AIFormLoadingMessages.vue
index ce0e9f172..53b852643 100644
--- a/client/components/open/forms/components/AIFormLoadingMessages.vue
+++ b/client/components/open/forms/components/AIFormLoadingMessages.vue
@@ -33,11 +33,11 @@
v-motion
:initial="{ opacity: 0, y: 5 }"
:enter="{ opacity: 1, y: 0, transition: { duration: 200 } }"
- class="text-sm text-gray-700 font-medium"
+ class="text-sm text-neutral-700 font-medium"
>
{{ currentMessage }}
</span>
- <span class="text-xs text-gray-500 ml-auto tabular-nums">{{ elapsedTime }}s</span>
+ <span class="text-xs text-neutral-500 ml-auto tabular-nums">{{ elapsedTime }}s</span>
</div>
</div>
</template>
diff --git a/client/components/open/forms/components/AdvancedFormUrlSettings.vue b/client/components/open/forms/components/AdvancedFormUrlSettings.vue
index 834849105..17d97226f 100644
--- a/client/components/open/forms/components/AdvancedFormUrlSettings.vue
+++ b/client/components/open/forms/components/AdvancedFormUrlSettings.vue
@@ -8,7 +8,7 @@
<h3 class="font-semibold block text-lg">
<svg
xmlns="http://www.w3.org/2000/svg"
- class="h-5 w-5 inline text-gray-500 mr-2 -mt-1"
+ class="h-5 w-5 inline text-neutral-500 mr-2 -mt-1"
fill="none"
viewBox="0 0 24 24"
stroke="currentColor"
@@ -36,7 +36,7 @@
</template>
<script>
-import Collapse from "~/components/global/Collapse.vue"
+import Collapse from "~/components/app/Collapse.vue"
export default {
name: "AdvancedFormUrlSettings",
components: { Collapse },
diff --git a/client/components/open/forms/components/BlockTypeIcon.vue b/client/components/open/forms/components/BlockTypeIcon.vue
index 58cc2bf1f..38c00f1bb 100644
--- a/client/components/open/forms/components/BlockTypeIcon.vue
+++ b/client/components/open/forms/components/BlockTypeIcon.vue
@@ -17,10 +17,18 @@ const props = defineProps({
type: {
type: String,
required: true
+ },
+ bgClass: {
+ type: String,
+ default: ''
+ },
+ textClass: {
+ type: String,
+ default: ''
}
})
-const bgClass = computed(() => blocksTypes[props.type]?.bg_class || '')
-const textClass = computed(() => blocksTypes[props.type]?.text_class || '')
+const bgClass = computed(() => props.bgClass || blocksTypes[props.type]?.bg_class || '')
+const textClass = computed(() => props.textClass || blocksTypes[props.type]?.text_class || '')
const icon = computed(() => blocksTypes[props.type]?.icon || '')
</script>
\ No newline at end of file
diff --git a/client/components/open/forms/components/CopyContent.vue b/client/components/open/forms/components/CopyContent.vue
index 3609545f5..a903f7d69 100644
--- a/client/components/open/forms/components/CopyContent.vue
+++ b/client/components/open/forms/components/CopyContent.vue
@@ -1,42 +1,45 @@
<template>
- <div class="flex flex-wrap sm:flex-nowrap my-4 w-full">
+ <div class="flex gap-2">
<div
- class="flex-1 truncate sm:w-auto border border-gray-300 rounded-md p-2 flex-grow select-all bg-gray-100"
+ class="flex-1 truncate sm:w-auto border border-neutral-300 rounded-md px-2 py-1 flex-grow select-all bg-neutral-100 relative"
>
- <p class="select-all text-gray-900">
+ <div class="absolute right-0 top-0 bottom-0 w-12 bg-gradient-to-r from-transparent to-neutral-100"></div>
+ <p class="select-all text-neutral-900 text-sm">
{{ content }}
</p>
</div>
- <div class="w-full sm:w-40 sm:ml-2 mt-2 sm:mt-0 shrink-0">
- <v-button
- color="light-gray"
+ <div class="shrink-0">
+ <TrackClick
+ v-if="trackingEvent"
+ :name="trackingEvent"
+ :properties="trackingProperties"
+ >
+ <UButton
+ :color="copySuccess ? 'success' : 'primary'"
+ :icon="copySuccess ? 'i-heroicons-check' : 'i-heroicons-clipboard-document'"
+ class="w-full"
+ @click.prevent="copyToClipboard"
+ >
+ <span class="hidden md:inline">{{ copySuccess ? 'Copied!' : label }}</span>
+ </UButton>
+ </TrackClick>
+ <UButton
+ v-else
+ :color="copySuccess ? 'success' : 'primary'"
+ :icon="copySuccess ? 'i-heroicons-check' : 'i-heroicons-clipboard-document'"
class="w-full"
@click.prevent="copyToClipboard"
>
- <slot name="icon">
- <svg
- class="h-4 w-4 -mt-1 text-blue-600 inline mr-1"
- viewBox="0 0 20 20"
- fill="none"
- xmlns="http://www.w3.org/2000/svg"
- >
- <path
- d="M4.16667 12.4998C3.3901 12.4998 3.00182 12.4998 2.69553 12.373C2.28715 12.2038 1.9627 11.8794 1.79354 11.471C1.66667 11.1647 1.66667 10.7764 1.66667 9.99984V4.33317C1.66667 3.39975 1.66667 2.93304 1.84833 2.57652C2.00812 2.26292 2.26308 2.00795 2.57669 1.84816C2.93321 1.6665 3.39992 1.6665 4.33334 1.6665H10C10.7766 1.6665 11.1649 1.6665 11.4711 1.79337C11.8795 1.96253 12.204 2.28698 12.3731 2.69536C12.5 3.00165 12.5 3.38993 12.5 4.1665M10.1667 18.3332H15.6667C16.6001 18.3332 17.0668 18.3332 17.4233 18.1515C17.7369 17.9917 17.9919 17.7368 18.1517 17.4232C18.3333 17.0666 18.3333 16.5999 18.3333 15.6665V10.1665C18.3333 9.23308 18.3333 8.76637 18.1517 8.40985C17.9919 8.09625 17.7369 7.84128 17.4233 7.68149C17.0668 7.49984 16.6001 7.49984 15.6667 7.49984H10.1667C9.23325 7.49984 8.76654 7.49984 8.41002 7.68149C8.09642 7.84128 7.84145 8.09625 7.68166 8.40985C7.50001 8.76637 7.50001 9.23308 7.50001 10.1665V15.6665C7.50001 16.5999 7.50001 17.0666 7.68166 17.4232C7.84145 17.7368 8.09642 17.9917 8.41002 18.1515C8.76654 18.3332 9.23325 18.3332 10.1667 18.3332Z"
- stroke="currentColor"
- stroke-width="1.66667"
- stroke-linecap="round"
- stroke-linejoin="round"
- />
- </svg>
- </slot>
- <slot />
- </v-button>
+ <span class="hidden md:inline">{{ copySuccess ? 'Copied!' : label }}</span>
+ </UButton>
</div>
</div>
</template>
<script setup>
-import { defineProps } from "vue"
+import { defineProps, ref } from "vue"
+import TrackClick from '~/components/global/TrackClick.vue'
+
const { copy } = useClipboard()
const props = defineProps({
@@ -48,17 +51,33 @@ const props = defineProps({
type: Boolean,
default: false,
},
+ label: {
+ type: String,
+ default: "Copy Link",
+ },
+ trackingEvent: {
+ type: String,
+ default: null,
+ },
+ trackingProperties: {
+ type: Object,
+ default: () => ({}),
+ },
})
+const copySuccess = ref(false)
+
const copyToClipboard = () => {
if (import.meta.server) return
+
copy(props.content)
- if (props.isDraft) {
- useAlert().warning(
- "Copied! But other people won't be able to see the form since it's currently in draft mode",
- )
- } else {
- useAlert().success("Copied!")
- }
+
+ // Show success state
+ copySuccess.value = true
+
+ // Reset after 2 seconds
+ setTimeout(() => {
+ copySuccess.value = false
+ }, 2000)
}
</script>
diff --git a/client/components/open/forms/components/CustomFieldValidation.vue b/client/components/open/forms/components/CustomFieldValidation.vue
index 570f3cc64..a885f2028 100644
--- a/client/components/open/forms/components/CustomFieldValidation.vue
+++ b/client/components/open/forms/components/CustomFieldValidation.vue
@@ -3,10 +3,10 @@
<div class="space-y-4">
<!-- Step 1: Validation Rules -->
<div>
- <h3 class="font-medium text-gray-900 text-sm mb-1">
+ <h3 class="font-medium text-neutral-900 text-sm mb-1">
Step 1: Set Validation Rules
</h3>
- <p class="text-gray-500 text-xs mb-3">
+ <p class="text-neutral-500 text-xs mb-3">
Define <span class="font-semibold">conditions that must be met</span> for this field to be valid. If these conditions are not met, the field will be marked as invalid.
</p>
<condition-editor
@@ -20,10 +20,10 @@
<!-- Step 2: Error Message -->
<div>
- <h3 class="font-medium text-gray-900 text-sm mb-1">
+ <h3 class="font-medium text-neutral-900 text-sm mb-1">
Step 2: Set Error Message
</h3>
- <p class="text-gray-500 text-xs mb-2">
+ <p class="text-neutral-500 text-xs mb-2">
Enter the message that will be <span class="font-semibold">shown to users when the validation rules above are not met</span>.
</p>
<text-input
@@ -35,7 +35,7 @@
<UAlert
icon="i-heroicons-information-circle"
- color="yellow"
+ color="warning"
variant="subtle"
size="sm"
description="Remember to save your form to apply these validation rules."
diff --git a/client/components/open/forms/components/FirstSubmissionModal.vue b/client/components/open/forms/components/FirstSubmissionModal.vue
index ce19a607d..f3541d203 100644
--- a/client/components/open/forms/components/FirstSubmissionModal.vue
+++ b/client/components/open/forms/components/FirstSubmissionModal.vue
@@ -1,22 +1,16 @@
<template>
- <modal
- :show="show"
- compact-header
- :backdrop-blur="true"
- @close="$emit('close')"
+ <UModal
+ v-model:open="isModalOpen"
+ :ui="{ content: 'sm:max-w-2xl' }"
+ title="🎉 Your first submission! Congratulations!"
>
- <template #title>
- <h2 class="text-xl font-medium">
- 🎉 Your first submission! Congratulations!
- </h2>
- </template>
- <div class="">
- <div class="text-sm text-gray-500">
+ <template #body>
+ <div class="text-sm text-neutral-500">
Congratulations on creating your form and receiving your first submission! Your form is now live and ready for action. You can now <span class="font-semibold">share your form</span> with others, or <span class="font-semibold">open your Form submission page</span> to view the submitted data.
</div>
<div class="flex gap-2 items-center max-w-full">
- <p class="text-sm w-48 text-gray-500">
+ <p class="text-sm w-48 text-neutral-500">
Share form URL:
</p>
<ShareFormUrl
@@ -25,20 +19,21 @@
/>
</div>
<div class="flex py-2 items-center max-w-full">
- <p class="text-sm w-48 text-gray-500">
+ <p class="text-sm w-48 text-neutral-500">
Check your submissions:
</p>
<UButton
- color="white"
+ color="neutral"
+ variant="outline"
icon="i-heroicons-document"
target="_blank"
@click="trackOpenDbClick"
- >
- See Submissions
- </UButton>
+ label="See Submissions"
+ trailing-icon=""
+ />
</div>
- <p class="text-gray-500 font-medium text-sm text-center my-4">
+ <p class="text-neutral-500 font-medium text-sm text-center my-4">
What's next?
</p>
<div class="grid grid-cols-2 gap-2">
@@ -46,11 +41,11 @@
v-for="(item, i) in helpLinks"
:key="i"
role="button"
- class="bg-white shadow border border-gray-200 rounded-lg p-4 pb-2 items-center justify-center flex flex-col relative hover:bg-gray-50 dark:hover:bg-gray-800 group transition-colors"
+ class="bg-white shadow-sm border border-neutral-200 rounded-lg p-4 pb-2 items-center justify-center flex flex-col relative hover:bg-neutral-50 dark:hover:bg-neutral-800 group transition-colors"
@click="item.action"
>
<div class="flex justify-center">
- <div class="h-8 w-8 text-gray-600 group-hover:text-gray-800 dark:group-hover:text-white transition-colors flex items-center">
+ <div class="h-8 w-8 text-neutral-600 group-hover:text-neutral-800 dark:group-hover:text-white transition-colors flex items-center">
<Icon
:name="item.icon"
class=""
@@ -59,31 +54,48 @@
</div>
</div>
- <p class="text-gray-500 font-medium text-xs text-center my-2">
+ <p class="text-neutral-500 font-medium text-xs text-center my-2">
{{ item.label }}
</p>
</div>
</div>
- </div>
- </modal>
+ </template>
+ </UModal>
</template>
<script setup>
import ShareFormUrl from '~/components/open/forms/components/ShareFormUrl.vue'
+
const props = defineProps({
show: { type: Boolean, required: true },
form: { type: Object, required: true }
})
-defineEmits(['close'])
+
+const emit = defineEmits(['close'])
+
+// Modal state
+const isModalOpen = computed({
+ get() {
+ return props.show
+ },
+ set(value) {
+ if (!value) {
+ emit("close")
+ }
+ }
+})
+
const confetti = useConfetti()
const crisp = useCrisp()
const amplitude = useAmplitude()
+
watch(() => props.show, () => {
if (props.show) {
confetti.play()
useAmplitude().logEvent('form_first_submission_modal_viewed')
}
})
+
const helpLinks = computed(() => {
return [
{
@@ -104,5 +116,4 @@ const trackOpenDbClick = () => {
window.open(submissionsUrl, '_blank')
amplitude.logEvent('form_first_submission_modal_open_db_click')
}
-
</script>
\ No newline at end of file
diff --git a/client/components/open/forms/components/FormColumnsSettingsModal.vue b/client/components/open/forms/components/FormColumnsSettingsModal.vue
deleted file mode 100644
index 1dbea6ea5..000000000
--- a/client/components/open/forms/components/FormColumnsSettingsModal.vue
+++ /dev/null
@@ -1,307 +0,0 @@
-<template>
- <modal
- compact-header
- :show="show"
- v-bind="$attrs"
- @close="$emit('close')"
- >
- <template #icon>
- <Icon
- name="heroicons:adjustments-horizontal"
- class="w-8 h-8"
- />
- </template>
- <template #title>
- Manage Columns
- </template>
-
- <div class="px-4">
- <template
- v-for="(section, sectionIndex) in sections"
- :key="sectionIndex"
- >
- <template v-if="section.fields.length > 0">
- <h4
- class="font-semibold mb-2"
- :class="{ 'mt-4': sectionIndex > 0 }"
- >
- <div class="flex items-center justify-between">
- <span>{{ section.title }}</span>
- <div class="flex items-center gap-2 text-xs text-gray-500">
- <button
- class="hover:text-gray-700"
- @click="toggleAllColumns(section.fields, true)"
- >
- Show all
- </button>
- <span class="text-gray-300">|</span>
- <button
- class="hover:text-gray-700"
- @click="toggleAllColumns(section.fields, false)"
- >
- Hide all
- </button>
- </div>
- </div>
- </h4>
- <div class="border border-gray-300">
- <div class="grid grid-cols-[1fr,auto,auto] gap-4 px-4 py-2 bg-gray-50 border-b border-gray-300">
- <div class="text-sm">
- Name
- </div>
- <div class="text-sm text-center w-20">
- Display
- </div>
- <div class="text-sm text-center w-20">
- Wrap Text
- </div>
- </div>
- <div
- v-for="(field, index) in section.fields"
- :key="field.id"
- class="grid grid-cols-[1fr,auto,auto] gap-4 px-4 py-2 items-center"
- :class="{ 'border-t border-gray-300': index !== 0 }"
- >
- <p class="truncate text-sm">
- {{ field.name }}
- </p>
- <div class="flex justify-center w-20">
- <ToggleSwitchInput
- v-model="computedDisplayColumns[field.id]"
- wrapper-class="my-0"
- label=""
- :name="`display-${field.id}`"
- @update:model-value="onChangeDisplayColumns"
- />
- </div>
- <div class="flex justify-center w-20">
- <ToggleSwitchInput
- v-model="computedWrapColumns[field.id]"
- wrapper-class="my-0"
- label=""
- :name="`wrap-${field.id}`"
- />
- </div>
- </div>
- </div>
- </template>
- </template>
- </div>
- </modal>
-</template>
-
-<script setup>
-import { useStorage } from '@vueuse/core'
-import clonedeep from 'clone-deep'
-
-const props = defineProps({
- show: {
- type: Boolean,
- required: true
- },
- form: {
- type: Object,
- required: true
- },
- columns: {
- type: Array,
- default: () => []
- },
- displayColumns: {
- type: Object,
- default: () => ({})
- },
- wrapColumns: {
- type: Object,
- default: () => ({})
- }
-})
-
-const emit = defineEmits(['close', 'update:columns', 'update:displayColumns', 'update:wrapColumns'])
-
-const candidatesProperties = computed(() => {
- if (!props.form?.properties) return []
-
- const properties = clonedeep(props.form.properties).filter((field) => {
- return !['nf-text', 'nf-code', 'nf-page-break', 'nf-divider', 'nf-image'].includes(field.type)
- })
-
- // Add created_at column if not present
- if (!properties.find(property => property.id === 'created_at')) {
- properties.push({
- name: 'Created at',
- id: 'created_at',
- type: 'date',
- width: 140
- })
- }
-
- return properties
-})
-
-const sections = computed(() => [
- {
- title: 'Form Fields',
- fields: candidatesProperties.value
- },
- {
- title: 'Removed Fields',
- fields: props.form?.removed_properties || []
- }
-])
-
-// Column preferences storage
-const storageKey = computed(() => `column-preferences-formid-${props.form.id}`)
-
-const columnPreferences = useStorage(
- storageKey.value,
- {
- display: {},
- wrap: {},
- widths: {}
- },
- localStorage,
- {
- onError: (error) => {
- console.error('Storage error:', error)
- }
- }
-)
-
-const computedDisplayColumns = computed({
- get: () => columnPreferences.value.display,
- set: (val) => {
- columnPreferences.value.display = val
- emit('update:displayColumns', val)
- }
-})
-
-const computedWrapColumns = computed({
- get: () => columnPreferences.value.wrap,
- set: (val) => {
- columnPreferences.value.wrap = val
- emit('update:wrapColumns', val)
- }
-})
-
-// Helper function to preserve column widths
-function preserveColumnWidths(newColumns, existingColumns = []) {
- if (!columnPreferences.value) {
- columnPreferences.value = { display: {}, wrap: {}, widths: {} }
- }
- if (!columnPreferences.value.widths) {
- columnPreferences.value.widths = {}
- }
-
- return newColumns.map(col => {
- // First try to find width in storage
- const storedWidth = columnPreferences.value?.widths?.[col.id]
- // Then try current table columns
- const currentCol = props.columns?.find(c => c.id === col.id)
- // Then fallback to form properties
- const existing = existingColumns?.find(e => e.id === col.id)
-
- // Convert any non-numeric width to default
- const defaultWidth = 250
- let width = storedWidth || currentCol?.width || existing?.width || defaultWidth
-
- // If width is not a number or is 'full', use default width
- if (typeof width !== 'number' || isNaN(width)) {
- width = defaultWidth
- }
-
- return {
- ...col,
- width
- }
- })
-}
-
-// Watch for column width changes
-watch(() => props.columns, (newColumns) => {
- if (!newColumns?.length) return
-
- if (!columnPreferences.value) {
- columnPreferences.value = { display: {}, wrap: {}, widths: {} }
- }
- if (!columnPreferences.value.widths) {
- columnPreferences.value.widths = {}
- }
-
- const widths = {}
- newColumns.forEach(col => {
- if (col.width) {
- widths[col.id] = col.width
- }
- })
-
- columnPreferences.value.widths = widths
-}, { deep: true })
-
-// Initialize display and wrap columns when form changes
-watch(() => props.form, (newForm) => {
- if (!newForm) return
-
- const properties = candidatesProperties.value
- const storedPrefs = columnPreferences.value
- const removedProperties = newForm.removed_properties || []
-
- // Initialize display columns if not set
- if (!Object.keys(storedPrefs.display).length) {
- // Set all non-removed properties to visible by default
- properties.forEach((field) => {
- storedPrefs.display[field.id] = true
- })
- // Also handle removed properties
- removedProperties.forEach((field) => {
- storedPrefs.display[field.id] = false
- })
- }
-
- // Initialize wrap columns if not set
- if (!Object.keys(storedPrefs.wrap).length) {
- [...properties, ...removedProperties].forEach((field) => {
- storedPrefs.wrap[field.id] = false
- })
- }
-
- // Initialize widths if not set
- if (!Object.keys(storedPrefs.widths).length) {
- [...properties, ...removedProperties].forEach((field) => {
- const defaultWidth = 150
- storedPrefs.widths[field.id] = field.width || defaultWidth
- })
- }
-
- // Emit initial values
- emit('update:displayColumns', storedPrefs.display)
- emit('update:wrapColumns', storedPrefs.wrap)
-
- // Emit initial columns (all non-removed visible by default)
- const initialColumns = clonedeep(properties)
- .concat(removedProperties)
- .filter((field) => storedPrefs.display[field.id] !== false)
-
- // Preserve any existing column widths
- const columnsWithWidths = preserveColumnWidths(initialColumns, properties)
- emit('update:columns', columnsWithWidths)
-}, { immediate: true })
-
-function toggleAllColumns(fields, show) {
- fields.forEach((field) => {
- computedDisplayColumns.value[field.id] = show
- })
- onChangeDisplayColumns()
-}
-
-function onChangeDisplayColumns() {
- if (!import.meta.client) return
- const properties = clonedeep(candidatesProperties.value)
- .concat(props.form?.removed_properties || [])
- .filter((field) => computedDisplayColumns.value[field.id] === true)
-
- // Preserve existing column widths when toggling visibility
- const columnsWithWidths = preserveColumnWidths(properties, props.form.properties)
- emit('update:columns', columnsWithWidths)
-}
-</script>
\ No newline at end of file
diff --git a/client/components/open/forms/components/FormEditor.vue b/client/components/open/forms/components/FormEditor.vue
index 4bb77f649..faca76097 100644
--- a/client/components/open/forms/components/FormEditor.vue
+++ b/client/components/open/forms/components/FormEditor.vue
@@ -1,373 +1,384 @@
<template>
- <div
- v-if="form"
- id="form-editor"
- class="relative flex w-full flex-col grow max-h-screen"
- >
- <!-- Loading overlay -->
+ <VTransition name="fade">
<div
- v-if="updateFormLoading"
- class="absolute inset-0 bg-white bg-opacity-70 z-50 flex items-center justify-center"
+ v-if="form"
+ id="form-editor"
+ class="relative flex w-full flex-col grow max-h-screen"
+ key="form"
>
- <loader class="h-6 w-6 text-blue-500" />
- </div>
- <div
- class="border-b bg-white md:hidden fixed inset-0 w-full z-50 flex flex-col items-center justify-center"
- >
- <Icon
- name="heroicons:exclamation-circle"
- class="w-10 h-10 text-nt-blue-dark"
- />
- <div class="p-5 text-nt-blue-dark text-center">
- OpnForm is not optimized for mobile devices. Please open this page on a device with a larger screen.
- </div>
- <div>
- <UButton
- color="white"
- size="lg"
- class="w-full"
- :to="{ name: 'home' }"
- >
- Back to dashboard
- </UButton>
+ <!-- Loading overlay -->
+ <div
+ v-if="form.busy || loading"
+ class="absolute inset-0 bg-white bg-opacity-70 z-50 flex items-center justify-center"
+ >
+ <loader class="h-6 w-6 text-blue-500" />
</div>
- </div>
-
- <FormEditorNavbar
- :back-button="backButton"
- :update-form-loading="updateFormLoading"
- :save-button-class="saveButtonClass"
- @go-back="goBack"
- @save-form="saveForm"
- >
- <template #before-save>
- <slot name="before-save" />
- </template>
- </FormEditorNavbar>
-
- <FormEditorErrorHandler>
<div
- v-show="activeTab !== 2"
- class="w-full flex grow overflow-y-scroll relative bg-white"
+ class="border-b bg-white md:hidden fixed inset-0 w-full z-50 flex flex-col items-center justify-center"
>
- <div
- class="relative w-full shrink-0 overflow-y-scroll border-r md:w-1/2 md:max-w-xs lg:w-2/5"
- >
- <VForm
- size="sm"
- @submit.prevent=""
+ <Icon
+ name="heroicons:exclamation-circle"
+ class="w-10 h-10 text-blue-800"
+ />
+ <div class="p-5 text-blue-800 text-center">
+ OpnForm is not optimized for mobile devices. Please open this page on a device with a larger screen.
+ </div>
+ <div>
+ <UButton
+ color="neutral"
+ variant="outline"
+ size="lg"
+ class="w-full"
+ :to="{ name: 'home' }"
>
- <div
- v-show="activeTab === 0"
- >
- <FormFieldsEditor />
- </div>
- <div
- v-show="activeTab === 1"
- >
- <FormCustomization />
- </div>
- </VForm>
+ Back to dashboard
+ </UButton>
</div>
+ </div>
+
+ <FormEditorNavbar
+ :back-button="backButton"
+ :update-form-loading="form.busy"
+ :save-button-class="saveButtonClass"
+ @go-back="goBack"
+ @save-form="saveForm"
+ >
+ <template #before-save>
+ <slot name="before-save" />
+ </template>
+ </FormEditorNavbar>
- <FormEditorPreview />
+ <FormEditorErrorHandler>
+ <div class="w-full flex grow overflow-y-scroll relative bg-white">
+ <div class="relative w-full shrink-0 overflow-y-scroll border-r md:w-1/2 md:max-w-xs lg:w-2/5">
+ <VForm
+ size="sm"
+ @submit.prevent=""
+ >
+ <div
+ v-show="activeTab === 'build'"
+ >
+ <FormFieldsEditor />
+ </div>
+ <div
+ v-show="activeTab === 'design'"
+ >
+ <FormCustomization />
+ </div>
+ </VForm>
+ </div>
- <FormEditorSidebar />
- </div>
- </FormEditorErrorHandler>
+ <FormEditorPreview />
- <FormSettings v-show="activeTab === 2" />
+ <FormEditorSidebar />
+ </div>
+ </FormEditorErrorHandler>
- <!-- Form Error Modal -->
- <FormErrorModal
- :show="showFormErrorModal"
- :validation-error-response="validationErrorResponse"
- @close="showFormErrorModal = false"
- />
+ <!-- Form Error Modal -->
+ <FormErrorModal
+ :show="showFormErrorModal"
+ :validation-error-response="validationErrorResponse"
+ @close="showFormErrorModal = false"
+ />
- <!-- Logic Confirmation Modal -->
- <LogicConfirmationModal
- :is-visible="showLogicConfirmationModal"
- :errors="logicErrors"
- @cancel="handleLogicConfirmationCancel"
- @confirm="handleLogicConfirmationConfirm"
+ <!-- Logic Confirmation Modal -->
+ <LogicConfirmationModal
+ :is-visible="showLogicConfirmationModal"
+ :errors="logicErrors"
+ @cancel="handleLogicConfirmationCancel"
+ @confirm="handleLogicConfirmationConfirm"
+ />
+ </div>
+ <FormEditorSkeleton
+ v-else
+ key="skeleton"
+ :back-button="backButton"
+ @go-back="goBack"
/>
- </div>
- <div
- v-else
- class="flex justify-center items-center p-8"
- >
- <Loader class="w-6 h-6" />
- </div>
+ </VTransition>
</template>
-<script>
+<script setup>
import FormEditorNavbar from './FormEditorNavbar.vue'
+import FormEditorSkeleton from './FormEditorSkeleton.vue'
import FormEditorSidebar from "./form-components/FormEditorSidebar.vue"
import FormErrorModal from "./form-components/FormErrorModal.vue"
import FormFieldsEditor from './FormFieldsEditor.vue'
import FormCustomization from "./form-components/FormCustomization.vue"
import FormEditorPreview from "./form-components/FormEditorPreview.vue"
import { useFormLogic } from "~/composables/forms/useFormLogic.js"
-import opnformConfig from "~/opnform.config.js"
import { captureException } from "@sentry/core"
-import FormSettings from './form-components/FormSettings.vue'
import FormEditorErrorHandler from '~/components/open/forms/components/FormEditorErrorHandler.vue'
import { setFormDefaults } from '~/composables/forms/initForm.js'
import { breakpointsTailwind, useBreakpoints } from '@vueuse/core'
-import LogicConfirmationModal from '~/components/forms/LogicConfirmationModal.vue'
-
-export default {
- name: "FormEditor",
- components: {
- FormEditorNavbar,
- FormEditorErrorHandler,
- FormEditorSidebar,
- FormEditorPreview,
- FormCustomization,
- FormFieldsEditor,
- FormErrorModal,
- FormSettings,
- LogicConfirmationModal
+import LogicConfirmationModal from '~/components/forms/heavy/LogicConfirmationModal.vue'
+import { formsApi } from "~/api"
+
+// Define props
+const props = defineProps({
+ isEdit: {
+ required: false,
+ type: Boolean,
+ default: false,
+ },
+ isGuest: {
+ required: false,
+ type: Boolean,
+ default: false,
},
- props: {
- isEdit: {
- required: false,
- type: Boolean,
- default: false,
- },
- isGuest: {
- required: false,
- type: Boolean,
- default: false,
- },
- backButton: {
- required: false,
- type: Boolean,
- default: true,
- },
- saveButtonClass: {
- required: false,
- type: String,
- default: "",
- },
+ backButton: {
+ required: false,
+ type: Boolean,
+ default: true,
},
+ saveButtonClass: {
+ required: false,
+ type: String,
+ default: "",
+ },
+ loading: {
+ required: false,
+ type: Boolean,
+ default: false,
+ }
+})
+
+// Define emits
+const emit = defineEmits(['mounted', 'on-save', 'openRegister', 'go-back', 'save-form'])
+
+// Reactive data
+const showFormErrorModal = ref(false)
+const showLogicConfirmationModal = ref(false)
+const validationErrorResponse = ref(null)
+const createdFormSlug = ref(null)
+const logicErrors = ref([])
+
+// Check if the editor is visible on smaller screens then send an email
+const breakpoints = useBreakpoints(breakpointsTailwind)
+const isVisible = ref(breakpoints.smaller("md"))
+watch(isVisible, (newValue) => {
+ if (newValue && form?.value && form?.value?.id) {
+ formsApi.mobileEditorEmail(form.value.id)
+ }
+})
+
+// Composables
+const { content: form } = storeToRefs(useWorkingFormStore())
+const { current: workspace } = useCurrentWorkspace()
+
+// Initialize TanStack Query mutations for forms
+const { create: createFormMutationFactory, update: updateFormMutationFactory } = useForms()
+const createMutation = createFormMutationFactory()
+
+// Create update mutation with reactive form ID
+const formId = computed(() => form.value?.id)
+const updateMutation = updateFormMutationFactory(formId)
+
+const workingFormStore = useWorkingFormStore()
+const crisp = useCrisp()
+const amplitude = useAmplitude()
+
+// Computed properties
+const activeTab = computed(() => workingFormStore.activeTab)
+
+// Methods
+const goBack = () => {
+ if (props.isEdit) {
+ useRouter().push({ name: 'forms-slug-show-submissions', params: {slug: form.value.slug} })
+ } else {
+ useRouter().push({ name: 'home' })
+ }
+}
+
+const displayFormModificationAlert = (responseData) => {
+ const alert = useAlert()
+ if (
+ responseData.form &&
+ responseData.form.cleanings &&
+ Object.keys(responseData.form.cleanings).length > 0
+ ) {
+ alert.warning(responseData.message)
+ } else if (responseData.message) {
+ alert.success(responseData.message)
+ }
+}
- emits: ['mounted', 'on-save', 'openRegister', 'go-back', 'save-form'],
+const showValidationErrors = () => {
+ showFormErrorModal.value = true
+}
+
+const saveForm = () => {
+ // Apply defaults to the form
+ const defaultedData = setFormDefaults(form.value.data())
+ form.value.fill(defaultedData)
+
+ // Check for logic errors
+ const { getLogicErrors } = useFormLogic()
+ logicErrors.value = getLogicErrors(form.value.properties)
+
+ if (logicErrors.value.length > 0) {
+ showLogicConfirmationModal.value = true
+ return
+ }
+
+ proceedWithSave()
+}
+
+const proceedWithSave = () => {
+ if (logicErrors.value.length > 0) {
+ // Clean invalid logic before saving using the comprehensive validator
+ const { validatePropertiesLogic } = useFormLogic()
+ form.value.properties = validatePropertiesLogic(form.value.properties)
+ }
+
+ if (props.isGuest) {
+ saveFormGuest()
+ } else if (props.isEdit) {
+ saveFormEdit()
+ } else {
+ saveFormCreate()
+ }
+}
- setup() {
- // Check if the editor is visible on smaller screens then send an email
- const breakpoints = useBreakpoints(breakpointsTailwind)
- const isVisible = ref(breakpoints.smaller("md"))
- watch(isVisible, (newValue) => {
- if (newValue && form?.value && form?.value?.id) {
- opnFetch('/open/forms/' + form.value.id + '/mobile-editor-email')
- }
+const handleLogicConfirmationCancel = () => {
+ showLogicConfirmationModal.value = false
+}
+
+const handleLogicConfirmationConfirm = () => {
+ showLogicConfirmationModal.value = false
+ proceedWithSave()
+}
+
+const saveFormEdit = () => {
+ if (form.value.busy || !form.value.id) return
+
+ validationErrorResponse.value = null
+
+ form.value.mutate(updateMutation).then((response) => {
+ const updatedForm = response.form
+ emit("on-save")
+
+ // Navigate to share page
+ useRouter().push({
+ name: "forms-slug-show-share",
+ params: { slug: updatedForm.slug },
})
-
- const { user } = storeToRefs(useAuthStore())
- const formsStore = useFormsStore()
- const { content: form } = storeToRefs(useWorkingFormStore())
- const { getCurrent: workspace } = storeToRefs(useWorkspacesStore())
- const workingFormStore = useWorkingFormStore()
+ try{
+ // Analytics / alerts
+ amplitude.logEvent("form_saved", {
+ form_id: updatedForm.id,
+ form_slug: updatedForm.slug,
+ })
+ displayFormModificationAlert({
+ form: updatedForm,
+ message: "Form successfully saved.",
+ })
+ } catch (error) {
+ console.error("Analytics error", error)
+ }
+ }).catch((error) => {
+ console.error("Error saving form", error)
- return {
- appStore: useAppStore(),
- crisp: useCrisp(),
- amplitude: useAmplitude(),
- opnformConfig,
- workspace,
- formsStore,
- form,
- user,
- workingFormStore,
- activeTab: computed(() => workingFormStore.activeTab)
+ // Check for 401 errors - these are handled by the HTTP interceptor
+ const errorStatus = error?.response?.status || error?.status
+ if (errorStatus === 401) {
+ // Token expiry is handled by the HTTP interceptor (opens QuickRegister modal)
+ // Don't show an additional error message
+ return
}
- },
-
- data() {
- return {
- showFormErrorModal: false,
- showLogicConfirmationModal: false,
- validationErrorResponse: null,
- updateFormLoading: false,
- createdFormSlug: null,
- logicErrors: [],
+
+ if (errorStatus === 422) {
+ validationErrorResponse.value = error.data
+ showValidationErrors()
+ } else {
+ console.error(error)
+ useAlert().error(
+ "An error occurred while saving the form, please try again.",
+ )
+ captureException(error)
}
- },
+ })
+}
- computed: {
- createdForm() {
- return this.formsStore.getByKey(this.createdFormSlug)
- }
- },
+const saveFormCreate = () => {
+ if (form.value.busy) return
+ // Attach workspace ID before sending
+ form.value.workspace_id = workspace.value.id
+ validationErrorResponse.value = null
- mounted() {
- this.$emit("mounted")
- this.workingFormStore.activeTab = 0
- useAmplitude().logEvent('form_editor_viewed')
- this.appStore.hideNavbar()
- if (!this.isEdit) {
- this.$nextTick(() => {
- this.workingFormStore.openAddFieldSidebar()
+ form.value.mutate(createMutation).then((response) => {
+ const newForm = response.form
+ emit("on-save")
+ createdFormSlug.value = newForm.slug
+
+ try{
+ // Analytics / alerts
+ amplitude.logEvent("form_created", {
+ form_id: newForm.id,
+ form_slug: newForm.slug,
+ })
+ crisp.pushEvent("form_created", {
+ form_id: newForm.id,
+ form_slug: newForm.slug,
})
+ } catch (error) {
+ console.error("Analytics error", error)
}
- },
+ displayFormModificationAlert({
+ form: newForm,
+ message: "Form successfully created.",
+ })
- beforeUnmount() {
- this.appStore.showNavbar()
- },
+ useRouter().push({
+ name: "forms-slug-show-share",
+ params: {
+ slug: createdFormSlug.value,
+ new_form: newForm.users_first_form ?? false,
+ },
+ })
+ }).catch((error) => {
+ console.error("Error saving form", error)
+
+ // Check for 401 errors - these are handled by the HTTP interceptor
+ const errorStatus = error?.response?.status || error?.status
+ if (errorStatus === 401) {
+ // Token expiry is handled by the HTTP interceptor (opens QuickRegister modal)
+ // Don't show an additional error message
+ return
+ }
+
+ if (errorStatus === 422) {
+ validationErrorResponse.value = error.data
+ showValidationErrors()
+ } else {
+ useAlert().error(
+ "An error occurred while saving the form, please try again.",
+ )
+ captureException(error)
+ }
+ })
+}
- methods: {
- goBack() {
- if (this.isEdit) {
- useRouter().push({ name: 'forms-slug-show-submissions', params: {slug:this.form.slug} })
- } else {
- useRouter().push({ name: 'home' })
- }
- },
- displayFormModificationAlert(responseData) {
- const alert = useAlert()
- if (
- responseData.form &&
- responseData.form.cleanings &&
- Object.keys(responseData.form.cleanings).length > 0
- ) {
- alert.warning(responseData.message)
- } else if (responseData.message) {
- alert.success(responseData.message)
- }
- },
- openCrisp() {
- this.crisp.openChat()
- },
- showValidationErrors() {
- this.showFormErrorModal = true
- },
- saveForm() {
- // Apply defaults to the form
- const defaultedData = setFormDefaults(this.form.data())
- this.form.fill(defaultedData)
-
- // Check for logic errors
- const { getLogicErrors } = useFormLogic()
- this.logicErrors = getLogicErrors(this.form.properties)
-
- if (this.logicErrors.length > 0) {
- this.showLogicConfirmationModal = true
- return
- }
-
- this.proceedWithSave()
- },
- proceedWithSave() {
- if (this.logicErrors.length > 0) {
- // Clean invalid logic before saving using the comprehensive validator
- const { validatePropertiesLogic } = useFormLogic()
- this.form.properties = validatePropertiesLogic(this.form.properties)
- }
-
- if (this.isGuest) {
- this.saveFormGuest()
- } else if (this.isEdit) {
- this.saveFormEdit()
- } else {
- this.saveFormCreate()
- }
- },
- handleLogicConfirmationCancel() {
- this.showLogicConfirmationModal = false
- },
- handleLogicConfirmationConfirm() {
- this.showLogicConfirmationModal = false
- this.proceedWithSave()
- },
- saveFormEdit() {
- if (this.updateFormLoading) return
-
- this.updateFormLoading = true
- this.validationErrorResponse = null
- this.form
- .put("/open/forms/{id}/".replace("{id}", this.form.id))
- .then((data) => {
- this.formsStore.save(data.form)
- this.$emit("on-save")
- this.$router.push({
- name: "forms-slug-show-share",
- params: { slug: this.form.slug },
- })
- this.amplitude.logEvent("form_saved", {
- form_id: this.form.id,
- form_slug: this.form.slug,
- })
- this.displayFormModificationAlert(data)
- })
- .catch((error) => {
- if (error?.response?.status === 422) {
- this.validationErrorResponse = error.data
- this.showValidationErrors()
- } else {
- useAlert().error(
- "An error occurred while saving the form, please try again.",
- )
- captureException(error)
- }
- })
- .finally(() => {
- this.updateFormLoading = false
- })
- },
- saveFormCreate() {
- if (this.updateFormLoading) return
- this.form.workspace_id = this.workspace.id
- this.validationErrorResponse = null
-
- this.updateFormLoading = true
- this.form
- .post("/open/forms")
- .then((response) => {
- this.formsStore.save(response.form)
- this.$emit("on-save")
- this.createdFormSlug = response.form.slug
-
- this.amplitude.logEvent("form_created", {
- form_id: response.form.id,
- form_slug: response.form.slug,
- })
- this.crisp.pushEvent("form_created", {
- form_id: response.form.id,
- form_slug: response.form.slug,
- })
- this.displayFormModificationAlert(response)
- useRouter().push({
- name: "forms-slug-show-share",
- params: {
- slug: this.createdFormSlug,
- new_form: response.users_first_form,
- },
- }).then(() => {
- this.updateFormLoading = false
- })
- })
- .catch((error) => {
- if (error?.response?.status === 422) {
- this.validationErrorResponse = error.data
- this.showValidationErrors()
- } else {
- useAlert().error(
- "An error occurred while saving the form, please try again.",
- )
- captureException(error)
- }
- this.updateFormLoading = false
- })
- },
- saveFormGuest() {
- this.$emit("openRegister")
- },
- },
+const saveFormGuest = () => {
+ emit("openRegister")
}
+
+defineExpose({
+ saveFormCreate
+})
+
+// Lifecycle hooks
+onMounted(() => {
+ emit("mounted")
+ workingFormStore.activeTab = 'build'
+ amplitude.logEvent('form_editor_viewed')
+ if (!props.isEdit) {
+ nextTick(() => {
+ workingFormStore.openAddFieldSidebar()
+ })
+ }
+})
</script>
<style lang="scss">
diff --git a/client/components/open/forms/components/FormEditorErrorHandler.vue b/client/components/open/forms/components/FormEditorErrorHandler.vue
index fcf1d27a9..d56f67e37 100644
--- a/client/components/open/forms/components/FormEditorErrorHandler.vue
+++ b/client/components/open/forms/components/FormEditorErrorHandler.vue
@@ -5,7 +5,7 @@
<h1 class="text-blue-800 text-2xl font-medium">
Oops! Something went wrong.
</h1>
- <p class="text-gray-500 max-w-lg text-center">
+ <p class="text-neutral-500 max-w-lg text-center">
It looks like your last action caused an issue on our side. We
apologize for
the
@@ -34,6 +34,8 @@
</template>
<script setup>
+import ErrorBoundary from '~/components/app/ErrorBoundary.vue'
+
const crisp = useCrisp()
const workingFormStore = useWorkingFormStore()
const form = storeToRefs(workingFormStore).content
diff --git a/client/components/open/forms/components/FormEditorNavbar.vue b/client/components/open/forms/components/FormEditorNavbar.vue
index be50554fc..22a3b3da1 100644
--- a/client/components/open/forms/components/FormEditorNavbar.vue
+++ b/client/components/open/forms/components/FormEditorNavbar.vue
@@ -15,31 +15,44 @@
<UTabs
id="form-editor-navbar-tabs"
+ class="px-4"
v-model="activeTab"
+ :content="false"
:items="[
- { label: 'Build' },
- { label: 'Design'},
- { label: 'Settings'}
+ { label: 'Build', value: 'build' },
+ { label: 'Design', value: 'design'}
]"
/>
+ <UButton
+ color="neutral"
+ variant="subtle"
+ icon="i-heroicons-cog-6-tooth"
+ label="Settings"
+ @click="settingsModal = true"
+ />
+ <FormSettingsModal
+ v-model="settingsModal"
+ @close="settingsModal = false"
+ hydrate-on-interaction
+ />
<div class="flex-grow flex justify-center gap-2">
<EditableTag
id="form-editor-title"
v-model="form.title"
element="h3"
- class="font-medium py-1 text-md w-48 text-gray-500 truncate form-editor-title"
+ class="font-medium py-1 text-md w-48 text-neutral-500 truncate form-editor-title"
/>
<UBadge
v-if="form.visibility == 'draft'"
- color="yellow"
+ color="warning"
variant="soft"
icon="i-heroicons-pencil-square"
label="Draft"
/>
<UBadge
v-else-if="form.visibility == 'closed'"
- color="gray"
+ color="neutral"
variant="soft"
icon="i-heroicons-lock-closed-20-solid"
label="Closed"
@@ -51,28 +64,25 @@
<div
class="flex items-stretch gap-x-2"
>
- <UTooltip
- text="Help"
- class="items-center relative"
- :popper="{ placement: 'left' }"
- >
- <a
- v-track.form_editor_help_button_clicked
- href="#"
- class="text-sm p-2 hover:bg-gray-100 cursor-pointer rounded-lg text-gray-500 hover:text-gray-800 cursor-pointer"
- @click.prevent="crisp.openHelpdesk()"
+ <TrackClick name="form_editor_help_button_clicked">
+ <UTooltip
+ text="Help"
+ class="items-center relative"
+ :popper="{ placement: 'left' }"
>
- <Icon
- name="heroicons:question-mark-circle"
- class="w-5 h-5"
+ <UButton
+ color="ghost"
+ icon="i-heroicons-question-mark-circle"
+ class="p-2 text-neutral-500 hover:text-neutral-800"
+ @click.prevent="crisp.openHelpdesk()"
/>
- </a>
- </UTooltip>
+ </UTooltip>
+ </TrackClick>
<slot name="before-save" />
<UTooltip :popper="{ placement: 'left' }">
- <template #text>
+ <template #content>
<UKbd
- :value="metaSymbol"
+ value="meta"
size="xs"
/>
<UKbd
@@ -80,46 +90,30 @@
size="xs"
/>
</template>
- <UButton
- v-track.save_form_click
- color="primary"
- class="px-8 md:px-4 py-2"
- :loading="updateFormLoading"
- :class="saveButtonClass"
- @click="emit('save-form')"
+ <TrackClick
+ name="save_form_click"
>
- <svg
- class="w-4 h-4 text-white inline mr-1 -mt-1"
- viewBox="0 0 24 24"
- fill="none"
- xmlns="http://www.w3.org/2000/svg"
- >
- <path
- d="M17 21V13H7V21M7 3V8H15M19 21H5C4.46957 21 3.96086 20.7893 3.58579 20.4142C3.21071 20.0391 3 19.5304 3 19V5C3 4.46957 3.21071 3.96086 3.58579 3.58579C3.96086 3.21071 4.46957 3 5 3H16L21 8V19C21 19.5304 20.7893 20.0391 20.4142 20.4142C20.0391 20.7893 19.5304 21 19 21Z"
- stroke="currentColor"
- stroke-width="2"
- stroke-linecap="round"
- stroke-linejoin="round"
- />
- </svg>
- <template v-if="form.visibility === 'public'">
- Publish Form
- </template>
- <template v-else>
- Save Changes
- </template>
- </UButton>
+ <UButton
+ color="primary"
+ class="px-8 md:px-4 py-2"
+ :loading="updateFormLoading"
+ :class="saveButtonClass"
+ icon="i-ic-outline-save"
+ @click="emit('save-form')"
+ :label="form.visibility === 'public' ? 'Publish Form' : 'Save Changes'"
+ />
+ </TrackClick>
</UTooltip>
</div>
</div>
</template>
<script setup>
-import { computed } from 'vue'
import { storeToRefs } from 'pinia'
-import UndoRedo from '../../editors/UndoRedo.vue'
-import { useWorkingFormStore } from '~/stores/working_form'
-import { useCrisp } from '~/composables/useCrisp'
+import UndoRedo from '~/components/open/editors/UndoRedo.vue'
+import FormSettingsModal from '~/components/open/forms/components/form-components/FormSettingsModal.vue'
+import EditableTag from '~/components/app/EditableTag.vue'
+import TrackClick from '~/components/global/TrackClick.vue'
defineProps({
backButton: {
@@ -138,7 +132,6 @@ defineProps({
const emit = defineEmits(['go-back', 'save-form'])
-const { metaSymbol } = useShortcuts()
defineShortcuts({
meta_s: {
handler: () => emit('save-form')
@@ -150,4 +143,6 @@ const crisp = useCrisp()
const form = computed(() => workingFormStore.content)
const { activeTab } = storeToRefs(workingFormStore)
+
+const settingsModal = ref(false)
</script>
\ No newline at end of file
diff --git a/client/components/open/forms/components/FormEditorSkeleton.vue b/client/components/open/forms/components/FormEditorSkeleton.vue
new file mode 100644
index 000000000..6b55739f2
--- /dev/null
+++ b/client/components/open/forms/components/FormEditorSkeleton.vue
@@ -0,0 +1,189 @@
+<template>
+ <div class="relative flex w-full flex-col grow max-h-screen">
+ <!-- Mobile warning (same as FormEditor) -->
+ <div
+ class="border-b bg-white md:hidden fixed inset-0 w-full z-50 flex flex-col items-center justify-center"
+ >
+ <Icon
+ name="heroicons:exclamation-circle"
+ class="w-10 h-10 text-blue-800"
+ />
+ <div class="p-5 text-blue-800 text-center">
+ OpnForm is not optimized for mobile devices. Please open this page on a device with a larger screen.
+ </div>
+ <div>
+ <UButton
+ color="neutral"
+ variant="outline"
+ size="lg"
+ class="w-full"
+ :to="{ name: 'home' }"
+ >
+ Back to dashboard
+ </UButton>
+ </div>
+ </div>
+
+ <!-- Navbar Skeleton -->
+ <div class="border-b bg-white px-4 py-3 flex items-center justify-between">
+ <!-- Back button and title -->
+ <div class="flex items-center gap-3">
+ <a
+ v-if="backButton"
+ href="#"
+ class="ml-2 flex text-blue font-semibold text-sm -m-1 hover:bg-blue-500/10 rounded-md p-1 group"
+ @click.prevent="$emit('go-back')"
+ >
+ <Icon
+ name="heroicons:arrow-left-20-solid"
+ class="text-blue mr-1 w-6 h-6 group-hover:-translate-x-0.5 transition-all"
+ />
+ </a>
+ <USkeleton v-else class="h-9 w-9" />
+ <USkeleton class="h-6 w-32" />
+ </div>
+
+ <!-- Save button -->
+ <USkeleton class="h-9 w-20" />
+ </div>
+
+ <!-- Main content area -->
+ <div class="w-full flex grow overflow-y-scroll relative bg-white">
+ <!-- Left sidebar skeleton -->
+ <div class="relative w-full shrink-0 overflow-y-scroll border-r md:w-1/2 md:max-w-xs lg:w-2/5">
+ <div class="p-4 space-y-4">
+ <!-- Tab buttons -->
+ <div class="flex gap-2 mb-6">
+ <USkeleton class="h-8 w-16" />
+ <USkeleton class="h-8 w-16" />
+ </div>
+
+ <!-- Form fields section -->
+ <div class="space-y-4">
+ <USkeleton class="h-5 w-24" />
+ <USkeleton class="h-10 w-full" />
+ <USkeleton class="h-5 w-32" />
+ <USkeleton class="h-8 w-full" />
+ <USkeleton class="h-5 w-28" />
+ <USkeleton class="h-12 w-full" />
+ <USkeleton class="h-5 w-20" />
+ <USkeleton class="h-6 w-full" />
+ </div>
+
+ <!-- Additional form options -->
+ <div class="space-y-3 mt-6">
+ <USkeleton class="h-4 w-36" />
+ <USkeleton class="h-9 w-full" />
+ <USkeleton class="h-4 w-28" />
+ <USkeleton class="h-9 w-full" />
+ <USkeleton class="h-4 w-32" />
+ <USkeleton class="h-16 w-full" />
+ </div>
+ </div>
+ </div>
+
+ <!-- Center preview area skeleton -->
+ <div class="flex-1 flex flex-col bg-neutral-50">
+ <div class="p-4 bg-white border-b">
+ <div class="flex items-center justify-between">
+ <USkeleton class="h-6 w-32" />
+ <div class="flex gap-2">
+ <USkeleton class="h-8 w-8" />
+ <USkeleton class="h-8 w-8" />
+ </div>
+ </div>
+ </div>
+
+ <div class="flex-1 p-6 overflow-y-auto">
+ <div class="max-w-lg mx-auto bg-white rounded-lg shadow-sm border p-6">
+ <!-- Form preview skeleton -->
+ <div class="space-y-6">
+ <div class="space-y-2">
+ <USkeleton class="h-8 w-3/4" />
+ <USkeleton class="h-4 w-full" />
+ <USkeleton class="h-4 w-2/3" />
+ </div>
+
+ <div class="space-y-4">
+ <div class="space-y-2">
+ <USkeleton class="h-4 w-24" />
+ <USkeleton class="h-10 w-full" />
+ </div>
+
+ <div class="space-y-2">
+ <USkeleton class="h-4 w-32" />
+ <USkeleton class="h-10 w-full" />
+ </div>
+
+ <div class="space-y-2">
+ <USkeleton class="h-4 w-28" />
+ <USkeleton class="h-24 w-full" />
+ </div>
+
+ <div class="space-y-2">
+ <USkeleton class="h-4 w-20" />
+ <USkeleton class="h-10 w-full" />
+ </div>
+ </div>
+
+ <USkeleton class="h-10 w-32" />
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <!-- Right sidebar skeleton -->
+ <div class="w-80 border-l bg-white p-4 space-y-4">
+ <div class="flex items-center justify-between">
+ <USkeleton class="h-6 w-24" />
+ <USkeleton class="h-6 w-6" />
+ </div>
+
+ <div class="space-y-4">
+ <div class="space-y-2">
+ <USkeleton class="h-4 w-20" />
+ <USkeleton class="h-9 w-full" />
+ </div>
+
+ <div class="space-y-2">
+ <USkeleton class="h-4 w-24" />
+ <USkeleton class="h-9 w-full" />
+ </div>
+
+ <div class="space-y-2">
+ <USkeleton class="h-4 w-32" />
+ <USkeleton class="h-16 w-full" />
+ </div>
+
+ <div class="space-y-2">
+ <USkeleton class="h-4 w-28" />
+ <USkeleton class="h-9 w-full" />
+ </div>
+
+ <!-- Field options -->
+ <div class="border-t pt-4 space-y-3">
+ <USkeleton class="h-4 w-36" />
+ <USkeleton class="h-8 w-full" />
+ <USkeleton class="h-4 w-28" />
+ <USkeleton class="h-8 w-full" />
+ <USkeleton class="h-4 w-32" />
+ <USkeleton class="h-12 w-full" />
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</template>
+
+<script setup>
+// Define props
+defineProps({
+ backButton: {
+ type: Boolean,
+ default: true
+ }
+})
+
+// Define emits
+defineEmits(['go-back'])
+</script>
\ No newline at end of file
diff --git a/client/components/open/forms/components/FormFieldsEditor.vue b/client/components/open/forms/components/FormFieldsEditor.vue
index 3bd5f3e60..2087e16b9 100644
--- a/client/components/open/forms/components/FormFieldsEditor.vue
+++ b/client/components/open/forms/components/FormFieldsEditor.vue
@@ -2,7 +2,8 @@
<div class="relative">
<div class="flex gap-2 sticky top-0 bg-white border-b z-10 p-4">
<UButton
- color="gray"
+ color="neutral"
+ variant="subtle"
icon="i-heroicons-plus"
class="flex-grow justify-center"
@click.prevent="openAddFieldSidebar"
@@ -15,15 +16,15 @@
<Draggable
v-model="form.properties"
item-key="id"
- class="mx-auto w-full overflow-hidden rounded-md border border-gray-300 bg-white transition-colors dark:bg-notion-dark-light"
- ghost-class="bg-nt-blue-lighter"
+ class="mx-auto w-full overflow-hidden rounded-md border border-neutral-300 bg-white transition-colors dark:bg-notion-dark-light"
+ ghost-class="bg-blue-100"
:animation="200"
>
<template #item="{ element, index }">
<div
- class="mx-auto w-full border-gray-300 transition-colors cursor-grab"
+ class="mx-auto w-full border-neutral-300 transition-colors cursor-grab"
:class="{
- 'bg-gray-100 ': element.hidden,
+ 'bg-neutral-100 ': element.hidden,
'bg-white ': !element.hidden,
'border-b': index !== form.properties.length - 1,
' !border-blue-400 border-b-2': element.type === 'nf-page-break',
@@ -40,7 +41,7 @@
<!-- Field name and type -->
<div class="flex grow flex-col truncate">
<EditableTag
- class="truncate text-gray-700 min-w-16 min-h-6"
+ class="truncate text-neutral-700 min-w-16 min-h-6"
:model-value="element.name"
@update:model-value="onChangeName(element, $event)"
>
@@ -52,10 +53,10 @@
<UTooltip :text="element.hidden ? 'Show Block' : 'Hide Block'">
<button
- class="hidden !cursor-pointer rounded p-1 transition-colors hover:bg-nt-blue-lighter items-center justify-center"
+ class="hidden !cursor-pointer rounded-sm p-1 transition-colors hover:bg-blue-100 items-center justify-center"
:class="{
- 'text-gray-300 hover:text-blue-500 md:group-hover:flex': !element.hidden,
- 'text-gray-300 hover:text-gray-500 md:flex': element.hidden,
+ 'text-neutral-300 hover:text-blue-500 md:group-hover:flex': !element.hidden,
+ 'text-neutral-300 hover:text-neutral-500 md:flex': element.hidden,
}"
@click="toggleHidden(element)"
>
@@ -78,9 +79,9 @@
:text="element.required ? 'Make it optional' : 'Make it required'"
>
<button
- class="hidden cursor-pointer rounded p-0.5 transition-colors hover:bg-nt-blue-lighter items-center px-1 justify-center"
+ class="hidden cursor-pointer rounded-sm p-0.5 transition-colors hover:bg-blue-100 items-center px-1 justify-center"
:class="{
- 'md:group-hover:flex text-gray-300 hover:text-red-500': !element.required,
+ 'md:group-hover:flex text-neutral-300 hover:text-red-500': !element.required,
'md:flex text-red-500': element.required,
}"
@click="toggleRequired(element)"
@@ -93,7 +94,7 @@
</button>
</UTooltip>
<button
- class="cursor-pointer rounded p-1 transition-colors hover:bg-nt-blue-lighter text-gray-300 hover:text-blue-500 flex items-center justify-center"
+ class="cursor-pointer rounded-sm p-1 transition-colors hover:bg-blue-100 text-neutral-300 hover:text-blue-500 flex items-center justify-center"
@click="editOptions(index)"
>
<Icon
@@ -111,7 +112,7 @@
<script>
import draggable from 'vuedraggable'
-import EditableTag from '~/components/global/EditableTag.vue'
+import EditableTag from '~/components/app/EditableTag.vue'
import BlockTypeIcon from './BlockTypeIcon.vue'
export default {
diff --git a/client/components/open/forms/components/FormStats.vue b/client/components/open/forms/components/FormStats.vue
index ba9b65f05..7d398466b 100644
--- a/client/components/open/forms/components/FormStats.vue
+++ b/client/components/open/forms/components/FormStats.vue
@@ -1,9 +1,10 @@
<template>
<div>
- <div class="flex flex-wrap items-end mt-5">
- <h3 class="flex-grow font-medium text-lg mb-3">
+ <div class="flex flex-wrap items-end mt-5 gap-2">
+ <h3 class="flex-grow font-medium text-lg">
Views & Submission History
</h3>
+ <VForm size="sm">
<DateInput
:form="filterForm"
name="filter_date"
@@ -12,16 +13,26 @@
:disable-future-dates="true"
:disabled="!form.is_pro"
/>
+ </VForm>
+ <UButton
+ class="self-stretch mt-1"
+ color="neutral"
+ variant="outline"
+ :disabled="!form.is_pro"
+ @click.prevent="refresh"
+ icon="i-heroicons-arrow-path"
+ :loading="isLoading"
+ />
</div>
<div
- class="border border-gray-300 rounded-lg shadow-sm p-4 mb-5 w-full mx-auto mt-4 select-all"
+ class="border border-neutral-300 rounded-lg shadow-xs p-4 mb-5 w-full mx-auto mt-2 select-all"
>
<div
v-if="!form.is_pro"
class="relative"
>
<div class="absolute inset-0 z-10">
- <div class="p-5 max-w-md mx-auto mt-5">
+ <div class="p-5 max-w-md mx-auto flex flex-col items-center justify-center h-full">
<p class="text-center">
You need a <pro-tag
upgrade-modal-title="Upgrade today to access form analytics"
@@ -29,36 +40,41 @@
/> subscription to access your form
analytics.
</p>
- <p class="mt-5 text-center">
- <v-button
- class="w-full"
- @click.prevent="subscriptionModalStore.openModal()"
- >
- Subscribe
- </v-button>
- </p>
+ <UButton
+ class="mt-5 flex justify-center"
+ @click.prevent="openSubscriptionModal({modal_title: 'Upgrade to unlock form Analytics'})"
+ label="Subscribe"
+ />
</div>
</div>
<img
src="/img/pages/forms/blurred_graph.png"
alt="Sample Graph"
- class="mx-auto filter blur-md z-0"
+ class="mx-auto w-full filter blur-md z-0 pointer-events-none"
>
</div>
- <Loader
- v-else-if="isLoading"
- class="h-6 w-6 text-nt-blue mx-auto"
- />
- <LineChart
- v-else
- :options="chartOptions"
- :data="chartData"
- />
+ <VTransition v-else name="fade">
+ <div
+ v-if="isLoading"
+ class="space-y-3"
+ >
+ <USkeleton class="h-4 w-full" />
+ <USkeleton class="h-4 w-3/4" />
+ <USkeleton class="h-4 w-1/2" />
+ <USkeleton class="h-32 w-full" />
+ </div>
+ <LineChart
+ v-else
+ :options="chartOptions"
+ :data="chartData"
+ />
+ </VTransition>
</div>
</div>
</template>
-<script>
+<script setup>
+import ProTag from "~/components/app/ProTag.vue"
import { Line as LineChart } from "vue-chartjs"
import {
Chart as ChartJS,
@@ -81,112 +97,106 @@ ChartJS.register(
PointElement,
)
-export default {
- name: "FormStats",
- components: { LineChart },
- props: {
- form: {
- type: Object,
- required: true,
- },
+const props = defineProps({
+ form: {
+ type: Object,
+ required: true,
},
- setup() {
- const subscriptionModalStore = useSubscriptionModalStore()
- const filterForm = useForm({
- filter_date: null,
- })
- return {
- subscriptionModalStore,
- filterForm
- }
- },
- data() {
- return {
- isLoading: true,
- chartData: {
- labels: [],
- datasets: [
- {
- label: "Form Views",
- backgroundColor: "rgba(59, 130, 246, 1)",
- borderColor: "rgba(59, 130, 246, 1)",
- data: [],
- },
- {
- label: "Form Submissions",
- backgroundColor: "rgba(16, 185, 129, 1)",
- borderColor: "rgba(16, 185, 129, 1)",
- data: [],
- },
- ].concat(this.form.enable_partial_submissions ? [{
- label: "Partial Submissions",
- backgroundColor: "rgba(255, 193, 7, 1)",
- borderColor: "rgba(255, 193, 7, 1)",
- data: [],
- }] : []),
- },
- chartOptions: {
- scales: {
- y: {
- beginAtZero: true,
- ticks: {
- precision: 0,
- },
- },
- },
- responsive: true,
- maintainAspectRatio: true,
+})
+
+const { openSubscriptionModal } = useAppModals()
+
+const toDate = new Date()
+const fromDate = new Date(toDate)
+fromDate.setDate(toDate.getDate() - 29)
+const filterForm = useForm({
+ filter_date: [fromDate.toISOString().split('T')[0], toDate.toISOString().split('T')[0]],
+})
+
+// Use query composables instead of manual API calls
+const { stats, invalidateStats } = useFormStats()
+
+// Set up default date range (last 30 days)
+onMounted(() => {
+ const toDate = new Date()
+ const fromDate = new Date(toDate)
+ fromDate.setDate(toDate.getDate() - 29)
+ filterForm.filter_date = [fromDate.toISOString().split('T')[0], toDate.toISOString().split('T')[0]]
+})
+
+const fromDateComputed = computed(() => {
+ return filterForm.filter_date?.[0] ? filterForm.filter_date[0].split('T')[0] : null
+})
+const toDateComputed = computed(() => {
+ return filterForm.filter_date?.[1] ? filterForm.filter_date[1].split('T')[0] : null
+})
+
+// Get stats data using query composable
+const { data: statsData, isFetching: isQueryLoading } = stats(
+ props.form.workspace_id,
+ props.form.id,
+ fromDateComputed,
+ toDateComputed,
+ {enabled: computed(() => import.meta.client && props.form && props.form.is_pro)}
+)
+
+// Handle loading state for SSR - show skeleton during SSR if query would run on client
+const isLoading = computed(() => {
+ if (import.meta.server) {
+ return !!props.form && props.form.is_pro
+ }
+ return isQueryLoading.value
+})
+
+// Refresh function to invalidate both stats and stats-details queries with current parameters
+const refresh = () => {
+ invalidateStats(props.form.id)
+}
+
+// Chart configuration
+const chartOptions = {
+ scales: {
+ y: {
+ beginAtZero: true,
+ ticks: {
+ precision: 0,
},
- }
- },
- watch: {
- filterForm: {
- deep: true,
- handler(newVal) {
- if(newVal.filter_date && Array.isArray(newVal.filter_date) && newVal.filter_date[0] && newVal.filter_date[1]) {
- this.getChartData()
- }
- }
- }
- },
- mounted() {
- if (this.form.is_pro) {
- const toDate = new Date()
- const fromDate = new Date(toDate)
- fromDate.setDate(toDate.getDate() - 29)
- this.filterForm.filter_date = [fromDate.toISOString().split('T')[0], toDate.toISOString().split('T')[0]]
- }
- },
- methods: {
- getChartData() {
- if (!this.form || !this.form.is_pro) { return null }
- this.isLoading = true
- opnFetch(
- "/open/workspaces/" +
- this.form.workspace_id +
- "/form-stats/" +
- this.form.id,
- {
- params: {
- date_from: this.filterForm.filter_date[0] ? this.filterForm.filter_date[0].split('T')[0] : null,
- date_to: this.filterForm.filter_date[1] ? this.filterForm.filter_date[1].split('T')[0] : null,
- }
- }
- ).then((statsData) => {
- if (statsData && statsData.views !== undefined) {
- this.chartData.labels = Object.keys(statsData.views)
- this.chartData.datasets[0].data = statsData.views
- this.chartData.datasets[1].data = statsData.submissions
- if (this.form.enable_partial_submissions) {
- this.chartData.datasets[2].data = statsData.partial_submissions
- }
- this.isLoading = false
- }
- }).catch((error) => {
- this.isLoading = false
- useAlert().error(error.data.message)
- })
},
},
+ responsive: true,
+ maintainAspectRatio: true,
}
+
+// Chart data computed from query results
+const chartData = computed(() => {
+ const baseDatasets = [
+ {
+ label: "Form Views",
+ backgroundColor: "rgba(59, 130, 246, 1)",
+ borderColor: "rgba(59, 130, 246, 1)",
+ data: statsData.value?.views || [],
+ },
+ {
+ label: "Form Submissions",
+ backgroundColor: "rgba(16, 185, 129, 1)",
+ borderColor: "rgba(16, 185, 129, 1)",
+ data: statsData.value?.submissions || [],
+ },
+ ]
+
+ // Add partial submissions dataset if enabled
+ if (props.form.enable_partial_submissions) {
+ baseDatasets.push({
+ label: "Partial Submissions",
+ backgroundColor: "rgba(255, 193, 7, 1)",
+ borderColor: "rgba(255, 193, 7, 1)",
+ data: statsData.value?.partial_submissions || [],
+ })
+ }
+
+ return {
+ labels: Object.keys(statsData.value?.views || {}),
+ datasets: baseDatasets,
+ }
+})
</script>
diff --git a/client/components/open/forms/components/FormStatusBadges.vue b/client/components/open/forms/components/FormStatusBadges.vue
index d8475192d..d4b15a53f 100644
--- a/client/components/open/forms/components/FormStatusBadges.vue
+++ b/client/components/open/forms/components/FormStatusBadges.vue
@@ -6,9 +6,9 @@
<!-- Draft Badge -->
<UTooltip v-if="form.visibility === 'draft'" text="Not publicly accessible">
<UBadge
- color="amber"
+ color="warning"
variant="subtle"
- icon="i-heroicons-exclamation-triangle"
+ icon="i-heroicons-pencil-square"
:size="size"
>
Draft
@@ -18,7 +18,7 @@
<!-- Closed Badge -->
<UTooltip v-else-if="form.visibility === 'closed'" text="Won't accept new submissions">
<UBadge
- color="gray"
+ color="neutral"
variant="subtle"
icon="i-heroicons-lock-closed"
:size="size"
@@ -28,38 +28,66 @@
</UTooltip>
<!-- Time Limited Badge -->
- <UTooltip v-if="form.closes_at && !form.is_closed" :text="`Will close on ${closesDate}`">
- <UBadge
- color="amber"
- variant="subtle"
- icon="i-heroicons-clock"
- :size="size"
- >
- Time limited
- </UBadge>
- </UTooltip>
+ <template v-else-if="form.closes_at">
+ <UTooltip v-if="!form.is_closed" :text="`Will close on ${closesDate}`">
+ <UBadge
+ color="warning"
+ variant="subtle"
+ icon="i-heroicons-clock"
+ :size="size"
+ >
+ Time limited
+ </UBadge>
+ </UTooltip>
+ <UTooltip v-else :text="`Closed on ${closesDate}`">
+ <UBadge
+ color="neutral"
+ variant="subtle"
+ icon="i-heroicons-clock"
+ :size="size"
+ >
+ Closed
+ </UBadge>
+ </UTooltip>
+ </template>
<!-- Submission Limited Badge -->
- <UTooltip
- v-if="form.max_submissions_count > 0 && !form.max_number_of_submissions_reached"
- :text="`Limited to ${form.max_submissions_count} submissions`"
- >
- <UBadge
- color="amber"
- variant="subtle"
- icon="i-heroicons-chart-bar"
- :size="size"
+ <template v-else-if="form.max_submissions_count > 0">
+ <UTooltip
+ v-if="!form.max_number_of_submissions_reached"
+ :text="`Limited to ${form.max_submissions_count} submissions`"
>
- Submission limited
- </UBadge>
- </UTooltip>
+ <UBadge
+ color="warning"
+ variant="subtle"
+ icon="i-heroicons-chart-bar"
+ :size="size"
+ >
+ Submission limited
+ </UBadge>
+ </UTooltip>
+ <UTooltip
+ v-else
+ :text="`Maximum ${form.max_submissions_count} submissions reached`"
+ >
+ <UBadge
+ color="neutral"
+ variant="subtle"
+ icon="i-heroicons-chart-bar"
+ :size="size"
+ >
+ Submissions full
+ </UBadge>
+ </UTooltip>
+ </template>
<!-- Tags Badges -->
<UBadge
+ v-if="withTags"
v-for="tag in form.tags"
:key="tag"
- color="white"
- variant="solid"
+ color="neutral"
+ variant="outline"
class="capitalize"
:size="size"
>
@@ -78,8 +106,12 @@ const props = defineProps({
},
size: {
type: String,
- default: 'sm',
+ default: 'md',
validator: (value) => ['xs', 'sm', 'md', 'lg'].includes(value)
+ },
+ withTags: {
+ type: Boolean,
+ default: true
}
})
diff --git a/client/components/open/forms/components/FormSubmissions.vue b/client/components/open/forms/components/FormSubmissions.vue
index 1af1a1e4d..b3e88b0c8 100644
--- a/client/components/open/forms/components/FormSubmissions.vue
+++ b/client/components/open/forms/components/FormSubmissions.vue
@@ -1,291 +1,120 @@
<template>
- <div
- id="table-page"
- class="w-full flex flex-col"
- >
- <div class="w-full md:w-4/5 lg:w-3/5 md:mx-auto md:max-w-4xl px-4 pt-4">
- <h3 class="font-semibold mb-4 text-xl">
- Form Submissions
- </h3>
-
- <!-- Settings Modal -->
- <form-columns-settings-modal
+ <div class="w-full">
+ <VTransition name="fade">
+ <OpenTable
v-if="form"
- :show="showColumnsModal"
+ ref="table"
+ :data="tableData"
+ :loading="isLoading"
:form="form"
- :columns="properties"
- :display-columns="displayColumns"
- :wrap-columns="wrapColumns"
- @update:display-columns="displayColumns = $event"
- @update:wrap-columns="wrapColumns = $event"
- @close="showColumnsModal = false"
- @update:columns="onColumnUpdated"
+ @deleted="onDeleteRecord"
+ @updated="(submission)=>onUpdateRecord(submission)"
/>
- <Loader
- v-if="!form"
- class="h-6 w-6 text-nt-blue mx-auto"
- />
- <div v-else>
- <div
- v-if="form && tableData.length > 0"
- class="flex flex-wrap items-center mb-4"
- >
- <div class="flex-grow">
- <VForm size="sm">
- <text-input
- class="w-64"
- :form="searchForm"
- name="search"
- placeholder="Search..."
- />
- </VForm>
+ <!-- Submissions Table Skeleton -->
+ <div v-else class="overflow-hidden mt-4">
+ <!-- Table Header Skeleton -->
+ <div class="bg-neutral-50 border-y border-neutral-200 px-4 py-3">
+ <div class="flex gap-4">
+ <USkeleton class="h-4 w-32" />
+ <USkeleton class="h-4 w-24" />
+ <USkeleton class="h-4 w-28" />
+ <USkeleton class="h-4 w-20" />
</div>
- <div class="font-semibold flex gap-2">
- <USelectMenu
- class="w-32"
- v-if="form.enable_partial_submissions"
- v-model="selectedStatus"
- :options="statusList"
- value-attribute="value"
- option-attribute="label"
- />
- <UButton
- size="sm"
- color="white"
- icon="heroicons:adjustments-horizontal"
- label="Edit columns"
- @click="showColumnsModal=true"
- />
- <UButton
- size="sm"
- color="white"
- icon="heroicons:arrow-down-tray"
- label="Export"
- :loading="exportLoading"
- @click="downloadAsCsv"
- />
+ </div>
+
+ <!-- Table Rows Skeleton -->
+ <div v-for="i in ['opacity-100', 'opacity-90', 'opacity-80', 'opacity-70', 'opacity-60', 'opacity-50', 'opacity-40', 'opacity-30', 'opacity-20', 'opacity-10']" :key="i" class="border-b border-neutral-200 px-4 py-3" :class="i">
+ <div class="flex gap-4 items-center">
+ <USkeleton class="h-4 w-32" />
+ <USkeleton class="h-4 w-24" />
+ <USkeleton class="h-4 w-28" />
+ <USkeleton class="h-4 w-20" />
</div>
</div>
</div>
+ </VTransition>
</div>
- <div class="px-4 pb-4 flex justify-center">
- <scroll-shadow
- ref="shadows"
- class="border h-full notion-database-renderer"
- :shadow-top-offset="0"
- :hide-scrollbar="true"
- >
- <open-table
- v-if="form"
- ref="table"
- class="max-h-full"
- :columns="properties"
- :wrap-columns="wrapColumns"
- :data="filteredData"
- :loading="isLoading"
- :scroll-parent="parentPage"
- @resize="dataChanged()"
- @deleted="onDeleteRecord"
- @updated="(submission)=>onUpdateRecord(submission)"
- @update-columns="onColumnUpdated"
- />
- </scroll-shadow>
- </div>
- </div>
</template>
-<script>
-import Fuse from 'fuse.js'
-import clonedeep from 'clone-deep'
-import OpenTable from '../../tables/OpenTable.vue'
-import FormColumnsSettingsModal from './FormColumnsSettingsModal.vue'
+<script setup>
+import OpenTable from '~/components/open/tables/OpenTable.vue'
+import { formsApi } from '~/api/forms'
-export default {
- name: 'FormSubmissions',
- components: { OpenTable, FormColumnsSettingsModal },
- props: {},
+const props = defineProps({
+ form: { type: Object, required: true },
+})
- setup() {
- const workingFormStore = useWorkingFormStore()
- const recordStore = useRecordsStore()
- const form = storeToRefs(workingFormStore).content
- const tableData = storeToRefs(recordStore).getAll
+const recordStore = useRecordsStore()
+const tableData = storeToRefs(recordStore).getAll
+const route = useRoute()
+const slug = route.params.slug
- return {
- workingFormStore,
- recordStore,
- form,
- tableData,
- runtimeConfig: useRuntimeConfig(),
- slug: useRoute().params.slug
- }
- },
+const fullyLoaded = ref(false)
+const table = ref(null)
- data() {
- return {
- fullyLoaded: false,
- showColumnsModal: false,
- properties: [],
- exportLoading: false,
- searchForm: useForm({
- search: ''
- }),
- displayColumns: {},
- wrapColumns: {},
- statusList: [
- { label: 'All', value: 'all' },
- { label: 'Submitted', value: 'completed' },
- { label: 'In Progress', value: 'partial' }
- ],
- selectedStatus: 'all',
- }
- },
+const isLoading = computed(() => {
+ return recordStore.loading
+})
- computed: {
- parentPage() {
- if (import.meta.server) {
- return null
- }
- return window
- },
- exportUrl() {
- if (!this.form) {
- return ''
- }
- return this.runtimeConfig.public.apiBase + '/open/forms/' + this.form.id + '/submissions/export'
- },
- isLoading() {
- return this.recordStore.loading
- },
- filteredData() {
- if (!this.tableData) return []
+onMounted(() => {
+ onFormChange()
+})
- let filteredData = clonedeep(this.tableData)
+watch(() => props.form?.id, () => {
+ onFormChange()
+})
- if (this.selectedStatus !== 'all') {
- filteredData = filteredData.filter((submission) => submission.status === this.selectedStatus)
- }
+const onFormChange = () => {
+ if (props.form === null || props.form.slug !== slug) {
+ return
+ }
+ fullyLoaded.value = false
+ getSubmissionsData()
+}
- if (this.searchForm.search === '' || this.searchForm.search === null) {
- return filteredData
- }
+const getSubmissionsData = () => {
+ if (fullyLoaded.value) {
+ return
+ }
- // Fuze search
- const fuzeOptions = {
- keys: this.properties.map((field) => field.id)
- }
- const fuse = new Fuse(filteredData, fuzeOptions)
- return fuse.search(this.searchForm.search).map((res) => {
- return res.item
+ recordStore.startLoading()
+ formsApi.submissions.list(props.form.id, { query: { page: 1 } }).then((firstResponse) => {
+ recordStore.save(firstResponse.data.map((record) => record.data))
+
+ const lastPage = firstResponse.meta.last_page
+
+ if (lastPage > 1) {
+ // Create an array of promises for remaining pages
+ const remainingPages = Array.from({ length: lastPage - 1 }, (_, i) => {
+ const page = i + 2 // Start from page 2
+ return formsApi.submissions.list(props.form.id, { query: { page } })
})
- },
- },
-
- watch: {
- 'form.id'() {
- this.onFormChange()
- },
- 'searchForm.search'() {
- this.dataChanged()
- },
- 'selectedStatus'() {
- this.dataChanged()
+
+ // Fetch all remaining pages in parallel
+ return Promise.all(remainingPages)
}
- },
+ return []
+ }).then(responses => {
+ // Save all responses data
+ responses.forEach(response => {
+ recordStore.save(response.data.map((record) => record.data))
+ })
+
+ fullyLoaded.value = true
+ recordStore.stopLoading()
+ }).catch(() => {
+ recordStore.stopLoading()
+ })
+}
- mounted() {
- this.onFormChange()
- },
- methods: {
- onFormChange() {
- if (this.form === null || this.form.slug !== this.slug) {
- return
- }
- this.fullyLoaded = false
- this.getSubmissionsData()
- },
- getSubmissionsData() {
- if (this.fullyLoaded) {
- return
- }
- this.recordStore.startLoading()
-
- opnFetch('/open/forms/' + this.form.id + '/submissions?page=1').then((firstResponse) => {
- this.recordStore.save(firstResponse.data.map((record) => record.data))
-
- const lastPage = firstResponse.meta.last_page
-
- if (lastPage > 1) {
- // Create an array of promises for remaining pages
- const remainingPages = Array.from({ length: lastPage - 1 }, (_, i) => {
- const page = i + 2 // Start from page 2
- return opnFetch('/open/forms/' + this.form.id + '/submissions?page=' + page)
- })
-
- // Fetch all remaining pages in parallel
- return Promise.all(remainingPages)
- }
- return []
- }).then(responses => {
- // Save all responses data
- responses.forEach(response => {
- this.recordStore.save(response.data.map((record) => record.data))
- })
-
- this.fullyLoaded = true
- this.recordStore.stopLoading()
- this.dataChanged()
- }).catch(() => {
- this.recordStore.stopLoading()
- })
- },
- dataChanged() {
- if (this.$refs.shadows) {
- this.$refs.shadows.toggleShadow()
- this.$refs.shadows.calcDimensions()
- }
- },
- onColumnUpdated(columns) {
- this.properties = columns
- this.dataChanged()
- },
- onUpdateRecord(submission) {
- this.recordStore.save(submission)
- this.dataChanged()
- },
- onDeleteRecord(submission) {
- this.recordStore.remove(submission)
- this.dataChanged()
- },
- downloadAsCsv() {
- if (this.exportLoading) {
- return
- }
- this.exportLoading = true
- opnFetch(this.exportUrl, {
- responseType: "blob",
- method: "POST",
- body: {
- columns: this.displayColumns
- }
- }).then(blob => {
- const filename = `${this.form.slug}-${Date.now()}-submissions.csv`
- const a = document.createElement("a")
- document.body.appendChild(a)
- a.style = "display: none"
- const url = window.URL.createObjectURL(blob)
- a.href = url
- a.download = filename
- a.click()
- window.URL.revokeObjectURL(url)
- }).catch((error) => {
- console.error(error)
- }).finally(() => {
- this.exportLoading = false
- })
- }
- }
+const onUpdateRecord = (submission) => {
+ recordStore.save(submission)
}
+
+const onDeleteRecord = (submission) => {
+ recordStore.remove(submission)
+}
+
</script>
diff --git a/client/components/open/forms/components/FormUrlPrefill.vue b/client/components/open/forms/components/FormUrlPrefill.vue
index cc5bf8e34..e9a28e06c 100644
--- a/client/components/open/forms/components/FormUrlPrefill.vue
+++ b/client/components/open/forms/components/FormUrlPrefill.vue
@@ -1,6 +1,6 @@
<template>
<div
- class="border border-nt-blue-light bg-blue-50 dark:bg-notion-dark-light shadow rounded-md p-4 mb-5 w-full mx-auto mt-4 select-all"
+ class="border border-blue-300 bg-blue-50 dark:bg-notion-dark-light shadow-sm rounded-sm p-4 mb-5 w-full mx-auto mt-4 select-all"
>
<div class="flex items-center">
<p
@@ -8,12 +8,12 @@
v-html="preFillUrl"
/>
<div
- class="hover:bg-nt-blue-lighter rounded transition-colors cursor-pointer"
+ class="hover:bg-blue-100 rounded-sm transition-colors cursor-pointer"
@click="copyToClipboard"
>
<svg
xmlns="http://www.w3.org/2000/svg"
- class="h-6 w-6 text-nt-blue"
+ class="h-6 w-6 text-blue-500"
fill="none"
viewBox="0 0 24 24"
stroke="currentColor"
diff --git a/client/components/open/forms/components/FormWorkspaceModal.vue b/client/components/open/forms/components/FormWorkspaceModal.vue
index 6fc263785..8d7e320b2 100644
--- a/client/components/open/forms/components/FormWorkspaceModal.vue
+++ b/client/components/open/forms/components/FormWorkspaceModal.vue
@@ -1,34 +1,32 @@
<template>
- <modal
- :show="show"
- @close="emit('close')"
+ <UModal
+ v-model:open="isOpen"
+ :ui="{ content: 'sm:max-w-lg' }"
>
- <template #icon>
- <svg
- xmlns="http://www.w3.org/2000/svg"
- fill="none"
- viewBox="0 0 24 24"
- stroke-width="1.5"
- stroke="currentColor"
- class="w-8 h-8"
+ <template #header>
+ <div class="flex items-center w-full gap-4 px-2">
+ <h2 class="font-semibold">
+ Change form's workspace
+ </h2>
+ </div>
+ <UButton
+ color="neutral"
+ variant="outline"
+ icon="i-heroicons-question-mark-circle"
+ size="sm"
+ @click="crisp.openHelpdeskArticle('how-to-move-a-form-to-another-workspace-1twq0kg')"
>
- <path
- stroke-linecap="round"
- stroke-linejoin="round"
- d="M2.25 21h19.5m-18-18v18m10.5-18v18m6-13.5V21M6.75 6.75h.75m-.75 3h.75m-.75 3h.75m3-6h.75m-.75 3h.75m-.75 3h.75M6.75 21v-3.375c0-.621.504-1.125 1.125-1.125h2.25c.621 0 1.125.504 1.125 1.125V21M3 3h12m-.75 4.5H21m-3.75 3.75h.008v.008h-.008v-.008Zm0 3h.008v.008h-.008v-.008Zm0 3h.008v.008h-.008v-.008Z"
- />
- </svg>
- </template>
- <template #title>
- Change form's workspace
+ Help
+ </UButton>
</template>
- <div class="p-4">
+
+ <template #body>
<div class="flex space-x-4 items-center">
<p>Current workspace:</p>
- <div class="flex items-center cursor group p-2 rounded border">
+ <div class="flex items-center cursor group p-2 rounded-sm border">
<WorkspaceIcon :workspace="workspace" />
<p
- class="lg:block max-w-10 truncate ml-2 text-gray-800 dark:text-gray-200"
+ class="lg:block max-w-10 truncate ml-2 text-neutral-800 dark:text-neutral-200"
>
{{ workspace.name }}
</p>
@@ -45,40 +43,56 @@
label="Select destination workspace"
/>
</div>
- <div class="flex justify-end mt-4 pb-5">
- <v-button
- class="mr-2"
- :loading="loading"
- >
- Change workspace
- </v-button>
- <v-button
- color="white"
- @click.prevent="emit('close')"
- >
- Close
- </v-button>
- </div>
</form>
- </div>
- </modal>
+ </template>
+
+ <template #footer>
+ <div class="flex justify-end gap-x-2">
+ <UButton
+ color="neutral"
+ variant="outline"
+ @click="close"
+ label="Close"
+ />
+ <UButton
+ :loading="loading"
+ @click="onSubmit"
+ label="Change workspace"
+ />
+ </div>
+ </template>
+ </UModal>
</template>
<script setup>
import { ref, defineProps, defineEmits, computed } from "vue"
import WorkspaceIcon from "~/components/workspaces/WorkspaceIcon.vue"
+
const emit = defineEmits(["close"])
-const workspacesStore = useWorkspacesStore()
-const formsStore = useFormsStore()
+const { switchTo } = useCurrentWorkspace()
+const crisp = useCrisp()
const selectedWorkspace = ref(null)
const props = defineProps({
show: { type: Boolean, required: true },
form: { type: Object, required: true },
})
-const workspaces = computed(() => workspacesStore.getAll)
+
+// Modal state
+const isOpen = computed({
+ get() {
+ return props.show
+ },
+ set(value) {
+ if (!value) {
+ close()
+ }
+ }
+})
+
+const { data: workspaces } = useWorkspaces().list()
const workspace = computed(() =>
- workspacesStore.getByKey(props.form?.workspace_id),
+ workspaces.value?.find(w => w.id === props.form?.workspace_id)
)
const loading = ref(false)
const workspacesSelectOptions = computed(() =>
@@ -89,33 +103,44 @@ const workspacesSelectOptions = computed(() =>
.map((workspace) => ({ name: workspace.name, value: workspace.id })),
)
+const { updateWorkspace } = useForms()
+const updateWorkspaceMutation = updateWorkspace()
+
+const close = () => {
+ emit("close")
+}
+
const onSubmit = () => {
- const endpoint =
- "/open/forms/" + props.form.id + "/workspace/" + selectedWorkspace.value
if (!selectedWorkspace.value) {
useAlert().error("Please select a workspace!")
return
}
- opnFetch(endpoint, { method: "POST" })
- .then(() => {
- loading.value = false
- emit("close")
- useAlert().success("Form workspace updated successfully.")
- workspacesStore.setCurrentId(selectedWorkspace.value)
- formsStore.resetState()
- formsStore.loadAll(selectedWorkspace.value)
- const router = useRouter()
- const route = useRoute()
- if (route.name !== "home") {
- router.push({ name: "home" })
- }
- formsStore.loadAll(selectedWorkspace.value)
- })
- .catch((error) => {
- useAlert().error(
- error?.data?.message ?? "Something went wrong, please try again!",
- )
- loading.value = false
- })
+
+ loading.value = true
+
+ updateWorkspaceMutation.mutateAsync({
+ id: props.form.id,
+ workspaceId: selectedWorkspace.value,
+ data: {}
+ }).then(() => {
+ loading.value = false
+ emit("close")
+ useAlert().success("Form workspace updated successfully.")
+
+ // Switch to the new workspace
+ switchTo(selectedWorkspace.value)
+
+ // Navigate to home if not already there
+ const router = useRouter()
+ const route = useRoute()
+ if (route.name !== "home") {
+ router.push({ name: "home" })
+ }
+ }).catch((error) => {
+ useAlert().error(
+ error?.data?.message ?? "Something went wrong, please try again!",
+ )
+ loading.value = false
+ })
}
</script>
diff --git a/client/components/open/forms/components/ShareFormUrl.vue b/client/components/open/forms/components/ShareFormUrl.vue
index 5fa50ebe3..898f81952 100644
--- a/client/components/open/forms/components/ShareFormUrl.vue
+++ b/client/components/open/forms/components/ShareFormUrl.vue
@@ -1,70 +1,35 @@
<template>
- <div
- class="border border-nt-blue-light bg-blue-50 dark:bg-notion-dark-light rounded-md p-2 overflow-hidden"
- >
- <div class="flex items-center w-full gap-2">
- <p class="select-all text-nt-blue flex-grow truncate overflow-hidden">
- <a
- v-if="link"
- :href="share_url"
- target="_blank"
- >
- {{ share_url }}
- </a>
- <span v-else>
- {{ share_url }}
- </span>
- </p>
- <UButton
- class="shrink-0"
- size="sm"
- icon="i-heroicons-clipboard-document"
- label="Copy"
- @click="copyToClipboard"
- />
- </div>
- </div>
+ <CopyContent
+ :content="share_url"
+ label="Copy"
+ class="w-auto"
+ />
</template>
- <script setup>
- import { computed, defineProps } from 'vue'
-
- const props = defineProps({
- form: {
- type: Object,
- required: true,
- },
- link: {
- type: Boolean,
- default: false,
- },
- extraQueryParam: {
- type: String,
- default: '',
- },
- })
-
- const { copy } = useClipboard()
-
- const share_url = computed(() => {
- if (props.extraQueryParam) {
- return `${props.form.share_url}?${props.extraQueryParam}`
- }
- return props.form.share_url
- })
-
- function copyToClipboard() {
- if (import.meta.server)
- return
- copy(share_url.value)
- if (props.form.visibility == 'draft') {
- useAlert().warning(
- 'Copied! But other people won\'t be able to see the form since it\'s currently in draft mode',
- )
- }
- else {
- useAlert().success('Copied!')
- }
+<script setup>
+import { computed, defineProps } from 'vue'
+import CopyContent from './CopyContent.vue'
+
+const props = defineProps({
+ form: {
+ type: Object,
+ required: true,
+ },
+ link: {
+ type: Boolean,
+ default: false,
+ },
+ extraQueryParam: {
+ type: String,
+ default: '',
+ },
+})
+
+const share_url = computed(() => {
+ if (props.extraQueryParam) {
+ return `${props.form.share_url}?${props.extraQueryParam}`
}
- </script>
+ return props.form.share_url
+})
+</script>
\ No newline at end of file
diff --git a/client/components/open/forms/components/form-components/AddFormBlock.vue b/client/components/open/forms/components/form-components/AddFormBlock.vue
index 74c154eb2..bf707787b 100644
--- a/client/components/open/forms/components/form-components/AddFormBlock.vue
+++ b/client/components/open/forms/components/form-components/AddFormBlock.vue
@@ -1,22 +1,25 @@
<template>
- <div>
- <div class="p-2 border-b border-gray-300 sticky top-0 z-10 bg-white">
+ <div class="pb-16">
+ <div class="p-2 border-b border-neutral-300 sticky top-0 z-10 bg-white">
<div class="flex items-center">
<UButton
size="sm"
- color="gray"
+ color="neutral"
icon="i-heroicons-x-mark-20-solid"
- variant="ghost"
+ variant="outlint"
@click="closeSidebar"
/>
<div class="font-medium inline ml-2 flex-grow truncate">
Add Block
</div>
+ <AiFieldGenerator
+ class="py-2 px-4"
+ />
</div>
</div>
<div class="py-2 px-4">
- <p class="text-gray-500 text-xs font-medium my-2">
+ <p class="text-neutral-500 text-xs font-medium my-2">
Input Blocks
</p>
<draggable
@@ -32,20 +35,20 @@
>
<template #item="{element}">
<div
- class="flex hover:bg-gray-50 rounded-md items-center gap-2 p-2 group"
+ class="flex hover:bg-neutral-50 rounded-md items-center gap-2 p-2 group"
role="button"
@click.prevent="addBlock(element.name)"
>
<BlockTypeIcon :type="element.name" />
<p
- class="w-full text-sm text-gray-500"
+ class="w-full text-sm text-neutral-500"
>
{{ element.title }}
</p>
<Icon
v-if="element.auth_required && !authenticated"
name="heroicons:lock-closed"
- class="text-gray-400 w-4 h-4"
+ class="text-neutral-400 w-4 h-4"
/>
</div>
</template>
@@ -68,20 +71,20 @@
>
<template #item="{element}">
<div
- class="flex hover:bg-gray-50 rounded-md items-center gap-2 p-2"
+ class="flex hover:bg-neutral-50 rounded-md items-center gap-2 p-2"
role="button"
@click.prevent="addBlock(element.name)"
>
<BlockTypeIcon :type="element.name" />
<p
- class="w-full text-sm text-gray-500"
+ class="w-full text-sm text-neutral-500"
>
{{ element.title }}
</p>
<Icon
v-if="element.auth_required && !authenticated"
name="heroicons:lock-closed"
- class="text-gray-400 w-4 h-4"
+ class="text-neutral-400 w-4 h-4"
/>
</div>
</template>
@@ -94,10 +97,10 @@
import draggable from 'vuedraggable'
import blocksTypes from '~/data/blocks_types.json'
import BlockTypeIcon from '../BlockTypeIcon.vue'
+import AiFieldGenerator from './components/AiFieldGenerator.vue'
const workingFormStore = useWorkingFormStore()
-const authStore = useAuthStore()
-const authenticated = computed(() => authStore.check)
+const { isAuthenticated: authenticated } = useIsAuthenticated()
const inputBlocks = computed(() => Object.values(blocksTypes).filter(block => !block.name.startsWith('nf-')))
const layoutBlocks = computed(() => Object.values(blocksTypes).filter(block => block.name.startsWith('nf-')))
diff --git a/client/components/open/forms/components/form-components/EditorSectionHeader.vue b/client/components/open/forms/components/form-components/EditorSectionHeader.vue
index d91e95b6e..b9fa1fdbd 100644
--- a/client/components/open/forms/components/form-components/EditorSectionHeader.vue
+++ b/client/components/open/forms/components/form-components/EditorSectionHeader.vue
@@ -2,7 +2,7 @@
<div class="relative">
<hr
v-if="showLine"
- class="border-t border-gray-200 mb-6 mt-8 -mx-4"
+ class="border-t border-neutral-200 mb-6 mt-8 -mx-4"
>
<div
:class="[
@@ -12,9 +12,9 @@
>
<Icon
:name="icon"
- class="w-4 h-4 text-gray-400"
+ class="w-4 h-4 text-neutral-400"
/>
- <h3 class="text-sm font-semibold text-gray-500">
+ <h3 class="text-sm font-semibold text-neutral-500">
{{ title }}
</h3>
</div>
diff --git a/client/components/open/forms/components/form-components/FormCustomCode.vue b/client/components/open/forms/components/form-components/FormCustomCode.vue
index c8f8a748e..655e569f7 100644
--- a/client/components/open/forms/components/form-components/FormCustomCode.vue
+++ b/client/components/open/forms/components/form-components/FormCustomCode.vue
@@ -1,52 +1,46 @@
<template>
- <SettingsSection
- name="Custom Code"
- icon="i-heroicons-code-bracket"
- >
- <ProTag
- class="mb-2 block"
- upgrade-modal-title="Upgrade to Unlock Custom Code Capabilities"
- upgrade-modal-description="On the Free plan, you can explore custom code features within the form editor. Upgrade your plan to implement custom scripts, styles, and advanced tracking in live forms. Elevate your form's functionality and design with unlimited customization options."
- />
- <p class="text-sm text-gray-500">
- The code will be injected in the <b>head</b> section of your form page.
- <a
- href="#"
- class="text-gray-700"
- @click.prevent="
- crisp.openHelpdeskArticle(
- 'how-do-i-add-custom-code-to-my-form-1amadj3',
- )
- "
- >Click here to get an example CSS code.</a>
- </p>
-
- <code-input
- name="custom_code"
- class="mt-4"
- :form="form"
- help="Saves changes and visit the actual form page to test."
- label="Custom Code"
- placeholder="<script>console.log('Hello World!')</script>"
- />
- </SettingsSection>
+ <VForm size="sm">
+ <div class="space-y-4">
+ <div class="flex flex-col flex-wrap items-start justify-between gap-4 sm:flex-row sm:items-center">
+ <div>
+ <h3 class="text-lg font-medium text-neutral-900">
+ Custom Code <ProTag
+ class="mb-2 block"
+ upgrade-modal-title="Upgrade to Unlock Custom Code Capabilities"
+ upgrade-modal-description="On the Free plan, you can explore custom code features within the form editor. Upgrade your plan to implement custom scripts, styles, and advanced tracking in live forms. Elevate your form's functionality and design with unlimited customization options."
+ />
+ </h3>
+ <p class="mt-1 text-sm text-neutral-500">
+ The code will be injected in the <b>head</b> section of your form page.
+ </p>
+ </div>
+ <UButton
+ label="Help"
+ icon="i-heroicons-question-mark-circle"
+ variant="outline"
+ color="neutral"
+ @click="crisp.openHelpdeskArticle('how-do-i-add-custom-code-to-my-form-1amadj3')"
+ />
+ </div>
+
+ <CodeInput
+ :allow-fullscreen="true"
+ name="custom_code"
+ class="mt-4"
+ :form="form"
+ help="Saves changes and visit the actual form page to test."
+ label="Custom Code"
+ placeholder="<script>console.log('Hello World!')</script>"
+ />
+ </div>
+ </VForm>
</template>
-<script>
-import ProTag from '~/components/global/ProTag.vue'
-import { useWorkingFormStore } from '../../../../../stores/working_form'
+<script setup>
+import ProTag from "~/components/app/ProTag.vue"
+
+const workingFormStore = useWorkingFormStore()
+const { content: form } = storeToRefs(workingFormStore)
+const crisp = useCrisp()
-export default {
- components: {
- ProTag
- },
- setup () {
- const workingFormStore = useWorkingFormStore()
- return {
- workingFormStore,
- form: storeToRefs(workingFormStore).content,
- crisp: useCrisp()
- }
- }
-}
</script>
diff --git a/client/components/open/forms/components/form-components/FormCustomSeo.vue b/client/components/open/forms/components/form-components/FormCustomSeo.vue
index d4ee180b2..15dc4849d 100644
--- a/client/components/open/forms/components/form-components/FormCustomSeo.vue
+++ b/client/components/open/forms/components/form-components/FormCustomSeo.vue
@@ -1,138 +1,136 @@
<template>
- <SettingsSection
- name="Link Settings"
- icon="i-heroicons-link"
- >
- <h4 class="font-semibold mt-4 border-t pt-4">
- SEO & Social Sharing - Meta <ProTag
- class="ml-2"
- upgrade-modal-title="Upgrade to Enhance Your Form's SEO"
- upgrade-modal-description="Explore advanced SEO features in the editor on our Free plan. Upgrade to fully implement custom meta tags, Open Graph data, and improved search visibility. Boost your form's online presence and attract more respondents with our premium SEO toolkit."
+ <VForm size="sm">
+ <div class="space-y-4">
+ <div class="flex flex-col flex-wrap items-start justify-between gap-4 sm:flex-row sm:items-center">
+ <div>
+ <h3 class="text-lg font-medium text-neutral-900">
+ SEO & Social Sharing - Meta <ProTag
+ class="ml-2"
+ upgrade-modal-title="Upgrade to Enhance Your Form's SEO"
+ upgrade-modal-description="Explore advanced SEO features in the editor on our Free plan. Upgrade to fully implement custom meta tags, Open Graph data, and improved search visibility. Boost your form's online presence and attract more respondents with our premium SEO toolkit."
+ />
+ </h3>
+ <p class="mt-1 text-sm text-neutral-500">
+ Customize the image and text that appear when you share your form on other sites (Open Graph).
+ </p>
+ </div>
+ <UButton
+ label="Help"
+ icon="i-heroicons-question-mark-circle"
+ variant="outline"
+ color="neutral"
+ @click="crisp.openHelpdeskArticle('how-do-i-add-custom-seo-settings-to-my-forms-url-preview-1v9y9a')"
/>
- </h4>
- <p class="text-gray-500 text-sm">
- Customize the image and text that appear when you share your form on other
- sites (Open Graph).
- </p>
- <select-input
- v-if="useFeatureFlag('custom_domains')"
- v-model="form.custom_domain"
- :clearable="true"
- :disabled="customDomainOptions.length <= 0"
- :options="customDomainOptions"
- name="type"
- class="mt-4 max-w-xs"
- label="Form Domain"
- placeholder="yourdomain.com"
- />
- <template v-if="form.seo_meta">
- <text-input
- v-model="form.seo_meta.page_title"
- name="page_title"
+ </div>
+
+ <SelectInput
+ v-if="useFeatureFlag('custom_domains')"
+ v-model="form.custom_domain"
+ :clearable="true"
+ :disabled="customDomainOptions.length <= 0"
+ :options="customDomainOptions"
+ name="type"
class="mt-4 max-w-xs"
- label="Page Title"
- help="Max 60 characters recommended"
+ label="Form Domain"
+ placeholder="yourdomain.com"
/>
- <text-area-input
- v-model="form.seo_meta.page_description"
- name="page_description"
- class="max-w-xs"
- label="Page Description"
- help="Between 150 and 160 characters"
- />
- <div class="flex gap-4">
- <image-input
- v-model="form.seo_meta.page_thumbnail"
- name="page_thumbnail"
- class="flex-grow"
- label="Thumbnail Image"
- help="og:image - 1200px X 630px"
+ <template v-if="form.seo_meta">
+ <text-input
+ v-model="form.seo_meta.page_title"
+ name="page_title"
+ class="mt-4 max-w-xs"
+ label="Page Title"
+ help="Max 60 characters recommended"
/>
- <image-input
- v-model="form.seo_meta.page_favicon"
- name="page_favicon"
- class="flex-grow"
- label="Favicon Image"
- help="Public form page favicon"
+ <text-area-input
+ v-model="form.seo_meta.page_description"
+ name="page_description"
+ class="mt-4 max-w-xs"
+ label="Page Description"
+ help="Between 150 and 160 characters"
/>
- </div>
- </template>
+ <div class="flex gap-4">
+ <image-input
+ v-model="form.seo_meta.page_thumbnail"
+ name="page_thumbnail"
+ class="flex-grow"
+ label="Thumbnail Image"
+ help="og:image - 1200px X 630px"
+ />
+ <image-input
+ v-model="form.seo_meta.page_favicon"
+ name="page_favicon"
+ class="flex-grow"
+ label="Favicon Image"
+ help="Public form page favicon"
+ />
+ </div>
+ </template>
- <div class="w-full border-t pt-4 mt-4">
- <h4 class="font-semibold">
- Link Privacy
- </h4>
- <p class="text-gray-500 text-sm mb-4">
- Disable to prevent Google from listing your form in search results.
- </p>
- <ToggleSwitchInput
- name="can_be_indexed"
- :form="form"
- label="Indexable by Google"
- />
- </div>
+ <div class="w-full border-t pt-4 mt-4">
+ <h4 class="font-semibold">
+ Link Privacy
+ </h4>
+ <p class="text-neutral-500 text-sm mb-4">
+ Disable to prevent Google from listing your form in search results.
+ </p>
+ <ToggleSwitchInput
+ name="can_be_indexed"
+ :form="form"
+ label="Indexable by Google"
+ />
+ </div>
- <div v-if="useFeatureFlag('self_hosted')" class="w-full border-t pt-4 mt-4">
- <h4 class="font-semibold">
- Custom Form URL
- </h4>
- <p class="text-gray-500 text-sm mb-4">
- Create a custom URL for your form. This will be the unique identifier in your form's URL.
- </p>
- <text-input
- :form="form"
- name="slug"
- class="mt-4 max-w-xs"
- label="Custom Form URL"
- help="Use only lowercase letters, numbers, and hyphens. Example: my-custom-form"
- />
+ <div v-if="useFeatureFlag('self_hosted')" class="w-full border-t pt-4 mt-4">
+ <h4 class="font-semibold">
+ Custom Form URL
+ </h4>
+ <p class="text-neutral-500 text-sm mb-4">
+ Create a custom URL for your form. This will be the unique identifier in your form's URL.
+ </p>
+ <text-input
+ :form="form"
+ name="slug"
+ class="mt-4 max-w-xs"
+ label="Custom Form URL"
+ help="Use only lowercase letters, numbers, and hyphens. Example: my-custom-form"
+ />
+ </div>
</div>
- </SettingsSection>
+ </VForm>
</template>
-<script>
-import ProTag from '~/components/global/ProTag.vue'
-import { useWorkingFormStore } from '../../../../../stores/working_form'
+<script setup>
+const crisp = useCrisp()
+import ProTag from "~/components/app/ProTag.vue"
+
+const workingFormStore = useWorkingFormStore()
+const { content: form } = storeToRefs(workingFormStore)
+
+const { current: workspace } = useCurrentWorkspace()
+
+const customDomainOptions = computed(() => {
+ return workspace.value.custom_domains
+ ? workspace.value.custom_domains.map((domain) => {
+ return {
+ name: domain,
+ value: domain,
+ }
+ })
+ : []
+})
-export default {
- components: {
- ProTag
- },
- setup () {
- const workingFormStore = useWorkingFormStore()
- return {
- workingFormStore,
- workspacesStore: useWorkspacesStore(),
- form: storeToRefs(workingFormStore).content
- }
- },
- computed: {
- workspace() {
- return this.workspacesStore.getCurrent
- },
- customDomainOptions() {
- return this.workspace.custom_domains
- ? this.workspace.custom_domains.map((domain) => {
- return {
- name: domain,
- value: domain,
- }
- })
- : []
- },
- },
- mounted () {
- if (!this.form.seo_meta || Array.isArray(this.form.seo_meta))
- this.form.seo_meta = {};
+onMounted(() => {
+ if (!form.value.seo_meta || Array.isArray(form.value.seo_meta))
+ form.value.seo_meta = {};
- ['page_title', 'page_description', 'page_thumbnail', 'page_favicon'].forEach((keyname) => {
- if (this.form.seo_meta[keyname] === undefined)
- this.form.seo_meta[keyname] = null
- })
+ ['page_title', 'page_description', 'page_thumbnail', 'page_favicon'].forEach((keyname) => {
+ if (form.value.seo_meta[keyname] === undefined)
+ form.value.seo_meta[keyname] = null
+ })
- if (this.form.custom_domain && this.workspace?.custom_domains && !this.workspace.custom_domains.find((item) => { return item === this.form.custom_domain })) {
- this.form.custom_domain = null
- }
+ if (form.value.custom_domain && workspace.value?.custom_domains && !workspace.value.custom_domains.find((item) => { return item === form.value.custom_domain })) {
+ form.value.custom_domain = null
}
-}
+})
</script>
diff --git a/client/components/open/forms/components/form-components/FormCustomization.vue b/client/components/open/forms/components/form-components/FormCustomization.vue
index 5ff44070e..31934f11b 100644
--- a/client/components/open/forms/components/form-components/FormCustomization.vue
+++ b/client/components/open/forms/components/form-components/FormCustomization.vue
@@ -53,17 +53,17 @@
/>
<div class="grid grid-cols-2 gap-4">
<div class="flex-grow my-1" v-if="useFeatureFlag('services.google.fonts')">
- <label class="text-gray-700 font-semibold text-sm mb-1 block">Font Family</label>
- <v-button
- color="white"
- class="w-full py-1.5"
- size="small"
+ <label class="text-neutral-700 font-semibold text-sm mb-1 block">Font Family</label>
+ <UButton
+ color="neutral"
+ variant="outline"
+ block
@click="showGoogleFontPicker = true"
>
<span :style="{ 'font-family': (form.font_family ? form.font_family + ' !important' : null) }">
{{ form.font_family || 'Default' }}
</span>
- </v-button>
+ </UButton>
<GoogleFontPicker
:show="showGoogleFontPicker"
:font="form.font_family || null"
@@ -224,22 +224,20 @@
import EditorSectionHeader from "./EditorSectionHeader.vue"
import { useWorkingFormStore } from "../../../../../stores/working_form"
import GoogleFontPicker from "../../../editors/GoogleFontPicker.vue"
-import ProTag from "~/components/global/ProTag.vue"
+import ProTag from "~/components/app/ProTag.vue"
import { DEFAULT_COLOR } from "@/composables/forms/initForm"
const workingFormStore = useWorkingFormStore()
-const subscriptionModalStore = useSubscriptionModalStore()
-const authStore = useAuthStore()
-const workspacesStore = useWorkspacesStore()
+const { openSubscriptionModal } = useAppModals()
const form = storeToRefs(workingFormStore).content
const isMounted = ref(false)
const confetti = useConfetti()
const showGoogleFontPicker = ref(false)
const { $i18n } = useNuxtApp()
-const user = computed(() => authStore.user)
-const workspace = computed(() => workspacesStore.getCurrent)
+const { data: user } = useAuth().user()
+const { current: workspace } = useCurrentWorkspace()
const isPro = computed(() => {
if (!useFeatureFlag('billing.enabled')) return true
@@ -263,8 +261,7 @@ const onChangeConfettiOnSubmission = (val) => {
const onChangeNoBranding = (val) => {
if (!isPro.value && val) {
- subscriptionModalStore.setModalContent("Upgrade today to remove OpnForm branding")
- subscriptionModalStore.openModal()
+ openSubscriptionModal({ modal_title: "Upgrade today to remove OpnForm branding" })
setTimeout(() => {
form.value.no_branding = false
}, 300)
diff --git a/client/components/open/forms/components/form-components/FormEditorPreview.vue b/client/components/open/forms/components/form-components/FormEditorPreview.vue
index c9aa0475a..f9b811b7b 100644
--- a/client/components/open/forms/components/form-components/FormEditorPreview.vue
+++ b/client/components/open/forms/components/form-components/FormEditorPreview.vue
@@ -2,48 +2,56 @@
<!-- Backdrop -->
<div
v-if="isExpanded"
- class="fixed inset-0 z-40 bg-white/30 dark:bg-gray-900/30 backdrop-blur-sm"
+ class="fixed inset-0 z-40 bg-white/30 dark:bg-neutral-900/30 backdrop-blur-xs"
@click="toggleExpand"
/>
<!-- Form Preview (desktop only) -->
<div
+ class="form-editor-preview"
ref="parent"
:class="{
'fixed inset-8 z-50 !flex': isExpanded,
- 'bg-gray-50 dark:bg-notion-dark-light hidden md:flex flex-grow p-4 flex-col items-center overflow-y-scroll shadow-inner': !isExpanded
+ 'bg-neutral-50 dark:bg-notion-dark-light hidden md:flex flex-grow p-4 flex-col items-center overflow-y-scroll shadow-inner': !isExpanded
}"
>
<div
- class="border rounded-lg bg-white dark:bg-notion-dark w-full block shadow-sm transition-all flex flex-col"
+ class="border rounded-lg bg-white dark:bg-notion-dark w-full block shadow-xs transition-all flex flex-col"
:class="{ 'max-w-5xl': !isExpanded, 'h-full': isExpanded }"
>
- <div class="w-full bg-white dark:bg-gray-950 border-b border-gray-300 dark:border-blue-900 dark:border-gray-700 rounded-t-lg p-1.5 pl-4 pr-1.5 flex items-center gap-x-1.5">
+ <div class="w-full bg-white dark:bg-neutral-950 border-b border-neutral-300 dark:border-blue-900 dark:border-neutral-700 rounded-t-lg p-1.5 pl-4 pr-1.5 flex items-center gap-x-1.5">
<div class="bg-red-500 rounded-full w-2.5 h-2.5" />
<div class="bg-yellow-500 rounded-full w-2.5 h-2.5" />
<div class="bg-green-500 rounded-full w-2.5 h-2.5" />
- <p class="text-sm text-gray-500/70 text-sm ml-4 select-none">
+ <p class="text-sm text-neutral-500/70 text-sm ml-4 select-none">
Form Preview
</p>
<div class="flex-grow" />
<UButton
v-if="previewFormSubmitted"
icon="i-heroicons-arrow-path-rounded-square"
- color="white"
+ color="neutral"
+ variant="outline"
size="xs"
@click="restartForm"
>
Re-start
</UButton>
+ <TrackClick
+ name="form_editor_toggle_expand"
+ :properties="{toggle: !isExpanded}"
+ >
<UTooltip :text="isExpanded ? 'Collapse' : 'Expand'">
- <UButton
- v-track.form_editor_toggle_expand="{toggle: !isExpanded}"
- :icon="isExpanded ? 'i-heroicons-arrows-pointing-in' : 'i-heroicons-arrows-pointing-out'"
- color="white"
- size="xs"
- @click="toggleExpand"
- />
+
+ <UButton
+ :icon="isExpanded ? 'i-heroicons-arrows-pointing-in' : 'i-heroicons-arrows-pointing-out'"
+ color="neutral"
+ variant="outline"
+ size="xs"
+ @click="toggleExpand"
+ />
</UTooltip>
+ </TrackClick>
</div>
<div class="flex-grow overflow-y-auto">
<transition
@@ -84,7 +92,7 @@
</transition>
<div v-if="recordLoading">
<p class="text-center p-4">
- <loader class="h-6 w-6 text-nt-blue mx-auto" />
+ <loader class="h-6 w-6 text-blue-500 mx-auto" />
</p>
</div>
<open-complete-form
@@ -111,6 +119,10 @@ import { useRecordsStore } from '~/stores/records'
import { useWorkingFormStore } from '~/stores/working_form'
import { storeToRefs } from 'pinia'
import { FormMode } from "~/lib/forms/FormModeStrategy.js"
+import { useCrisp } from '~/composables/useCrisp.js'
+import TrackClick from '~/components/global/TrackClick.vue'
+
+const { hideChat, showChat } = useCrisp()
const recordsStore = useRecordsStore()
const workingFormStore = useWorkingFormStore()
@@ -120,6 +132,13 @@ const formPreview = ref(null)
const previewFormSubmitted = ref(false)
const isExpanded = ref(false)
+watch(isExpanded, (expanded) => {
+ if (expanded)
+ hideChat()
+ else
+ showChat()
+})
+
const { content: form } = storeToRefs(workingFormStore)
const recordLoading = computed(() => recordsStore.loading)
const darkMode = useDarkMode(parent)
@@ -191,4 +210,12 @@ function toggleExpand() {
.fixed {
transition: all 0.3s ease-in-out;
}
+</style>
+
+<style>
+@reference '~/css/app.css';
+
+.form-editor-preview .powered-by-button {
+ @apply bottom-10 right-10 z-50;
+}
</style>
\ No newline at end of file
diff --git a/client/components/open/forms/components/form-components/FormErrorModal.vue b/client/components/open/forms/components/form-components/FormErrorModal.vue
index bba8700ef..b12df0037 100644
--- a/client/components/open/forms/components/form-components/FormErrorModal.vue
+++ b/client/components/open/forms/components/form-components/FormErrorModal.vue
@@ -1,22 +1,20 @@
<template>
- <modal
- :show="show"
- @close="$emit('close')"
+ <UModal
+ v-model:open="isOpen"
+ :ui="{ content: 'sm:max-w-lg' }"
+ title="We couldn't save your form"
>
- <div class="-mx-5">
- <h2 class="text-red-600 text-2xl font-medium mb-4 px-4">
- We couldn't save your form
- </h2>
-
+ <template #body>
<div
v-if="validationErrorResponse"
- class="p-4 border-b border-t"
+ class="p-4 border border-red-200 rounded-lg bg-red-50"
>
<p
v-if="validationErrorResponse.message"
+ class="text-red-800 mb-3"
v-text="validationErrorResponse.message"
/>
- <ul class="list-disc list-inside">
+ <ul class="list-disc list-inside text-red-700 space-y-1">
<li
v-for="(err, key) in validationErrorResponse.errors"
:key="key"
@@ -25,27 +23,42 @@
</li>
</ul>
</div>
+ </template>
- <div class="px-4 pt-4 text-right">
- <v-button
- color="gray"
- shade="light"
- @click="$emit('close')"
+ <template #footer>
+ <div class="flex justify-end">
+ <UButton
+ color="neutral"
+ variant="outline"
+ @click="closeModal"
>
Close
- </v-button>
+ </UButton>
</div>
- </div>
- </modal>
+ </template>
+ </UModal>
</template>
-<script>
-export default {
- name: 'FormErrorModal',
- props: {
- show: { type: Boolean, required: true },
- validationErrorResponse: { type: Object, required: false },
- },
- emits: ['close'],
+<script setup>
+const props = defineProps({
+ show: { type: Boolean, required: true },
+ validationErrorResponse: { type: Object, required: false },
+})
+
+const emit = defineEmits(['close'])
+
+// Modal state
+const isOpen = computed({
+ get: () => props.show,
+ set: (value) => {
+ if (!value) {
+ emit('close')
+ }
+ }
+})
+
+// Methods
+const closeModal = () => {
+ isOpen.value = false
}
</script>
diff --git a/client/components/open/forms/components/form-components/FormInformation.vue b/client/components/open/forms/components/form-components/FormInformation.vue
index 54ff66326..48201fe20 100644
--- a/client/components/open/forms/components/form-components/FormInformation.vue
+++ b/client/components/open/forms/components/form-components/FormInformation.vue
@@ -1,126 +1,123 @@
<template>
- <SettingsSection
- name="General"
- icon="i-heroicons-information-circle"
- >
- <p class="text-gray-500 text-sm">
- Basic information about your form.
- </p>
+ <VForm size="sm">
+ <div class="space-y-4">
+ <div class="flex flex-col flex-wrap items-start justify-between gap-4 sm:flex-row sm:items-center">
+ <div>
+ <h3 class="text-lg font-medium text-neutral-900">General</h3>
+ <p class="mt-1 text-sm text-neutral-500">
+ Basic information about your form.
+ </p>
+ </div>
+ </div>
- <text-input
- :form="form"
- name="title"
- class="mt-4 max-w-xs"
- label="Form Name"
- placeholder="My form"
- />
- <select-input
- name="tags"
- label="Tags"
- clearable
- :form="form"
- help="To organize your forms"
- placeholder="Select Tag(s)"
- class="max-w-xs"
- :multiple="true"
- :allow-creation="true"
- :options="allTagsOptions"
- />
- <flat-select-input
- name="visibility"
- label="Form Visibility"
- class="max-w-xs"
- :form="form"
- placeholder="Select Visibility"
- :options="visibilityOptions"
- />
- <div
- v-if="isFormClosingOrClosed"
- class="bg-gray-50 border rounded-lg px-4 py-2"
- >
- <rich-text-area-input
- name="closed_text"
+ <text-input
:form="form"
- label="Closed form text"
- help="This message will be shown when the form will be closed"
- :required="false"
- wrapper-class="mb-0"
+ name="title"
+ class="mt-4 max-w-xs"
+ label="Form Name"
+ placeholder="My form"
/>
- </div>
+ <select-input
+ name="tags"
+ label="Tags"
+ clearable
+ :form="form"
+ help="To organize your forms"
+ placeholder="Select Tag(s)"
+ class="max-w-xs"
+ :multiple="true"
+ :allow-creation="true"
+ :options="allTagsOptions"
+ />
+ <flat-select-input
+ name="visibility"
+ label="Form Visibility"
+ class="max-w-xs"
+ :form="form"
+ placeholder="Select Visibility"
+ :options="visibilityOptions"
+ />
+ <div
+ v-if="isFormClosingOrClosed"
+ class="bg-neutral-50 border rounded-lg px-4 py-2"
+ >
+ <rich-text-area-input
+ name="closed_text"
+ :allow-fullscreen="true"
+ :form="form"
+ label="Closed form text"
+ help="This message will be shown when the form will be closed"
+ :required="false"
+ wrapper-class="mb-0"
+ />
+ </div>
- <UButton
- v-if="copyFormOptions.length > 0"
- color="white"
- class="mt-4"
- icon="i-heroicons-document-duplicate"
- @click.prevent="showCopyFormSettingsModal = true"
- >
- Copy another form's settings
- </UButton>
- </SettingsSection>
+ <UButton
+ v-if="copyFormOptions.length > 0"
+ color="neutral"
+ variant="outline"
+ class="mt-4"
+ icon="i-heroicons-document-duplicate"
+ @click.prevent="showCopyFormSettingsModal = true"
+ >
+ Copy another form's settings
+ </UButton>
+ </div>
+ </VForm>
- <modal
- :show="showCopyFormSettingsModal"
- max-width="md"
+ <UModal
+ v-model:open="showCopyFormSettingsModal"
@close="showCopyFormSettingsModal = false"
>
- <template #icon>
- <svg
- class="w-10 h-10 text-blue"
- viewBox="0 0 48 48"
- fill="none"
- xmlns="http://www.w3.org/2000/svg"
- >
- <path
- d="M17 27C16.0681 27 15.6022 27 15.2346 26.8478C14.7446 26.6448 14.3552 26.2554 14.1522 25.7654C14 25.3978 14 24.9319 14 24V17.2C14 16.0799 14 15.5198 14.218 15.092C14.4097 14.7157 14.7157 14.4097 15.092 14.218C15.5198 14 16.0799 14 17.2 14H24C24.9319 14 25.3978 14 25.7654 14.1522C26.2554 14.3552 26.6448 14.7446 26.8478 15.2346C27 15.6022 27 16.0681 27 17M24.2 34H30.8C31.9201 34 32.4802 34 32.908 33.782C33.2843 33.5903 33.5903 33.2843 33.782 32.908C34 32.4802 34 31.9201 34 30.8V24.2C34 23.0799 34 22.5198 33.782 22.092C33.5903 21.7157 33.2843 21.4097 32.908 21.218C32.4802 21 31.9201 21 30.8 21H24.2C23.0799 21 22.5198 21 22.092 21.218C21.7157 21.4097 21.4097 21.7157 21.218 22.092C21 22.5198 21 23.0799 21 24.2V30.8C21 31.9201 21 32.4802 21.218 32.908C21.4097 33.2843 21.7157 33.5903 22.092 33.782C22.5198 34 23.0799 34 24.2 34Z"
- stroke="currentColor"
- stroke-width="2"
- stroke-linecap="round"
- stroke-linejoin="round"
- />
- </svg>
+ <template #header>
+ <div class="flex items-center w-full gap-4 px-2">
+ <h2 class="text-lg font-semibold">
+ Import Settings from another form
+ </h2>
+ </div>
</template>
- <template #title>
- Import Settings from another form
+ <template #body>
+ <VForm size="sm">
+ <select-input
+ v-model="copyFormId"
+ name="copy_form_id"
+ label="Copy Settings From"
+ placeholder="Choose a form"
+ :searchable="copyFormOptions.length > 5"
+ :options="copyFormOptions"
+ />
+ <div class="mt-4 flex items-center justify-between">
+ <UButton
+ @click="copySettings"
+ >
+ Confirm & Copy
+ </UButton>
+ <UButton
+ color="neutral"
+ variant="outline"
+ @click="showCopyFormSettingsModal = false"
+ >
+ Cancel
+ </UButton>
+ </div>
+ </VForm>
</template>
- <div>
- <select-input
- v-model="copyFormId"
- name="copy_form_id"
- label="Copy Settings From"
- placeholder="Choose a form"
- :searchable="copyFormOptions.length > 5"
- :options="copyFormOptions"
- />
- <div class="flex">
- <v-button
- color="white"
- class="w-full mr-2"
- @click="showCopyFormSettingsModal = false"
- >
- Cancel
- </v-button>
- <v-button
- color="blue"
- class="w-full"
- @click="copySettings"
- >
- Confirm & Copy
- </v-button>
- </div>
- </div>
- </modal>
+ </UModal>
</template>
<script setup>
import clonedeep from 'clone-deep'
import { default as _has } from 'lodash/has'
-// Store setup
-const formsStore = useFormsStore()
+const alert = useAlert()
const workingFormStore = useWorkingFormStore()
const { content: form } = storeToRefs(workingFormStore)
-const forms = computed(() => formsStore.getAll)
+
+// Get forms list for current workspace
+const { currentId: workspaceId } = useCurrentWorkspace()
+const { forms } = useFormsList(workspaceId, {
+ enabled: computed(() => !!workspaceId.value)
+})
// Reactive state
const showCopyFormSettingsModal = ref(false)
@@ -143,6 +140,7 @@ const visibilityOptions = [
]
const copyFormOptions = computed(() => {
+ if (!forms.value) return []
return forms.value
.filter((formItem) => {
return form.value.id !== formItem.id
@@ -156,7 +154,21 @@ const copyFormOptions = computed(() => {
})
const allTagsOptions = computed(() => {
- return formsStore.allTags.map((tagname) => {
+ if (!forms.value) return []
+
+ // Extract all unique tags from forms
+ let tags = []
+ forms.value.forEach((formItem) => {
+ if (formItem.tags && formItem.tags.length) {
+ if (typeof formItem.tags === "string" || formItem.tags instanceof String) {
+ tags = tags.concat(formItem.tags.split(","))
+ } else if (Array.isArray(formItem.tags)) {
+ tags = tags.concat(formItem.tags)
+ }
+ }
+ })
+
+ return [...new Set(tags)].map((tagname) => {
return {
name: tagname,
value: tagname,
@@ -171,10 +183,13 @@ const isFormClosingOrClosed = computed(() => {
// Methods
const copySettings = () => {
- if (copyFormId.value == null)
+ if (copyFormId.value == null) {
+ alert.error('Please select a form to copy settings from')
return
+ }
+
const copyForm = clonedeep(
- forms.value.find(form => form.id === copyFormId.value),
+ forms.value?.find(form => form.id === copyFormId.value),
)
if (!copyForm)
return;
@@ -209,6 +224,6 @@ const copySettings = () => {
form.value[property] = copyForm[property]
})
showCopyFormSettingsModal.value = false
- useAlert().success('Form settings copied.')
+ alert.success('Form settings copied.')
}
</script>
diff --git a/client/components/open/forms/components/form-components/FormSecurityAccess.vue b/client/components/open/forms/components/form-components/FormSecurityAccess.vue
index 8cd2bf5d5..89a2419aa 100644
--- a/client/components/open/forms/components/form-components/FormSecurityAccess.vue
+++ b/client/components/open/forms/components/form-components/FormSecurityAccess.vue
@@ -1,98 +1,100 @@
<template>
- <SettingsSection
- name="Security & Access"
- icon="i-heroicons-shield-check"
- >
- <h4 class="font-semibold mt-4 border-t pt-4">
- Access
- </h4>
- <p class="text-gray-500 text-sm">
- Manage who can access your form and when.
- </p>
+ <VForm size="sm">
+ <div class="space-y-4">
+ <div class="flex flex-col flex-wrap items-start justify-between gap-4 sm:flex-row sm:items-center">
+ <div>
+ <h3 class="text-lg font-medium text-neutral-900">Security & Access</h3>
+ <p class="mt-1 text-sm text-neutral-500">
+ Manage who can access your form and when.
+ </p>
+ </div>
+ </div>
- <text-input
- name="password"
- :form="form"
- class="mt-4 max-w-xs"
- label="Form Password"
- placeholder="********"
- help="Leave empty to disable password protection"
- />
- <date-input
- :with-time="true"
- name="closes_at"
- class="mt-4 max-w-xs"
- :form="form"
- label="Closing date"
- help="Leave empty to keep the form open indefinitely"
- :required="false"
- />
- <div
- v-if="form.closes_at || form.visibility == 'closed'"
- class="bg-gray-50 border rounded-lg px-4 py-2"
- >
- <rich-text-area-input
- name="closed_text"
+ <TextInput
+ name="password"
:form="form"
- label="Closed form text"
- help="This message will be shown when the form will be closed"
- :required="false"
- wrapper-class="mb-0"
+ class="mt-4 max-w-xs"
+ label="Form Password"
+ placeholder="********"
+ help="Leave empty to disable password protection"
/>
- </div>
- <text-input
- name="max_submissions_count"
- native-type="number"
- :min="1"
- :form="form"
- label="Limit number of submissions"
- placeholder="Max submissions"
- class="mt-4 max-w-xs"
- help="Leave empty for unlimited submissions"
- :required="false"
- />
- <div
- v-if="form.max_submissions_count && form.max_submissions_count > 0"
- class="bg-gray-50 border rounded-lg px-4 py-2"
- >
- <rich-text-area-input
- wrapper-class="mb-0"
- name="max_submissions_reached_text"
+ <DateInput
+ :with-time="true"
+ name="closes_at"
+ class="mt-4 max-w-xs"
:form="form"
- label="Max Submissions reached text"
- help="This message will be shown when the form will have the maximum number of submissions"
+ label="Closing date"
+ help="Leave empty to keep the form open indefinitely"
:required="false"
/>
- </div>
-
-
- <h4 class="font-semibold mt-4 border-t pt-4">
- Security
- </h4>
- <p class="text-gray-500 text-sm">
- Protect your form, and your sensitive files.
- </p>
- <div
- v-if="hasCaptcha"
- class="flex items-start gap-6 flex-wrap"
- >
- <ToggleSwitchInput
- name="use_captcha"
+ <div
+ v-if="form.closes_at || form.visibility == 'closed'"
+ class="bg-neutral-50 border rounded-lg px-4 py-2"
+ >
+ <rich-text-area-input
+ name="closed_text"
+ :form="form"
+ :allow-fullscreen="true"
+ label="Closed form text"
+ help="This message will be shown when the form will be closed"
+ :required="false"
+ wrapper-class="mb-0"
+ />
+ </div>
+ <text-input
+ name="max_submissions_count"
+ native-type="number"
+ :min="1"
:form="form"
- class="mt-4"
- label="Bot Protection"
- help="Protects your form from spam and abuse with a captcha"
- />
- <FlatSelectInput
- v-if="form.use_captcha"
- name="captcha_provider"
- :form="form"
- :options="captchaOptions"
- class="mt-4 w-80"
- label="Select a captcha provider"
+ label="Limit number of submissions"
+ placeholder="Max submissions"
+ class="mt-4 max-w-xs"
+ help="Leave empty for unlimited submissions"
+ :required="false"
/>
+ <div
+ v-if="form.max_submissions_count && form.max_submissions_count > 0"
+ class="bg-neutral-50 border rounded-lg px-4 py-2"
+ >
+ <rich-text-area-input
+ wrapper-class="mb-0"
+ :allow-fullscreen="true"
+ name="max_submissions_reached_text"
+ :form="form"
+ label="Max Submissions reached text"
+ help="This message will be shown when the form will have the maximum number of submissions"
+ :required="false"
+ />
+ </div>
+
+ <h4 class="font-semibold mt-4 border-t pt-4">
+ Security
+ </h4>
+ <p class="text-neutral-500 text-sm">
+ Protect your form, and your sensitive files.
+ </p>
+ <div
+ v-if="hasCaptcha"
+ class="flex items-start gap-6 flex-wrap"
+ >
+ <ToggleSwitchInput
+ name="use_captcha"
+ :form="form"
+ class="mt-4"
+ label="Bot Protection"
+ help="Protects your form from spam and abuse with a captcha"
+ />
+ <FlatSelectInput
+ v-if="form.use_captcha"
+ name="captcha_provider"
+ :form="form"
+ :options="captchaOptions"
+ class="mt-4 w-80"
+ label="Select a captcha provider"
+ />
+ </div>
</div>
- </SettingsSection>
+ </VForm>
</template>
<script setup>
diff --git a/client/components/open/forms/components/form-components/FormSettings.vue b/client/components/open/forms/components/form-components/FormSettings.vue
deleted file mode 100644
index f362ed2a7..000000000
--- a/client/components/open/forms/components/form-components/FormSettings.vue
+++ /dev/null
@@ -1,40 +0,0 @@
-<template>
- <VForm
- class="flex-grow flex flex-col"
- size="sm"
- @submit.prevent=""
- >
- <SettingsWrapper class="flex-grow">
- <FormInformation />
- <FormSubmissionSettings />
- <FormSecurityAccess />
- <FormCustomSeo />
- <FormCustomCode />
- </SettingsWrapper>
- </VForm>
-</template>
-
-<script>
-import { useWorkingFormStore } from '../../../../../stores/working_form'
-import FormInformation from './FormInformation.vue'
-import FormSubmissionSettings from './FormSubmissionSettings.vue'
-import FormSecurityAccess from './FormSecurityAccess.vue'
-import FormCustomSeo from './FormCustomSeo.vue'
-import FormCustomCode from './FormCustomCode.vue'
-
-export default {
- components: {
- FormInformation,
- FormSubmissionSettings,
- FormSecurityAccess,
- FormCustomSeo,
- FormCustomCode,
- },
- setup() {
- const workingFormStore = useWorkingFormStore()
- return {
- form: storeToRefs(workingFormStore).content
- }
- }
-}
-</script>
\ No newline at end of file
diff --git a/client/components/open/forms/components/form-components/FormSettingsModal.vue b/client/components/open/forms/components/form-components/FormSettingsModal.vue
new file mode 100644
index 000000000..901f9f2fa
--- /dev/null
+++ b/client/components/open/forms/components/form-components/FormSettingsModal.vue
@@ -0,0 +1,97 @@
+<template>
+ <SettingsModal
+ v-model="isOpen"
+ v-model:activeTab="activeTab"
+ @close="closeModal"
+ >
+ <SettingsModalPage
+ id="general"
+ label="General"
+ icon="i-heroicons-information-circle"
+ >
+ <FormInformation />
+ </SettingsModalPage>
+
+ <SettingsModalPage
+ id="submission"
+ label="Submission Settings"
+ icon="i-heroicons-paper-airplane"
+ >
+ <FormSubmissionSettings />
+ </SettingsModalPage>
+
+ <SettingsModalPage
+ id="security"
+ label="Security & Access"
+ icon="i-heroicons-shield-check"
+ >
+ <FormSecurityAccess />
+ </SettingsModalPage>
+
+ <SettingsModalPage
+ id="seo"
+ label="SEO & Social Sharing"
+ icon="i-heroicons-link"
+ >
+ <FormCustomSeo />
+ </SettingsModalPage>
+
+ <SettingsModalPage
+ id="custom-code"
+ label="Custom Code"
+ icon="i-heroicons-code-bracket"
+ >
+ <FormCustomCode />
+ </SettingsModalPage>
+
+ </SettingsModal>
+</template>
+
+<script setup>
+import SettingsModal from '~/components/pages/settings/SettingsModal.vue'
+import SettingsModalPage from '~/components/pages/settings/SettingsModalPage.vue'
+import FormInformation from '~/components/open/forms/components/form-components/FormInformation.vue'
+import FormSubmissionSettings from '~/components/open/forms/components/form-components/FormSubmissionSettings.vue'
+import FormSecurityAccess from '~/components/open/forms/components/form-components/FormSecurityAccess.vue'
+import FormCustomSeo from '~/components/open/forms/components/form-components/FormCustomSeo.vue'
+import FormCustomCode from '~/components/open/forms/components/form-components/FormCustomCode.vue'
+
+const emit = defineEmits(['close', 'update:activeTab'])
+
+const props = defineProps({
+ modelValue: {
+ type: Boolean,
+ default: false
+ },
+ activeTab: {
+ type: String,
+ default: 'general'
+ }
+})
+
+// Modal state
+const isOpen = computed({
+ get: () => props.modelValue,
+ set: (value) => emit('close', value)
+})
+
+// Active tab state
+const activeTab = computed({
+ get: () => props.activeTab,
+ set: (value) => emit('update:activeTab', value)
+})
+
+// Methods
+const closeModal = () => {
+ isOpen.value = false
+}
+
+// Define keyboard shortcuts
+defineShortcuts({
+ escape: {
+ handler: () => {
+ closeModal()
+ }
+ }
+})
+</script>
\ No newline at end of file
diff --git a/client/components/open/forms/components/form-components/FormSubmissionSettings.vue b/client/components/open/forms/components/form-components/FormSubmissionSettings.vue
index 3224b8f2a..cf03cc9cd 100644
--- a/client/components/open/forms/components/form-components/FormSubmissionSettings.vue
+++ b/client/components/open/forms/components/form-components/FormSubmissionSettings.vue
@@ -1,233 +1,228 @@
<template>
- <SettingsSection
- name="Submission Settings"
- icon="i-heroicons-paper-airplane"
- class="w-full"
- >
- <!-- Basic Submission Settings -->
- <h4 class="font-semibold mt-4 border-t pt-4">
- Basic
- </h4>
- <p class="text-gray-500 text-sm mb-4">
- Configure how form submissions are handled.
- </p>
- <text-input
- name="submit_button_text"
- :form="form"
- class="max-w-xs"
- label="Submit button text"
- :required="true"
- />
-
- <ToggleSwitchInput
- name="auto_save"
- :form="form"
- label="Auto save form response"
- help="Saves form progress, allowing respondents to resume later."
- class="mt-4"
- :disabled="hasPaymentBlock"
- />
- <UAlert
- v-if="hasPaymentBlock"
- color="primary"
- variant="subtle"
- title="Must be enabled with a payment block."
- class="max-w-md"
- />
-
- <flat-select-input
- :form="submissionOptions"
- name="databaseAction"
- class="mt-4 max-w-xs"
- label="Database Submission Action"
- :options="[
- { name: 'Create new record', value: 'create' },
- { name: 'Update existing record', value: 'update' }
- ]"
- :required="true"
- />
- <div
- v-if="submissionOptions.databaseAction == 'update' && filterableFields.length"
- class="bg-gray-50 border rounded-lg px-4 py-2"
- >
- <div
- v-if="submissionOptions.databaseAction == 'update' && filterableFields.length"
- class="w-auto max-w-lg"
- >
- <p class="mb-2 mt-2 text-gray-500 text-sm">
- When matching values are found in the selected column(s), the (first) existing record will be updated instead of creating a new record. If there's no match, a new record will be created.
- <a
- href="#"
- class="text-blue-500 hover:underline"
- @click.prevent="crisp.openHelpdeskArticle('how-to-update-a-record-on-form-submission-1t1jwmn')"
- >
- Learn more.
- </a>
- </p>
- <select-input
- v-if="filterableFields.length"
- :form="form"
- name="database_fields_update"
- label="Properties to check on update"
- :options="filterableFields"
- multiple
- clearable
- />
+ <VForm size="sm">
+ <div class="space-y-4">
+ <div class="flex flex-col flex-wrap items-start justify-between gap-4 sm:flex-row sm:items-center">
+ <div>
+ <h3 class="text-lg font-medium text-neutral-900">Submission Settings</h3>
+ <p class="mt-1 text-sm text-neutral-500">
+ Configure how form submissions are handled.
+ </p>
+ </div>
</div>
- </div>
- <!-- Advanced Submission Settings -->
- <h4 class="font-semibold mt-4 border-t pt-4">
- Advanced Submission Options <pro-tag />
- </h4>
- <p class="text-gray-500 text-sm mb-4">
- Configure advanced options for form submissions and data collection.
- </p>
-
- <ToggleSwitchInput
- name="enable_partial_submissions"
- :form="form"
- help="Capture incomplete form submissions to analyze user drop-off points and collect partial data even when users don't complete the entire form."
- >
- <template #label>
- <span class="text-sm">
- Collect partial submissions
- </span>
- <ProTag
- class="ml-1"
- upgrade-modal-title="Upgrade to collect partial submissions"
- upgrade-modal-description="Capture valuable data from incomplete form submissions. Analyze where users drop off and collect partial information even when they don't complete the entire form."
- />
- </template>
- </ToggleSwitchInput>
-
- <!-- Post-Submission Behavior -->
- <h4 class="font-semibold mt-4 border-t pt-4">
- After Submission <pro-tag
- upgrade-modal-title="Upgrade to customize post-submission behavior"
- upgrade-modal-description="Customize post-submission behavior: redirect users, show custom messages, or trigger actions. Upgrade to unlock advanced options for a seamless user experience. We have plenty of other pro features to enhance your form functionality and user engagement."
+ <TextInput
+ name="submit_button_text"
+ :form="form"
+ class="max-w-xs"
+ label="Submit button text"
+ :required="true"
+ />
+ <ToggleSwitchInput
+ name="auto_save"
+ :form="form"
+ label="Auto save form response"
+ help="Saves form progress, allowing respondents to resume later."
+ class="mt-4"
+ :disabled="hasPaymentBlock"
+ />
+ <UAlert
+ v-if="hasPaymentBlock"
+ color="primary"
+ variant="subtle"
+ title="Must be enabled with a payment block."
+ class="max-w-md"
/>
- </h4>
- <p class="text-gray-500 text-sm mb-4">
- Customize the user experience after form submission.
- </p>
- <div
- class="w-full"
- :class="{'flex flex-wrap gap-x-4':submissionOptions.submissionMode === 'redirect'}"
- >
- <flat-select-input
+
+ <FlatSelectInput
:form="submissionOptions"
- name="submissionMode"
- class="w-full max-w-xs"
- label="Action After Form Submission"
+ name="databaseAction"
+ class="mt-4 max-w-xs"
+ label="Database Submission Action"
:options="[
- { name: 'Show Success page', value: 'default' },
- { name: 'Redirect', value: 'redirect' }
+ { name: 'Create new record', value: 'create' },
+ { name: 'Update existing record', value: 'update' }
]"
+ :required="true"
+ />
+ <div
+ v-if="submissionOptions.databaseAction == 'update' && filterableFields.length"
+ class="bg-neutral-50 border rounded-lg px-4 py-2"
>
- <template #selected="{ option, optionName }">
- <div class="flex items-center truncate text-sm mr-6">
- {{ optionName }}
- <pro-tag
- v-if="option === 'redirect'"
- class="ml-2"
- />
- </div>
- </template>
- <template #option="{ option, selected }">
- <span class="flex">
- <p class="flex-grow">
- {{ option.name }} <template v-if="option.value === 'redirect'"><pro-tag /></template>
- </p>
- <span
- v-if="selected"
- class="absolute inset-y-0 right-0 flex items-center pr-4"
+ <div
+ v-if="submissionOptions.databaseAction == 'update' && filterableFields.length"
+ class="w-auto max-w-lg"
+ >
+ <p class="mb-2 mt-2 text-neutral-500 text-sm">
+ When matching values are found in the selected column(s), the (first) existing record will be updated instead of creating a new record. If there's no match, a new record will be created.
+ <a
+ href="#"
+ class="text-blue-500 hover:underline"
+ @click.prevent="crisp.openHelpdeskArticle('how-to-update-a-record-on-form-submission-1t1jwmn')"
>
- <Icon
- name="heroicons:check-20-solid"
- class="h-5 w-5"
- />
- </span>
- </span>
- </template>
- </flat-select-input>
- <template v-if="submissionOptions.submissionMode === 'redirect'">
- <MentionInput
- name="redirect_url"
- :form="form"
- :mentions="form.properties"
- class="w-full max-w-xs"
- label="Redirect URL"
- placeholder="https://www.google.com"
- :required="true"
- />
- </template>
- <template v-else>
- <rich-text-area-input
- enable-mentions
- :mentions="form.properties"
- name="submitted_text"
- class="w-full mt-4"
- :form="form"
- label="Success page text"
- :required="false"
- />
- <div class="flex items-center flex-wrap gap-x-4">
- <toggle-switch-input
- name="re_fillable"
- class="w-full max-w-xs"
+ Learn more.
+ </a>
+ </p>
+ <select-input
+ v-if="filterableFields.length"
:form="form"
- label="Re-fillable form"
- help="Allows user to fill the form multiple times"
- />
- <text-input
- v-if="form.re_fillable"
- name="re_fill_button_text"
- :form="form"
- label="Text of re-start button"
- :required="true"
+ name="database_fields_update"
+ label="Properties to check on update"
+ :options="filterableFields"
+ multiple
+ clearable
/>
</div>
+ </div>
- <div class="flex items-center flex-wrap gap-x-4">
- <toggle-switch-input
- name="editable_submissions"
- class="w-full max-w-sm"
- help="Allows users to edit submissions via unique URL"
- :form="form"
- >
- <template #label>
- <span class="text-sm">
- Editable submissions
- </span>
- <ProTag
- class="ml-1"
- upgrade-modal-title="Upgrade to use Editable Submissions"
- upgrade-modal-description="On the Free plan, you can try out all paid features only within the form editor. Upgrade your plan to allow users to update their submissions via a unique URL, and much more. Gain full access to all advanced features."
+ <!-- Advanced Submission Settings -->
+ <h4 class="font-semibold mt-4 border-t pt-4">
+ Advanced Submission Options <pro-tag />
+ </h4>
+ <p class="text-neutral-500 text-sm mb-4">
+ Configure advanced options for form submissions and data collection.
+ </p>
+
+ <ToggleSwitchInput
+ name="enable_partial_submissions"
+ :form="form"
+ help="Capture incomplete form submissions to analyze user drop-off points and collect partial data even when users don't complete the entire form."
+ >
+ <template #label>
+ <span class="text-sm">
+ Collect partial submissions
+ </span>
+ <ProTag
+ class="ml-1"
+ upgrade-modal-title="Upgrade to collect partial submissions"
+ upgrade-modal-description="Capture valuable data from incomplete form submissions. Analyze where users drop off and collect partial information even when they don't complete the entire form."
+ />
+ </template>
+ </ToggleSwitchInput>
+
+ <!-- Post-Submission Behavior -->
+ <h4 class="font-semibold mt-4 border-t pt-4">
+ After Submission <pro-tag
+ upgrade-modal-title="Upgrade to customize post-submission behavior"
+ upgrade-modal-description="Customize post-submission behavior: redirect users, show custom messages, or trigger actions. Upgrade to unlock advanced options for a seamless user experience. We have plenty of other pro features to enhance your form functionality and user engagement."
+ />
+ </h4>
+ <p class="text-neutral-500 text-sm mb-4">
+ Customize the user experience after form submission.
+ </p>
+ <div
+ class="w-full"
+ :class="{'flex flex-wrap gap-x-4':submissionOptions.submissionMode === 'redirect'}"
+ >
+ <flat-select-input
+ :form="submissionOptions"
+ name="submissionMode"
+ class="w-full max-w-xs"
+ label="Action After Form Submission"
+ :options="[
+ { name: 'Show Success page', value: 'default' },
+ { name: 'Redirect', value: 'redirect' }
+ ]"
+ >
+ <template #selected="{ option, optionName }">
+ <div class="flex items-center truncate text-sm mr-6">
+ {{ optionName }}
+ <pro-tag
+ v-if="option === 'redirect'"
+ class="ml-2"
/>
- </template>
- </toggle-switch-input>
- <text-input
- v-if="form.editable_submissions"
- name="editable_submissions_button_text"
- class="w-full max-w-64"
+ </div>
+ </template>
+ <template #option="{ option, selected }">
+ <span class="flex">
+ <p class="flex-grow">
+ {{ option.name }} <template v-if="option.value === 'redirect'"><pro-tag /></template>
+ </p>
+ <span
+ v-if="selected"
+ class="absolute inset-y-0 right-0 flex items-center pr-4"
+ >
+ <Icon
+ name="heroicons:check-20-solid"
+ class="h-5 w-5"
+ />
+ </span>
+ </span>
+ </template>
+ </flat-select-input>
+ <template v-if="submissionOptions.submissionMode === 'redirect'">
+ <MentionInput
+ name="redirect_url"
:form="form"
- label="Edit submission button text"
+ :mentions="form.properties"
+ class="w-full max-w-xs"
+ label="Redirect URL"
+ placeholder="https://www.google.com"
:required="true"
/>
- </div>
- </template>
+ </template>
+ <template v-else>
+ <rich-text-area-input
+ enable-mentions
+ :mentions="form.properties"
+ :allow-fullscreen="true"
+ name="submitted_text"
+ class="w-full mt-4"
+ :form="form"
+ label="Success page text"
+ :required="false"
+ />
+ <div class="flex items-center flex-wrap gap-x-4">
+ <toggle-switch-input
+ name="re_fillable"
+ class="w-full max-w-xs"
+ :form="form"
+ label="Re-fillable form"
+ help="Allows user to fill the form multiple times"
+ />
+ <text-input
+ v-if="form.re_fillable"
+ name="re_fill_button_text"
+ :form="form"
+ label="Text of re-start button"
+ :required="true"
+ />
+ </div>
+
+ <div class="flex items-center flex-wrap gap-x-4">
+ <toggle-switch-input
+ name="editable_submissions"
+ class="w-full max-w-sm"
+ help="Allows users to edit submissions via unique URL"
+ :form="form"
+ >
+ <template #label>
+ <span class="text-sm">
+ Editable submissions
+ </span>
+ <ProTag
+ class="ml-1"
+ upgrade-modal-title="Upgrade to use Editable Submissions"
+ upgrade-modal-description="On the Free plan, you can try out all paid features only within the form editor. Upgrade your plan to allow users to update their submissions via a unique URL, and much more. Gain full access to all advanced features."
+ />
+ </template>
+ </toggle-switch-input>
+ <text-input
+ v-if="form.editable_submissions"
+ name="editable_submissions_button_text"
+ class="w-full max-w-64"
+ :form="form"
+ label="Edit submission button text"
+ :required="true"
+ />
+ </div>
+ </template>
+ </div>
</div>
- </SettingsSection>
+ </VForm>
</template>
<script setup>
-import { ref, computed, watch } from 'vue'
-import { storeToRefs } from 'pinia'
-import { useWorkingFormStore } from '../../../../../stores/working_form'
-import ProTag from '~/components/global/ProTag.vue'
-import ToggleSwitchInput from '../../../../forms/ToggleSwitchInput.vue'
-import { useCrisp } from '~/composables/useCrisp'
+import ProTag from "~/components/app/ProTag.vue"
const workingFormStore = useWorkingFormStore()
const { content: form } = storeToRefs(workingFormStore)
diff --git a/client/components/open/forms/components/form-components/components/AiFieldGenerator.vue b/client/components/open/forms/components/form-components/components/AiFieldGenerator.vue
new file mode 100644
index 000000000..ab8fbdb59
--- /dev/null
+++ b/client/components/open/forms/components/form-components/components/AiFieldGenerator.vue
@@ -0,0 +1,144 @@
+<template>
+ <div>
+ <UPopover v-model:open="isPopoverOpen" arrow :content="popoverContent">
+ <UTooltip text="Add question with AI">
+ <UButton
+ size="sm"
+ color="neutral"
+ variant="outline"
+ icon="i-heroicons-sparkles"
+ :loading="loading"
+ />
+ </UTooltip>
+
+ <template #content>
+ <div class="p-4 w-72">
+ <div class="space-y-2">
+ <div class="flex items-center justify-between">
+ <p class="text-sm font-medium">Add new field(s) with AI</p>
+ </div>
+
+ <p class="text-xs text-neutral-500">
+ This will generate new fields based on your description.
+ </p>
+
+ <TextAreaInput
+ name="fields_prompt"
+ :disabled="loading"
+ :form="aiFields"
+ placeholder="Describe the question you want to add with AI..."
+ />
+
+ <UButton
+ class="mt-2"
+ icon="i-heroicons-sparkles"
+ label="Generate"
+ block
+ :loading="loading"
+ @click="handleGenerate"
+ />
+ </div>
+ </div>
+ </template>
+ </UPopover>
+ </div>
+</template>
+
+<script setup>
+import { formsApi } from '~/api'
+
+defineProps({
+ popoverContent: {
+ type: Object,
+ default: () => ({
+ align: 'start',
+ side: 'left',
+ }),
+ },
+})
+
+const workingFormStore = useWorkingFormStore()
+const { content: form } = storeToRefs(workingFormStore)
+
+const isPopoverOpen = ref(false)
+const loading = ref(false)
+const aiRequestId = ref(null)
+const aiFields = useForm({
+ fields_prompt: '',
+ current_form_structure: null
+})
+
+onMounted(() => {
+ if(form.value) {
+ aiFields.current_form_structure = {
+ 'title': form.value.title,
+ 'properties': form.value.properties.map(property => ({
+ 'name': property.name,
+ 'type': property.type
+ }))
+ }
+ }
+})
+
+const handleGenerate = () => {
+ if (loading.value) return
+
+ if (!aiFields.fields_prompt) {
+ useAlert().warning('Please describe the fields you want to add with AI.')
+ return
+ }
+
+ loading.value = true
+ aiRequestId.value = null
+ formsApi.ai.generateFields(aiFields).then(data => {
+ aiRequestId.value = data.ai_form_completion_id
+ fetchGeneratedForm(data.ai_form_completion_id)
+ }).catch(error => {
+ console.error('Failed to add new field(s):', error)
+ useAlert().error(error.response?.data?.message ?? 'Failed to add new field(s).')
+ loading.value = false
+ })
+}
+
+const fetchGeneratedForm = (generationId) => {
+ // If aiRequestId is null, it means we cancelled the request
+ if (!aiRequestId.value) {
+ loading.value = false
+ return
+ }
+
+ const checkFormStatus = () => {
+ // If aiRequestId is null, it means we cancelled the request
+ if (!aiRequestId.value) {
+ loading.value = false
+ return
+ }
+
+ formsApi.ai.get(generationId).then(data => {
+ if (data.ai_form_completion.status === 'completed') {
+ // Only proceed if we haven't cancelled
+ if (aiRequestId.value) {
+ workingFormStore.addGeneratedFields(JSON.parse(data.ai_form_completion.result))
+ }
+ loading.value = false
+ isPopoverOpen.value = false
+ useAlert().success('New field(s) added successfully.')
+ aiFields.fields_prompt = ''
+ } else if (data.ai_form_completion.status === 'failed') {
+ useAlert().error('Something went wrong, please try again.')
+ loading.value = false
+ } else {
+ // Call itself again after 4 seconds if form is not yet ready
+ setTimeout(checkFormStatus, 4000)
+ }
+ }).catch(error => {
+ console.error(error)
+ useAlert().error(error.response?.data?.message)
+ loading.value = false
+ })
+ }
+
+ // Call the function immediately
+ checkFormStatus()
+}
+</script>
\ No newline at end of file
diff --git a/client/components/open/forms/components/form-logic-components/ColumnCondition.vue b/client/components/open/forms/components/form-logic-components/ColumnCondition.vue
index 46f036a64..819eac6cd 100644
--- a/client/components/open/forms/components/form-logic-components/ColumnCondition.vue
+++ b/client/components/open/forms/components/form-logic-components/ColumnCondition.vue
@@ -3,7 +3,7 @@
v-if="content"
class="flex flex-wrap"
>
- <div class="w-full font-semibold text-gray-700 dark:text-gray-300 mb-2">
+ <div class="w-full font-semibold text-neutral-700 dark:text-neutral-300 mb-2">
{{ property.name }}
</div>
<SelectInput
diff --git a/client/components/open/forms/components/form-logic-components/ConditionEditor.client.vue b/client/components/open/forms/components/form-logic-components/ConditionEditor.client.vue
index c3d3ee741..e737f2752 100644
--- a/client/components/open/forms/components/form-logic-components/ConditionEditor.client.vue
+++ b/client/components/open/forms/components/form-logic-components/ConditionEditor.client.vue
@@ -45,7 +45,7 @@
</template>
<script>
-
+import ErrorBoundary from '~/components/app/ErrorBoundary.vue'
import { defineComponent } from "vue"
import QueryBuilder from "query-builder-vue-3"
import ColumnCondition from "./ColumnCondition.vue"
@@ -56,6 +56,7 @@ export default {
GroupControlSlot,
QueryBuilder,
ColumnCondition,
+ ErrorBoundary,
},
props: {
diff --git a/client/components/open/forms/components/form-logic-components/FormBlockLogicEditor.vue b/client/components/open/forms/components/form-logic-components/FormBlockLogicEditor.vue
index 417fdfbb9..a2dc621bd 100644
--- a/client/components/open/forms/components/form-logic-components/FormBlockLogicEditor.vue
+++ b/client/components/open/forms/components/form-logic-components/FormBlockLogicEditor.vue
@@ -3,27 +3,30 @@
v-if="logic"
:key="resetKey"
>
- <p class="text-gray-400 text-xs mb-3">
+ <p class="text-neutral-400 text-xs mb-3">
Select a field, add some conditions, and finally add some actions.
</p>
<div class="relative flex">
<UButtonGroup size="xs">
<UButton
- color="gray"
+ color="neutral"
+ variant="subtle"
icon="i-heroicons-arrow-down-on-square"
@click="showCopyFormModal = true"
>
Copy from
</UButton>
<UButton
- color="gray"
+ color="neutral"
+ variant="subtle"
icon="i-heroicons-arrow-up-on-square"
@click="showCopyToModal = true"
>
Copy to
</UButton>
<UButton
- color="gray"
+ color="neutral"
+ variant="subtle"
icon="i-mdi-clear-outline"
@click="clearAll"
>
@@ -32,7 +35,7 @@
</UButtonGroup>
</div>
- <h5 class="font-medium text-gray-700 mt-3">
+ <h5 class="font-medium text-neutral-700 mt-3">
1. Conditions
</h5>
<condition-editor
@@ -42,10 +45,10 @@
:form="form"
/>
- <h5 class="font-medium text-gray-700 mt-3">
+ <h5 class="font-medium text-neutral-700 mt-3">
2. Actions
</h5>
- <p class="text-gray-500 text-xs mb-3">
+ <p class="text-neutral-500 text-xs mb-3">
Action(s) triggered when above conditions are true.
</p>
<flat-select-input
@@ -59,104 +62,85 @@
@update:model-value="onActionInput"
/>
- <p class="text-gray-500 text-xs mb-3">
+ <p class="text-neutral-500 text-xs mb-3">
Note that hidden fields can never be required.
</p>
- <modal
- max-width="sm"
-
- :show="showCopyFormModal"
- @close="showCopyFormModal = false"
+ <UModal
+ v-model:open="showCopyFormModal"
+ title="Copy logic from another field"
+ :description="`Select another field/block to copy its logic and apply it to '${field.name}'.`"
>
- <h3 class="font-semibold block text-lg">
- Copy logic from another field
- </h3>
- <p class="text-gray-400 text-xs mb-5">
- Select another field/block to copy its logic and apply it to "{{
- field.name
- }}".
- </p>
- <select-input
- v-model="copyFrom"
- name="copy_from"
- emit-key="value"
- label="Copy logic from"
- placeholder="Choose a field/block..."
- :options="copyFromOptions"
- :searchable="copyFromOptions && copyFromOptions.options > 5"
- />
- <div class="flex justify-between mt-2">
+ <template #body>
+ <SelectInput
+ v-model="copyFrom"
+ name="copy_from"
+ emit-key="value"
+ label="Copy logic from"
+ placeholder="Choose a field/block..."
+ :options="copyFromOptions"
+ :searchable="copyFromOptions && copyFromOptions.options > 5"
+ />
+ </template>
+
+ <template #footer>
+ <UButton
+ color="neutral"
+ variant="outline"
+ label="Close"
+ @click="showCopyFormModal = false"
+ />
<UButton
color="primary"
- icon="i-heroicons-check"
@click="copyLogic"
- >
- Confirm & Copy
- </UButton>
- <UButton
- color="gray"
- icon="i-heroicons-x-mark"
- class="ml-1"
- @click="showCopyFormModal = false"
- >
- Close
- </UButton>
- </div>
- </modal>
-
+ label="Confirm & Copy"
+ />
+ </template>
+ </UModal>
- <modal
- max-width="sm"
- :show="showCopyToModal"
- @close="showCopyToModal = false"
+ <UModal
+ v-model:open="showCopyToModal"
+ title="Copy logic to other fields"
+ :description="`Select other fields to copy the logic from '${field.name}' to.`"
>
- <h3 class="font-semibold block text-lg">
- Copy logic to other fields
- </h3>
- <p class="text-gray-400 text-xs mb-5">
- Select fields to copy the logic from "{{ field.name }}" to them.
- </p>
- <select-input
- v-model="copyTo"
- name="copy_to"
- emit-key="value"
- label="Copy logic to"
- placeholder="Choose fields..."
- :options="copyToOptions"
- :multiple="true"
- :searchable="copyToOptions && copyToOptions.length > 5"
- />
- <div class="flex justify-between mt-2">
+ <template #body>
+ <SelectInput
+ v-model="copyTo"
+ name="copy_to"
+ emit-key="value"
+ label="Copy logic to"
+ placeholder="Choose fields..."
+ :options="copyToOptions"
+ :multiple="true"
+ :searchable="copyToOptions && copyToOptions.length > 5"
+ />
+ </template>
+
+ <template #footer>
+ <UButton
+ color="neutral"
+ variant="outline"
+ label="Close"
+ @click="showCopyToModal = false"
+ />
<UButton
color="primary"
- icon="i-heroicons-check"
@click="copyLogicToFields"
- >
- Confirm & Copy
- </UButton>
- <UButton
- color="gray"
- icon="i-heroicons-x-mark"
- class="ml-1"
- @click="showCopyToModal = false"
- >
- Close
- </UButton>
- </div>
- </modal>
+ label="Confirm & Copy"
+ />
+ </template>
+ </UModal>
</div>
</template>
<script>
import ConditionEditor from "./ConditionEditor.client.vue"
-import Modal from "../../../../global/Modal.vue"
import clonedeep from "clone-deep"
import { default as _has } from "lodash/has"
export default {
name: "FormBlockLogicEditor",
- components: { Modal, ConditionEditor },
+ components: { ConditionEditor },
props: {
field: {
type: Object,
diff --git a/client/components/open/forms/components/form-logic-components/GroupControlSlot.vue b/client/components/open/forms/components/form-logic-components/GroupControlSlot.vue
index a7c25d224..122da24e0 100644
--- a/client/components/open/forms/components/form-logic-components/GroupControlSlot.vue
+++ b/client/components/open/forms/components/form-logic-components/GroupControlSlot.vue
@@ -13,23 +13,23 @@
option-key="identifier"
name="group-control-slot-rule"
/>
- <v-button
+ <UButton
class="ml-1 mt-1"
- color="blue"
- size="small"
+ color="neutral"
+ variant="outline"
+ size="sm"
:disabled="selectedRule === '' ? true : null"
@click="addRule"
- >
- Add Condition
- </v-button>
- <v-button
+ label="Add Condition"
+ />
+ <UButton
class="ml-1 mt-1"
- color="outline-blue"
- size="small"
+ variant="outline"
+ color="neutral"
+ size="sm"
@click="groupCtrl.newGroup"
- >
- Add Group
- </v-button>
+ label="Add Group"
+ />
</div>
</template>
diff --git a/client/components/open/forms/components/templates/FormTemplateModal.vue b/client/components/open/forms/components/templates/FormTemplateModal.vue
index 68778a247..669ba4158 100644
--- a/client/components/open/forms/components/templates/FormTemplateModal.vue
+++ b/client/components/open/forms/components/templates/FormTemplateModal.vue
@@ -1,163 +1,142 @@
<template>
- <modal
- :show="show"
- @close="emit('close')"
+ <UModal
+ v-model:open="isOpen"
+ :ui="{ content: 'sm:max-w-4xl' }"
>
- <template #icon>
- <svg
- class="w-10 h-10 text-blue"
- viewBox="0 0 48 48"
- fill="none"
- xmlns="http://www.w3.org/2000/svg"
+ <template #header>
+ <div class="flex items-center w-full gap-4 px-2">
+ <h2 class="font-semibold">
+ {{ template ? 'Edit Template' : 'Create Template' }}
+ </h2>
+ </div>
+ <UButton
+ color="neutral"
+ variant="outline"
+ icon="i-heroicons-question-mark-circle"
+ size="sm"
+ @click="crisp.openHelpdeskArticle('how-to-create-an-opnform-template-1fn84i4')"
>
- <path
- d="M17 27C16.0681 27 15.6022 27 15.2346 26.8478C14.7446 26.6448 14.3552 26.2554 14.1522 25.7654C14 25.3978 14 24.9319 14 24V17.2C14 16.0799 14 15.5198 14.218 15.092C14.4097 14.7157 14.7157 14.4097 15.092 14.218C15.5198 14 16.0799 14 17.2 14H24C24.9319 14 25.3978 14 25.7654 14.1522C26.2554 14.3552 26.6448 14.7446 26.8478 15.2346C27 15.6022 27 16.0681 27 17M24.2 34H30.8C31.9201 34 32.4802 34 32.908 33.782C33.2843 33.5903 33.5903 33.2843 33.782 32.908C34 32.4802 34 31.9201 34 30.8V24.2C34 23.0799 34 22.5198 33.782 22.092C33.5903 21.7157 33.2843 21.4097 32.908 21.218C32.4802 21 31.9201 21 30.8 21H24.2C23.0799 21 22.5198 21 22.092 21.218C21.7157 21.4097 21.4097 21.7157 21.218 22.092C21 22.5198 21 23.0799 21 24.2V30.8C21 31.9201 21 32.4802 21.218 32.908C21.4097 33.2843 21.7157 33.5903 22.092 33.782C22.5198 34 23.0799 34 24.2 34Z"
- stroke="currentColor"
- stroke-width="2"
- stroke-linecap="round"
- stroke-linejoin="round"
- />
- </svg>
- </template>
- <template #title>
- <template v-if="template">
- Edit Template
- </template>
- <template v-else>
- Create Template
- </template>
+ Help
+ </UButton>
</template>
- <div class="p-4">
- <p v-if="!template">
+
+ <template #body>
+ <p v-if="!template" class="mb-4">
New template will be create from your form:
<span class="font-semibold">{{ form.title }}</span>.
</p>
<form
v-if="templateForm"
- class="mt-6"
@submit.prevent="onSubmit"
- @keydown="templateForm.onKeydown($event)"
>
- <div class="-m-6">
- <div class="border-t py-4 px-6">
- <toggle-switch-input
- v-if="user && (user.admin || user.template_editor)"
- name="publicly_listed"
- :form="templateForm"
- class="mt-4"
- label="Publicly Listed?"
- />
- <text-input
- name="name"
- :form="templateForm"
- class="mt-4"
- label="Title"
- :required="true"
- />
- <text-input
- name="slug"
- :form="templateForm"
- class="mt-4"
- label="Slug"
- :required="true"
- />
- <text-area-input
- name="short_description"
- :form="templateForm"
- class="mt-4"
- label="Short Description"
- :required="true"
- />
- <rich-text-area-input
- name="description"
- :form="templateForm"
- class="mt-4"
- label="Description"
- :required="true"
- />
- <text-input
- name="image_url"
- :form="templateForm"
- class="mt-4"
- label="Image"
- :required="true"
- />
- <select-input
- name="types"
- :form="templateForm"
- class="mt-4"
- label="Types"
- :options="typesOptions"
- :multiple="true"
- :searchable="true"
- />
- <select-input
- name="industries"
- :form="templateForm"
- class="mt-4"
- label="Industries"
- :options="industriesOptions"
- :multiple="true"
- :searchable="true"
- />
- <select-input
- name="related_templates"
- :form="templateForm"
- class="mt-4"
- label="Related Templates"
- :options="templatesOptions"
- :multiple="true"
- :searchable="true"
- />
- <questions-editor
- name="questions"
- :questions="templateForm.questions"
- class="mt-4"
- label="Frequently asked questions"
- />
- </div>
- <div class="flex justify-end mt-4 pb-5 px-6">
- <v-button
- class="mr-2"
- :loading="templateForm.busy"
- >
- <template v-if="template">
- Update
- </template>
- <template v-else>
- Create
- </template>
- </v-button>
- <v-button
- v-if="template"
- color="red"
- class="mr-2"
- @click.prevent="
- useAlert().confirm(
- 'Do you really want to delete this template?',
- deleteFormTemplate,
- )
- "
- >
- Delete
- </v-button>
- <v-button
- color="white"
- @click.prevent="emit('close')"
- >
- Close
- </v-button>
- </div>
+ <div class="space-y-4">
+ <toggle-switch-input
+ v-if="user && (user.admin || user.template_editor)"
+ name="publicly_listed"
+ :form="templateForm"
+ label="Publicly Listed?"
+ />
+ <text-input
+ name="name"
+ :form="templateForm"
+ label="Title"
+ :required="true"
+ />
+ <text-input
+ name="slug"
+ :form="templateForm"
+ label="Slug"
+ :required="true"
+ />
+ <text-area-input
+ name="short_description"
+ :form="templateForm"
+ label="Short Description"
+ :required="true"
+ />
+ <rich-text-area-input
+ name="description"
+ :allow-fullscreen="true"
+ :form="templateForm"
+ label="Description"
+ :required="true"
+ />
+ <text-input
+ name="image_url"
+ :form="templateForm"
+ label="Image"
+ :required="true"
+ />
+ <select-input
+ name="types"
+ :form="templateForm"
+ label="Types"
+ :options="typesOptions"
+ :multiple="true"
+ :searchable="true"
+ />
+ <select-input
+ name="industries"
+ :form="templateForm"
+ label="Industries"
+ :options="industriesOptions"
+ :multiple="true"
+ :searchable="true"
+ />
+ <select-input
+ name="related_templates"
+ :form="templateForm"
+ label="Related Templates"
+ :options="templatesOptions"
+ :multiple="true"
+ :searchable="true"
+ />
+ <questions-editor
+ name="questions"
+ :questions="templateForm.questions"
+ label="Frequently asked questions"
+ />
</div>
</form>
- </div>
- </modal>
+ </template>
+
+ <template #footer>
+ <div class="flex justify-end gap-x-2 w-full">
+ <UButton
+ color="neutral"
+ variant="outline"
+ @click="close"
+ label="Close"
+ />
+ <UButton
+ v-if="template"
+ color="error"
+ variant="outline"
+ @click="
+ useAlert().confirm(
+ 'Do you really want to delete this template?',
+ deleteFormTemplate,
+ )
+ "
+ label="Delete template"
+ />
+ <div class="grow"/>
+ <UButton
+ class="px-8"
+ :loading="createMutation.isPending.value || updateMutation.isPending.value"
+ @click="onSubmit"
+ :label="template ? 'Update' : 'Create'"
+ />
+ </div>
+ </template>
+ </UModal>
</template>
<script setup>
-import { ref, defineProps, defineEmits, computed } from "vue"
+import { ref, defineProps, defineEmits, computed, watch, onMounted } from "vue"
import QuestionsEditor from "./QuestionsEditor.vue"
+import { useTemplateMeta } from "~/composables/data/useTemplateMeta"
const props = defineProps({
show: { type: Boolean, required: true },
@@ -165,17 +144,42 @@ const props = defineProps({
template: { type: Object, required: false, default: () => {} },
})
-const authStore = useAuthStore()
-const templatesStore = useTemplatesStore()
+const crisp = useCrisp()
const router = useRouter()
-const user = computed(() => authStore.user)
-const templates = computed(() => [...templatesStore.content.values()])
-const industries = computed(() => [...templatesStore.industries.values()])
-const types = computed(() => [...templatesStore.types.values()])
+const { data: user } = useAuth().user()
+
+const { list, create, update, remove } = useTemplates()
+
+const { industries: industriesMap, types: typesMap } = useTemplateMeta()
+
+const industries = computed(() => [...(industriesMap.value?.values() ?? [])])
+const types = computed(() => [...(typesMap.value?.values() ?? [])])
const templateForm = ref(null)
const emit = defineEmits(["close"])
+// Modal state
+const isOpen = computed({
+ get() {
+ return props.show
+ },
+ set(value) {
+ if (!value) {
+ close()
+ }
+ }
+})
+
+// Initialize templates query - this needs to be called at setup level
+const templatesQuery = list({ enabled: false })
+
+// Enable the query when modal is opened
+watch(isOpen, (open) => {
+ if (open) {
+ templatesQuery.refetch()
+ }
+})
+
onMounted(() => {
templateForm.value = useForm(
props.template ?? {
@@ -185,23 +189,14 @@ onMounted(() => {
short_description: "",
description: "",
image_url: "",
- types: null,
- industries: null,
- related_templates: null,
+ types: [],
+ industries: [],
+ related_templates: [],
questions: [],
},
)
})
-watch(
- () => props.show,
- () => {
- if (props.show) {
- loadAllTemplates(templatesStore)
- }
- },
-)
-
const typesOptions = computed(() => {
return Object.values(types.value).map((type) => {
return {
@@ -219,7 +214,8 @@ const industriesOptions = computed(() => {
})
})
const templatesOptions = computed(() => {
- return Object.values(templates.value).map((template) => {
+ if (!templatesQuery.data.value) return []
+ return Object.values(templatesQuery.data.value).map((template) => {
return {
name: template.name,
value: template.slug,
@@ -227,6 +223,14 @@ const templatesOptions = computed(() => {
})
})
+const close = () => {
+ emit("close")
+}
+
+const createMutation = create()
+const updateMutation = update()
+const deleteMutation = remove()
+
const onSubmit = () => {
if (props.template) {
updateFormTemplate()
@@ -234,39 +238,32 @@ const onSubmit = () => {
createFormTemplate()
}
}
-const createFormTemplate = async () => {
+const createFormTemplate = () => {
templateForm.value.form = props.form
- await templateForm.value.post("/templates").then((data) => {
- if (data.message) {
- useAlert().success(data.message)
- }
- templatesStore.save(data.data)
+ createMutation.mutateAsync(templateForm.value).then(() => {
+ useAlert().success("Template created successfully")
emit("close")
+ }).catch((error) => {
+ useAlert().error(error.message)
})
}
-const updateFormTemplate = async () => {
+const updateFormTemplate = () => {
templateForm.value.form = props.form
- await templateForm.value
- .put("/templates/" + props.template.id)
- .then((data) => {
- if (data.message) {
- useAlert().success(data.message)
- }
- templatesStore.save(data.data)
- emit("close")
- })
+ updateMutation.mutateAsync({ id: props.template.id, data: templateForm.value }).then(() => {
+ useAlert().success("Template updated successfully")
+ emit("close")
+ }).catch((error) => {
+ useAlert().error(error.message)
+ })
}
-const deleteFormTemplate = async () => {
+const deleteFormTemplate = () => {
if (!props.template) return
- opnFetch("/templates/" + props.template.id, { method: "DELETE" }).then(
- (data) => {
- if (data.message) {
- useAlert().success(data.message)
- }
- router.push({ name: "templates" })
- templatesStore.remove(props.template)
- emit("close")
- },
- )
+ deleteMutation.mutateAsync(props.template.id).then(() => {
+ useAlert().success("Template deleted successfully")
+ router.push({ name: "templates" })
+ emit("close")
+ }).catch((error) => {
+ useAlert().error(error.message)
+ })
}
</script>
diff --git a/client/components/open/forms/components/templates/QuestionsEditor.vue b/client/components/open/forms/components/templates/QuestionsEditor.vue
index d4d4ff299..90ee4555a 100644
--- a/client/components/open/forms/components/templates/QuestionsEditor.vue
+++ b/client/components/open/forms/components/templates/QuestionsEditor.vue
@@ -18,7 +18,7 @@
<Loader
v-if="loading"
key="loader"
- class="h-6 w-6 text-nt-blue mx-auto"
+ class="h-6 w-6 text-blue-500 mx-auto"
/>
<div
v-else
@@ -27,30 +27,17 @@
<div
v-for="(questionForm, quesKey) in allQuestions"
:key="quesKey"
- class="bg-gray-100 p-2 mb-4"
+ class="bg-neutral-100 p-2 mb-4"
>
- <v-button
- color="red"
- size="small"
+ <UButton
+ color="error"
+ variant="outline"
+ size="sm"
class="mb-2"
@click.prevent="onRemove(quesKey)"
- >
- <svg
- class="h-4 w-4 text-white inline mr-1 -mt-1"
- viewBox="0 0 24 24"
- fill="none"
- xmlns="http://www.w3.org/2000/svg"
- >
- <path
- d="M3 6H5M5 6H21M5 6V20C5 20.5304 5.21071 21.0391 5.58579 21.4142C5.96086 21.7893 6.46957 22 7 22H17C17.5304 22 18.0391 21.7893 18.4142 21.4142C18.7893 21.0391 19 20.5304 19 20V6H5ZM8 6V4C8 3.46957 8.21071 2.96086 8.58579 2.58579C8.96086 2.21071 9.46957 2 10 2H14C14.5304 2 15.0391 2.21071 15.4142 2.58579C15.7893 2.96086 16 3.46957 16 4V6M10 11V17M14 11V17"
- stroke="currentColor"
- stroke-width="2"
- stroke-linecap="round"
- stroke-linejoin="round"
- />
- </svg>
- Remove
- </v-button>
+ icon="i-heroicons-trash"
+ label="Remove"
+ />
<text-input
name="question"
:form="questionForm"
@@ -58,36 +45,21 @@
/>
<rich-text-area-input
name="answer"
+ :allow-fullscreen="true"
:form="questionForm"
class="mt-4"
placeholder="Question response"
/>
</div>
- <v-button
+ <UButton
v-if="addNew"
- color="green"
- size="small"
- native-type="button"
+ color="success"
+ size="sm"
class="mt-2 flex"
@click.prevent="onAdd"
- >
- <svg
- xmlns="http://www.w3.org/2000/svg"
- class="h-6 w-6 mr-1 inline"
- fill="none"
- viewBox="0 0 24 24"
- stroke-width="1.5"
- stroke="currentColor"
- >
- <path
- stroke-linecap="round"
- stroke-linejoin="round"
- stroke-width="2"
- d="M12 9v6m3-3H9m12 0a9 9 0 11-18 0 9 9 0 0118 0z"
- />
- </svg>
- Add New
- </v-button>
+ icon="i-heroicons-plus"
+ label="Add New"
+ />
</div>
<small
diff --git a/client/components/open/forms/fields/FormFieldEdit.vue b/client/components/open/forms/fields/FormFieldEdit.vue
index f5e5516ec..18beebfdb 100644
--- a/client/components/open/forms/fields/FormFieldEdit.vue
+++ b/client/components/open/forms/fields/FormFieldEdit.vue
@@ -4,7 +4,7 @@
<UButton
v-if="!field"
size="sm"
- color="gray"
+ color="neutral"
icon="i-heroicons-x-mark-20-solid"
variant="ghost"
@click="closeSidebar"
@@ -13,7 +13,7 @@
<div class="flex">
<UButton
size="sm"
- color="gray"
+ color="neutral"
icon="i-heroicons-x-mark-20-solid"
variant="ghost"
@click="closeSidebar"
@@ -26,45 +26,37 @@
<p
v-if="blocksTypes[field.type]"
- class="text-sm text-gray-500"
+ class="text-sm text-neutral-500"
>
{{ blocksTypes[field.type].title }}
</p>
- <UDropdown
+ <UDropdownMenu
:items="dropdownItems"
:popper="{ placement: 'bottom-start' }"
>
<UButton
- color="white"
+ color="neutral"
+ variant="outline"
icon="i-heroicons-ellipsis-vertical"
/>
-
- <template
- v-if="typeCanBeChanged"
- #changetype
- >
- <ChangeFieldType
- v-if="!isBlockField"
- :field="field"
- @change-type="onChangeType"
- />
- </template>
- </UDropdown>
+ </UDropdownMenu>
</div>
</div>
</template>
</div>
<template v-if="field">
- <div class="bg-gray-100 border-b">
+ <div class="bg-neutral-100 border-b">
<UTabs
v-model="activeTab"
:items="tabItems"
+ color="primary"
+ :content="false"
class="w-full"
/>
</div>
- <div v-if="activeTab ===0">
+ <div v-if="activeTab === 'options'">
<FieldOptions
v-if="!isBlockField"
:form="form"
@@ -76,14 +68,14 @@
:field="field"
/>
</div>
- <div v-else-if="activeTab === 1">
+ <div v-else-if="activeTab === 'logic'">
<FormBlockLogicEditor
class="py-2 px-4"
:form="form"
:field="field"
/>
</div>
- <div v-else-if="activeTab === 2">
+ <div v-else-if="activeTab === 'validation'">
<custom-field-validation
class="py-2 px-4"
:form="form"
@@ -93,7 +85,7 @@
</template>
<div
v-else
- class="text-center p-10 text-sm text-gray-500"
+ class="text-center p-10 text-sm text-neutral-500"
>
Click on field to edit it.
</div>
@@ -107,7 +99,6 @@ import clonedeep from 'clone-deep'
import FieldOptions from './components/FieldOptions.vue'
import BlockOptions from './components/BlockOptions.vue'
import BlockTypeIcon from '../components/BlockTypeIcon.vue'
-import ChangeFieldType from "./components/ChangeFieldType.vue"
import blocksTypes from '~/data/blocks_types.json'
import FormBlockLogicEditor from '../components/form-logic-components/FormBlockLogicEditor.vue'
import CustomFieldValidation from '../components/CustomFieldValidation.vue'
@@ -152,6 +143,64 @@ const typeCanBeChanged = computed(() => {
].includes(field.value.type)
})
+// Composable for field type changing logic
+const useFieldTypeChange = () => {
+
+ const onChangeType = (newType) => {
+ if (["select", "multi_select"].includes(field.value.type)) {
+ field.value[newType] = field.value[field.value.type] // Set new options with new type
+ delete field.value[field.value.type] // remove old type options
+ }
+ field.value.type = newType
+ }
+
+ const getChangeTypeOptions = (currentType) => {
+ let newTypes = []
+
+ if ([
+ "text",
+ "email",
+ "phone_number",
+ "number",
+ "slider",
+ "rating",
+ "scale",
+ ].includes(currentType)) {
+ newTypes = [
+ { name: "Text Input", value: "text", icon: "i-heroicons-pencil-20-solid" },
+ { name: "Email Input", value: "email", icon: "i-heroicons-at-symbol-20-solid" },
+ { name: "Phone Input", value: "phone_number", icon: "i-heroicons-phone-20-solid" },
+ { name: "Number Input", value: "number", icon: "i-heroicons-hashtag-20-solid" },
+ { name: "Slider Input", value: "slider", icon: "i-heroicons-adjustments-horizontal-20-solid" },
+ { name: "Rating Input", value: "rating", icon: "i-heroicons-star-20-solid" },
+ { name: "Scale Input", value: "scale", icon: "i-heroicons-chart-bar-20-solid" },
+ ]
+ }
+
+ if (["select", "multi_select"].includes(currentType)) {
+ newTypes = [
+ { name: "Select Input", value: "select", icon: "i-heroicons-chevron-down-20-solid" },
+ { name: "Multi-Select Input", value: "multi_select", icon: "i-heroicons-check-20-solid" },
+ ]
+ }
+
+ return newTypes
+ .filter((item) => item.value !== currentType)
+ .map((item) => ({
+ label: item.name,
+ value: item.value,
+ icon: item.icon,
+ onClick: () => onChangeType(item.value)
+ }))
+ }
+
+ return {
+ getChangeTypeOptions
+ }
+}
+
+const { getChangeTypeOptions } = useFieldTypeChange()
+
function removeBlock() {
workingFormStore.removeField(field.value)
}
@@ -162,20 +211,12 @@ function closeSidebar() {
workingFormStore.closeEditFieldSidebar()
}
-function onChangeType(newType) {
- if (["select", "multi_select"].includes(field.value.type)) {
- field.value[newType] = field.value[field.value.type] // Set new options with new type
- delete field.value[field.value.type] // remove old type options
- }
- field.value.type = newType
-}
-
const dropdownItems = computed(() => {
- return [
+ const baseItems = [
[{
label: 'Copy field ID',
icon: 'i-heroicons-clipboard-20-solid',
- click: () => {
+ onClick: () => {
navigator.clipboard.writeText(field.value.id)
useAlert().success('Field ID copied to clipboard')
}
@@ -183,7 +224,7 @@ const dropdownItems = computed(() => {
[{
label: 'Duplicate',
icon: 'i-heroicons-document-duplicate-20-solid',
- click: () => {
+ onClick: () => {
const newField = clonedeep(field.value)
newField.id = generateUUID()
newField.name = 'Copy of ' + newField.name
@@ -191,28 +232,38 @@ const dropdownItems = computed(() => {
newFields.splice(selectedFieldIndex.value + 1, 0, newField)
form.value.properties = newFields
}
- }],
- ... (typeCanBeChanged.value ? [[{
- label: 'Change type',
- icon: 'i-heroicons-document-duplicate-20-solid',
- slot: 'changetype',
- }]] : []),
- [{
- label: 'Remove',
- icon: 'i-heroicons-trash-20-solid',
- class: 'group/remove hover:text-red-800',
- iconClass: 'group-hover/remove:text-red-900',
- click: removeBlock
}]
]
+
+ // Add change type option with nested menu if type can be changed
+ if (typeCanBeChanged.value && !isBlockField.value) {
+ const changeTypeOptions = getChangeTypeOptions(field.value.type)
+ if (changeTypeOptions.length > 0) {
+ baseItems.push([{
+ label: 'Change type',
+ icon: 'i-heroicons-arrows-right-left-20-solid',
+ children: [changeTypeOptions]
+ }])
+ }
+ }
+
+ // Add remove option
+ baseItems.push([{
+ label: 'Remove',
+ icon: 'i-heroicons-trash-20-solid',
+ color: 'error',
+ onClick: removeBlock
+ }])
+
+ return baseItems
})
+const activeTab = ref('options')
-const activeTab = ref(0)
const tabItems = computed(() => {
const commonTabs = [
- { label: 'Options'},
- { label: 'Logic' },
+ { label: 'Options', value: 'options' },
+ { label: 'Logic', value: 'logic' },
]
if (isBlockField.value) {
@@ -220,7 +271,7 @@ const tabItems = computed(() => {
} else {
return [
...commonTabs,
- { label: 'Validation'},
+ { label: 'Validation', value: 'validation' },
]
}
})
diff --git a/client/components/open/forms/fields/components/BlockOptions.vue b/client/components/open/forms/fields/components/BlockOptions.vue
index c25968327..6b2547d00 100644
--- a/client/components/open/forms/fields/components/BlockOptions.vue
+++ b/client/components/open/forms/fields/components/BlockOptions.vue
@@ -63,6 +63,7 @@
>
<rich-text-area-input
class="mx-4"
+ :allow-fullscreen="true"
name="content"
:form="field"
label="Content"
@@ -104,9 +105,10 @@
<div
v-else-if="field.type == 'nf-code'"
- class="border-t"
+ class="border-t mt-6"
>
- <code-input
+ <CodeInput
+ :allow-fullscreen="true"
name="content"
class="mt-4 mx-4"
:form="field"
diff --git a/client/components/open/forms/fields/components/ChangeFieldType.vue b/client/components/open/forms/fields/components/ChangeFieldType.vue
deleted file mode 100644
index 2f6a87613..000000000
--- a/client/components/open/forms/fields/components/ChangeFieldType.vue
+++ /dev/null
@@ -1,102 +0,0 @@
-<template>
- <UPopover
- v-if="changeTypeOptions.length > 0"
- v-model:open="open"
- class="-mb-1"
- >
- <div class="flex items-center gap-1.5 group">
- <Icon
- name="heroicons:arrows-right-left-20-solid"
- class="flex-shrink-0 w-5 h-5 text-gray-400 group-hover:text-gray-500"
- />
- <span class="truncate">Change Type</span>
- </div>
-
- <template #panel>
- <a
- v-for="(op, index) in changeTypeOptions"
- :key="index"
- href="#"
- class="block px-4 py-2 text-md text-gray-700 dark:text-white hover:bg-gray-100 hover:text-gray-900 dark:text-gray-100 dark:hover:text-white dark:hover:bg-gray-600 flex items-center"
- @click.prevent="changeType(op.value)"
- >
- {{ op.name }}
- </a>
- </template>
- </UPopover>
-</template>
-
-<script>
-export default {
- name: "ChangeFieldType",
- components: {},
- props: {
- field: {
- type: Object,
- required: true,
- },
- },
- emits: ['changeType'],
- data() {
- return {
- open: false,
- }
- },
-
- computed: {
- changeTypeOptions() {
- let newTypes = []
- if (
- [
- "text",
- "email",
- "phone_number",
- "number",
- "slider",
- "rating",
- "scale",
- ].includes(this.field.type)
- ) {
- newTypes = [
- { name: "Text Input", value: "text" },
- { name: "Email Input", value: "email" },
- { name: "Phone Input", value: "phone_number" },
- { name: "Number Input", value: "number" },
- { name: "Slider Input", value: "slider" },
- { name: "Rating Input", value: "rating" },
- { name: "Scale Input", value: "scale" },
- ]
- }
- if (["select", "multi_select"].includes(this.field.type)) {
- newTypes = [
- { name: "Select Input", value: "select" },
- { name: "Multi-Select Input", value: "multi_select" },
- ]
- }
- return newTypes
- .filter((item) => {
- return item.value !== this.field.type
- })
- .map((item) => {
- return {
- name: item.name,
- value: item.value,
- }
- })
- },
- },
-
- watch: {},
-
- mounted() {},
-
- methods: {
- changeType(newType) {
- if (newType) {
- this.$emit("changeType", newType)
- this.open = false
- }
- },
- },
-}
-</script>
diff --git a/client/components/open/forms/fields/components/FieldOptions.vue b/client/components/open/forms/fields/components/FieldOptions.vue
index 508369c41..d5c9fecb5 100644
--- a/client/components/open/forms/fields/components/FieldOptions.vue
+++ b/client/components/open/forms/fields/components/FieldOptions.vue
@@ -1,7 +1,7 @@
<template>
<div
v-if="field"
- class="pb-2"
+ class="pb-20"
>
<!-- General -->
<div class="px-4">
@@ -485,6 +485,7 @@
/>
<rich-text-area-input
v-else-if="field.type === 'rich_text'"
+ :allow-fullscreen="true"
name="prefill"
class="mt-3"
:form="field"
@@ -499,7 +500,7 @@
/>
<div
v-if="['select', 'multi_select'].includes(field.type)"
- class="-mt-3 mb-3 text-gray-400 dark:text-gray-500"
+ class="-mt-3 mb-3 text-neutral-400 dark:text-neutral-500"
>
<small>
A problem? <a
@@ -545,11 +546,11 @@
/>
<!-- Help -->
- <rich-text-area-input
+ <RichTextAreaInput
name="help"
class="mt-3"
+ :allow-fullscreen="true"
:form="field"
- :editor-toolbar="editorToolbarCustom"
label="Help Text"
:editor-options="{
formats: [
@@ -638,13 +639,14 @@ import MatrixFieldOptions from './MatrixFieldOptions.vue'
import PaymentFieldOptions from './PaymentFieldOptions.vue'
import HiddenRequiredDisabled from './HiddenRequiredDisabled.vue'
import EditorSectionHeader from '~/components/open/forms/components/form-components/EditorSectionHeader.vue'
+import ProTag from '~/components/app/ProTag.vue'
import { format } from 'date-fns'
import { default as _has } from 'lodash/has'
import blocksTypes from '~/data/blocks_types.json'
export default {
name: 'FieldOptions',
- components: { CountryFlag, MatrixFieldOptions, HiddenRequiredDisabled, EditorSectionHeader, PaymentFieldOptions },
+ components: { CountryFlag, MatrixFieldOptions, HiddenRequiredDisabled, EditorSectionHeader, PaymentFieldOptions, ProTag },
props: {
field: {
type: Object,
@@ -656,14 +658,12 @@ export default {
}
},
setup() {
- return { currentWorkspace: computed(() => useWorkspacesStore().getCurrent), }
+ const { current: currentWorkspace } = useCurrentWorkspace()
+ return { currentWorkspace }
},
data() {
return {
typesWithoutPlaceholder: ['date', 'checkbox', 'files', 'payment', 'matrix', 'signature', 'barcode', 'scale', 'slider', 'rating'],
- editorToolbarCustom: [
- ['bold', 'italic', 'underline', 'link']
- ],
allCountries: countryCodes,
barcodeDecodersOptions: [
{ name: 'QR Code', value: 'qr_reader' },
diff --git a/client/components/open/forms/fields/components/MatrixFieldOptions.vue b/client/components/open/forms/fields/components/MatrixFieldOptions.vue
index 8d672583b..44e9f2b2d 100644
--- a/client/components/open/forms/fields/components/MatrixFieldOptions.vue
+++ b/client/components/open/forms/fields/components/MatrixFieldOptions.vue
@@ -24,13 +24,13 @@
<button @click="removeMatrixRow(i)">
<Icon
name="heroicons:trash"
- class="text-gray-300 w-4 h-4 mb-2"
+ class="text-neutral-300 w-4 h-4 mb-2"
/>
</button>
</div>
<UButton
size="xs"
- color="gray"
+ color="neutral"
icon="i-heroicons-plus"
@click="addMatrixRow"
>
@@ -51,13 +51,13 @@
<button @click="removeMatrixColumn(i)">
<Icon
name="heroicons:trash"
- class="text-gray-300 w-4 h-4 mb-2"
+ class="text-neutral-300 w-4 h-4 mb-2"
/>
</button>
</div>
<UButton
size="xs"
- color="gray"
+ color="neutral"
icon="i-heroicons-plus"
@click="addMatrixColumn"
>
diff --git a/client/components/open/forms/fields/components/PaymentFieldOptions.vue b/client/components/open/forms/fields/components/PaymentFieldOptions.vue
index 289d551bd..0e15b433f 100644
--- a/client/components/open/forms/fields/components/PaymentFieldOptions.vue
+++ b/client/components/open/forms/fields/components/PaymentFieldOptions.vue
@@ -47,10 +47,10 @@
>
Connect Stripe Account
</UButton>
- <p class="text-sm text-gray-500 mt-3">
+ <p class="text-sm text-neutral-500 mt-3">
<a
target="#"
- class="text-gray-500 cursor-pointer text-sm"
+ class="text-neutral-500 cursor-pointer text-sm"
@click.prevent="crisp.openHelpdeskArticle('how-to-collect-payment-svig30')"
>
<Icon
@@ -76,14 +76,15 @@ const props = defineProps({
})
const crisp = useCrisp()
-const providersStore = useOAuthProvidersStore()
+const oAuth = useOAuth()
+const { data: providersData, refetch } = oAuth.providers()
const stripeLoading = ref(false)
// Setup window message listener for Stripe connection
const { listen, cleanup } = useWindowMessage()
onMounted(async () => {
- await providersStore.fetchOAuthProviders()
+ await oAuth.fetchOAuthProviders()
if(props.field?.currency === undefined || props.field?.currency === null) {
props.field.currency = 'USD'
@@ -99,7 +100,7 @@ onMounted(async () => {
// Listen for Stripe connection message
listen(async () => {
- await providersStore.fetchOAuthProviders()
+ await refetch()
// Auto-select first Stripe account after refresh if one isn't already selected (or maybe always select the newest? for now, first)
if (stripeAccounts.value.length > 0) {
props.field.stripe_account_id = stripeAccounts.value[0].value
@@ -116,7 +117,7 @@ onUnmounted(() => {
cleanup()
})
-const stripeAccounts = computed(() => providersStore.getAll.filter((item) => item.provider === 'stripe').map((item) => ({
+const stripeAccounts = computed(() => (providersData.value || []).filter((item) => item.provider === 'stripe').map((item) => ({
name: item.name + (item.email ? ' (' + item.email + ')' : ''),
value: item.id
})))
@@ -128,10 +129,9 @@ const currencyList = computed(() => {
}))
})
-
const connectStripe = () => {
stripeLoading.value = true
- providersStore.connect('stripe', false, true, true)
+ oAuth.connect('stripe', false, true, true)
setTimeout(() => {
stripeLoading.value = false
}, 10000)
diff --git a/client/components/open/integrations/EmailIntegration.vue b/client/components/open/integrations/EmailIntegration.vue
index dc6091552..7de9aa924 100644
--- a/client/components/open/integrations/EmailIntegration.vue
+++ b/client/components/open/integrations/EmailIntegration.vue
@@ -4,25 +4,39 @@
:integration="props.integration"
:form="form"
>
- <p class="text-gray-500 text-sm mb-3">
- You can <NuxtLink
- class="underline"
- :to="{ name: 'settings-workspace' }"
- target="_blank"
+ <p class="text-neutral-500 text-sm mb-3">
+ You can <a
+ class="underline cursor-pointer"
+ @click="openEmailsModal"
>
use our custom SMTP feature
- </NuxtLink> to send emails from your own domain.
+ </a> to send emails from your own domain.
</p>
<MentionInput
:form="integrationData"
:mentions="form.properties"
:disable-mention="!form.is_pro"
+ :disabled="!form.is_pro"
name="settings.send_to"
required
label="Send To"
- help="Add one email per line"
- />
+ >
+ <template #help>
+ <InputHelp>
+ <span v-if="form.is_pro">
+ Add one email per line
+ </span>
+ <span v-else>
+ You can only send email notification to your own email address.
+ Please <a
+ class="underline cursor-pointer"
+ @click="openSubscriptionModal"
+ >upgrade to the Pro plan</a> to send to other email addresses.
+ </span>
+ </InputHelp>
+ </template>
+ </MentionInput>
<div class="flex space-x-4">
<MentionInput
:form="integrationData"
@@ -90,9 +104,23 @@ const props = defineProps({
})
const selfHosted = computed(() => useFeatureFlag('self_hosted'))
+const { openWorkspaceSettings } = useAppModals()
+const { data: user } = useAuth().user()
+
+function openEmailsModal () {
+ openWorkspaceSettings('emails')
+}
+
+function openSubscriptionModal () {
+ useAppModals().openSubscriptionModal({
+ modal_title: 'Upgrade to unlock powerful email integration',
+ modal_description: 'Upgrade to Pro to customize email notification recipients, send confirmation email to form respondents, and more: form customization, custom domain, collaboration, etc.'
+ })
+}
onBeforeMount(() => {
for (const [keyname, defaultValue] of Object.entries({
+ send_to: user.value.email || '',
sender_name: "OpnForm",
subject: "We saved your answers",
email_content: "Hello there 👋 <br>This is a confirmation that your submission was successfully saved.",
diff --git a/client/components/open/integrations/GoogleSheetsIntegration.vue b/client/components/open/integrations/GoogleSheetsIntegration.vue
index 9b6352119..34da0d570 100644
--- a/client/components/open/integrations/GoogleSheetsIntegration.vue
+++ b/client/components/open/integrations/GoogleSheetsIntegration.vue
@@ -5,7 +5,7 @@
:form="form"
>
<div class="mb-4">
- <p class="text-gray-500 mb-4">
+ <p class="text-neutral-500 mb-4">
Adds new entry to spreadsheets on each form submission.
</p>
<FlatSelectInput
@@ -24,32 +24,31 @@
<template #help>
<InputHelp>
<span>
- <NuxtLink
- class="text-blue-500"
- :to="{ name: 'settings-connections' }"
+ <a
+ class="text-blue-500 cursor-pointer"
+ @click="openConnectionsModal"
>
Click here
- </NuxtLink>
+ </a>
to connect another account.
</span>
</InputHelp>
</template>
</FlatSelectInput>
- <v-button
+ <UButton
v-else
- color="white"
- :loading="providersStore.loading"
+ color="neutral"
+ variant="outline"
+ :loading="isLoading"
@click.prevent="connect"
- >
- Connect Google account
- </v-button>
+ label="Connect Google account"
+ />
</div>
</IntegrationWrapper>
</template>
<script setup>
-import FlatSelectInput from '~/components/forms/FlatSelectInput.vue'
import IntegrationWrapper from './components/IntegrationWrapper.vue'
const props = defineProps({
@@ -59,11 +58,17 @@ const props = defineProps({
formIntegrationId: { type: Number, required: false, default: null }
})
-const providersStore = useOAuthProvidersStore()
-const providers = computed(() => providersStore.getAll.filter(provider => provider.provider == 'google'))
-const disableProviders = computed(() => providersStore.getAll.filter(provider => !provider.scopes.includes(providersStore.googleDrivePermission)).map((provider) => provider.id))
+const oAuth = useOAuth()
+const { data: providersData, isLoading } = oAuth.providers()
+const providers = computed(() => (providersData.value || []).filter(provider => provider.provider == 'google'))
+const disableProviders = computed(() => (providersData.value || []).filter(provider => !provider.scopes.includes(oAuth.googleDrivePermission)).map((provider) => provider.id))
+const { openUserSettings } = useAppModals()
function connect () {
- providersStore.connect('google', true)
+ oAuth.connect('google', true)
+}
+
+function openConnectionsModal () {
+ openUserSettings('connections')
}
</script>
diff --git a/client/components/open/integrations/TelegramIntegration.vue b/client/components/open/integrations/TelegramIntegration.vue
index d405c6a03..92405e2ad 100644
--- a/client/components/open/integrations/TelegramIntegration.vue
+++ b/client/components/open/integrations/TelegramIntegration.vue
@@ -5,7 +5,7 @@
:form="form"
>
<div class="mb-4">
- <p class="text-gray-500 mb-4">
+ <p class="text-neutral-500 mb-4">
Receive Telegram messages on each form submission.
</p>
<template v-if="providers.length">
@@ -22,12 +22,12 @@
<template #help>
<InputHelp>
<span>
- <NuxtLink
- class="text-blue-500"
- :to="{ name: 'settings-connections' }"
- >
- Click here
- </NuxtLink>
+ <a
+ class="text-blue-500 cursor-pointer"
+ @click="openConnectionsModal"
+ >
+ Click here
+ </a>
to connect another account.
</span>
</InputHelp>
@@ -43,20 +43,19 @@
/>
</template>
- <v-button
+ <UButton
v-else
- color="white"
- :loading="providersStore.loading"
- @click.prevent="connect"
- >
- Connect Telegram account
- </v-button>
+ color="neutral"
+ variant="outline"
+ :loading="isLoading"
+ @click.prevent="openConnectionsModal"
+ label="Connect Telegram account"
+ />
</div>
</IntegrationWrapper>
</template>
<script setup>
-import FlatSelectInput from '~/components/forms/FlatSelectInput.vue'
import IntegrationWrapper from './components/IntegrationWrapper.vue'
import NotificationsMessageActions from './components/NotificationsMessageActions.vue'
@@ -67,10 +66,13 @@ const props = defineProps({
formIntegrationId: { type: Number, required: false, default: null }
})
-const providersStore = useOAuthProvidersStore()
-const providers = computed(() => providersStore.getAll.filter(provider => provider.provider == 'telegram'))
+const oAuth = useOAuth()
+const { data: providersData, isLoading } = oAuth.providers()
+const providers = computed(() => (providersData.value || []).filter(provider => provider.provider == 'telegram'))
-function connect () {
- useRouter().push({ name: 'settings-connections' })
+const { openUserSettings } = useAppModals()
+
+function openConnectionsModal () {
+ openUserSettings('connections')
}
</script>
\ No newline at end of file
diff --git a/client/components/open/integrations/components/DiscordIntegrationActions.vue b/client/components/open/integrations/components/DiscordIntegrationActions.vue
index 1ae2ac0bc..e68321dc6 100644
--- a/client/components/open/integrations/components/DiscordIntegrationActions.vue
+++ b/client/components/open/integrations/components/DiscordIntegrationActions.vue
@@ -6,8 +6,9 @@
>
<UBadge
:label="mentionAsText(integration.data.message)"
- color="gray"
- size="xs"
+ color="neutral"
+ variant="subtle"
+ size="sm"
class="max-w-[300px] truncate"
/>
</div>
@@ -28,12 +29,12 @@ const props = defineProps({
}
})
-const formIntegrationsStore = useFormIntegrationsStore()
+const { invalidateIntegrations } = useFormIntegrations()
let interval = null
onMounted(() => {
if (!props.integration.data || props.integration.data.length === 0) {
- interval = setInterval(() => formIntegrationsStore.fetchFormIntegrations(props.form.id), 3000)
+ interval = setInterval(() => invalidateIntegrations(props.form.id), 3000)
setTimeout(() => { clearInterval(interval) }, 30000)
}
})
diff --git a/client/components/open/integrations/components/EmailIntegrationActions.vue b/client/components/open/integrations/components/EmailIntegrationActions.vue
index 449b511dc..d9893ef42 100644
--- a/client/components/open/integrations/components/EmailIntegrationActions.vue
+++ b/client/components/open/integrations/components/EmailIntegrationActions.vue
@@ -6,22 +6,25 @@
>
<UBadge
:label="mentionAsText(integration.data.subject)"
- color="gray"
- size="xs"
+ color="neutral"
+ variant="subtle"
+ size="sm"
class="max-w-[300px] block truncate"
/>
<div class="flex items-center gap-1">
<UBadge
:label="firstEmail"
- color="white"
- size="xs"
+ color="neutral"
+ variant="outline"
+ size="sm"
class="max-w-[300px] block truncate"
/>
<UBadge
v-if="additionalEmailsCount > 0"
:label="`+${additionalEmailsCount}`"
- color="white"
- size="xs"
+ color="neutral"
+ variant="outline"
+ size="sm"
/>
</div>
</div>
@@ -42,12 +45,12 @@ const props = defineProps({
}
})
-const formIntegrationsStore = useFormIntegrationsStore()
+const { invalidateIntegrations } = useFormIntegrations()
let interval = null
onMounted(() => {
if (!props.integration.data || props.integration.data.length === 0) {
- interval = setInterval(() => formIntegrationsStore.fetchFormIntegrations(props.form.id), 3000)
+ interval = setInterval(() => invalidateIntegrations(props.form.id), 3000)
setTimeout(() => { clearInterval(interval) }, 30000)
}
})
@@ -58,13 +61,18 @@ onBeforeUnmount(() => {
}
})
+const sendToEmails = computed(() => {
+ if (!props.integration.data.send_to) {
+ return []
+ }
+ return mentionAsText(props.integration.data.send_to).split(/[,;\s\n]+/).filter(Boolean)
+})
+
const firstEmail = computed(() => {
- const emails = mentionAsText(props.integration.data.send_to).split('\n').filter(Boolean)
- return emails[0].replace(/<[^>]*>/g, '') || ''
+ return sendToEmails.value[0] || ''
})
const additionalEmailsCount = computed(() => {
- const emails = mentionAsText(props.integration.data.send_to).split('\n').filter(Boolean)
- return Math.max(0, emails.length - 1)
+ return Math.max(0, sendToEmails.value.length - 1)
})
</script>
diff --git a/client/components/open/integrations/components/GoogleSheetsIntegrationActions.vue b/client/components/open/integrations/components/GoogleSheetsIntegrationActions.vue
index 223ebe753..69507358a 100644
--- a/client/components/open/integrations/components/GoogleSheetsIntegrationActions.vue
+++ b/client/components/open/integrations/components/GoogleSheetsIntegrationActions.vue
@@ -6,7 +6,8 @@
>
<UBadge
:label="mentionAsText(integration.provider.email)"
- color="gray"
+ color="neutral"
+ variant="subtle"
size="xs"
class="max-w-[300px] truncate"
/>
@@ -16,22 +17,18 @@
v-if="integration.data"
class="ml-auto"
>
- <v-button
- :href="integration.data.url"
+ <UButton
+ :to="integration.data.url"
target="_blank"
color="white"
+ size="sm"
+ variant="outline"
class="block"
+ icon="mdi:google-spreadsheet"
+ trailing-icon="heroicons:arrow-top-right-on-square-20-solid"
>
- <Icon
- name="mdi:google-spreadsheet"
- size="20px"
- />
Open
- <Icon
- class="ml-1"
- name="heroicons:arrow-top-right-on-square-20-solid"
- />
- </v-button>
+ </UButton>
</div>
</div>
</template>
@@ -50,12 +47,12 @@ const props = defineProps({
}
})
-const formIntegrationsStore = useFormIntegrationsStore()
+const { invalidateIntegrations } = useFormIntegrations()
let interval = null
onMounted(() => {
if (!props.integration.data || props.integration.data.length === 0) {
- interval = setInterval(() => formIntegrationsStore.fetchFormIntegrations(props.form.id, false), 3000)
+ interval = setInterval(() => invalidateIntegrations(props.form.id), 3000)
setTimeout(() => { clearInterval(interval) }, 30000)
}
})
diff --git a/client/components/open/integrations/components/IntegrationCard.vue b/client/components/open/integrations/components/IntegrationCard.vue
index e7a0fe217..10e17f97c 100644
--- a/client/components/open/integrations/components/IntegrationCard.vue
+++ b/client/components/open/integrations/components/IntegrationCard.vue
@@ -1,158 +1,71 @@
<template>
- <div
- class="text-gray-500 border shadow rounded-md p-5 mt-4 relative flex items-center"
- >
+ <div class="p-4 flex gap-4 items-center relative border rounded-lg shadow-xs">
+ <!-- Icon -->
<div
- class="flex items-center w-full md:max-w-[240px]"
- :class="{'flex-grow': !actionsComponent}"
+ class="flex-shrink-0"
+ :class="{
+ 'text-blue-500': integration.status === 'active',
+ 'text-neutral-400': integration.status !== 'active',
+ }"
>
- <div
- class="mr-4"
- :class="{
- 'text-blue-500': integration.status === 'active',
- 'text-gray-400': integration.status !== 'active',
- }"
- >
- <Icon
- :name="integrationTypeInfo.icon"
- size="32px"
- />
+ <Icon
+ :name="integrationTypeInfo.icon"
+ size="32px"
+ />
+ </div>
+
+ <!-- Title & Status -->
+ <div class="items-center truncate relative">
+ <div class="font-semibold text-neutral-900 dark:text-white">
+ {{ integrationTypeInfo.name }}
</div>
- <div>
- <div class="flex space-x-3 font-semibold mr-2">
- {{ integrationTypeInfo.name }}
- </div>
- <Badge
- :color="integration.status === 'active' ? 'green' : 'gray'"
- :before-icon="
- integration.status === 'active'
- ? 'solar:play-bold'
- : 'solar:pause-bold'
- "
+ </div>
+
+ <div class="grow truncate">
+ <UBadge
+ variant="subtle"
+ size="sm"
+ :color="integration.status ? 'success' : 'neutral'"
+ :icon="integration.status ? 'i-heroicons-play-solid' : 'i-heroicons-pause-solid'"
>
- {{ integration.status === "active" ? "Active" : "Paused" }}
- </Badge>
- </div>
+ {{ integration.status ? "Active" : "Paused" }}
+ </UBadge>
</div>
- <div
- class="flex items-center gap-4 pl-4"
- :class="{'grow': actionsComponent}"
- >
- <component
- :is="actionsComponent"
- v-if="actionsComponent"
- :integration="integration"
- :form="form"
- />
+
+ <!-- Actions -->
+ <div class="flex items-center gap-4">
+ <Suspense v-if="integrationTypeInfo?.actions_file_name">
+ <component
+ :is="actionsComponent"
+ v-if="actionsComponent"
+ :integration="integration"
+ :form="form"
+ />
+ <template #fallback>
+ <USkeleton class="h-6 w-24" />
+ </template>
+ </Suspense>
<div
v-if="loadingDelete"
- class="pr-4 pt-2 ml-auto"
+ class="flex items-center justify-center w-8 h-8"
>
- <Loader class="h-6 w-6 mx-auto" />
+ <Loader class="h-6 w-6" />
</div>
- <dropdown
+ <UDropdownMenu
v-else
- class="inline"
+ :items="dropdownItems"
+ :content="{ side: 'bottom', align: 'end' }"
>
- <template #trigger="{ toggle }">
- <v-button
- color="white"
- @click="toggle"
- >
- <svg
- class="w-4 h-4 inline -mt-1"
- viewBox="0 0 16 4"
- fill="none"
- xmlns="http://www.w3.org/2000/svg"
- >
- <path
- d="M8.00016 2.83366C8.4604 2.83366 8.8335 2.46056 8.8335 2.00033C8.8335 1.54009 8.4604 1.16699 8.00016 1.16699C7.53993 1.16699 7.16683 1.54009 7.16683 2.00033C7.16683 2.46056 7.53993 2.83366 8.00016 2.83366Z"
- stroke="#344054"
- stroke-width="1.66667"
- stroke-linecap="round"
- stroke-linejoin="round"
- />
- <path
- d="M13.8335 2.83366C14.2937 2.83366 14.6668 2.46056 14.6668 2.00033C14.6668 1.54009 14.2937 1.16699 13.8335 1.16699C13.3733 1.16699 13.0002 1.54009 13.0002 2.00033C13.0002 2.46056 13.3733 2.83366 13.8335 2.83366Z"
- stroke="#344054"
- stroke-width="1.66667"
- stroke-linecap="round"
- stroke-linejoin="round"
- />
- <path
- d="M2.16683 2.83366C2.62707 2.83366 3.00016 2.46056 3.00016 2.00033C3.00016 1.54009 2.62707 1.16699 2.16683 1.16699C1.70659 1.16699 1.3335 1.54009 1.3335 2.00033C1.3335 2.46056 1.70659 2.83366 2.16683 2.83366Z"
- stroke="#344054"
- stroke-width="1.66667"
- stroke-linecap="round"
- stroke-linejoin="round"
- />
- </svg>
- </v-button>
- </template>
- <a
- v-if="integrationTypeInfo.is_editable !== false"
- v-track.edit_form_integration_click="{
- form_slug: form.slug,
- form_integration_id: integration.id,
- }"
- href="#"
- class="flex px-4 py-2 text-md text-gray-700 hover:bg-gray-100 hover:no-underline hover:text-gray-900 items-center"
- @click.prevent="showIntegrationModal = true"
- >
- <Icon
- name="heroicons:pencil"
- class="w-5 h-5 mr-2"
- />
- Edit
- </a>
- <a
- v-else-if="integrationTypeInfo.url"
- v-track.edit_form_integration_click="{
- form_slug: form.slug,
- form_integration_id: integration.id,
- }"
- :href="integrationTypeInfo.url"
- class="flex px-4 py-2 text-md text-gray-700 hover:bg-gray-100 hover:no-underline hover:text-gray-900 items-center"
- >
- <Icon
- name="heroicons:pencil"
- class="w-5 h-5 mr-2"
- />
- Edit on {{ integrationTypeInfo.name }}
- </a>
- <a
- v-track.past_events_form_integration_click="{
- form_slug: form.slug,
- form_integration_id: integration.id,
- }"
- href="#"
- class="flex px-4 py-2 text-md text-gray-700 hover:bg-gray-100 hover:no-underline hover:text-gray-900 items-center"
- @click.prevent="showIntegrationEventsModal = true"
- >
- <Icon
- name="heroicons:clock"
- class="w-5 h-5 mr-2"
- />
- Past Events
- </a>
- <a
- v-track.delete_form_integration_click="{
- form_integration_id: integration.id,
- }"
- href="#"
- class="flex px-4 py-2 text-md text-red-600 hover:bg-red-50 hover:no-underline items-center"
- @click.prevent="deleteFormIntegration(integration.id)"
- >
- <Icon
- name="heroicons:trash"
- class="w-5 h-5 mr-2"
- />
-
- Delete Integration
- </a>
- </dropdown>
+ <UButton
+ color="neutral"
+ variant="ghost"
+ size="md"
+ icon="i-heroicons-ellipsis-horizontal"
+ class="hover:bg-neutral-200"
+ />
+ </UDropdownMenu>
</div>
<IntegrationModal
@@ -177,6 +90,9 @@
<script setup>
import { computed } from "vue"
+import { useComponentRegistry } from "~/composables/components/useComponentRegistry"
+import IntegrationModal from "~/components/open/integrations/components/IntegrationModal.vue"
+import IntegrationEventsModal from "./IntegrationEventsModal.vue"
const props = defineProps({
integration: {
@@ -190,10 +106,9 @@ const props = defineProps({
})
const alert = useAlert()
-const formIntegrationsStore = useFormIntegrationsStore()
-const integrations = computed(
- () => formIntegrationsStore.availableIntegrations,
-)
+const { availableIntegrations, deleteIntegration } = useFormIntegrations()
+const { getActionComponent } = useComponentRegistry()
+const integrations = availableIntegrations
const integrationTypeInfo = computed(() =>
integrations.value.get(props.integration.integration_id),
)
@@ -204,31 +119,69 @@ const loadingDelete = ref(false)
const actionsComponent = computed(() => {
if(integrationTypeInfo.value?.actions_file_name || false) {
- return resolveComponent(integrationTypeInfo.value.actions_file_name)
+ return getActionComponent(integrationTypeInfo.value.actions_file_name)
}
return null
})
+const dropdownItems = computed(() => {
+ const items = []
+
+ // Edit option
+ if (integrationTypeInfo.value?.is_editable !== false) {
+ items.push({
+ label: 'Edit',
+ icon: 'i-heroicons-pencil',
+ onClick: () => {
+ showIntegrationModal.value = true
+ }
+ })
+ } else if (integrationTypeInfo.value?.url) {
+ items.push({
+ label: `Edit on ${integrationTypeInfo.value.name}`,
+ icon: 'i-heroicons-pencil',
+ to: integrationTypeInfo.value.url
+ })
+ }
+
+ // Past Events option
+ items.push({
+ label: 'Past Events',
+ icon: 'i-heroicons-clock',
+ onClick: () => {
+ showIntegrationEventsModal.value = true
+ }
+ })
+
+ // Delete option
+ items.push({
+ label: 'Delete Integration',
+ icon: 'i-heroicons-trash',
+ onClick: () => {
+ deleteFormIntegration(props.integration.id)
+ },
+ color: 'error',
+ })
+
+ return items
+})
+
+const deleteIntegrationMutation = deleteIntegration()
+
const deleteFormIntegration = (integrationid) => {
alert.confirm("Do you really want to delete this form integration?", () => {
- opnFetch(
- "/open/forms/{formid}/integration/{integrationid}"
- .replace("{formid}", props.form.id)
- .replace("{integrationid}", integrationid),
- { method: "DELETE" },
- )
- .then((data) => {
- if (data.type === "success") {
- alert.success(data.message)
- formIntegrationsStore.remove(integrationid)
- } else {
- alert.error("Something went wrong!")
- }
- })
- .catch((error) => {
- alert.error(error.data.message)
- })
+ loadingDelete.value = true
+ deleteIntegrationMutation.mutateAsync({
+ formId: props.form.id,
+ integrationId: integrationid
+ }).then(() => {
+ alert.success("Integration deleted successfully!")
+ loadingDelete.value = false
+ }).catch((error) => {
+ alert.error(error.data?.message || "Something went wrong!")
+ loadingDelete.value = false
+ })
})
}
</script>
diff --git a/client/components/open/integrations/components/IntegrationCardSkeleton.vue b/client/components/open/integrations/components/IntegrationCardSkeleton.vue
new file mode 100644
index 000000000..00f32c562
--- /dev/null
+++ b/client/components/open/integrations/components/IntegrationCardSkeleton.vue
@@ -0,0 +1,11 @@
+<template>
+ <div class="p-4 flex items-center gap-4 border rounded-lg shadow-xs">
+ <USkeleton
+ class="h-8 w-8 rounded-full"
+ />
+ <div class="space-y-2">
+ <USkeleton class="h-4 w-[250px]" />
+ </div>
+ <USkeleton class="h-8 w-8 ml-auto rounded-full" />
+ </div>
+</template>
\ No newline at end of file
diff --git a/client/components/open/integrations/components/IntegrationEventsModal.vue b/client/components/open/integrations/components/IntegrationEventsModal.vue
index ce2707645..d5a428152 100644
--- a/client/components/open/integrations/components/IntegrationEventsModal.vue
+++ b/client/components/open/integrations/components/IntegrationEventsModal.vue
@@ -1,58 +1,50 @@
<template>
- <modal
- :show="show"
- compact-header
- inner-padding=""
- @close="emit('close')"
+ <UModal
+ v-model:open="isOpen"
+ :ui="{ content: 'sm:max-w-4xl' }"
+ title="Past Events"
>
- <template #icon>
- <Icon
- name="heroicons:clock"
- size="40px"
- />
- </template>
- <template #title>
- Past Events
+ <template #body>
+ <UTable
+ :loading="integrationEventsLoading"
+ :columns="columns"
+ :data="integrationEvents"
+ >
+ <template #status-cell="{ row }">
+ <UBadge
+ variant="subtle"
+ :color="row.original.status === 'Success' ? 'success' : 'error'"
+ :label="row.original.status"
+ />
+ </template>
+ <template #data-cell="{ row }">
+ <vue-json-pretty
+ v-if="row.original.data && Object.keys(row.original.data).length > 0"
+ :data="row.original.data"
+ :collapsed-node-length="0"
+ :show-length="true"
+ :show-icon="true"
+ />
+ <span v-else>-</span>
+ </template>
+ </UTable>
</template>
- <UTable
- :loading="integrationEventsLoading"
- :columns="columns"
- :rows="integrationEvents"
- >
- <template #status-data="{ row }">
- <Badge :color="row.status === 'Success' ? 'green' : 'red'">
- {{ row.status }}
- </Badge>
- </template>
- <template #data-data="{ row }">
- <vue-json-pretty
- v-if="row.data && Object.keys(row.data).length > 0"
- :data="row.data"
- :collapsed-node-length="0"
- :show-length="true"
- :show-icon="true"
- />
- <span v-else>-</span>
- </template>
- </UTable>
-
<template #footer>
- <div class="flex justify-center gap-x-2">
- <v-button
- color="white"
- @click.prevent="emit('close')"
- >
- Close
- </v-button>
- </div>
+ <UButton
+ color="neutral"
+ variant="outline"
+ @click="close"
+ label="Close"
+ />
</template>
- </modal>
+ </UModal>
</template>
<script setup>
import VueJsonPretty from "vue-json-pretty"
import "vue-json-pretty/lib/styles.css"
+import { formsApi } from "~/api/forms"
const props = defineProps({
show: { type: Boolean, required: true },
@@ -61,12 +53,22 @@ const props = defineProps({
})
const emit = defineEmits(["close"])
-const formIntegrationEventEndpoint =
- "/open/forms/{formid}/integration/{integrationid}/events"
+
+// Modal state
+const isOpen = computed({
+ get() {
+ return props.show
+ },
+ set(value) {
+ if (!value) {
+ close()
+ }
+ }
+})
const columns = [
- { key: "date", label: "Date", sortable: true },
- { key: "status", label: "Status", sortable: true },
- { key: "data", label: "Info" },
+ { accessorKey: "date", header: "Date" },
+ { accessorKey: "status", header: "Status" },
+ { accessorKey: "data", header: "Info" },
]
const integrationEvents = ref([])
const integrationEventsLoading = ref(false)
@@ -83,15 +85,15 @@ const fetchEvents = () => {
nextTick(() => {
integrationEventsLoading.value = true
integrationEvents.value = []
- opnFetch(
- formIntegrationEventEndpoint
- .replace("{formid}", props.form.id)
- .replace("{integrationid}", props.formIntegrationId),
- ).then((data) => {
+ formsApi.integrations.events(props.form.id, props.formIntegrationId).then((data) => {
integrationEvents.value = data
integrationEventsLoading.value = false
})
})
}
}
+
+const close = () => {
+ emit("close")
+}
</script>
diff --git a/client/components/open/integrations/components/IntegrationListOption.vue b/client/components/open/integrations/components/IntegrationListOption.vue
index 18f92a554..3a29c5e65 100644
--- a/client/components/open/integrations/components/IntegrationListOption.vue
+++ b/client/components/open/integrations/components/IntegrationListOption.vue
@@ -1,46 +1,41 @@
<template>
<UTooltip
:text="tooltipText"
- :prevent="!unavailable || !tooltipText"
+ :disabled="!unavailable || !tooltipText"
>
<div
v-track.new_integration_click="{ name: integration.id }"
role="button"
:class="{
- 'hover:bg-blue-50 group cursor-pointer': !unavailable,
- 'cursor-not-allowed': integration.coming_soon,
+ 'hover:bg-neutral-100 dark:hover:bg-neutral-800 group cursor-pointer': !unavailable,
+ 'cursor-not-allowed opacity-50': unavailable,
}"
- class="bg-gray-50 border border-gray-200 rounded-md transition-colors p-4 pb-2 items-center justify-center w-[170px] h-[110px] flex flex-col relative"
+ class="border rounded-lg p-4 flex flex-col items-center justify-center text-center transition-colors w-full h-full relative"
@click="onClick"
>
- <div class="flex justify-center">
- <div
- class="h-10 w-10 text-gray-500 group-hover:text-blue-500 transition-colors flex items-center"
- >
- <Icon
- :name="integration.icon"
- size="40px"
- />
- </div>
+ <div class="flex-shrink-0">
+ <Icon
+ :name="integration.icon"
+ class="w-8 h-8 text-neutral-500 transition-colors group-hover:text-neutral-700"
+ />
</div>
- <div class="flex-grow flex items-center">
- <div class="text-gray-400 font-medium text-sm text-center">
- {{ integration.name
- }}<span
+ <div class="flex-grow flex flex-col justify-center">
+ <div class="font-semibold text-sm text-neutral-800 dark:text-neutral-200">
+ {{ integration.name }}
+ <span
v-if="integration.coming_soon"
- class="text-xs"
- >
- (coming soon)</span>
+ class="text-xs text-neutral-500"
+ >(soon)</span>
</div>
- <Icon
- v-if="integration.is_external"
- class="inline h-4 w-4 ml-1 inline text-gray-500"
- name="heroicons:arrow-top-right-on-square-20-solid"
- />
</div>
<pro-tag
v-if="integration?.is_pro === true"
- class="absolute top-0 right-1"
+ class="absolute top-2 right-2"
+ />
+ <Icon
+ v-if="integration.is_external"
+ class="absolute bottom-2 right-2 h-4 w-4 text-neutral-400"
+ name="heroicons:arrow-top-right-on-square-20-solid"
/>
</div>
</UTooltip>
@@ -48,9 +43,9 @@
<script setup>
import { computed } from 'vue'
-import { useWorkspacesStore } from '@/stores/workspaces'
+import ProTag from "~/components/app/ProTag.vue"
const emit = defineEmits(["select"])
-const subscriptionModalStore = useSubscriptionModalStore()
+const { openSubscriptionModal } = useAppModals()
const props = defineProps({
integration: {
@@ -59,8 +54,7 @@ const props = defineProps({
},
})
-const workspacesStore = useWorkspacesStore()
-const currentWorkspace = computed(() => workspacesStore.getCurrent)
+const { current: currentWorkspace } = useCurrentWorkspace()
const unavailable = computed(() => {
return (
@@ -79,11 +73,10 @@ const tooltipText = computed(() => {
const onClick = () => {
if (props.integration.coming_soon) return
if (props.integration.requires_subscription && !currentWorkspace.value.is_pro ) {
- subscriptionModalStore.setModalContent(
- 'Upgrade today to use this integration',
- `Upgrade your account to use "${props.integration.name}" and unlock all of our Pro features.`
- )
- subscriptionModalStore.openModal()
+ openSubscriptionModal({
+ modal_title: 'Upgrade today to use this integration',
+ modal_description: `Upgrade your account to use our ${props.integration.name} and unlock all of our Pro features.`
+ })
return
}
emit("select", props.integration.id)
diff --git a/client/components/open/integrations/components/IntegrationModal.vue b/client/components/open/integrations/components/IntegrationModal.vue
index c863665a0..bb7eb26fd 100644
--- a/client/components/open/integrations/components/IntegrationModal.vue
+++ b/client/components/open/integrations/components/IntegrationModal.vue
@@ -1,51 +1,79 @@
<template>
- <modal
- :show="show"
- compact-header
- :closeable="false"
- @close="emit('close')"
+ <UModal
+ v-model:open="isOpen"
+ :dismissible="false"
+ :ui="{ content: 'sm:max-w-2xl' }"
>
- <template #icon>
- <Icon
- :name="integration?.icon"
- size="40px"
- />
- </template>
- <template #title>
- {{ integration?.name }}
- <pro-tag v-if="integration?.is_pro === true" />
+ <template #header>
+ <div class="flex items-center w-full gap-4 px-2">
+ <Icon
+ :name="integration?.icon"
+ class="text-blue-500"
+ size="40px"
+ />
+ <h2 class="text-lg font-semibold">
+ {{ integration?.name }}
+ <pro-tag v-if="integration?.is_pro === true" />
+ </h2>
+ </div>
+ <UButton
+ color="neutral"
+ variant="outline"
+ icon="i-heroicons-question-mark-circle"
+ size="sm"
+ @click="openHelp"
+ >
+ Help
+ </UButton>
</template>
- <component
- :is="component"
- v-if="integration && component"
- :form="form"
- :integration="integration"
- :integration-data="integrationData"
- />
+ <template #body>
+ <div class="overflow-y-scroll px-2">
+ <VForm size="sm">
+ <Suspense v-if="integration">
+ <component
+ :is="component"
+ v-if="component"
+ :form="form"
+ :integration="integration"
+ :integration-data="integrationData"
+ />
+ <template #fallback>
+ <div class="flex items-center justify-center p-8">
+ <USkeleton class="h-32 w-full" />
+ </div>
+ </template>
+ </Suspense>
+ </VForm>
+ </div>
+ </template>
<template #footer>
- <div class="flex justify-center gap-x-2">
- <v-button
+ <div class="flex justify-center w-full gap-x-2">
+ <UButton
class="px-8"
:loading="loading"
@click.prevent="save"
>
Save
- </v-button>
- <v-button
- color="white"
- @click.prevent="emit('close')"
+ </UButton>
+ <UButton
+ color="neutral"
+ variant="outline"
+ class="px-8"
+ @click.prevent="isOpen = false"
>
Close
- </v-button>
+ </UButton>
</div>
</template>
- </modal>
+ </UModal>
</template>
<script setup>
import { computed } from "vue"
+import { useComponentRegistry } from "~/composables/components/useComponentRegistry"
+import ProTag from "~/components/app/ProTag.vue"
const props = defineProps({
show: { type: Boolean, required: true },
@@ -57,18 +85,51 @@ const props = defineProps({
const alert = useAlert()
const emit = defineEmits(["close"])
-const loading = ref(false)
-const formIntegrationsStore = useFormIntegrationsStore()
-const formIntegration = computed(() =>
- props.formIntegrationId
- ? formIntegrationsStore.getByKey(props.formIntegrationId)
- : null,
+const { createIntegration, updateIntegration } = useFormIntegrations()
+
+const createIntegrationMutation = createIntegration()
+const updateIntegrationMutation = updateIntegration()
+
+const loading = computed(
+ () =>
+ integrationData.value?.busy || false
)
+// Computed property to handle show/hide logic for UModal
+const isOpen = computed({
+ get: () => props.show,
+ set: (value) => {
+ if (!value) {
+ emit('close')
+ }
+ }
+})
+
+const crisp = useCrisp()
+const openHelp = () => {
+ if (props.integration && props.integration?.crisp_help_page_slug) {
+ crisp.openHelpdeskArticle(props.integration?.crisp_help_page_slug)
+ return
+ }
+ crisp.openHelpdesk()
+}
+
+// Use query composables to get form integrations
+const { list } = useFormIntegrations()
+const { data: formIntegrationsData } = list(computed(() => props.form.id))
+
+// Get the specific form integration by ID
+const formIntegration = computed(() => {
+ if (!props.formIntegrationId || !formIntegrationsData.value) return null
+ return formIntegrationsData.value.find(integration => integration.id === props.formIntegrationId)
+})
+
+const { getIntegrationComponent } = useComponentRegistry()
+
const component = computed(() => {
if (!props.integration) return null
- return resolveComponent(props.integration.file_name)
+ return getIntegrationComponent(props.integration.id)
})
const integrationData = ref(null)
@@ -82,14 +143,16 @@ watch(
const initIntegrationData = () => {
integrationData.value = useForm({
- integration_id: props.formIntegrationId
+ integration_id: props.formIntegrationId && formIntegration.value
? formIntegration.value.integration_id
: props.integrationKey,
- status: props.formIntegrationId
+ status: props.formIntegrationId && formIntegration.value
? formIntegration.value.status === "active"
: true,
- settings: props.formIntegrationId ? formIntegration.value.data ?? {} : {},
- logic: props.formIntegrationId
+ settings: props.formIntegrationId && formIntegration.value
+ ? formIntegration.value.data ?? {}
+ : {},
+ logic: props.formIntegrationId && formIntegration.value
? !Array.isArray(formIntegration.value.logic) &&
formIntegration.value.logic
? formIntegration.value.logic
@@ -101,28 +164,42 @@ const initIntegrationData = () => {
initIntegrationData()
const save = () => {
- if (!integrationData.value || loading.value) return
- loading.value = true
- integrationData.value
- .submit(
- props.formIntegrationId ? "PUT" : "POST",
- "/open/forms/{formid}/integration".replace("{formid}", props.form.id) +
- (props.formIntegrationId ? "/" + props.formIntegrationId : ""),
- )
- .then((data) => {
- alert.success(data.message)
- formIntegrationsStore.save(data.form_integration)
+ if (loading.value) return
+
+ if (props.formIntegrationId) {
+ integrationData.value.mutate(updateIntegrationMutation, {
+ data: {
+ formId: props.form.id,
+ integrationId: props.formIntegrationId,
+ }
+ }).then((result) => {
+ alert.success(result.message)
emit("close")
- })
- .catch((error) => {
+ }).catch((error) => {
try {
alert.error(error.data.message)
- } catch {
+ }
+ catch {
alert.error("An error occurred while saving the integration")
}
})
- .finally(() => {
- loading.value = false
+ }
+ else {
+ integrationData.value.mutate(createIntegrationMutation, {
+ data: {
+ formId: props.form.id,
+ }
+ }).then((result) => {
+ alert.success(result.message)
+ emit("close")
+ }).catch((error) => {
+ try {
+ alert.error(error.data.message)
+ }
+ catch {
+ alert.error("An error occurred while saving the integration")
+ }
})
+ }
}
</script>
diff --git a/client/components/open/integrations/components/IntegrationWrapper.vue b/client/components/open/integrations/components/IntegrationWrapper.vue
index 69833b5aa..6aade4b36 100644
--- a/client/components/open/integrations/components/IntegrationWrapper.vue
+++ b/client/components/open/integrations/components/IntegrationWrapper.vue
@@ -11,25 +11,12 @@
label="Enabled"
/>
</slot>
- <slot
- v-if="integration?.crisp_help_page_slug"
- name="help"
- >
- <UButton
- color="gray"
- size="sm"
- icon="i-heroicons-question-mark-circle-solid"
- @click="openHelp"
- >
- Help
- </UButton>
- </slot>
</div>
<slot />
<slot name="logic">
- <div class="-mx-6 px-6 border-t pt-6">
+ <div class="-mx-6 px-6 border-t mt-6 pt-6">
<collapse
v-model="showLogic"
class="w-full"
@@ -40,7 +27,7 @@
class="transition-colors"
:class="{
'text-blue-600': showLogic,
- 'text-gray-300': !showLogic,
+ 'text-neutral-300': !showLogic,
}"
>
<Icon
@@ -52,7 +39,7 @@
<h3 class="font-semibold">
Logic
</h3>
- <p class="text-gray-400 text-xs">
+ <p class="text-neutral-500 text-xs">
Only run integration when a condition is met
</p>
</div>
@@ -72,6 +59,7 @@
<script setup>
import ConditionEditor from "~/components/open/forms/components/form-logic-components/ConditionEditor.client.vue"
+import Collapse from "~/components/app/Collapse.vue"
const props = defineProps({
integration: { type: Object, required: true },
@@ -81,17 +69,8 @@ const props = defineProps({
form: { type: Object, required: false },
})
-const crisp = useCrisp()
defineEmits(["close"])
const showLogic = ref(!!props.modelValue.logic)
-
-const openHelp = () => {
- if (props.integration && props.integration?.crisp_help_page_slug) {
- crisp.openHelpdeskArticle(props.integration?.crisp_help_page_slug)
- return
- }
- crisp.openHelpdesk()
-}
</script>
<style lang="scss">
diff --git a/client/components/open/integrations/components/SlackIntegrationActions.vue b/client/components/open/integrations/components/SlackIntegrationActions.vue
index 7a119521e..01419422d 100644
--- a/client/components/open/integrations/components/SlackIntegrationActions.vue
+++ b/client/components/open/integrations/components/SlackIntegrationActions.vue
@@ -6,8 +6,9 @@
>
<UBadge
:label="mentionAsText(integration.data.message)"
- color="gray"
- size="xs"
+ color="neutral"
+ variant="subtle"
+ size="sm"
class="max-w-[300px] block truncate"
/>
</div>
@@ -28,12 +29,12 @@ const props = defineProps({
}
})
-const formIntegrationsStore = useFormIntegrationsStore()
+const { invalidateIntegrations } = useFormIntegrations()
let interval = null
onMounted(() => {
if (!props.integration.data || props.integration.data.length === 0) {
- interval = setInterval(() => formIntegrationsStore.fetchFormIntegrations(props.form.id), 3000)
+ interval = setInterval(() => invalidateIntegrations(props.form.id), 3000)
setTimeout(() => { clearInterval(interval) }, 30000)
}
})
diff --git a/client/components/open/integrations/components/TelegramIntegrationActions.vue b/client/components/open/integrations/components/TelegramIntegrationActions.vue
index e6b2c2cfb..1215b3c53 100644
--- a/client/components/open/integrations/components/TelegramIntegrationActions.vue
+++ b/client/components/open/integrations/components/TelegramIntegrationActions.vue
@@ -6,8 +6,9 @@
>
<UBadge
:label="mentionAsText(integration.data.message)"
- color="gray"
- size="xs"
+ color="neutral"
+ variant="subtle"
+ size="sm"
class="max-w-[300px] block truncate"
/>
</div>
diff --git a/client/components/open/integrations/components/WebhookIntegrationActions.vue b/client/components/open/integrations/components/WebhookIntegrationActions.vue
index 05d619ea2..19ee92954 100644
--- a/client/components/open/integrations/components/WebhookIntegrationActions.vue
+++ b/client/components/open/integrations/components/WebhookIntegrationActions.vue
@@ -6,8 +6,9 @@
>
<UBadge
:label="integration.data.webhook_url"
- color="gray"
- size="xs"
+ color="neutral"
+ variant="subtle"
+ size="sm"
class="max-w-[300px] block truncate"
/>
</div>
@@ -26,12 +27,12 @@ const props = defineProps({
}
})
-const formIntegrationsStore = useFormIntegrationsStore()
+const { invalidateIntegrations } = useFormIntegrations()
let interval = null
onMounted(() => {
if (!props.integration.data || props.integration.data.length === 0) {
- interval = setInterval(() => formIntegrationsStore.fetchFormIntegrations(props.form.id), 3000)
+ interval = setInterval(() => invalidateIntegrations(props.form.id), 3000)
setTimeout(() => { clearInterval(interval) }, 30000)
}
})
diff --git a/client/components/open/tables/OpenTable.vue b/client/components/open/tables/OpenTable.vue
index 5200557c8..01ec97f4b 100644
--- a/client/components/open/tables/OpenTable.vue
+++ b/client/components/open/tables/OpenTable.vue
@@ -1,171 +1,120 @@
<template>
- <table
- :id="'table-' + tableHash"
- ref="table"
- class="notion-table n-table whitespace-no-wrap bg-white dark:bg-notion-dark-light relative"
+ <div
+ ref="root"
+ :class="[
+ 'flex-1 divide-y divide-accented w-full flex flex-col',
+ { 'fixed inset-0 z-50 bg-white dark:bg-neutral-900 z-[70]': isExpanded,
+ 'border-t mt-4': !isExpanded
+ }
+ ]"
>
- <thead
- :id="'table-header-' + tableHash"
- ref="header"
- class="n-table-head top-0 z-10"
- :class="{ absolute: data.length !== 0 }"
- style="will-change: transform; transform: translate3d(0px, 0px, 0px)"
- >
- <tr class="n-table-row overflow-x-hidden">
- <resizable-th
- v-for="(col) in columns"
- :id="'table-head-cell-' + col.id"
- :key="col.id"
- scope="col"
- :allow-resize="allowResize"
- :width="col.width ? col.width + 'px' : '150px'"
- class="n-table-cell p-0 relative"
- @resize-width="resizeCol(col, $event)"
- >
- <p
- class="bg-gray-50 border-r dark:bg-notion-dark truncate sticky top-0 border-b border-gray-200 dark:border-gray-800 px-4 py-2 text-gray-500 font-semibold tracking-wider uppercase text-xs"
- >
- {{ col.name }}
- </p>
- </resizable-th>
- <th
- v-if="hasStatus"
- class="n-table-cell p-0 relative"
- :class="{ 'border-r': hasActions }"
- style="width: 100px"
- >
- <p
- class="bg-gray-50 dark:bg-notion-dark truncate sticky top-0 border-b border-gray-200 dark:border-gray-800 px-4 py-2 text-gray-500 font-semibold tracking-wider uppercase text-xs"
- >
- Status
- </p>
- </th>
- <th
- v-if="hasActions"
- class="n-table-cell p-0 relative"
- style="width: 100px"
- >
- <p
- class="bg-gray-50 dark:bg-notion-dark truncate sticky top-0 border-b border-gray-200 dark:border-gray-800 px-4 py-2 text-gray-500 font-semibold tracking-wider uppercase text-xs"
- >
- Actions
- </p>
- </th>
- </tr>
- </thead>
- <tbody
- v-if="formData.length > 0"
- class="n-table-body bg-white dark:bg-notion-dark-light"
+ <div ref="topBar" class="flex items-center gap-2 p-2 overflow-x-auto">
+ <UInput
+ size="sm"
+ variant="ghost"
+ class="max-w-sm min-w-[12ch]"
+ placeholder="Search..."
+ icon="i-heroicons-magnifying-glass-solid"
+ v-model="search"
+ />
+ <USelectMenu
+ size="sm"
+ variant="ghost"
+ class="w-24"
+ v-if="hasStatus"
+ v-model="selectedStatus"
+ value-key="value"
+ :items="statusList"
+ :search-input="false"
+ />
+
+ <TableColumnManager
+ class="ml-auto"
+ :table-state="tableState"
+ />
+
+ <UButton
+ size="sm"
+ color="neutral"
+ variant="ghost"
+ label="Export"
+ :loading="exportLoading"
+ @click="downloadAsCsv"
+ />
+ <UButton
+ size="sm"
+ color="neutral"
+ variant="ghost"
+ :icon="isExpanded ? 'i-heroicons-arrows-pointing-in' : 'i-heroicons-arrows-pointing-out'"
+ @click="toggleExpanded"
+ />
+ </div>
+
+ <UTable
+ v-if="form"
+ ref="table"
+ :columns="allColumns"
+ :column-visibility="columnVisibility"
+ :column-pinning="columnPinning"
+ :column-sizing="columnSizing"
+ :data="filteredTableData"
+ :loading="loading"
+ sticky
+ class="flex-1"
+ :style="{ maxHeight, ...columnSizeVars }"
+ :ui="{
+ thead: 'bg-neutral-50',
+ th: 'p-1 relative overflow-hidden bg-neutral-50',
+ td: 'px-3 py-2 overflow-hidden data-[pinned=left]:bg-white data-[pinned=left]:border-t data-[pinned=left]:border-r data-[pinned=left]:border-neutral-200 border-r',
+ }"
>
- <tr
- v-if="objectHas($slots, 'actions')"
- :id="'table-actions-' + tableHash"
- ref="actions-row"
- class="action-row absolute w-full"
- style="will-change: transform; transform: translate3d(0px, 32px, 0px)"
+ <template v-for="col in tableColumns" :key="`${col.id}-header`" #[`${col.id}-header`]="{ column }">
+ <TableHeader
+ :column="column"
+ :table-state="tableState"
+ :is-wrapped="columnWrapping[col.id]"
+ @resize="handleColumnResize"
+ />
+ </template>
+
+ <template
+ v-for="col in tableColumns"
+ :key="col.id"
+ #[`${col.id}-cell`]="{ row }"
>
- <td
- :colspan="columns.length"
- class="p-1"
- >
- <slot name="actions" />
- </td>
- </tr>
- <tr
- v-for="(row, index) in formData"
- :key="row.id"
- class="n-table-row"
- :class="{ first: index === 0 }"
- >
- <td
- v-for="(col, colIndex) in columns"
- :key="col.id"
- :style="{ width: col.width ? col.width + 'px' : '150px' }"
- class="n-table-cell border-gray-100 dark:border-gray-900 text-sm p-2 overflow-hidden"
- :class="[
- {
- 'border-b': index !== data.length - 1,
- 'border-r': colIndex !== columns.length - 1 || hasActions,
- 'whitespace-normal break-words': wrapColumns[col.id] === true,
- },
- colClasses(col),
- ]"
+ <div
+ :class="getCellClasses(col.id)"
+ :style="{
+ width: `var(--col-${col.id}-size, auto)`,
+ }"
>
<component
:is="fieldComponents[col.type]"
- class="border-gray-100 dark:border-gray-900"
+ class="border-neutral-100 dark:border-neutral-900"
:property="col"
- :value="row[col.id]"
+ :value="row.original[col.id]"
/>
- </td>
- <td
- v-if="hasStatus"
- class="n-table-cell border-gray-100 dark:border-gray-900 text-sm p-2 border-b"
- :class="{ 'border-r': hasActions }"
- style="width: 100px"
- >
- <UBadge
- :label="row.status === 'partial' ? 'In Progress' : 'Submitted'"
- :color="row.status === 'partial' ? 'yellow' : 'green'"
- variant="soft"
- size="xs"
+ </div>
+ </template>
+
+ <template #actions-cell="{ row }">
+ <div class="flex justify-center" :style="{ width: `var(--col-actions-size, auto)` }">
+ <RecordOperations
+ :form="form"
+ :submission="row.original"
+ @deleted="(submission) => $emit('deleted', submission)"
+ @updated="(submission) => $emit('updated', submission)"
/>
- </td>
- <td
- v-if="hasActions"
- class="n-table-cell border-gray-100 dark:border-gray-900 text-sm p-2 border-b"
- style="width: 100px"
- >
- <div class="flex justify-center">
- <record-operations
- :form="form"
- :structure="columns"
- :submission="row"
- @deleted="(submission) => $emit('deleted', submission)"
- @updated="(submission) => $emit('updated', submission)"
- />
- </div>
- </td>
- </tr>
- <tr
- v-if="loading"
- class="n-table-row border-t bg-gray-50 dark:bg-gray-900"
- >
- <td
- :colspan="columns.length"
- class="p-8 w-full"
- >
- <Loader class="w-4 h-4 mx-auto" />
- </td>
- </tr>
- </tbody>
- <tbody
- v-else
- key="body-content"
- class="n-table-body"
- >
- <tr class="n-table-row loader w-full">
- <td
- :colspan="columns.length"
- class="n-table-cell w-full p-8"
- >
- <Loader
- v-if="loading"
- class="w-4 h-4 mx-auto"
- />
- <p
- v-else
- class="text-gray-500 text-center"
- >
- No data found.
- </p>
- </td>
- </tr>
- </tbody>
- </table>
+ </div>
+ </template>
+ </UTable>
+ </div>
</template>
-<script>
+<script setup>
+import { formsApi } from '~/api'
+import { useEventListener, refDebounced } from '@vueuse/core'
+import { useTableState } from '~/composables/components/tables/useTableState'
import OpenText from "./components/OpenText.vue"
import OpenUrl from "./components/OpenUrl.vue"
import OpenSelect from "./components/OpenSelect.vue"
@@ -174,263 +123,213 @@ import OpenDate from "./components/OpenDate.vue"
import OpenFile from "./components/OpenFile.vue"
import OpenCheckbox from "./components/OpenCheckbox.vue"
import OpenPayment from "./components/OpenPayment.vue"
-import ResizableTh from "./components/ResizableTh.vue"
+import OpenSubmissionStatus from "./components/OpenSubmissionStatus.vue"
import RecordOperations from "../components/RecordOperations.vue"
-import clonedeep from "clone-deep"
-import { hash } from "~/lib/utils.js"
-import { default as _has } from "lodash/has"
-
-export default {
- components: { ResizableTh, RecordOperations },
- props: {
- columns: {
- type: Array,
- default: () => [],
- },
- wrapColumns: {
- type: Object,
- default: () => {},
- },
- data: {
- type: Array,
- default: () => [],
- },
- loading: {
- type: Boolean,
- default: false,
- },
- allowResize: {
- required: false,
- default: true,
- type: Boolean,
- },
- scrollParent: {
- type: [Boolean, Object],
- default: null
- },
+import TableHeader from "./components/TableHeader.vue"
+import TableColumnManager from "./components/TableColumnManager.vue"
+import Fuse from "fuse.js"
+
+const props = defineProps({
+ data: {
+ type: Array,
+ default: () => [],
},
- emits: ["updated", "deleted", "resize", "update-columns"],
-
- setup() {
- const workingFormStore = useWorkingFormStore()
- return {
- workingFormStore,
- form: storeToRefs(workingFormStore).content,
- user: useAuthStore().user,
- workspace: useWorkspacesStore().getCurrent,
- }
+ loading: {
+ type: Boolean,
+ default: false,
},
-
- data() {
- return {
- tableHash: null,
- skip: false,
- internalColumns: [],
- rafId: null,
- fieldComponents: {
- text: shallowRef(OpenText),
- rich_text: shallowRef(OpenText),
- number: shallowRef(OpenText),
- rating: shallowRef(OpenText),
- scale: shallowRef(OpenText),
- slider: shallowRef(OpenText),
- select: shallowRef(OpenSelect),
- matrix: shallowRef(OpenMatrix),
- multi_select: shallowRef(OpenSelect),
- date: shallowRef(OpenDate),
- files: shallowRef(OpenFile),
- checkbox: shallowRef(OpenCheckbox),
- url: shallowRef(OpenUrl),
- email: shallowRef(OpenText),
- phone_number: shallowRef(OpenText),
- signature: shallowRef(OpenFile),
- payment: shallowRef(OpenPayment),
- barcode: shallowRef(OpenText),
- },
- }
+ form: {
+ type: Object,
+ default: () => null,
},
+})
- computed: {
- hasActions() {
- return !this.workspace.is_readonly
- },
- hasStatus() {
- return this.form.is_pro && (this.form.enable_partial_submissions ?? false)
- },
- formData() {
- return [...this.data].sort((a, b) => new Date(b.created_at) - new Date(a.created_at))
- }
- },
+defineEmits(["updated", "deleted"])
- watch: {
- columns: {
- handler() {
- this.internalColumns = clonedeep(this.columns)
- this.onStructureChange()
- },
- deep: true
- },
- data() {
- this.$nextTick(() => {
- this.handleScroll()
- })
- }
- },
+// Get workspace for table state
+const { current: workspace } = useCurrentWorkspace()
- mounted() {
- this.internalColumns = clonedeep(this.columns)
- const parent = this.scrollParent ?? document.getElementById("table-page")
- this.tableHash = hash(JSON.stringify(this.form.properties))
- if (parent) {
- parent.addEventListener("scroll", this.handleScroll, { passive: false })
- }
- window.addEventListener("resize", this.handleScroll)
- this.onStructureChange()
- this.handleScroll()
- },
- beforeUnmount() {
- const parent = this.scrollParent ?? document.getElementById("table-page")
- if (parent) {
- parent.removeEventListener("scroll", this.handleScroll)
- }
- window.removeEventListener("resize", this.handleScroll)
- },
+// Initialize table state (includes preferences internally)
+const tableState = useTableState(
+ computed(() => props.form),
+ workspace && !workspace.is_readonly
+)
- methods: {
- colClasses(col) {
- let colColor, colFontWeight, colWrap
-
- // Column align
- const colAlign = `text-${col.alignment ? col.alignment : "left"}`
-
- // Column color
- colColor = null
- if (!_has(col, "color") || col.color === "default") {
- colColor = "text-gray-700 dark:text-gray-300"
- }
- colColor = `text-${col.color}`
-
- // Column font weight
- if (_has(col, "bold") && col.bold) {
- colFontWeight = "font-semibold"
- }
-
- // Column wrapping
- if (!_has(col, "wrap_text") || !col.wrap_text) {
- colWrap = "truncate"
- }
-
- return [colAlign, colColor, colWrap, colFontWeight]
- },
- onStructureChange() {
- if (this.internalColumns) {
- this.$nextTick(() => {
- this.internalColumns.forEach((col) => {
- if (!_has(col, "width")) {
- if (
- this.allowResize &&
- this.internalColumns.length &&
- document.getElementById("table-head-cell-" + col.id)
- ) {
- // Within editor
- this.resizeCol(
- col,
- document.getElementById("table-head-cell-" + col.id)
- .offsetWidth,
- )
- }
- }
- })
- })
- }
- },
- resizeCol(col, width) {
- if (!this.form) return
- const index = this.internalColumns.findIndex((c) => c.id === col.id)
- this.internalColumns[index].width = width
- this.setColumns(this.internalColumns)
- this.$nextTick(() => {
- this.$emit("resize")
- })
- },
- handleScroll() {
- if (this.rafId) {
- cancelAnimationFrame(this.rafId)
- }
-
- this.rafId = requestAnimationFrame(() => {
- const table = this.$refs.table
- const tableHeader = document.getElementById(
- "table-header-" + this.tableHash,
- )
- const tableActionsRow = document.getElementById(
- "table-actions-" + this.tableHash,
- )
-
- if (!table || !tableHeader) return
-
- const scrollTop =
- window.pageYOffset || document.documentElement.scrollTop
- const tableRect = table.getBoundingClientRect()
-
- // The starting point of the table relative to the viewport
- const tableStart = tableRect.top + scrollTop
- // The end point of the table relative to the viewport
- const tableEnd = tableStart + tableRect.height
-
- let headerY = scrollTop - tableStart
- let actionsY = scrollTop + window.innerHeight - tableEnd
-
- if (headerY < 0) headerY = 0
- if (scrollTop + window.innerHeight > tableEnd) {
- actionsY =
- tableRect.height - (scrollTop + window.innerHeight - tableEnd)
- } else {
- actionsY = tableRect.height
- }
-
- if (tableHeader) {
- tableHeader.style.transform = `translate3d(0px, ${headerY}px, 0px)`
- }
-
- if (tableActionsRow) {
- tableActionsRow.style.transform = `translate3d(0px, ${actionsY}px, 0px)`
- }
- })
- },
- setColumns(val) {
- this.$emit("update-columns", val)
- },
- objectHas(object, key) {
- return _has(object, key)
- },
- },
+const { tableColumns: allColumns, columnVisibility, columnPinning, columnSizing, columnWrapping, handleColumnResize: handleColumnResizeState } = tableState
+
+const tableColumns = computed(() => {
+ return allColumns.value.filter(column => column.id !== 'actions')
+})
+
+const fieldComponents = {
+ text: OpenText,
+ rich_text: OpenText,
+ number: OpenText,
+ rating: OpenText,
+ scale: OpenText,
+ slider: OpenText,
+ select: OpenSelect,
+ matrix: OpenMatrix,
+ multi_select: OpenSelect,
+ date: OpenDate,
+ files: OpenFile,
+ checkbox: OpenCheckbox,
+ url: OpenUrl,
+ email: OpenText,
+ phone_number: OpenText,
+ signature: OpenFile,
+ payment: OpenPayment,
+ barcode: OpenText,
+ status: OpenSubmissionStatus,
}
-</script>
-<style lang="scss">
-.n-table {
- .n-table-head {
- height: 33px;
+const exportLoading = ref(false)
+const table = ref(null)
+const root = ref(null)
+const topBar = ref(null)
+const isExpanded = ref(false)
+const maxHeight = ref('800px') // fallback default
+const search = ref("")
+const debouncedSearch = refDebounced(search, 300)
+const selectedStatus = ref('all')
- .resize-handler {
- height: 33px;
- width: 5px;
- margin-left: -3px;
- }
+const statusList = [
+ { label: 'All', value: 'all' },
+ { label: 'Submitted', value: 'completed' },
+ { label: 'In Progress', value: 'partial' }
+]
+
+const filteredTableData = computed(() => {
+ let data = [...props.data]
+
+ // Status filter (client-side)
+ if (hasStatus.value && selectedStatus.value !== 'all') {
+ data = data.filter(row => {
+ if (selectedStatus.value === 'completed') return row.status !== 'partial'
+ if (selectedStatus.value === 'partial') return row.status === 'partial'
+ return true
+ })
+ }
+
+ // Search (client-side, fuzzy)
+ if (debouncedSearch.value && debouncedSearch.value.trim() !== "") {
+ const fuse = new Fuse(data, {
+ keys: allColumns.value.map(col => col.id).filter(id => id !== 'actions'),
+ threshold: 0.4,
+ })
+ return fuse.search(debouncedSearch.value).map(res => res.item)
+ } else {
+ // Default sort by created_at desc
+ return data.sort((a, b) => new Date(b.created_at) - new Date(a.created_at))
+ }
+})
+
+const hasStatus = computed(() => {
+ return props.form?.is_pro && (props.form.enable_partial_submissions ?? false)
+})
+
+// Since UTable only renders when form exists, no need for safe wrappers
+
+// Cell styling based on wrapping preferences
+const getCellClasses = (columnId) => {
+ const isWrapped = columnWrapping.value?.[columnId] || false
+ return {
+ 'text-truncate whitespace-nowrap': !isWrapped,
+ 'whitespace-normal': isWrapped,
+ }
+}
+
+// Column size CSS variables - similar to TanStack Table React example
+const columnSizeVars = computed(() => {
+ // Ensure reactivity to columnSizing changes
+ const sizing = columnSizing.value
+
+ if (!sizing) return {}
+
+ const colSizes = {}
+
+ for (const [colId, size] of Object.entries(sizing)) {
+ colSizes[`--header-${colId}-size`] = `${size}px`
+ colSizes[`--col-${colId}-size`] = `${size}px`
}
- .n-table-row {
- display: flex;
+ return colSizes
+})
+
+const computeMaxHeight = () => {
+ if (!root.value || !topBar.value) return
+
+ const topBarHeight = topBar.value.offsetHeight
+
+ if (isExpanded.value) {
+ maxHeight.value = `${window.innerHeight - topBarHeight}px`
+ } else {
+ const rootRect = root.value.getBoundingClientRect()
+ // 16px bottom margin for breathing room
+ maxHeight.value = `${window.innerHeight - rootRect.top - topBarHeight}px`
+ }
+}
+
+const toggleExpanded = () => {
+ isExpanded.value = !isExpanded.value
+ nextTick(() => {
+ computeMaxHeight()
+ })
+}
- &.first,
- &.loader {
- margin-top: 33px;
+defineShortcuts({
+ escape: () => {
+ if (isExpanded.value) {
+ toggleExpanded()
}
}
+})
+
+const handleColumnResize = (columnId, newSize) => {
+ handleColumnResizeState(columnId, newSize)
+}
+
+onMounted(() => {
+ computeMaxHeight()
+})
- .n-table-cell {
- min-width: 80px;
+useEventListener(window, 'resize', computeMaxHeight)
+
+// Download as CSV
+const downloadAsCsv = () => {
+ if (exportLoading.value) {
+ return
}
+
+ exportLoading.value = true
+ formsApi.submissions.export(props.form.id, {
+ columns: columnVisibility.value
+ }).then(data => {
+ console.log(data)
+
+ // Convert string to Blob if needed
+ let blob
+ if (typeof data === 'string') {
+ blob = new Blob([data], { type: 'text/csv;charset=utf-8;' })
+ } else if (data instanceof Blob) {
+ blob = data
+ } else {
+ throw new Error('Invalid export data format')
+ }
+
+ const filename = `${props.form.slug}-${Date.now()}-submissions.csv`
+ const a = document.createElement("a")
+ document.body.appendChild(a)
+ a.style = "display: none"
+ const url = window.URL.createObjectURL(blob)
+ a.href = url
+ a.download = filename
+ a.click()
+ window.URL.revokeObjectURL(url)
+ }).catch((error) => {
+ console.error(error)
+ }).finally(() => {
+ exportLoading.value = false
+ })
}
-</style>
+</script>
\ No newline at end of file
diff --git a/client/components/open/tables/components/ColumnHeaderPopover.vue b/client/components/open/tables/components/ColumnHeaderPopover.vue
new file mode 100644
index 000000000..96aada5bd
--- /dev/null
+++ b/client/components/open/tables/components/ColumnHeaderPopover.vue
@@ -0,0 +1,76 @@
+<template>
+ <div class="flex flex-col gap-1 w-48">
+ <!-- Column Info -->
+ <div class="flex items-center gap-1 border-b p-2">
+ <BlockTypeIcon
+ v-if="column.columnDef.type"
+ :type="column.columnDef.type"
+ bg-class="bg-transparent"
+ text-class="text-neutral-500"
+ class="flex-shrink-0"
+ />
+ <span class="text-sm font-medium truncate">
+ {{ column.columnDef.header }}
+ </span>
+ </div>
+
+ <!-- Quick Actions -->
+ <div class="flex flex-col gap-1 p-2">
+ <!-- Pin Actions -->
+ <div class="flex items-center justify-between">
+ <span class="text-xs text-neutral-500">Pin Column</span>
+ <UButton
+ size="xs"
+ :variant="getColumnPreference().pinned === 'left' ? 'soft' : 'ghost'"
+ icon="i-ic-baseline-push-pin"
+ :color="getColumnPreference().pinned === 'left' ? 'primary' : 'neutral'"
+ @click="tableState.toggleColumnPin(column.id)"
+ />
+ </div>
+
+ <!-- Wrap Toggle -->
+ <div class="flex items-center justify-between">
+ <span class="text-xs text-neutral-500">Text Wrapping</span>
+ <UButton
+ size="xs"
+ :variant="getColumnPreference().wrapped ? 'soft' : 'ghost'"
+ icon="i-ic-baseline-wrap-text"
+ :color="getColumnPreference().wrapped ? 'primary' : 'neutral'"
+ @click="tableState.toggleColumnWrap(column.id)"
+ />
+ </div>
+
+ <!-- Visibility Toggle -->
+ <div class="flex items-center justify-between">
+ <span class="text-xs text-neutral-500">Visibility</span>
+ <UButton
+ size="xs"
+ variant="ghost"
+ :icon="getColumnPreference().visible ? 'i-heroicons-eye-solid' : 'i-heroicons-eye-slash-solid'"
+ :color="getColumnPreference().visible ? 'primary' : 'neutral'"
+ @click="tableState.toggleColumnVisibility(column.id)"
+ />
+ </div>
+ </div>
+ </div>
+</template>
+
+<script setup>
+import BlockTypeIcon from '~/components/open/forms/components/BlockTypeIcon.vue'
+
+const props = defineProps({
+ column: {
+ type: Object,
+ required: true,
+ },
+ tableState: {
+ type: Object,
+ required: true,
+ },
+})
+
+// Get column preferences helper
+const getColumnPreference = () => {
+ return props.tableState.getColumnPreference(props.column.id) || {}
+}
+</script>
\ No newline at end of file
diff --git a/client/components/open/tables/components/OpenCheckbox.vue b/client/components/open/tables/components/OpenCheckbox.vue
index 8d7a26233..4b8eacc99 100644
--- a/client/components/open/tables/components/OpenCheckbox.vue
+++ b/client/components/open/tables/components/OpenCheckbox.vue
@@ -1,53 +1,29 @@
<template>
- <svg
+ <UBadge
v-if="value === true"
- xmlns="http://www.w3.org/2000/svg"
- class="h-4 w-4 mx-auto"
- fill="none"
- viewBox="0 0 24 24"
- stroke="currentColor"
- stroke-width="2"
+ color="primary"
+ variant="soft"
+ class="mx-auto"
+ size="sm"
>
- <path
- stroke-linecap="round"
- stroke-linejoin="round"
- d="M5 13l4 4L19 7"
- />
- </svg>
- <svg
+ Yes
+ </UBadge>
+ <UBadge
v-else-if="value === false"
- xmlns="http://www.w3.org/2000/svg"
- class="h-4 w-4 mx-auto"
- fill="none"
- viewBox="0 0 24 24"
- stroke="currentColor"
- stroke-width="2"
+ color="neutral"
+ variant="soft"
+ class="mx-auto"
+ size="sm"
>
- <path
- stroke-linecap="round"
- stroke-linejoin="round"
- d="M6 18L18 6M6 6l12 12"
- />
- </svg>
+ No
+ </UBadge>
</template>
-<script>
-export default {
- components: {},
- props: {
- value: {
- type: Boolean,
- required: true,
- },
+<script setup>
+defineProps({
+ value: {
+ type: Boolean,
+ required: true,
},
-
- data() {
- return {}
- },
-
- computed: {},
- mounted() {},
-
- methods: {},
-}
+})
</script>
diff --git a/client/components/open/tables/components/OpenDate.vue b/client/components/open/tables/components/OpenDate.vue
index a85f41d9b..625783b10 100644
--- a/client/components/open/tables/components/OpenDate.vue
+++ b/client/components/open/tables/components/OpenDate.vue
@@ -1,60 +1,48 @@
<template>
- <span v-if="valueIsObject">
+ <span class="text-sm text-neutral-900" v-if="valueIsObject">
<template v-if="value[0]">{{ formattedDate(value[0]) }}</template>
<template v-if="value[1]"><b class="mx-2">to</b>{{ formattedDate(value[1]) }}</template>
</span>
- <span v-else>
+ <span class="text-sm text-neutral-900" v-else>
{{ formattedDate(value) }}
</span>
</template>
-<script>
+<script setup>
import { format } from 'date-fns'
import { default as _has } from 'lodash/has'
-export default {
- components: {},
- props: {
-
- property: {
- required: true
- },
-
- value: {
- required: true
- }
- },
- data () {
- return {}
- },
- computed: {
- valueIsObject () {
- if (typeof this.value === 'object' && this.value !== null) {
- return true
- }
- return false
- }
- },
- mounted () {
+const props = defineProps({
+ property: {
+ required: true
},
- methods: {
- formattedDate(val) {
- if (!val) return ''
- const dateFormat = _has(this.property, 'date_format') ? this.property.date_format : 'dd/MM/yyyy'
- const timeFormat = _has(this.property, 'time_format') ? this.property.time_format : '24'
- if (this.property?.with_time) {
- try {
- return format(new Date(val), dateFormat + (timeFormat == 12 ? ' p':' HH:mm'))
- } catch {
- return ''
- }
- }
- try {
- return format(new Date(val), dateFormat)
- } catch {
- return ''
- }
+ value: {
+ required: true
+ }
+})
+
+const valueIsObject = computed(() => {
+ if (typeof props.value === 'object' && props.value !== null) {
+ return true
+ }
+ return false
+})
+
+const formattedDate = (val) => {
+ if (!val) return ''
+ const dateFormat = _has(props.property, 'date_format') ? props.property.date_format : 'dd/MM/yyyy'
+ const timeFormat = _has(props.property, 'time_format') ? props.property.time_format : '24'
+ if (props.property?.with_time) {
+ try {
+ return format(new Date(val), dateFormat + (timeFormat == 12 ? ' p':' HH:mm'))
+ } catch {
+ return ''
}
}
+ try {
+ return format(new Date(val), dateFormat)
+ } catch {
+ return ''
+ }
}
</script>
diff --git a/client/components/open/tables/components/OpenFile.vue b/client/components/open/tables/components/OpenFile.vue
index 78b67c4c0..8ffe68068 100644
--- a/client/components/open/tables/components/OpenFile.vue
+++ b/client/components/open/tables/components/OpenFile.vue
@@ -5,29 +5,31 @@
:key="file.file_url"
class="whitespace-nowrap rounded-md transition-colors hover:decoration-none"
:class="{
- 'open-file text-gray-700 dark:text-gray-300 truncate': !file.is_image,
+ 'open-file text-neutral-700 dark:text-neutral-300 truncate': !file.is_image,
'open-file-img': file.is_image,
}"
>
<a
- class="text-gray-700 dark:text-gray-300"
+ class="text-neutral-700 dark:text-neutral-300"
:href="file.file_url"
target="_blank"
rel="nofollow"
>
<div
v-if="file.is_image"
- class="w-8 h-8"
+ class="w-8 h-8 rounded border border-neutral-200"
>
<img
- class="object-cover h-full w-full rounded"
+ class="object-cover h-full w-full"
:src="file.file_url"
@error="failedImages.push(file.file_url)"
>
</div>
- <span
+ <UBadge
v-else
- class="py-1 px-2"
+ size="sm"
+ color="neutral"
+ variant="ghost"
>
<a
:href="file.file_url"
@@ -36,61 +38,51 @@
>{{
file.displayed_file_name
}}</a>
- </span>
+ </UBadge>
</a>
</span>
</p>
</template>
-<script>
-export default {
- components: {},
- props: {
- value: {
- type: Array,
- required: false,
- },
+<script setup>
+const props = defineProps({
+ value: {
+ type: Array,
+ required: false,
},
+})
- data() {
- return {
- failedImages: [],
- }
- },
-
- computed: {
- parsedFiles() {
- return this.value && Array.isArray(this.value)
- ? this.value.map((file) => {
- return {
- file_name: file.file_name,
- file_url: file.file_url,
- displayed_file_name: this.displayedFileName(file.file_name),
- is_image:
- !this.failedImages.includes(file.file_url) &&
- this.isImage(file.file_name),
- }
- })
- : []
- },
- },
+const failedImages = ref([])
- methods: {
- isImage(fileName) {
- return ["png", "gif", "jpg", "jpeg", "tif"].some((suffix) => {
- return fileName && fileName.endsWith(suffix)
+const parsedFiles = computed(() => {
+ return props.value && Array.isArray(props.value)
+ ? props.value.map((file) => {
+ return {
+ file_name: file.file_name,
+ file_url: file.file_url,
+ displayed_file_name: displayedFileName(file.file_name),
+ is_image:
+ !failedImages.value.includes(file.file_url) &&
+ isImage(file.file_name),
+ }
})
- },
- displayedFileName(fileName) {
- const extension = fileName.substr(fileName.lastIndexOf(".") + 1)
- const filename = fileName.substr(0, fileName.lastIndexOf("."))
+ : []
+})
- if (filename.length > 10) {
- return filename.substr(0, 10) + "[...]." + extension
- }
- return filename + "." + extension
- },
- },
+const isImage = (fileName) => {
+ return ["png", "gif", "jpg", "jpeg", "tif"].some((suffix) => {
+ return fileName && fileName.endsWith(suffix)
+ })
+}
+
+const displayedFileName = (fileName) => {
+ const extension = fileName.substr(fileName.lastIndexOf(".") + 1)
+ const filename = fileName.substr(0, fileName.lastIndexOf("."))
+
+ if (filename.length > 10) {
+ return filename.substr(0, 10) + "[...]." + extension
+ }
+ return filename + "." + extension
}
</script>
diff --git a/client/components/open/tables/components/OpenMatrix.vue b/client/components/open/tables/components/OpenMatrix.vue
index f8b68755f..c451cc587 100644
--- a/client/components/open/tables/components/OpenMatrix.vue
+++ b/client/components/open/tables/components/OpenMatrix.vue
@@ -1,17 +1,19 @@
<template>
<span
v-if="value"
- class="-mb-2"
+ class="flex flex-wrap gap-1"
>
<template v-if="matrixData">
- <div
+ <UBadge
v-for="(data) in matrixData"
:key="data.label+data.value"
- class="mr-2 mb-1 text-gray-700 bg-gray-100 dark:text-gray-300 rounded-md flex px-2 text-sm w-max"
+ size="sm"
+ color="neutral"
+ variant="soft"
>
- <span class="py-0.5 pr-1 border-r border-gray-300">{{ data.label }}</span>
- <span class="py-0.5 pl-1">{{ data.value }}</span>
- </div>
+ <span class="border-r pr-1 border-neutral-300">{{ data.label }}</span>
+ <span>{{ data.value }}</span>
+ </UBadge>
</template>
<open-tag
@@ -21,30 +23,21 @@
</span>
</template>
-<script>
+<script setup>
import OpenTag from "./OpenTag.vue"
-export default {
- components: { OpenTag },
- props: {
- value: {
- type: Object,
- },
+const props = defineProps({
+ value: {
+ type: Object,
},
+})
- data() {
- return {}
- },
-
- computed: {
- matrixData() {
- if (typeof this.value === "object" && this.value !== null) {
- return Object.entries(this.value).map(([label, value]) => {
- return { label, value }
- })
- }
- return null
- },
- },
-}
+const matrixData = computed(() => {
+ if (typeof props.value === "object" && props.value !== null) {
+ return Object.entries(props.value).map(([label, value]) => {
+ return { label, value }
+ })
+ }
+ return null
+})
</script>
diff --git a/client/components/open/tables/components/OpenPayment.vue b/client/components/open/tables/components/OpenPayment.vue
index 7050ba3bf..e933ec268 100644
--- a/client/components/open/tables/components/OpenPayment.vue
+++ b/client/components/open/tables/components/OpenPayment.vue
@@ -5,35 +5,26 @@
>
<UButton
:to="paymentUrl"
- icon="i-heroicons-arrow-top-right-on-square"
size="xs"
variant="link"
- label="View Payment"
+ icon="i-heroicons-credit-card-20-solid"
+ trailing-icon="i-heroicons-arrow-top-right-on-square-20-solid"
+ label="Payment"
target="_blank"
- trailing
/>
</span>
</template>
-<script>
-export default {
- components: { },
- props: {
- value: {
- type: Object,
- },
+<script setup>
+const props = defineProps({
+ value: {
+ type: Object,
},
+})
- data() {
- return {}
- },
-
- computed: {
- paymentUrl() {
- if (!this.value) return null
- const isLocal = useRuntimeConfig().public.env === 'local'
- return `https://dashboard.stripe.com${isLocal ? '/test' : ''}/payments/${this.value}`
- },
- },
-}
+const paymentUrl = computed(() => {
+ if (!props.value) return null
+ const isLocal = useRuntimeConfig().public.env === 'local'
+ return `https://dashboard.stripe.com${isLocal ? '/test' : ''}/payments/${props.value}`
+})
</script>
diff --git a/client/components/open/tables/components/OpenSelect.vue b/client/components/open/tables/components/OpenSelect.vue
index 3bfe9bc8b..f887c1410 100644
--- a/client/components/open/tables/components/OpenSelect.vue
+++ b/client/components/open/tables/components/OpenSelect.vue
@@ -1,7 +1,7 @@
<template>
<span
v-if="value"
- class="-mb-2"
+ class="-mb-2 flex flex-wrap gap-1"
>
<template v-if="valueIsObject">
<open-tag
@@ -17,31 +17,22 @@
</span>
</template>
-<script>
+<script setup>
import OpenTag from "./OpenTag.vue"
-export default {
- components: { OpenTag },
- props: {
- value: {
- type: [String, Object, Array],
- required: false,
- default: null
- },
- property: {
- type: Object,
- required: true
- }
+const props = defineProps({
+ value: {
+ type: [String, Object, Array],
+ required: false,
+ default: null
},
+ property: {
+ type: Object,
+ required: true
+ }
+})
- data() {
- return {}
- },
-
- computed: {
- valueIsObject() {
- return Array.isArray(this.value) || (typeof this.value === "object" && this.value !== null)
- },
- },
-}
+const valueIsObject = computed(() => {
+ return Array.isArray(props.value) || (typeof props.value === "object" && props.value !== null)
+})
</script>
diff --git a/client/components/open/tables/components/OpenSubmissionStatus.vue b/client/components/open/tables/components/OpenSubmissionStatus.vue
new file mode 100644
index 000000000..2102c2ee6
--- /dev/null
+++ b/client/components/open/tables/components/OpenSubmissionStatus.vue
@@ -0,0 +1,26 @@
+<template>
+ <UBadge
+ :label="displayLabel"
+ :color="badgeColor"
+ variant="subtle"
+ class="mx-auto"
+ size="sm"
+ />
+</template>
+
+<script setup>
+const props = defineProps({
+ value: {
+ type: String,
+ required: true,
+ },
+})
+
+const displayLabel = computed(() => {
+ return props.value === 'partial' ? 'In Progress' : 'Submitted'
+})
+
+const badgeColor = computed(() => {
+ return props.value === 'partial' ? 'warning' : 'success'
+})
+</script>
\ No newline at end of file
diff --git a/client/components/open/tables/components/OpenTag.vue b/client/components/open/tables/components/OpenTag.vue
index 8718deb6c..72292b5ec 100644
--- a/client/components/open/tables/components/OpenTag.vue
+++ b/client/components/open/tables/components/OpenTag.vue
@@ -1,102 +1,22 @@
<template>
- <span
+ <UBadge
:id="opt"
- class="py-1 px-2 mb-1 open-tag default mr-2 text-gray-700 dark:text-gray-300 text-xs whitespace-nowrap rounded-md transition-colors"
+ class="mb-1"
+ size="sm"
+ color="neutral"
+ variant="soft"
>
{{ opt }}
- </span>
+ </UBadge>
</template>
-<script>
-export default {
- components: {},
- props: {
- opt: {
- type: String,
- required: true,
- },
+<script setup>
+defineProps({
+ opt: {
+ type: String,
+ required: true,
},
-
- data() {
- return {}
- },
-
- computed: {},
- mounted() {},
-
- methods: {},
-}
+})
</script>
-<style lang="scss">
-.open-tag {
- display: inline-block;
- &.gray {
- background-color: #e3e2e0;
- }
- &.light-gray,
- &.default {
- background-color: #e3e2e080;
- }
- &.brown {
- background-color: #eee0da;
- }
- &.orange {
- background-color: #fadec9;
- }
- &.yellow {
- background-color: #fdecc8;
- }
- &.green {
- background-color: #dbeddb;
- }
- &.blue {
- background-color: #d3e5ef;
- }
- &.purple {
- background-color: #e8deee;
- }
- &.pink {
- background-color: #f5e0e9;
- }
- &.red {
- background-color: #ffe2dd;
- }
-}
-.dark {
- .open-tag {
- &.gray {
- background-color: #5a5a5a;
- }
- &.light-gray,
- &.default {
- background-color: #ffffff21;
- }
- &.brown {
- background-color: #603b2c;
- }
- &.orange {
- background-color: #854c1d;
- }
- &.yellow {
- background-color: #89632a;
- }
- &.green {
- background-color: #2b593f;
- }
- &.blue {
- background-color: #28456c;
- }
- &.purple {
- background-color: #492f64;
- }
- &.pink {
- background-color: #69314c;
- }
- &.red {
- background-color: #6e3630;
- }
- }
-}
-</style>
diff --git a/client/components/open/tables/components/OpenText.vue b/client/components/open/tables/components/OpenText.vue
index 470d1fc4d..c1ec2df03 100644
--- a/client/components/open/tables/components/OpenText.vue
+++ b/client/components/open/tables/components/OpenText.vue
@@ -1,16 +1,16 @@
<template>
- <div class="break-words whitespace-break-spaces" v-html="value" />
+ <div
+ class="text-sm text-neutral-900"
+ v-html="value"
+ />
</template>
-<script>
-export default {
- components: {},
- props: {
- value: {
- type: [String, Number],
- required: false,
- default: null
- },
+<script setup>
+defineProps({
+ value: {
+ type: [String, Number],
+ required: false,
+ default: null
},
-}
+})
</script>
diff --git a/client/components/open/tables/components/OpenUrl.vue b/client/components/open/tables/components/OpenUrl.vue
index c0a613ffb..59be38951 100644
--- a/client/components/open/tables/components/OpenUrl.vue
+++ b/client/components/open/tables/components/OpenUrl.vue
@@ -1,29 +1,19 @@
<template>
<a
- class="text-gray-700 dark:text-gray-300 hover:underline"
+ v-if="value"
+ class="text-sm text-neutral-900 underline decoration-neutral-300"
:href="value"
target="_blank"
rel="nofollow"
>{{ value }}</a>
</template>
-<script>
-export default {
- components: {},
- props: {
- value: {
- type: String,
- required: true,
- },
+<script setup>
+defineProps({
+ value: {
+ type: String,
+ required: false,
+ default: null,
},
-
- data() {
- return {}
- },
-
- computed: {},
- mounted() {},
-
- methods: {},
-}
+})
</script>
diff --git a/client/components/open/tables/components/ResizableTh.vue b/client/components/open/tables/components/ResizableTh.vue
deleted file mode 100644
index 9cbe5f11e..000000000
--- a/client/components/open/tables/components/ResizableTh.vue
+++ /dev/null
@@ -1,72 +0,0 @@
-<template>
- <th
- ref="th"
- :style="{ width: width }"
- >
- <slot />
- <div
- v-if="allowResize"
- class="absolute right-0 top-0 w-0 z-10"
- >
- <div
- class="resize-handler bg-transparent cursor-move hover:bg-blue-500 opacity-80 transition-colors"
- @mousedown="mouseDownHandler"
- />
- </div>
- </th>
-</template>
-
-<script>
-export default {
- components: {},
- props: {
- allowResize: {
- type: Boolean,
- required: true,
- },
- width: {
- type: [String, Number],
- required: true,
- },
- },
- emits: ['resize-width'],
-
- data() {
- return {
- x: 0,
- w: 0,
- lastEmit: Date.now(),
- throttlePeriod: 50, // milliseconds
- }
- },
-
- methods: {
- mouseDownHandler(e) {
- if (import.meta.server) return
- // Get the current mouse position
- this.x = e.clientX
-
- // Calculate the dimension of element
- const styles = window.getComputedStyle(this.$refs.th)
- this.w = parseInt(styles.width, 10)
-
- // Attach the listeners to `document`
- document.addEventListener("mousemove", this.mouseMoveHandler)
- document.addEventListener("mouseup", this.mouseUpHandler)
- },
- mouseMoveHandler(e) {
- const now = Date.now()
- if (now - this.lastEmit > this.throttlePeriod) {
- const dx = e.clientX - this.x
- this.$emit("resize-width", this.w + dx)
- this.lastEmit = now
- }
- },
- mouseUpHandler() {
- // Remove the handlers of `mousemove` and `mouseup`
- document.removeEventListener("mousemove", this.mouseMoveHandler)
- document.removeEventListener("mouseup", this.mouseUpHandler)
- },
- },
-}
-</script>
diff --git a/client/components/open/tables/components/TableColumnManager.vue b/client/components/open/tables/components/TableColumnManager.vue
new file mode 100644
index 000000000..3cc9acd85
--- /dev/null
+++ b/client/components/open/tables/components/TableColumnManager.vue
@@ -0,0 +1,329 @@
+<template>
+ <div>
+ <UPopover v-model:open="isPopoverOpen" arrow :content="popoverContent">
+ <UButton
+ size="sm"
+ variant="ghost"
+ label="Columns"
+ color="neutral"
+ trailing-icon="i-lucide-chevron-down"
+ class="ml-auto"
+ />
+
+ <template #content>
+ <div class="w-80 p-2 flex flex-col">
+ <!-- Header -->
+ <div class="flex items-center justify-between">
+ <UInput
+ variant="outline"
+ placeholder="Search columns..."
+ icon="i-heroicons-magnifying-glass"
+ size="sm"
+ v-model="searchQuery"
+ />
+ <div class="flex items-center gap-1">
+ <UButton
+ size="sm"
+ variant="ghost"
+ color="neutral"
+ label="Reset"
+ @click="tableState.resetPreferences()"
+ />
+ </div>
+ </div>
+
+ <!-- Column Sections -->
+ <div class="relative mt-1">
+ <!-- Top Fade -->
+ <VTransition name="fade">
+ <div
+ v-if="showTopFade"
+ class="absolute top-0 left-0 right-0 z-10 h-8 bg-gradient-to-b from-white to-transparent pointer-events-none"
+ />
+ </VTransition>
+
+ <div
+ ref="sectionsContainer"
+ class="max-h-80 overflow-y-auto"
+ >
+ <template v-for="section in columnSections" :key="section.type">
+ <div
+ v-if="section.columns.length > 0"
+ class="flex flex-col"
+ >
+ <div class="flex items-center justify-between">
+ <h4 class="text-xs text-neutral-500">{{ section.title }}</h4>
+ <UButton
+ size="xs"
+ variant="link"
+ :label="section.actionLabel"
+ @click="toggleAllColumns(section.targetVisibility)"
+ />
+ </div>
+
+ <draggable
+ :list="section.columns"
+ item-key="id"
+ :ghost-class="['opacity-50', 'bg-blue-50', 'rounded-md']"
+ :chosen-class="['bg-blue-100', 'rounded-md']"
+ :animation="200"
+ group="columns"
+ :data-section-type="section.type"
+ @change="handleDragChange"
+ >
+ <template #item="{ element: column }">
+ <div class="group">
+ <div class="flex items-center gap-1 p-2 rounded-md hover:bg-neutral-50 transition-colors">
+ <!-- Drag Handle -->
+ <div class="w-4 h-4 flex items-center justify-center opacity-60 group-hover:opacity-100 transition-opacity">
+ <UIcon name="clarity:drag-handle-line" class="h-6 w-6 -ml-1 shrink-0 text-neutral-400" />
+ </div>
+
+ <!-- Column Icon -->
+ <div class="w-4 h-4 flex items-center justify-center">
+ <BlockTypeIcon
+ v-if="column.type"
+ :type="column.type"
+ bg-class="bg-transparent"
+ text-class="text-neutral-600"
+ class="flex-shrink-0"
+ />
+ </div>
+
+ <!-- Column Name with Tooltip -->
+ <UTooltip :text="column.header || column.id" :content="{ align: 'start' }">
+ <span class="flex-1 text-sm truncate">
+ {{ column.header || column.id }}
+ </span>
+ </UTooltip>
+
+ <!-- Removed Indicator -->
+ <UTooltip v-if="column.isRemoved" text="Column was removed from form" :content="{ align: 'end' }">
+ <UIcon name="i-heroicons-trash" class="w-3 h-3 text-neutral-400" />
+ </UTooltip>
+
+ <!-- Column Actions -->
+ <div class="flex items-center gap-1">
+ <!-- Pin Toggle -->
+ <UTooltip :text="getPinTooltip(column.id)">
+ <UButton
+ size="xs"
+ :variant="columnPreferencesMap[column.id]?.pinned ? 'soft' : 'ghost'"
+ :icon="getPinIcon(column.id)"
+ :color="columnPreferencesMap[column.id]?.pinned ? 'primary' : 'neutral'"
+ @click.prevent="tableState.toggleColumnPin(column.id)"
+ />
+ </UTooltip>
+
+ <!-- Wrap Toggle -->
+ <UTooltip :text="columnPreferencesMap[column.id]?.wrapped ? 'Disable text wrapping' : 'Enable text wrapping'">
+ <UButton
+ size="xs"
+ :variant="columnPreferencesMap[column.id]?.wrapped ? 'soft' : 'ghost'"
+ icon="i-ic-baseline-wrap-text"
+ :color="columnPreferencesMap[column.id]?.wrapped ? 'primary' : 'neutral'"
+ @click.prevent="tableState.toggleColumnWrap(column.id)"
+ />
+ </UTooltip>
+
+ <!-- Visibility Toggle Button -->
+ <UTooltip :text="columnVisibilityMap[column.id] ? 'Hide' : 'Show'">
+ <UButton
+ size="xs"
+ variant="ghost"
+ color="neutral"
+ :icon="columnVisibilityMap[column.id] ? 'i-heroicons-eye-solid' : 'i-heroicons-eye-slash-solid'"
+ @click.prevent="props.tableState.toggleColumnVisibility(column.id)"
+ />
+ </UTooltip>
+ </div>
+ </div>
+ </div>
+ </template>
+ </draggable>
+ </div>
+ </template>
+ </div>
+
+ <!-- Bottom Fade -->
+ <VTransition name="fade">
+ <div
+ v-if="showBottomFade"
+ class="absolute bottom-0 left-0 right-0 z-10 h-8 bg-gradient-to-t from-white to-transparent pointer-events-none"
+ />
+ </VTransition>
+ </div>
+ <div class="w-full h-1"></div>
+ </div>
+ </template>
+ </UPopover>
+ </div>
+</template>
+
+<script setup>
+import draggable from 'vuedraggable'
+import BlockTypeIcon from '~/components/open/forms/components/BlockTypeIcon.vue'
+import VTransition from '@/components/global/transitions/VTransition.vue'
+import { useScroll, useResizeObserver } from '@vueuse/core'
+
+const props = defineProps({
+ tableState: {
+ type: Object,
+ required: true,
+ },
+ popoverContent: {
+ type: Object,
+ default: () => ({
+ align: 'end',
+ side: 'bottom',
+ }),
+ },
+})
+
+
+
+const isPopoverOpen = ref(false)
+const searchQuery = ref('')
+
+// Scroll fade detection for sections container
+const sectionsContainer = ref(null)
+const { y: scrollY } = useScroll(sectionsContainer)
+const contentHeight = ref(0)
+const containerHeight = ref(0)
+
+const showTopFade = computed(() => scrollY.value > 0)
+const showBottomFade = computed(() => {
+ if (containerHeight.value === 0 || contentHeight.value === 0) return false
+ return scrollY.value < contentHeight.value - containerHeight.value - 1 // -1 for subpixel precision
+})
+
+useResizeObserver(sectionsContainer, (entries) => {
+ const entry = entries[0]
+ containerHeight.value = entry.contentRect.height
+ if (sectionsContainer.value) {
+ contentHeight.value = sectionsContainer.value.scrollHeight
+ }
+})
+
+// Computed maps for better performance - avoid repeated function calls in templates
+const columnVisibilityMap = computed(() => {
+ const map = {}
+ const visibility = props.tableState.columnVisibility.value || {}
+ const columns = props.tableState.orderedColumns.value || []
+
+ columns.forEach(column => {
+ map[column.id] = visibility[column.id] !== false
+ })
+ return map
+})
+
+const columnPreferencesMap = computed(() => {
+ const map = {}
+ const columns = props.tableState.orderedColumns.value || []
+
+ columns.forEach(column => {
+ map[column.id] = props.tableState.getColumnPreference(column.id)
+ })
+ return map
+})
+
+
+
+// Filter columns based on search query and maintain order
+const filteredColumns = computed(() => {
+ const columns = props.tableState.orderedColumns.value || []
+ if (!Array.isArray(columns)) return []
+
+ const query = searchQuery.value.toLowerCase()
+ return columns.filter(column =>
+ column.id !== 'actions' &&
+ (column.header || column.id).toLowerCase().includes(query)
+ )
+})
+
+// Computed visible columns (reactive to table state) - now using the map
+const visibleColumns = computed(() => {
+ const visibilityMap = columnVisibilityMap.value
+ return filteredColumns.value.filter(column => visibilityMap[column.id] !== false)
+})
+
+// Computed hidden columns (reactive to table state) - now using the map
+const hiddenColumns = computed(() => {
+ const visibilityMap = columnVisibilityMap.value
+ return filteredColumns.value.filter(column => visibilityMap[column.id] === false)
+})
+
+// Column sections configuration (now fully reactive)
+const columnSections = computed(() => {
+ return [
+ {
+ type: 'visible',
+ title: 'Shown in table',
+ actionLabel: 'Hide All',
+ targetVisibility: false,
+ columns: visibleColumns.value
+ },
+ {
+ type: 'hidden',
+ title: 'Hidden in table',
+ actionLabel: 'Show All',
+ targetVisibility: true,
+ columns: hiddenColumns.value
+ }
+ ]
+})
+
+// Handle drag end event
+const handleDragChange = async (event) => {
+ if (event.added) {
+ const columnId = event.added.element.id
+ props.tableState.toggleColumnVisibility(columnId)
+ await nextTick() // Wait for Vue to process the visibility change
+ }
+
+ const isNowVisibleAfterAdd = event.added ? props.tableState.columnVisibility.value[event.added.element.id] : undefined
+
+ if (event.moved || (event.added && isNowVisibleAfterAdd)) {
+ const eventData = event.moved || event.added
+ const { element, newIndex } = eventData
+ props.tableState.setColumnOrder(element.id, newIndex)
+ }
+}
+
+// Get pin icon - now using computed map
+const getPinIcon = (columnId) => {
+ const pref = columnPreferencesMap.value[columnId]
+ return pref?.pinned === 'left' ? 'i-ic-baseline-push-pin' : 'i-ic-baseline-push-pin'
+}
+
+// Get pin tooltip - now using computed map
+const getPinTooltip = (columnId) => {
+ const pref = columnPreferencesMap.value[columnId]
+ return pref?.pinned === 'left' ? 'Unpin column' : 'Pin column to left'
+}
+
+// Toggle all columns visibility - now using computed map
+const toggleAllColumns = (targetVisibility) => {
+ const columns = props.tableState.columnConfigurations.value || []
+ const visibilityMap = columnVisibilityMap.value
+
+ columns
+ .filter(column => column.id !== 'actions')
+ .forEach(column => {
+ if ((visibilityMap[column.id] !== false) !== targetVisibility) {
+ props.tableState.toggleColumnVisibility(column.id)
+ }
+ })
+}
+</script>
+
+<style scoped>
+/* Ensure drag cursor is applied to the entire row */
+.group {
+ cursor: grab;
+}
+
+.group:active {
+ cursor: grabbing;
+}
+</style>
diff --git a/client/components/open/tables/components/TableHeader.vue b/client/components/open/tables/components/TableHeader.vue
new file mode 100644
index 000000000..6fd867e27
--- /dev/null
+++ b/client/components/open/tables/components/TableHeader.vue
@@ -0,0 +1,101 @@
+<template>
+
+ <div
+ class="flex items-center justify-between group cursor-pointer hover:bg-neutral-100 rounded-md px-2 py-1.5 w-full"
+ :style="{ maxWidth: `var(--header-${column.id}-size, auto)`, 'minWidth': '80px'}"
+ >
+ <UPopover arrow>
+ <UTooltip
+ :text="column.columnDef.header"
+ class="flex-1 min-w-0"
+ >
+ <div class="flex items-center gap-1">
+ <BlockTypeIcon
+ v-if="column.columnDef.type"
+ :type="column.columnDef.type"
+ bg-class="bg-transparent"
+ text-class="text-neutral-500"
+ class="flex-shrink-0"
+ />
+ <span
+ class="truncate block text-sm text-neutral-500 font-medium"
+ :class="{ 'line-clamp-none': isWrapped }"
+ >
+ {{ column.columnDef.header }}
+ </span>
+ </div>
+ </UTooltip>
+ <!-- Individual column popover -->
+ <template #content>
+ <ColumnHeaderPopover
+ :column="column"
+ :table-state="tableState"
+ />
+ </template>
+ </UPopover>
+
+ <div
+ v-if="column.getCanResize()"
+ @mousedown="handleResizeStart"
+ @touchstart="handleResizeStart"
+ class="w-1 h-[80%] absolute right-0 bg-primary-500/50 rounded cursor-col-resize select-none touch-none opacity-0 group-hover:opacity-100"
+ :class="{ 'opacity-100': isResizing }"
+ />
+ </div>
+</template>
+
+<script setup>
+import BlockTypeIcon from '~/components/open/forms/components/BlockTypeIcon.vue'
+import ColumnHeaderPopover from './ColumnHeaderPopover.vue'
+
+const props = defineProps({
+ column: {
+ type: Object,
+ required: true,
+ },
+ tableState: {
+ type: Object,
+ required: true,
+ },
+ isWrapped: {
+ type: Boolean,
+ default: false,
+ },
+})
+
+const emit = defineEmits(['resize'])
+
+const isResizing = ref(false)
+
+const handleResizeStart = (event) => {
+ event.preventDefault()
+ event.stopPropagation()
+
+ isResizing.value = true
+ const startX = event.clientX || event.touches[0]?.clientX
+ const startWidth = props.column.getSize()
+
+ const handleMouseMove = (moveEvent) => {
+ const currentX = moveEvent.clientX || moveEvent.touches[0]?.clientX
+ const diff = currentX - startX
+ const newWidth = Math.max(60, startWidth + diff) // Minimum width of 60px
+
+ // Emit the new size
+ emit('resize', props.column.id, newWidth)
+ }
+
+ const handleMouseUp = () => {
+ isResizing.value = false
+ document.removeEventListener('mousemove', handleMouseMove)
+ document.removeEventListener('mouseup', handleMouseUp)
+ document.removeEventListener('touchmove', handleMouseMove)
+ document.removeEventListener('touchend', handleMouseUp)
+
+ }
+
+ document.addEventListener('mousemove', handleMouseMove)
+ document.addEventListener('mouseup', handleMouseUp)
+ document.addEventListener('touchmove', handleMouseMove)
+ document.addEventListener('touchend', handleMouseUp)
+}
+</script>
\ No newline at end of file
diff --git a/client/components/pages/NotFoundForm.vue b/client/components/pages/NotFoundForm.vue
index 0ca96f734..013fc3de8 100644
--- a/client/components/pages/NotFoundForm.vue
+++ b/client/components/pages/NotFoundForm.vue
@@ -5,12 +5,12 @@
<img
src="/img/icons/404.png"
alt="404 Error"
- class="mx-auto w-1/3"
+ class="w-full max-w-[250px] mb-5 mx-auto"
>
<h1 class="text-dark text-2xl md:text-4xl leading-none font-medium text-center pt-4 md:pt-0 mx-auto md:max-w-full">
We're sorry! This Form Is No Longer Here
</h1>
- <p class="text-gray-500 mt-3 max-w-xl mx-auto">
+ <p class="text-neutral-500 mt-3 max-w-xl mx-auto">
It may have been deleted, deactivated, or the form URL might have been regenerated or updated by its owner. But don't worry—you've got plenty of other options!
</p>
@@ -23,12 +23,12 @@
:key="index"
:to="action.to"
:href="action.href"
- class="bg-blue-100/50 rounded-lg px-4 py-6 text-center text-gray-700 hover:bg-blue-100 flex flex-col items-center hover:no-underline"
+ class="bg-blue-100/50 rounded-lg px-4 py-6 text-center text-neutral-700 hover:bg-blue-100 flex flex-col items-center hover:no-underline"
@click="action.onClick ? action.onClick() : null"
>
<Icon
:name="action.icon"
- class="w-8 h-8 mb-2 text-nt-blue"
+ class="w-8 h-8 mb-2 text-blue-500"
/>
<span class="font-medium">
{{ action.text }}
@@ -36,11 +36,11 @@
</NuxtLink>
</div>
- <div class="mt-10 text-gray-700">
+ <div class="mt-10 text-neutral-700">
<h3 class="mt-8 text-dark text-xl font-semibold text-center md:pt-0 mx-auto md:max-w-full">
Still not sure what to do? Here are more ways to get started!
</h3>
- <p class="mt-4 text-gray-500">
+ <p class="mt-4 text-neutral-500">
No worries! Here are some other options for you:
</p>
<ul class="mt-4 space-y-2 text-sm">
diff --git a/client/components/pages/OpenFormFooter.vue b/client/components/pages/OpenFormFooter.vue
index 0a7e881a8..35f9f4f4a 100644
--- a/client/components/pages/OpenFormFooter.vue
+++ b/client/components/pages/OpenFormFooter.vue
@@ -2,7 +2,7 @@
<div class="w-full">
<div class="grid md:grid-cols-3 my-8">
<div class="flex mt-2 items-center">
- <p class="text-sm text-gray-600 dark:text-gray-400 text-center w-full">
+ <p class="text-sm text-neutral-600 dark:text-neutral-400 text-center w-full">
© Copyright {{ currYear }}. All Rights Reserved
<span v-if="version">
<br>Version {{ version }}
@@ -27,54 +27,54 @@
<a
:href="opnformConfig.links.feature_requests"
target="_blank"
- class="text-gray-600 dark:text-gray-400 transition-colors duration-300 hover:text-nt-blue"
+ class="text-neutral-600 dark:text-neutral-400 transition-colors duration-300 hover:text-blue-500"
>
Feature Requests
</a>
<a
:href="opnformConfig.links.roadmap"
target="_blank"
- class="text-gray-600 dark:text-gray-400 transition-colors duration-300 hover:text-nt-blue"
+ class="text-neutral-600 dark:text-neutral-400 transition-colors duration-300 hover:text-blue-500"
>
Roadmap
</a>
<a
:href="opnformConfig.links.discord"
target="_blank"
- class="text-gray-600 dark:text-gray-400 transition-colors duration-300 hover:text-nt-blue"
+ class="text-neutral-600 dark:text-neutral-400 transition-colors duration-300 hover:text-blue-500"
>
Discord
</a>
<a
:href="opnformConfig.links.tech_docs"
target="_blank"
- class="text-gray-600 dark:text-gray-400 transition-colors duration-300 hover:text-nt-blue"
+ class="text-neutral-600 dark:text-neutral-400 transition-colors duration-300 hover:text-blue-500"
>
Technical Docs
</a>
<template v-if="!useFeatureFlag('self_hosted')">
<router-link
:to="{ name: 'integrations' }"
- class="text-gray-600 dark:text-gray-400 transition-colors duration-300 hover:text-nt-blue"
+ class="text-neutral-600 dark:text-neutral-400 transition-colors duration-300 hover:text-blue-500"
>
Integrations
</router-link>
<router-link
:to="{ name: 'report-abuse' }"
- class="text-gray-600 dark:text-gray-400 transition-colors duration-300 hover:text-nt-blue"
+ class="text-neutral-600 dark:text-neutral-400 transition-colors duration-300 hover:text-blue-500"
>
Report Abuse
</router-link>
<router-link
:to="{ name: 'privacy-policy' }"
- class="text-gray-600 dark:text-gray-400 transition-colors duration-300 hover:text-nt-blue"
+ class="text-neutral-600 dark:text-neutral-400 transition-colors duration-300 hover:text-blue-500"
>
Privacy Policy
</router-link>
<router-link
:to="{ name: 'terms-conditions' }"
- class="text-gray-600 dark:text-gray-400 transition-colors duration-300 hover:text-nt-blue"
+ class="text-neutral-600 dark:text-neutral-400 transition-colors duration-300 hover:text-blue-500"
>
Terms & Conditions
</router-link>
@@ -88,9 +88,7 @@
<script setup>
import opnformConfig from "~/opnform.config.js"
-const authStore = useAuthStore()
-
-const user = computed(() => authStore.user)
+const { data: user } = useAuth().user()
const currYear = ref(new Date().getFullYear())
// Use the reactive version for proper template reactivity
diff --git a/client/components/pages/admin/AddUserToWorkspace.vue b/client/components/pages/admin/AddUserToWorkspace.vue
index 28f411489..374782e91 100644
--- a/client/components/pages/admin/AddUserToWorkspace.vue
+++ b/client/components/pages/admin/AddUserToWorkspace.vue
@@ -25,7 +25,7 @@
<UButton
type="submit"
:disabled="disabled"
- :loading="addingUsersState"
+ :loading="addMutation.isPending.value"
icon="i-heroicons-envelope"
>
Invite User
@@ -42,9 +42,9 @@ defineProps({
default: false,
},
})
-const emit = defineEmits(['fetchUsers'])
-const workspacesStore = useWorkspacesStore()
+const { currentId } = useCurrentWorkspace()
+const { addUser: addUserMutation } = useWorkspaceUsers()
const roleOptions = [
{name: "User", value: "user"},
@@ -54,33 +54,22 @@ const roleOptions = [
const newUser = ref("")
const newUserRole = ref("user")
-const addingUsersState = ref(false)
+const addMutation = addUserMutation(currentId)
const addUser = () => {
if (!newUser.value) return
- addingUsersState.value = true
- opnFetch(
- "/open/workspaces/" + workspacesStore.currentId + "/users/add",
- {
- method: "POST",
- body: {
- email: newUser.value,
- role: newUserRole.value,
- },
- }
- ).then((data) => {
+
+ addMutation.mutateAsync({
+ email: newUser.value,
+ role: newUserRole.value,
+ }).then((data) => {
newUser.value = ""
newUserRole.value = "user"
-
useAlert().success(data.message)
-
- emit("fetchUsers")
+ // No need to emit 'fetchUsers' - the mutation handles cache updates automatically
}).catch((error) => {
useAlert().error("There was an error adding user: " + error.data.message)
- }).finally(() => {
- addingUsersState.value = false
})
}
-
</script>
diff --git a/client/components/pages/admin/AdminCard.vue b/client/components/pages/admin/AdminCard.vue
index 58685e1d0..b821ab917 100644
--- a/client/components/pages/admin/AdminCard.vue
+++ b/client/components/pages/admin/AdminCard.vue
@@ -1,5 +1,5 @@
<template>
- <div class="w-full bg-white border border-gray-200 rounded-lg shadow flex flex-col">
+ <div class="w-full bg-white border border-neutral-200 rounded-lg shadow-sm flex flex-col">
<collapse
v-model="show"
class="p-2 w-full"
@@ -8,7 +8,7 @@
<div class="w-full flex px-4 py-2">
<Icon
:name="props.icon"
- class="w-6 h-6 text-nt-blue"
+ class="w-6 h-6 text-blue-500"
/>
<h3 class="text-md font-semibold ml-2">
{{ props.title }}
@@ -23,6 +23,7 @@
</template>
<script setup>
+import Collapse from "~/components/app/Collapse.vue"
const props = defineProps({
title: { type: String, required: true },
icon: { type: String, required: true }
diff --git a/client/components/pages/admin/BillingEmail.vue b/client/components/pages/admin/BillingEmail.vue
index 412eca511..0783692da 100644
--- a/client/components/pages/admin/BillingEmail.vue
+++ b/client/components/pages/admin/BillingEmail.vue
@@ -4,12 +4,12 @@
title="Billing email"
icon="heroicons:envelope-16-solid"
>
- <p class="text-xs text-gray-500">
+ <p class="text-xs text-neutral-500">
You can update the billing email of the subscriber.
</p>
<div
v-if="loading"
- class="text-gray-600 dark:text-gray-400"
+ class="text-neutral-600 dark:text-neutral-400"
>
<Loader class="h-6 w-6 mx-auto m-10" />
</div>
@@ -19,7 +19,7 @@
@submit.prevent="updateUserBillingEmail"
>
<div>
- <text-input
+ <TextInput
name="billing_email"
:form="form"
label="Billing email"
@@ -29,21 +29,21 @@
placeholder="Billing email"
:disabled="!userCreated"
/>
- <v-button
+ <UButton
:loading="loading"
- type="success"
- class="w-full"
- color="white"
+ type="submit"
+ block
:disabled="!userCreated"
- >
- Update billing email
- </v-button>
+ label="Update billing email"
+ />
</div>
</form>
</AdminCard>
</template>
<script setup>
+import { adminApi } from '~/api'
+
const props = defineProps({
user: { type: Object, required: true }
})
@@ -59,7 +59,7 @@ const form = useForm({
onMounted(() => {
if (!props.user.stripe_id) return
loadingBillingEmail.value = true
- opnFetch("/moderator/billing/" + props.user.id + "/email",).then(data => {
+ adminApi.billing.getEmail(props.user.id).then(data => {
loadingBillingEmail.value = false
userCreated.value = true
form.billing_email = data.billing_email
@@ -71,7 +71,10 @@ onMounted(() => {
const updateUserBillingEmail = () => {
loading.value = true
- form.patch("/moderator/billing/email")
+ adminApi.billing.updateEmail({
+ billing_email: form.billing_email,
+ user_id: form.user_id
+ })
.then(async (data) => {
loading.value = false
useAlert().success(data.message)
diff --git a/client/components/pages/admin/CancelSubscription.vue b/client/components/pages/admin/CancelSubscription.vue
index 6773569b0..c8f8d408c 100644
--- a/client/components/pages/admin/CancelSubscription.vue
+++ b/client/components/pages/admin/CancelSubscription.vue
@@ -8,12 +8,12 @@
class="space-y-6 flex flex-col h-full justify-between"
@submit.prevent="askCancel"
>
- <p class="text-xs text-gray-500">
+ <p class="text-xs text-neutral-500">
Ideally customers should cancel subscription themselves via the UI. If
you cancel the subscription for them, please provide a reason.
</p>
<div>
- <text-input
+ <TextInput
name="cancellation_reason"
:form="form"
label="Cancellation reason"
@@ -22,18 +22,13 @@
help="Cancellation reason"
/>
- <v-button
+ <UButton
:loading="loading"
- type="success"
- class="w-full"
- color="outline-red"
- >
- <Icon
- class="inline w-4 h-4 text-red-600"
- name="heroicons:exclamation-triangle-16-solid"
- />
- Cancel subscription now
- </v-button>
+ type="submit"
+ block
+ icon="heroicons:exclamation-triangle-16-solid"
+ label="Cancel subscription now"
+ />
</div>
</form>
</AdminCard>
diff --git a/client/components/pages/admin/DeletedForms.vue b/client/components/pages/admin/DeletedForms.vue
index 6d9afcb6d..e1bb2aefa 100644
--- a/client/components/pages/admin/DeletedForms.vue
+++ b/client/components/pages/admin/DeletedForms.vue
@@ -9,24 +9,24 @@
:progress="{ color: 'primary', animation: 'carousel' }"
:empty-state="{ icon: 'i-heroicons-circle-stack-20-solid', label: 'No items.' }"
:columns="columns"
- :rows="rows"
+ :data="rows"
class="-mx-6"
>
- <template #actions-data="{ row }">
- <VButton
+ <template #actions-cell="{ row }">
+ <UButton
:loading="restoringForm"
- native-type="button"
- size="small"
- color="white"
- @click.prevent="restoreForm(row.slug)"
+ size="sm"
+ color="neutral"
+ variant="outline"
+ @click.prevent="restoreForm(row.original.slug)"
>
Restore
- </VButton>
+ </UButton>
</template>
</UTable>
<div
v-if="forms?.length > pageCount"
- class="flex justify-end px-3 py-3.5 border-t border-gray-200 dark:border-gray-700"
+ class="flex justify-end px-3 py-3.5 border-t border-neutral-200 dark:border-neutral-700"
>
<UPagination
v-model="page"
@@ -38,6 +38,7 @@
</template>
<script setup>
+import { adminApi } from '~/api'
const props = defineProps({
user: { type: Object, required: true }
@@ -58,7 +59,7 @@ onMounted(() => {
const getDeletedForms = () => {
loading.value = true
- opnFetch("/moderator/forms/" + props.user.id + "/deleted-forms",).then(data => {
+ adminApi.forms.getDeleted(props.user.id).then(data => {
loading.value = false
forms.value = data.forms
}).catch(error => {
@@ -72,9 +73,7 @@ const restoreForm = (slug) => {
"Are you sure you want to restore this form?",
() => {
restoringForm.value = true
- opnFetch("/moderator/forms/" + slug + "/restore", {
- method: 'PATCH',
- }).then(data => {
+ adminApi.forms.restore(slug).then(data => {
restoringForm.value = false
useAlert().success(data.message)
getDeletedForms()
@@ -87,27 +86,27 @@ const restoreForm = (slug) => {
const columns = [{
- key: 'id',
- label: 'ID'
+ accessorKey: 'id',
+ header: 'ID'
}, {
- key: 'slug',
- label: 'Slug',
+ accessorKey: 'slug',
+ header: 'Slug',
sortable: true
}, {
- key: 'title',
- label: 'Title',
+ accessorKey: 'title',
+ header: 'Title',
sortable: true
}, {
- key: 'created_by',
- label: 'Created by',
+ accessorKey: 'created_by',
+ header: 'Created by',
sortable: true
}, {
- key: 'deleted_at',
- label: 'Deleted at',
+ accessorKey: 'deleted_at',
+ header: 'Deleted at',
sortable: true,
}, {
- key: 'actions',
- label: 'Restore',
+ id: 'actions',
+ header: 'Restore',
sortable: false,
}]
diff --git a/client/components/pages/admin/DiscountOnSubscription.vue b/client/components/pages/admin/DiscountOnSubscription.vue
index a8fb04628..f975f1f9b 100644
--- a/client/components/pages/admin/DiscountOnSubscription.vue
+++ b/client/components/pages/admin/DiscountOnSubscription.vue
@@ -8,20 +8,18 @@
class="space-y-6 flex flex-col justify-between"
@submit.prevent="applyDiscount"
>
- <p class="text-xs text-gray-500">
+ <p class="text-xs text-neutral-500">
This is only for students, academics and NGOs. Make sure to verify
their status before applying discount (student/university email, NGO
website, proof of non-profit, etc). They need to create their
subscriptions before you can apply the 40% discount.
</p>
- <v-button
+ <UButton
:loading="loading"
- type="success"
- class="w-full"
- color="white"
- >
- Apply Discount
- </v-button>
+ type="submit"
+ block
+ label="Apply Discount"
+ />
</form>
</AdminCard>
</template>
diff --git a/client/components/pages/admin/EditWorkSpaceUser.vue b/client/components/pages/admin/EditWorkSpaceUser.vue
index 9a185d6ca..22488b042 100644
--- a/client/components/pages/admin/EditWorkSpaceUser.vue
+++ b/client/components/pages/admin/EditWorkSpaceUser.vue
@@ -1,84 +1,71 @@
<template>
- <modal
- :show="showEditUserModal"
- max-width="lg"
+ <UModal
+ v-model:open="showEditUserModal"
+ :ui="{ width: 'lg:max-w-lg' }"
@close="$emit('close')"
+ title="Edit User Role"
>
- <template #title>
- Edit User Role
- </template>
- <div class="px-4">
- <form
- @submit.prevent="updateUserRole"
- >
- <div>
- <FlatSelectInput
- v-model="userNewRole"
- name="newUserRole"
- :label="'New Role for '+props.user.name"
- :options="[
- { name: 'User', value: 'user' },
- { name: 'Admin', value: 'admin' },
- { name: 'Read Only', value: 'readonly' },
- ]"
- option-key="value"
- display-key="name"
- />
- </div>
-
- <div class="w-full mt-6">
- <v-button
- :loading="updatingUserRoleState"
- class="w-full my-3"
+ <template #body>
+ <UCard>
+ <div class="px-4">
+ <form
+ @submit.prevent="updateUserRole"
>
- Update
- </v-button>
+ <div>
+ <FlatSelectInput
+ v-model="userNewRole"
+ name="newUserRole"
+ :label="'New Role for '+props.user.name"
+ :options="[
+ { name: 'User', value: 'user' },
+ { name: 'Admin', value: 'admin' },
+ { name: 'Read Only', value: 'readonly' },
+ ]"
+ option-key="value"
+ display-key="name"
+ />
+ </div>
+
+ <div class="w-full mt-6">
+ <UButton
+ :loading="updateMutation.isPending.value"
+ class="my-3"
+ block
+ label="Update"
+ />
+ </div>
+ </form>
</div>
- </form>
- </div>
- </modal>
+ </UCard>
+ </template>
+ </UModal>
</template>
-<script setup>
-import {watch, ref} from "vue"
-
-
+<script setup>
const props = defineProps(['user', 'showEditUserModal'])
const emit = defineEmits(['close', 'fetchUsers'])
-const workspacesStore = useWorkspacesStore()
+const { currentId } = useCurrentWorkspace()
+const { updateUserRole: updateUserRoleMutation } = useWorkspaceUsers()
+
const userNewRole = ref("")
-const updatingUserRoleState = ref(false)
+const updateMutation = updateUserRoleMutation(currentId)
watch(() => props.user, () => {
userNewRole.value = props.user.pivot.role
})
const updateUserRole = () => {
- updatingUserRoleState.value = true
- opnFetch(
- "/open/workspaces/" +
- workspacesStore.currentId +
- "/users/" +
- props.user.id +
- "/update-role",
- {
- method: "PUT",
- body: {
- role: userNewRole.value,
- },
- },
- {showSuccess: false},
- ).then(() => {
+ updateMutation.mutateAsync({
+ userId: props.user.id,
+ data: { role: userNewRole.value }
+ }).then(() => {
useAlert().success("User role updated.")
- emit('fetchUsers')
emit('close')
+ // No need to emit 'fetchUsers' - the mutation handles cache updates automatically
}).catch(() => {
useAlert().error("There was an error updating user role")
- }).finally(() => {
- updatingUserRoleState.value = false
})
}
-
</script>
diff --git a/client/components/pages/admin/ExtendTrial.vue b/client/components/pages/admin/ExtendTrial.vue
index 4bf091831..94542a13c 100644
--- a/client/components/pages/admin/ExtendTrial.vue
+++ b/client/components/pages/admin/ExtendTrial.vue
@@ -8,13 +8,13 @@
class="space-y-6 flex flex-col justify-between"
@submit.prevent="extendTrial"
>
- <p class="text-xs text-gray-500">
+ <p class="text-xs text-neutral-500">
You can extend the trial of subscribers that are still in the trial
period. Usually, you should not offer more than 7 days of trial, but
you can add up to 14 days if needed.
</p>
<div>
- <text-input
+ <TextInput
name="number_of_day"
:form="form"
label="Number of days"
@@ -23,14 +23,12 @@
help="Number Of Days"
placeholder="7"
/>
- <v-button
+ <UButton
:loading="loading"
- type="success"
- class="w-full"
- color="white"
- >
- Apply Extend Trial
- </v-button>
+ type="submit"
+ block
+ label="Apply Extend Trial"
+ />
</div>
</form>
</AdminCard>
diff --git a/client/components/pages/admin/ImpersonateUser.vue b/client/components/pages/admin/ImpersonateUser.vue
index 73e017d4f..c1459cf64 100644
--- a/client/components/pages/admin/ImpersonateUser.vue
+++ b/client/components/pages/admin/ImpersonateUser.vue
@@ -1,49 +1,50 @@
<template>
<UButton
- size="sm"
- color="white"
+ variant="outline"
icon="i-heroicons-eye-16-solid"
:loading="loading"
@click="impersonate"
- >
- Impersonate User
- </UButton>
+ label="Impersonate User"
+ />
</template>
<script setup>
+import { adminApi, authApi } from '~/api'
+import { useQueryClient } from '@tanstack/vue-query'
+
const props = defineProps({
user: { type: Object, required: true }
})
const authStore = useAuthStore()
-const formsStore = useFormsStore()
-const workspacesStore = useWorkspacesStore()
+const queryClient = useQueryClient()
const loading = ref(false)
+const { invalidateAll: invalidateWorkspaces } = useWorkspaces()
+const { invalidateAll: invalidateForms } = useForms()
+const { user } = useAuth()
+const { data: userData } = user()
+
const impersonate = () => {
loading.value = true
authStore.startImpersonating()
- opnFetch(`/moderator/impersonate/${props.user.id}`).then(async (data) => {
+ adminApi.impersonate(props.user.id).then(async (data) => {
loading.value = false
// Save the token with its expiration time.
authStore.setToken(data.token, data.expires_in)
// Fetch the user.
- const userData = await opnFetch('user')
- authStore.setUser(userData)
-
- // Redirect to the dashboard.
- formsStore.set([])
- workspacesStore.set([])
+ await authApi.user.get()
+ useAuth().invalidateUser()
- const workspaces = await fetchAllWorkspaces()
- workspacesStore.set(workspaces.data.value)
- formsStore.startLoading()
- formsStore.loadAll(workspacesStore.currentId)
+ // Clear all query cache and invalidate to refetch fresh data for the impersonated user
+ queryClient.clear()
+ await invalidateWorkspaces()
+ await invalidateForms()
- useAlert().success(`Impersonating ${authStore.user.name}`)
+ useAlert().success(`Impersonating ${userData.value.name}`)
useRouter().push({ name: 'home' })
})
.catch((error) => {
diff --git a/client/components/pages/admin/SendPasswordResetEmail.vue b/client/components/pages/admin/SendPasswordResetEmail.vue
index 0eafdb09c..f5fdc19c3 100644
--- a/client/components/pages/admin/SendPasswordResetEmail.vue
+++ b/client/components/pages/admin/SendPasswordResetEmail.vue
@@ -1,13 +1,11 @@
<template>
<UButton
- size="sm"
- color="white"
+ variant="outline"
icon="i-heroicons-key-16-solid"
:loading="loading"
@click="resetPassword"
- >
- Reset Password
- </UButton>
+ label="Reset Password"
+ />
</template>
<script setup>
diff --git a/client/components/pages/admin/UserPayments.vue b/client/components/pages/admin/UserPayments.vue
index b762cc993..90c643bb8 100644
--- a/client/components/pages/admin/UserPayments.vue
+++ b/client/components/pages/admin/UserPayments.vue
@@ -10,12 +10,12 @@
:progress="{ color: 'primary', animation: 'carousel' }"
:empty-state="{ icon: 'i-heroicons-circle-stack-20-solid', label: 'No items.' }"
:columns="columns"
- :rows="rows"
+ :data="rows"
class="-mx-6"
>
- <template #id-data="{ row }">
+ <template #id-cell="{ row }">
<a
- :href="'https://dashboard.stripe.com/invoices/' + row.id"
+ :href="'https://dashboard.stripe.com/invoices/' + row.original.id"
target="_blank"
class="text-xs select-all bg-purple-50 border-purple-200 text-purple-500 rounded-md px-2 py-1 border"
>
@@ -23,24 +23,24 @@
name="bx:bxl-stripe"
class="h-4 w-4 inline-block"
/>
- {{ row.id }}
+ {{ row.original.id }}
</a>
</template>
- <template #amount_paid-data="{ row }">
- <span class="font-semibold">${{ parseFloat(row.amount_paid / 100).toFixed(2) }}</span>
+ <template #amount_paid-cell="{ row }">
+ <span class="font-semibold">${{ parseFloat(row.original.amount_paid / 100).toFixed(2) }}</span>
</template>
- <template #status-data="{ row }">
+ <template #status-cell="{ row }">
<span
class="text-xs select-all rounded-md px-2 py-1 border"
- :class="row.status == 'paid' ? 'bg-green-50 border-green-200 text-green-500' : 'bg-yellow-50 border-yellow-200 text-yellow-500'"
+ :class="row.original.status == 'paid' ? 'bg-green-50 border-green-200 text-green-500' : 'bg-yellow-50 border-yellow-200 text-yellow-500'"
>
- {{ row.status }}
+ {{ row.original.status }}
</span>
</template>
</UTable>
<div
v-if="payments?.length > pageCount"
- class="flex justify-end px-3 py-3.5 border-t border-gray-200 dark:border-gray-700"
+ class="flex justify-end px-3 py-3.5 border-t border-neutral-200 dark:border-neutral-700"
>
<UPagination
v-model="page"
@@ -52,6 +52,7 @@
</template>
<script setup>
+import { adminApi } from '~/api'
const props = defineProps({
user: {type: Object, required: true}
@@ -72,7 +73,7 @@ onMounted(() => {
const getPayments = () => {
if (!props.user.stripe_id) return
loading.value = true
- opnFetch("/moderator/billing/" + props.user.id + "/payments",).then(data => {
+ adminApi.billing.getPayments(props.user.id).then(data => {
loading.value = false
payments.value = data.payments
}).catch(error => {
@@ -83,23 +84,23 @@ const getPayments = () => {
const columns = [{
- key: 'id',
- label: 'ID'
+ accessorKey: 'id',
+ header: 'ID'
}, {
- key: 'amount_paid',
- label: 'Amount paid',
+ accessorKey: 'amount_paid',
+ header: 'Amount paid',
sortable: true
}, {
- key: 'name',
- label: 'Name',
+ accessorKey: 'name',
+ header: 'Name',
sortable: true
}, {
- key: 'status',
- label: 'Status',
+ accessorKey: 'status',
+ header: 'Status',
sortable: true
}, {
- key: 'creation_date',
- label: 'Creation date',
+ accessorKey: 'creation_date',
+ header: 'Creation date',
sortable: true
}]
diff --git a/client/components/pages/admin/UserSubscriptions.vue b/client/components/pages/admin/UserSubscriptions.vue
index 11029e9d5..0021690f9 100644
--- a/client/components/pages/admin/UserSubscriptions.vue
+++ b/client/components/pages/admin/UserSubscriptions.vue
@@ -10,12 +10,12 @@
:progress="{ color: 'primary', animation: 'carousel' }"
:empty-state="{ icon: 'i-heroicons-circle-stack-20-solid', label: 'No items.' }"
:columns="columns"
- :rows="rows"
+ :data="rows"
class="-mx-6"
>
- <template #stripe_id-data="{ row }">
+ <template #stripe_id-cell="{ row }">
<a
- :href="'https://dashboard.stripe.com/subscriptions/' + row.stripe_id"
+ :href="'https://dashboard.stripe.com/subscriptions/' + row.original.stripe_id"
target="_blank"
class="text-xs select-all bg-purple-50 border-purple-200 text-purple-500 rounded-md px-2 py-1 border"
>
@@ -23,21 +23,21 @@
name="bx:bxl-stripe"
class="h-4 w-4 inline-block"
/>
- {{ row.stripe_id }}
+ {{ row.original.stripe_id }}
</a>
</template>
- <template #status-data="{ row }">
+ <template #status-cell="{ row }">
<span
class="text-xs select-all rounded-md px-2 py-1 border"
- :class="row.status == 'active' ? 'bg-green-50 border-green-200 text-green-500' : 'bg-yellow-50 border-yellow-200 text-yellow-500'"
+ :class="row.original.status == 'active' ? 'bg-green-50 border-green-200 text-green-500' : 'bg-yellow-50 border-yellow-200 text-yellow-500'"
>
- {{ row.status }}
+ {{ row.original.status }}
</span>
</template>
</UTable>
<div
v-if="subscriptions?.length > pageCount"
- class="flex justify-end px-3 py-3.5 border-t border-gray-200 dark:border-gray-700"
+ class="flex justify-end px-3 py-3.5 border-t border-neutral-200 dark:border-neutral-700"
>
<UPagination
v-model="page"
@@ -49,6 +49,7 @@
</template>
<script setup>
+import { adminApi } from '~/api'
const props = defineProps({
user: { type: Object, required: true }
@@ -69,7 +70,7 @@ onMounted(() => {
const getSubscriptions = () => {
if (!props.user.stripe_id) return
loading.value = true
- opnFetch("/moderator/billing/" + props.user.id + "/subscriptions",).then(data => {
+ adminApi.billing.getSubscriptions(props.user.id).then(data => {
loading.value = false
subscriptions.value = data.subscriptions
}).catch(error => {
@@ -81,27 +82,27 @@ const getSubscriptions = () => {
const columns = [{
- key: 'id',
- label: 'ID'
+ accessorKey: 'id',
+ header: 'ID'
}, {
- key: 'stripe_id',
- label: 'Stripe ID'
+ accessorKey: 'stripe_id',
+ header: 'Stripe ID'
}, {
- key: 'name',
- label: 'Name',
+ accessorKey: 'name',
+ header: 'Name',
sortable: true
}, {
- key: 'creation_date',
- label: 'Creation date',
+ accessorKey: 'creation_date',
+ header: 'Creation date',
sortable: true
}, {
- key: 'plan',
- label: 'Plan',
+ accessorKey: 'plan',
+ header: 'Plan',
sortable: true,
direction: 'desc'
}, {
- key: 'status',
- label: 'Status'
+ accessorKey: 'status',
+ header: 'Status'
}]
</script>
diff --git a/client/components/pages/admin/UserWorkspaces.vue b/client/components/pages/admin/UserWorkspaces.vue
index 96ad4541a..4ee8d57fb 100644
--- a/client/components/pages/admin/UserWorkspaces.vue
+++ b/client/components/pages/admin/UserWorkspaces.vue
@@ -8,21 +8,21 @@
:progress="{ color: 'primary', animation: 'carousel' }"
:empty-state="{ icon: 'i-heroicons-circle-stack-20-solid', label: 'No items.' }"
:columns="columns"
- :rows="rows"
+ :data="rows"
class="-mx-6"
>
- <template #plan-data="{ row }">
+ <template #plan-cell="{ row }">
<span
class="text-xs select-all rounded-md px-2 py-1 border"
- :class="userPlanStyles(row.plan)"
+ :class="userPlanStyles(row.original.plan)"
>
- {{ row.plan }}
+ {{ row.original.plan }}
</span>
</template>
</UTable>
<div
v-if="workspaces?.length > pageCount"
- class="flex justify-end px-3 py-3.5 border-t border-gray-200 dark:border-gray-700"
+ class="flex justify-end px-3 py-3.5 border-t border-neutral-200 dark:border-neutral-700"
>
<UPagination
v-model="page"
@@ -49,19 +49,19 @@ const rows = computed(() => {
const columns = [{
- key: 'id',
- label: 'ID'
+ accessorKey: 'id',
+ header: 'ID'
}, {
- key: 'name',
- label: 'Name',
+ accessorKey: 'name',
+ header: 'Name',
sortable: true
}, {
- key: 'plan',
- label: 'Plan',
+ accessorKey: 'plan',
+ header: 'Plan',
sortable: true
}, {
- key: 'forms_count',
- label: '# of forms',
+ accessorKey: 'forms_count',
+ header: '# of forms',
sortable: true
}]
@@ -72,7 +72,7 @@ function userPlanStyles(plan) {
case 'enterprise':
return 'capitalize text-xs select-all bg-blue-50 rounded-md px-2 py-1 border border-blue-200 text-blue-500'
default:
- return 'capitalize text-xs select-all bg-gray-50 rounded-md px-2 py-1 border'
+ return 'capitalize text-xs select-all bg-neutral-50 rounded-md px-2 py-1 border'
}
}
diff --git a/client/components/pages/auth/ForgotPasswordModal.vue b/client/components/pages/auth/ForgotPasswordModal.vue
index 6794f1920..b58ea7130 100644
--- a/client/components/pages/auth/ForgotPasswordModal.vue
+++ b/client/components/pages/auth/ForgotPasswordModal.vue
@@ -1,169 +1,102 @@
<template>
<!-- Forgot password modal -->
- <modal
- :show="show"
- max-width="lg"
- @close="close"
+ <UModal
+ v-model:open="isOpen"
+ :ui="{ content: 'sm:max-w-lg' }"
+ :title="isMailSent ? 'Check your email' : 'Forgot password?'"
+ :description="isMailSent ? '' : 'No worries, we\'ll send you reset instructions.'"
>
- <template #icon>
+ <template #body>
<template v-if="isMailSent">
- <svg
- width="56"
- height="56"
- viewBox="0 0 56 56"
- fill="none"
- xmlns="http://www.w3.org/2000/svg"
- >
- <rect
- class="text-blue-50"
- width="56"
- height="56"
- rx="28"
- fill="currentColor"
- />
- <path
- d="M16.3333 22.1666L25.859 28.8346C26.6304 29.3746 27.016 29.6446 27.4356 29.7492C27.8061 29.8415 28.1937 29.8415 28.5643 29.7492C28.9838 29.6446 29.3695 29.3746 30.1408 28.8346L39.6666 22.1666M21.9333 37.3333H34.0666C36.0268 37.3333 37.0069 37.3333 37.7556 36.9518C38.4141 36.6163 38.9496 36.0808 39.2851 35.4223C39.6666 34.6736 39.6666 33.6935 39.6666 31.7333V24.2666C39.6666 22.3064 39.6666 21.3264 39.2851 20.5777C38.9496 19.9191 38.4141 19.3837 37.7556 19.0481C37.0069 18.6666 36.0268 18.6666 34.0666 18.6666H21.9333C19.9731 18.6666 18.993 18.6666 18.2443 19.0481C17.5857 19.3837 17.0503 19.9191 16.7147 20.5777C16.3333 21.3264 16.3333 22.3064 16.3333 24.2666V31.7333C16.3333 33.6935 16.3333 34.6736 16.7147 35.4223C17.0503 36.0808 17.5857 36.6163 18.2443 36.9518C18.993 37.3333 19.9731 37.3333 21.9333 37.3333Z"
- stroke="currentColor"
- stroke-width="2"
- stroke-linecap="round"
- stroke-linejoin="round"
+ <div class="text-center">
+ We sent a password reset link to <br><span class="font-bold">{{ form.email }}</span>
+ </div>
+ <div class="w-full mt-4 text-center">
+ <UButton
+ icon="heroicons:arrow-path"
+ variant="outline"
+ color="neutral"
+ label="Resend email"
+ @click="send"
/>
- </svg>
+ </div>
</template>
<template v-else>
- <svg
- width="56"
- height="56"
- viewBox="0 0 56 56"
- fill="none"
- xmlns="http://www.w3.org/2000/svg"
+ <form
+ @submit.prevent="send"
>
- <rect
- class="text-blue-50"
- width="56"
- height="56"
- rx="28"
- fill="currentColor"
- />
- <path
- d="M33.8333 24.4999C33.8333 23.9028 33.6055 23.3057 33.1499 22.8501C32.6943 22.3945 32.0972 22.1667 31.5 22.1667M31.5 31.5C35.366 31.5 38.5 28.366 38.5 24.5C38.5 20.634 35.366 17.5 31.5 17.5C27.634 17.5 24.5 20.634 24.5 24.5C24.5 24.8193 24.5214 25.1336 24.5628 25.4415C24.6309 25.948 24.6649 26.2013 24.642 26.3615C24.6181 26.5284 24.5877 26.6184 24.5055 26.7655C24.4265 26.9068 24.2873 27.046 24.009 27.3243L18.0467 33.2866C17.845 33.4884 17.7441 33.5893 17.6719 33.707C17.608 33.8114 17.5608 33.9252 17.5322 34.0442C17.5 34.1785 17.5 34.3212 17.5 34.6065V36.6333C17.5 37.2867 17.5 37.6134 17.6272 37.863C17.739 38.0825 17.9175 38.261 18.137 38.3728C18.3866 38.5 18.7133 38.5 19.3667 38.5H22.1667V36.1667H24.5V33.8333H26.8333L28.6757 31.991C28.954 31.7127 29.0932 31.5735 29.2345 31.4945C29.3816 31.4123 29.4716 31.3819 29.6385 31.358C29.7987 31.3351 30.052 31.3691 30.5585 31.4372C30.8664 31.4786 31.1807 31.5 31.5 31.5Z"
- stroke="currentColor"
- stroke-width="2"
- stroke-linecap="round"
- stroke-linejoin="round"
+ <text-input
+ name="email"
+ :form="form"
+ label="Email"
+ placeholder="Your email address"
+ :required="true"
/>
- </svg>
- </template>
- </template>
- <template #title>
- <template v-if="isMailSent">
- Check your email
- </template>
- <template v-else>
- Forgot password?
+
+ <div class="w-full mt-6">
+ <UButton
+ type="submit"
+ block
+ :loading="form.busy"
+ label="Reset password"
+ />
+ </div>
+ </form>
</template>
</template>
- <template v-if="isMailSent">
- <div class="text-center">
- We sent a password reset link to <br><span>{{ form.email }}</span>
- </div>
- <div class="w-full p-4 text-center">
- <span class="mt-4">Didn't receive the email?
- <a
- href="#"
- class="ml-1"
- @click.prevent="send"
- >Click to resend</a></span>
- </div>
- </template>
- <template v-else>
- <div class="text-center">
- No worries, we'll send you reset instructions.
- </div>
- <form
- class="p-4"
- @submit.prevent="send"
- @keydown="form.onKeydown($event)"
- >
- <text-input
- name="email"
- :form="form"
- label="Email"
- placeholder="Your email address"
- :required="true"
- />
- <div class="w-full mt-6">
- <v-button
- :loading="form.busy"
- class="w-full my-3"
- >
- Reset password
- </v-button>
- </div>
- </form>
+ <template #footer>
+ <UButton
+ block
+ icon="heroicons:arrow-left"
+ variant="link"
+ color="neutral"
+ @click="close"
+ label="Back to log in"
+ />
</template>
- <div class="w-full text-center">
- <a
- href="#"
- class="text-xs hover:underline text-gray-500 sm:text-sm hover:text-gray-700"
- @click.prevent="close"
- >
- <svg
- class="inline mr-1"
- width="15"
- height="14"
- viewBox="0 0 15 14"
- fill="none"
- xmlns="http://www.w3.org/2000/svg"
- >
- <path
- d="M13.3334 6.99996H1.66669M1.66669 6.99996L7.50002 12.8333M1.66669 6.99996L7.50002 1.16663"
- stroke="#475467"
- stroke-width="1.66667"
- stroke-linecap="round"
- stroke-linejoin="round"
- />
- </svg>
- Back to log in
- </a>
- </div>
- </modal>
+ </UModal>
</template>
-<script>
-export default {
- name: "ForgotPasswordModal",
- components: {},
- props: {
- show: {
- type: Boolean,
- required: true,
- },
+<script setup>
+const props = defineProps({
+ show: {
+ type: Boolean,
+ required: true,
},
- emits: ['close'],
- data: () => ({
- isMailSent: false,
- form: useForm({
- email: "",
- }),
- }),
- methods: {
- async send() {
- await this.form.post("/password/email").then(() => {
- this.isMailSent = true
- }).catch(error => {
- if(error?.data?.email){
- useAlert().error(error.data?.email)
- this.isMailSent = false
- }
- }
- )
- },
- close() {
- this.$emit("close")
- this.isMailSent = false
- },
+})
+
+const emit = defineEmits(['close'])
+
+const isMailSent = ref(false)
+const form = useForm({
+ email: "",
+})
+
+const isOpen = computed({
+ get() {
+ return props.show
},
+ set(value) {
+ if (!value) {
+ close()
+ }
+ }
+})
+
+const send = () => {
+ form.post("/password/email").then(() => {
+ isMailSent.value = true
+ }).catch(error => {
+ if(error?.data?.email){
+ useAlert().error(error.data?.email)
+ isMailSent.value = false
+ }
+ })
+}
+
+const close = () => {
+ emit("close")
+ isMailSent.value = false
}
</script>
diff --git a/client/components/pages/auth/components/LoginForm.vue b/client/components/pages/auth/components/LoginForm.vue
index f404d8ae5..cd834fa5f 100644
--- a/client/components/pages/auth/components/LoginForm.vue
+++ b/client/components/pages/auth/components/LoginForm.vue
@@ -9,7 +9,6 @@
method="POST"
class="mt-4"
@submit.prevent="login"
- @keydown="form.onKeydown($event)"
>
<!-- Email -->
<text-input
@@ -33,7 +32,7 @@
<!-- Remember Me -->
<div class="relative flex items-center mt-3">
<CheckboxInput
- v-model="remember"
+ :form="form"
class="w-full md:w-1/2"
name="remember"
size="small"
@@ -43,7 +42,7 @@
<div class="w-full md:w-1/2 text-right">
<a
href="#"
- class="text-xs hover:underline text-gray-500 sm:text-sm hover:text-gray-700"
+ class="text-xs hover:underline text-neutral-500 sm:text-sm hover:text-neutral-700"
@click.prevent="showForgotModal = true"
>
Forgot your password?
@@ -52,30 +51,32 @@
</div>
<!-- Submit Button -->
- <v-button
- class="w-full flex mt-2"
- :loading="form.busy || loading"
- >
- Log in to continue
- </v-button>
+ <UButton
+ class="mt-2"
+ block
+ size="lg"
+ :loading="form.busy"
+ type="submit"
+ label="Log in to continue"
+ />
- <v-button
- v-if="useFeatureFlag('services.google.auth')"
+ <UButton
+ v-if="useFeatureFlag('services.google.auth') && !useFeatureFlag('self_hosted')"
native-type="button"
- color="white"
- class="space-x-4 mt-4 flex items-center w-full"
+ color="neutral"
+ variant="outline"
+ size="lg"
+ class="space-x-4 mt-4 flex items-center"
+ block
+ :disabled="form.busy"
:loading="false"
@click.prevent="signInwithGoogle"
- >
- <Icon
- name="devicon:google"
- class="w-4 h-4"
- />
- <span class="mx-2">Sign in with Google</span>
- </v-button>
+ icon="devicon:google"
+ label="Sign in with Google"
+ />
<p
v-if="!useFeatureFlag('self_hosted')"
- class="text-gray-500 text-sm text-center mt-4"
+ class="text-neutral-500 text-sm text-center mt-4"
>
Don't have an account?
<a
@@ -93,97 +94,100 @@
</NuxtLink>
</p>
</form>
+
+ <!-- Google One Tap -->
+ <ClientOnly>
+ <GoogleOneTap context="signin" />
+ </ClientOnly>
</div>
</template>
-<script>
+<script setup>
import ForgotPasswordModal from "../ForgotPasswordModal.vue"
+import GoogleOneTap from "~/components/vendor/GoogleOneTap.vue"
import { WindowMessageTypes } from "~/composables/useWindowMessage"
-export default {
- name: "LoginForm",
- components: {
- ForgotPasswordModal,
+// Props
+const props = defineProps({
+ isQuick: {
+ type: Boolean,
+ required: false,
+ default: false,
},
- props: {
- isQuick: {
- type: Boolean,
- required: false,
- default: false,
- },
- },
-
- emits: ['openRegister'],
- setup() {
- return {
- appStore: useAppStore(),
- authStore: useAuthStore(),
- formsStore: useFormsStore(),
- workspaceStore: useWorkspacesStore(),
- providersStore: useOAuthProvidersStore()
+})
+
+// Emits
+defineEmits(['openRegister'])
+
+// Composables
+const oAuth = useOAuth()
+const router = useRouter()
+const { login: loginMutationFactory } = useAuth()
+
+// Reactive data
+const form = useForm({
+ email: "",
+ password: "",
+ remember: false,
+})
+
+const loginMutation = loginMutationFactory()
+const showForgotModal = ref(false)
+
+// Lifecycle
+onMounted(() => {
+ // Use the window message composable
+ const windowMessage = useWindowMessage(WindowMessageTypes.LOGIN_COMPLETE)
+
+ // Listen for login complete messages
+ windowMessage.listen(() => {
+ redirect()
+ })
+})
+
+// Methods
+const login = () => {
+ form.mutate(loginMutation).then(() => {
+ redirect()
+ }).catch((error) => {
+ console.log(error)
+ if (error.response?._data?.message == "You must change your credentials when in self host mode") {
+ redirect()
}
- },
+ })
+}
- data: () => ({
- form: useForm({
- email: "",
- password: "",
- }),
- loading: false,
- remember: false,
- showForgotModal: false,
- }),
-
- computed: {},
-
- mounted() {
- // Use the window message composable
- const windowMessage = useWindowMessage(WindowMessageTypes.LOGIN_COMPLETE)
-
- // Listen for login complete messages
- windowMessage.listen(() => {
- this.redirect()
- })
- },
+const redirect = () => {
+ if (props.isQuick) {
+ // Use window message instead of event
+ const afterLoginMessage = useWindowMessage(WindowMessageTypes.AFTER_LOGIN)
+ afterLoginMessage.send(window)
+ return
+ }
+
+ const intendedUrlCookie = useCookie("intended_url")
+
+ if (intendedUrlCookie.value) {
+ router.push({ path: intendedUrlCookie.value })
+ useCookie("intended_url").value = null
+ } else {
+ router.push({ name: "home" })
+ }
+}
- methods: {
- async login() {
- this.loading = true
- const auth = useAuth()
-
- try {
- await auth.loginWithCredentials(this.form, this.remember)
- this.redirect()
- } catch (error) {
- if (error.response?._data?.message == "You must change your credentials when in self host mode") {
- this.redirect()
- }
- } finally {
- this.loading = false
- }
- },
-
- redirect() {
- if (this.isQuick) {
- // Use window message instead of event
- const afterLoginMessage = useWindowMessage(WindowMessageTypes.AFTER_LOGIN)
- afterLoginMessage.send(window)
- return
- }
-
- const intendedUrlCookie = useCookie("intended_url")
- const router = useRouter()
-
- if (intendedUrlCookie.value) {
- router.push({ path: intendedUrlCookie.value })
- useCookie("intended_url").value = null
- } else {
- router.push({ name: "home" })
- }
- },
- signInwithGoogle() {
- this.providersStore.guestConnect('google', true)
- }
- },
+const showOAuthError = (error) => {
+ if (error.response?.status === 422 && error.response?.data?.message) {
+ useAlert().error(error.response.data.message)
+ } else {
+ useAlert().error("Sign-in failed. Please try again.")
+ }
+}
+
+const signInwithGoogle = () => {
+ try {
+ oAuth.guestConnect('google', true)
+ } catch (error) {
+ showOAuthError(error)
+ }
}
</script>
diff --git a/client/components/pages/auth/components/QuickRegister.vue b/client/components/pages/auth/components/QuickRegister.vue
index 72fed8ab2..37b8b5df9 100644
--- a/client/components/pages/auth/components/QuickRegister.vue
+++ b/client/components/pages/auth/components/QuickRegister.vue
@@ -1,33 +1,12 @@
<template>
<div>
<!-- Login modal -->
- <modal
- compact-header
- :show="appStore.quickLoginModal"
- max-width="lg"
- :closeable="!appStore.isUnauthorizedError"
- @close="appStore.quickLoginModal=false"
+ <UModal
+ v-model:open="isLoginModalOpen"
+ title="Login to OpnForm"
+ :dismissible="!appStore.isUnauthorizedError"
>
- <template #icon>
- <svg
- xmlns="http://www.w3.org/2000/svg"
- fill="none"
- viewBox="0 0 24 24"
- stroke-width="1.5"
- stroke="currentColor"
- class="w-8 h-8"
- >
- <path
- stroke-linecap="round"
- stroke-linejoin="round"
- d="M17.982 18.725A7.488 7.488 0 0012 15.75a7.488 7.488 0 00-5.982 2.975m11.963 0a9 9 0 10-11.963 0m11.963 0A8.966 8.966 0 0112 21a8.966 8.966 0 01-5.982-2.275M15 9.75a3 3 0 11-6 0 3 3 0 016 0z"
- />
- </svg>
- </template>
- <template #title>
- Login to OpnForm
- </template>
- <div class="px-4">
+ <template #body>
<template v-if="appStore.isUnauthorizedError">
<div class="mb-4 p-3 bg-amber-50 dark:bg-amber-900/30 border border-amber-200 dark:border-amber-700 rounded-md">
<p class="text-amber-800 dark:text-amber-200 text-sm font-medium">
@@ -35,70 +14,51 @@
</p>
</div>
</template>
- <login-form
+
+ <LoginForm
:is-quick="true"
@open-register="openRegister"
/>
<template v-if="appStore.isUnauthorizedError">
<div class="flex items-center my-6">
- <div class="h-[1px] bg-gray-300 dark:bg-gray-600 flex-1" />
- <div class="px-4 text-gray-500 text-sm">
+ <div class="h-[1px] bg-neutral-300 dark:bg-neutral-600 flex-1" />
+ <div class="px-4 text-neutral-500 text-sm">
or
</div>
- <div class="h-[1px] bg-gray-300 dark:bg-gray-600 flex-1" />
+ <div class="h-[1px] bg-neutral-300 dark:bg-neutral-600 flex-1" />
</div>
<UButton
icon="i-heroicons-arrow-right-on-rectangle"
type="button"
- variant="solid"
- color="white"
+ color="neutral"
+ variant="outline"
label="Logout"
:block="true"
size="lg"
@click="logout"
/>
- <p class="text-gray-500 text-sm text-center mt-2">
+ <p class="text-neutral-500 text-sm text-center mt-2">
Progress will be lost.
</p>
</template>
- </div>
- </modal>
+ </template>
+ </UModal>
<!-- Register modal -->
- <modal
- compact-header
- :show="appStore.quickRegisterModal"
- max-width="lg"
- :closeable="!appStore.isUnauthorizedError"
- @close="appStore.quickRegisterModal=false"
+ <UModal
+ v-model:open="isRegisterModalOpen"
+ :ui="{ content: 'sm:max-w-lg' }"
+ title="Create an account"
+ :dismissible="!appStore.isUnauthorizedError"
>
- <template #icon>
- <svg
- xmlns="http://www.w3.org/2000/svg"
- fill="none"
- viewBox="0 0 24 24"
- stroke-width="1.5"
- stroke="currentColor"
- class="w-8 h-8"
- >
- <path
- stroke-linecap="round"
- stroke-linejoin="round"
- d="M17.982 18.725A7.488 7.488 0 0012 15.75a7.488 7.488 0 00-5.982 2.975m11.963 0a9 9 0 10-11.963 0m11.963 0A8.966 8.966 0 0112 21a8.966 8.966 0 01-5.982-2.275M15 9.75a3 3 0 11-6 0 3 3 0 016 0z"
- />
- </svg>
- </template>
- <template #title>
- Create an account
- </template>
- <div class="px-4">
- <register-form
+ <template #body>
+ <RegisterForm
:is-quick="true"
@open-login="openLogin"
/>
- </div>
- </modal>
+ </template>
+ </UModal>
</div>
</template>
@@ -112,6 +72,25 @@ const appStore = useAppStore()
// Define emits for component interactions
const emit = defineEmits(['close', 'reopen'])
+// Modal state
+const isLoginModalOpen = computed({
+ get() {
+ return appStore.quickLoginModal
+ },
+ set(value) {
+ appStore.quickLoginModal = value
+ }
+})
+
+const isRegisterModalOpen = computed({
+ get() {
+ return appStore.quickRegisterModal
+ },
+ set(value) {
+ appStore.quickRegisterModal = value
+ }
+})
+
const windowMessage = useWindowMessage(WindowMessageTypes.LOGIN_COMPLETE)
// Set up a listener for after-login messages
@@ -161,26 +140,19 @@ const openRegister = () => {
emit('reopen')
}
-const afterQuickLogin = async () => {
- // Reset unauthorized error flag immediately
+const afterQuickLogin = () => {
appStore.isUnauthorizedError = false
-
- // Verify authentication is complete using the useAuth composable
- const auth = useAuth()
- await auth.verifyAuthentication()
-
- // Close both login and register modals
appStore.quickLoginModal = false
appStore.quickRegisterModal = false
// Show success alert
- useAlert().success("Successfully logged in. Welcome back!")
+ useAlert().success("Successfully logged in!")
// Use the window message for after-login instead of emitting the event
afterLoginMessage.send(window, { useMessageChannel: false })
}
-const logout = async () => {
+const logout = () => {
appStore.isUnauthorizedError = false
appStore.quickLoginModal = false
appStore.quickRegisterModal = false
diff --git a/client/components/pages/auth/components/RegisterForm.vue b/client/components/pages/auth/components/RegisterForm.vue
index 1f2c6bbb3..949ac61b4 100644
--- a/client/components/pages/auth/components/RegisterForm.vue
+++ b/client/components/pages/auth/components/RegisterForm.vue
@@ -1,276 +1,301 @@
<template>
- <div>
- <form
- method="POST"
- @submit.prevent="register"
- @keydown="form.onKeydown($event)"
- >
- <!-- Name -->
- <text-input
- name="name"
- :form="form"
- label="Name"
- placeholder="Your name"
- :required="true"
- />
+ <VForm size="sm"
+ method="POST"
+ @submit.prevent="register"
+ class="flex flex-col gap-1"
+ >
+ <!-- Name -->
+ <text-input
+ name="name"
+ :form="form"
+ label="Name"
+ placeholder="Your name"
+ :required="true"
+ />
- <!-- Email -->
- <text-input
- name="email"
- :form="form"
- label="Email"
- :required="true"
- :disabled="disableEmail"
- placeholder="Your email address"
- />
+ <!-- Email -->
+ <text-input
+ name="email"
+ :form="form"
+ label="Email"
+ :required="true"
+ :disabled="disableEmail"
+ placeholder="Your email address"
+ />
- <select-input
- v-if="!disableEmail"
- name="hear_about_us"
- :options="hearAboutUsOptions"
- :form="form"
- placeholder="Select option"
- label="How did you hear about us?"
- :required="true"
- />
+ <select-input
+ v-if="!disableEmail"
+ name="hear_about_us"
+ :options="hearAboutUsOptions"
+ :form="form"
+ placeholder="Select option"
+ label="How did you hear about us?"
+ :required="true"
+ />
- <!-- Password -->
- <text-input
- native-type="password"
- placeholder="Enter password"
- name="password"
- :form="form"
- label="Password"
- :required="true"
- />
+ <!-- Password -->
+ <text-input
+ native-type="password"
+ placeholder="Enter password"
+ name="password"
+ :form="form"
+ label="Password"
+ :required="true"
+ />
- <!-- Password Confirmation-->
- <text-input
- native-type="password"
+ <!-- Password Confirmation-->
+ <text-input
+ native-type="password"
+ :form="form"
+ :required="true"
+ placeholder="Enter confirm password"
+ name="password_confirmation"
+ label="Confirm Password"
+ />
+
+ <!-- Captcha -->
+ <div
+ v-if="reCaptchaSiteKey"
+ class="my-4 px-2 mx-auto w-max"
+ >
+ <CaptchaInput
+ ref="captcha"
+ provider="recaptcha"
:form="form"
- :required="true"
- placeholder="Enter confirm password"
- name="password_confirmation"
- label="Confirm Password"
+ language="en"
/>
+ </div>
- <!-- Captcha -->
- <div
- v-if="reCaptchaSiteKey"
- class="my-4 px-2 mx-auto w-max"
- >
- <CaptchaInput
- ref="captcha"
- provider="recaptcha"
- :form="form"
- language="en"
- />
- </div>
+ <checkbox-input
+ :form="form"
+ name="agree_terms"
+ class="my-3"
+ :required="true"
+ >
+ <template #label>
+ <label for="agree_terms">
+ I agree with the
+ <NuxtLink
+ :to="{ name: 'terms-conditions' }"
+ target="_blank"
+ class="underline"
+ >
+ Terms and conditions
+ </NuxtLink>
+ and
+ <NuxtLink
+ :to="{ name: 'privacy-policy' }"
+ target="_blank"
+ class="underline"
+ >
+ Privacy policy
+ </NuxtLink>
+ of the website and I accept them.
+ </label>
+ </template>
+ </checkbox-input>
- <checkbox-input
- :form="form"
- name="agree_terms"
- class="my-3"
- :required="true"
- >
- <template #label>
- <label for="agree_terms">
- I agree with the
- <NuxtLink
- :to="{ name: 'terms-conditions' }"
- target="_blank"
- class="underline"
- >
- Terms and conditions
- </NuxtLink>
- and
- <NuxtLink
- :to="{ name: 'privacy-policy' }"
- target="_blank"
- class="underline"
- >
- Privacy policy
- </NuxtLink>
- of the website and I accept them.
- </label>
- </template>
- </checkbox-input>
+ <!-- Submit Button -->
+ <UButton
+ class="mt-4"
+ block
+ size="lg"
+ :loading="form.busy"
+ type="submit"
+ label="Create account"
+ />
- <!-- Submit Button -->
- <v-button
- class="w-full mt-4"
- :loading="form.busy"
- >
- Create account
- </v-button>
+ <template v-if="useFeatureFlag('services.google.auth') && !useFeatureFlag('self_hosted')">
+ <p class="text-neutral-500 text-sm text-center my-4">
+ OR
+ </p>
+ <UButton
+ color="neutral"
+ variant="outline"
+ size="lg"
+ class="space-x-4 flex items-center"
+ block
+ :loading="false"
+ @click.prevent="signInwithGoogle"
+ icon="devicon:google"
+ label="Sign in with Google"
+ />
+ </template>
- <template v-if="useFeatureFlag('services.google.auth')">
- <p class="text-gray-500 text-sm text-center my-4">
- OR
- </p>
- <v-button
- native-type="buttom"
- color="white"
- class="space-x-4 flex items-center w-full"
- :loading="false"
- @click.prevent="signInwithGoogle"
- >
- <Icon name="devicon:google" />
- <span class="mx-2">Sign in with Google</span>
- </v-button>
- </template>
+ <p class="text-neutral-500 mt-4 text-sm text-center">
+ Already have an account?
+ <a
+ v-if="isQuick"
+ href="#"
+ class="font-medium ml-1"
+ @click.prevent="$emit('openLogin')"
+ >Log In</a>
+ <NuxtLink
+ v-else
+ :to="{ name: 'login' }"
+ class="font-semibold ml-1"
+ >
+ Log In
+ </NuxtLink>
+ </p>
+ </VForm>
- <p class="text-gray-500 mt-4 text-sm text-center">
- Already have an account?
- <a
- v-if="isQuick"
- href="#"
- class="font-medium ml-1"
- @click.prevent="$emit('openLogin')"
- >Log In</a>
- <NuxtLink
- v-else
- :to="{ name: 'login' }"
- class="font-semibold ml-1"
- >
- Log In
- </NuxtLink>
- </p>
- </form>
- </div>
+ <!-- Google One Tap -->
+ <ClientOnly>
+ <GoogleOneTap context="signup" />
+ </ClientOnly>
</template>
-<script>
+<script setup>
+import GoogleOneTap from "~/components/vendor/GoogleOneTap.vue"
import { WindowMessageTypes } from "~/composables/useWindowMessage"
-export default {
- name: "RegisterForm",
- components: {},
- props: {
- isQuick: {
- type: Boolean,
- required: false,
- default: false,
- },
+// Props
+const props = defineProps({
+ isQuick: {
+ type: Boolean,
+ required: false,
+ default: false,
},
- emits: ['openLogin'],
+})
- setup() {
- const { $utm } = useNuxtApp()
- return {
- authStore: useAuthStore(),
- formsStore: useFormsStore(),
- workspaceStore: useWorkspacesStore(),
- providersStore: useOAuthProvidersStore(),
- runtimeConfig: useRuntimeConfig(),
- logEvent: useAmplitude().logEvent,
- $utm
- }
- },
+// Emits
+defineEmits(['openLogin'])
- data: () => ({
- form: useForm({
- name: "",
- email: "",
- hear_about_us: "",
- password: "",
- password_confirmation: "",
- agree_terms: false,
- appsumo_license: null,
- utm_data: null,
- 'g-recaptcha-response': null
- }),
- disableEmail: false,
- }),
+// Composables
+const { $utm } = useNuxtApp()
+const oAuth = useOAuth()
+const runtimeConfig = useRuntimeConfig()
+const { register: registerMutationFactory } = useAuth()
+const router = useRouter()
+const route = useRoute()
- computed: {
- reCaptchaSiteKey() {
- return this.runtimeConfig.public.reCaptchaSiteKey
- },
- hearAboutUsOptions() {
- const options = [
- {name: "Facebook", value: "facebook"},
- {name: "Twitter", value: "twitter"},
- {name: "Reddit", value: "reddit"},
- {name: "Github", value: "github"},
- {
- name: "Search Engine (Google, DuckDuckGo...)",
- value: "search_engine",
- },
- {name: "Friend or Colleague", value: "friend_colleague"},
- {name: "Blog/Article", value: "blog_article"},
- ]
- .map((value) => ({value, sort: Math.random()}))
- .sort((a, b) => a.sort - b.sort)
- .map(({value}) => value)
- options.push({name: "Other", value: "other"})
- return options
+const registerMutation = registerMutationFactory()
+
+// Reactive data
+const form = useForm({
+ name: "",
+ email: "",
+ hear_about_us: "",
+ password: "",
+ password_confirmation: "",
+ agree_terms: false,
+ appsumo_license: null,
+ utm_data: null,
+ 'g-recaptcha-response': null
+})
+
+const disableEmail = ref(false)
+const captcha = ref(null)
+
+// Computed
+const reCaptchaSiteKey = computed(() => {
+ return runtimeConfig.public.reCaptchaSiteKey
+})
+
+const hearAboutUsOptions = computed(() => {
+ const options = [
+ {name: "Facebook", value: "facebook"},
+ {name: "Twitter", value: "twitter"},
+ {name: "Reddit", value: "reddit"},
+ {name: "Github", value: "github"},
+ {
+ name: "Search Engine (Google, DuckDuckGo...)",
+ value: "search_engine",
},
- },
+ {name: "Friend or Colleague", value: "friend_colleague"},
+ {name: "Blog/Article", value: "blog_article"},
+ ]
+ .map((value) => ({value, sort: Math.random()}))
+ .sort((a, b) => a.sort - b.sort)
+ .map(({value}) => value)
+ options.push({name: "Other", value: "other"})
+ return options
+})
- mounted() {
- // Use the window message composable
- const windowMessage = useWindowMessage(WindowMessageTypes.LOGIN_COMPLETE)
-
- // Listen for login complete messages
- windowMessage.listen(() => {
- this.redirect()
- })
+// Lifecycle
+onMounted(() => {
+ // Use the window message composable
+ const windowMessage = useWindowMessage(WindowMessageTypes.LOGIN_COMPLETE)
+
+ // Listen for login complete messages
+ windowMessage.listen(() => {
+ redirect()
+ })
+
+ // Set appsumo license
+ if (
+ route.query.appsumo_license !== undefined &&
+ route.query.appsumo_license
+ ) {
+ form.appsumo_license = route.query.appsumo_license
+ }
- // Set appsumo license
- if (
- this.$route.query.appsumo_license !== undefined &&
- this.$route.query.appsumo_license
- ) {
- this.form.appsumo_license = this.$route.query.appsumo_license
+ if (route.query?.invite_token) {
+ if (route.query?.email) {
+ form.email = route.query?.email
+ form.hear_about_us = 'invite'
+ disableEmail.value = true
}
+ form.invite_token = route.query?.invite_token
+ }
+})
- if (this.$route.query?.invite_token) {
- if (this.$route.query?.email) {
- this.form.email = this.$route.query?.email
- this.form.hear_about_us = 'invite'
- this.disableEmail = true
- }
- this.form.invite_token = this.$route.query?.invite_token
+// Methods
+const register = () => {
+ form.utm_data = {...$utm.value}
+ $utm.value = null
+
+ form.mutate(registerMutation, {
+ data: {
+ formData: form.data(),
+ source: form.hear_about_us
}
- },
+ }).then(() => {
+ useAlert().success({
+ title: "Welcome to OpnForm 👋",
+ ...!props.isQuick ? {description: "Time to create your first form!"} : {}
+ })
+ redirect()
+ }).catch((err) => {
+ useAlert().error(err.response?._data?.message)
+ }).finally(() => {
+ // Reset captcha after submission
+ if (import.meta.client && reCaptchaSiteKey.value) {
+ captcha.value.reset()
+ }
+ })
+}
- methods: {
- async register() {
- const auth = useAuth()
-
- // Reset captcha after submission
- if (import.meta.client && this.reCaptchaSiteKey) {
- this.$refs.captcha.reset()
- }
+const redirect = () => {
+ if (props.isQuick) {
+ // Use window message instead of event
+ const afterLoginMessage = useWindowMessage(WindowMessageTypes.AFTER_LOGIN)
+ afterLoginMessage.send(window)
+ } else {
+ // If is invite just redirect to home
+ if (form.invite_token) {
+ useAlert().success("You have successfully accepted the invite and joined this workspace.")
+ router.push({name: "home"})
+ } else {
+ router.push({name: "forms-create"})
+ }
+ }
+}
- try {
- this.form.utm_data = this.$utm.value
- await auth.registerUser(this.form)
+const showOAuthError = (error) => {
+ if (error.response?.status === 422 && error.response?.data?.message) {
+ useAlert().error(error.response.data.message)
+ } else {
+ useAlert().error("Sign-in failed. Please try again.")
+ }
+}
- this.redirect()
- } catch (err) {
- useAlert().error(err.response?._data?.message)
- }
- },
- redirect() {
- if (this.isQuick) {
- // Use window message instead of event
- const afterLoginMessage = useWindowMessage(WindowMessageTypes.AFTER_LOGIN)
- afterLoginMessage.send(window)
- } else {
- // If is invite just redirect to home
- if (this.form.invite_token) {
- useAlert().success("You have successfully accepted the invite and joined this workspace.")
- this.$router.push({name: "home"})
- } else {
- this.$router.push({name: "forms-create"})
- }
- }
- },
- signInwithGoogle() {
- this.providersStore.guestConnect('google', true)
- }
- },
+const signInwithGoogle = () => {
+ try {
+ oAuth.guestConnect('google', true)
+ } catch (error) {
+ showOAuthError(error)
+ }
}
</script>
diff --git a/client/components/pages/forms/NewFeatures.vue b/client/components/pages/forms/NewFeatures.vue
deleted file mode 100644
index c4d83fea5..000000000
--- a/client/components/pages/forms/NewFeatures.vue
+++ /dev/null
@@ -1,147 +0,0 @@
-<template>
- <div
- id="new-features"
- class="w-full bg-gray-50 dark:bg-gray-800 border rounded-lg mt-4"
- >
- <div class="border-b">
- <div
- v-track.new_in_notionforms_click
- class="relative flex items-center cursor-pointer hover:bg-gray-100 p-4"
- role="button"
- @click.prevent="showNewFeatures = !showNewFeatures"
- >
- <div class="text-gray-700 dark:text-gray-300 pr-4">
- <svg
- xmlns="http://www.w3.org/2000/svg"
- class="h-6 w-6"
- fill="none"
- viewBox="0 0 24 24"
- stroke="currentColor"
- stroke-width="2"
- >
- <path
- stroke-linecap="round"
- stroke-linejoin="round"
- d="M19 20H5a2 2 0 01-2-2V6a2 2 0 012-2h10a2 2 0 012 2v1m2 13a2 2 0 01-2-2V7m2 13a2 2 0 002-2V9a2 2 0 00-2-2h-2m-4-3H9M7 16h6M7 8h6v4H7V8z"
- />
- </svg>
- </div>
- <div>
- <p class="text-gray-700 dark:text-gray-300 font-semibold">
- New in OpnForm
- </p>
- <p class="text-sm text-gray-700 dark:text-gray-300">
- Click here to see our new features
- </p>
- </div>
- </div>
- <v-transition>
- <ul
- v-if="showNewFeatures"
- class="list-disc list-inside border-t pt-2 p-4"
- >
- <li
- v-for="changelog in changelogEntries"
- :key="changelog.id"
- v-track.new_feature_click
- class="text-sm"
- >
- <a
- :href="changelog.url"
- target="_blank"
- class="text-gray-700 dark:text-gray-300"
- >{{ changelog.title }}</a>
- </li>
- <li
- v-track.new_feature_read_more_click
- class="text-sm"
- >
- <a
- class="text-gray-700 dark:text-gray-300"
- :href="changelogLink"
- target="_blank"
- >Read more</a>
- </li>
- </ul>
- </v-transition>
- </div>
- <div
- class="relative flex items-center cursor-pointer hover:bg-gray-100 p-4"
- >
- <a
- v-track.feature_request_click="{ user_has_forms: user.has_forms }"
- :href="requestFeatureLink"
- class="absolute inset-0"
- target="_blank"
- />
- <div class="text-gray-700 dark:text-gray-300 pr-4">
- <svg
- xmlns="http://www.w3.org/2000/svg"
- class="h-6 w-6"
- fill="none"
- viewBox="0 0 24 24"
- stroke="currentColor"
- stroke-width="2"
- >
- <path
- stroke-linecap="round"
- stroke-linejoin="round"
- d="M9.663 17h4.673M12 3v1m6.364 1.636l-.707.707M21 12h-1M4 12H3m3.343-5.657l-.707-.707m2.828 9.9a5 5 0 117.072 0l-.548.547A3.374 3.374 0 0014 18.469V19a2 2 0 11-4 0v-.531c0-.895-.356-1.754-.988-2.386l-.548-.547z"
- />
- </svg>
- </div>
- <div>
- <p class="text-gray-700 dark:text-gray-300 font-semibold">
- An idea for a new feature?
- </p>
- <p class="text-sm text-gray-700 dark:text-gray-300">
- Click here to request a new feature
- </p>
- </div>
- </div>
- </div>
-</template>
-
-<script>
-import { computed } from "vue"
-import { useAuthStore } from "../../../stores/auth"
-import VTransition from "~/components/global/transitions/VTransition.vue"
-
-export default {
- components: { VTransition },
- props: {},
-
- setup() {
- const authStore = useAuthStore()
- return {
- user: computed(() => authStore.user),
- }
- },
-
- data: () => ({
- changelogEntries: [],
- showNewFeatures: false,
- }),
-
- computed: {
- requestFeatureLink() {
- return this.$config.links.feature_requests
- },
- changelogLink() {
- return this.$config.links.changelog_url
- },
- },
-
- mounted() {
- this.loadChangelogEntries()
- },
-
- methods: {
- loadChangelogEntries() {
- opnFetch("/content/changelog/entries").then((data) => {
- this.changelogEntries = data.splice(0, 3)
- })
- },
- },
-}
-</script>
diff --git a/client/components/pages/forms/create/CreateFormBaseModal.vue b/client/components/pages/forms/create/CreateFormBaseModal.vue
index 7bd15e8a2..dd8df47ea 100644
--- a/client/components/pages/forms/create/CreateFormBaseModal.vue
+++ b/client/components/pages/forms/create/CreateFormBaseModal.vue
@@ -1,247 +1,178 @@
<template>
- <Modal
- :show="show"
- :closeable="!aiForm.busy"
- @close="$emit('close')"
+ <UModal
+ v-model:open="isOpen"
+ :ui="{ content: state === 'default' ? 'sm:max-w-3xl' : 'sm:max-w-2xl' }"
+ :title="state === 'default' ? 'Choose a base for your form' : 'AI-powered form generator'"
+ :dismissible="!aiForm.busy"
>
- <template #icon>
- <template v-if="state == 'default'">
- <svg
- xmlns="http://www.w3.org/2000/svg"
- viewBox="0 0 24 24"
- fill="currentColor"
- class="w-10 h-10 text-blue"
- >
- <path
- fill-rule="evenodd"
- d="M12 3.75a.75.75 0 01.75.75v6.75h6.75a.75.75 0 010 1.5h-6.75v6.75a.75.75 0 01-1.5 0v-6.75H4.5a.75.75 0 010-1.5h6.75V4.5a.75.75 0 01.75-.75z"
- clip-rule="evenodd"
- />
- </svg>
- </template>
- <template v-else-if="state == 'ai'">
- <svg
- xmlns="http://www.w3.org/2000/svg"
- viewBox="0 0 24 24"
- fill="currentColor"
- class="w-8 h-8 text-blue-500"
- >
- <path
- fill-rule="evenodd"
- d="M14.615 1.595a.75.75 0 01.359.852L12.982 9.75h7.268a.75.75 0 01.548 1.262l-10.5 11.25a.75.75 0 01-1.272-.71l1.992-7.302H3.75a.75.75 0 01-.548-1.262l10.5-11.25a.75.75 0 01.913-.143z"
- clip-rule="evenodd"
- />
- </svg>
- </template>
- </template>
- <template #title>
- <template v-if="state == 'default'">
- Choose a base for your form
- </template>
- <template v-else-if="state == 'ai'">
- AI-powered form generator
- </template>
- </template>
- <div
- v-if="state == 'default'"
- class="grid grid-cols-1 sm:grid-cols-2 gap-4"
- >
+ <template #body>
<div
- v-track.select_form_base="{ base: 'contact-form' }"
- role="button"
- class="rounded-md border p-4 flex flex-col items-center cursor-pointer hover:bg-gray-50"
- @click="$emit('close')"
+ v-if="state === 'default'"
+ class="grid grid-cols-1 sm:grid-cols-3 gap-4"
>
- <div class="p-4">
- <svg
- xmlns="http://www.w3.org/2000/svg"
- viewBox="0 0 24 24"
- fill="currentColor"
- class="w-8 h-8 text-blue-500"
- >
- <path
- d="M1.5 8.67v8.58a3 3 0 003 3h15a3 3 0 003-3V8.67l-8.928 5.493a3 3 0 01-3.144 0L1.5 8.67z"
- />
- <path
- d="M22.5 6.908V6.75a3 3 0 00-3-3h-15a3 3 0 00-3 3v.158l9.714 5.978a1.5 1.5 0 001.572 0L22.5 6.908z"
+ <div
+ v-track.select_form_base="{ base: 'contact-form' }"
+ role="button"
+ class="rounded-md border p-6 flex flex-col items-center cursor-pointer hover:bg-neutral-50"
+ @click="$emit('close')"
+ >
+ <div class="p-4">
+ <UIcon
+ name="i-heroicons-envelope"
+ class="w-8 h-8 text-blue-500"
/>
- </svg>
+ </div>
+ <p class="font-medium">
+ Simple contact form
+ </p>
</div>
- <p class="font-medium">
- Start from a simple contact form
- </p>
- </div>
- <div
- v-if="useFeatureFlag('ai_features')"
- v-track.select_form_base="{ base: 'ai' }"
- class="rounded-md border p-4 flex flex-col items-center cursor-pointer hover:bg-gray-50"
- role="button"
- @click="state = 'ai'"
- >
- <div class="p-4 relative">
- <svg
- xmlns="http://www.w3.org/2000/svg"
- viewBox="0 0 24 24"
- fill="currentColor"
- class="w-8 h-8 text-blue-500"
- >
- <path
- fill-rule="evenodd"
- d="M14.615 1.595a.75.75 0 01.359.852L12.982 9.75h7.268a.75.75 0 01.548 1.262l-10.5 11.25a.75.75 0 01-1.272-.71l1.992-7.302H3.75a.75.75 0 01-.548-1.262l10.5-11.25a.75.75 0 01.913-.143z"
- clip-rule="evenodd"
+ <div
+ v-if="useFeatureFlag('ai_features')"
+ v-track.select_form_base="{ base: 'ai' }"
+ class="rounded-md border p-6 flex flex-col items-center cursor-pointer hover:bg-neutral-50"
+ role="button"
+ @click="state = 'ai'"
+ >
+ <div class="p-4">
+ <UIcon
+ name="i-heroicons-bolt"
+ class="w-8 h-8 text-blue-500"
/>
- </svg>
+ </div>
+ <p class="font-medium text-blue-700">
+ AI Form Generator
+ </p>
</div>
- <p class="font-medium text-blue-700">
- Use our AI to create the form
- </p>
- <span class="text-xs text-gray-500">(1 min)</span>
- </div>
- <div
- class="rounded-md border p-4 flex flex-col items-center cursor-pointer hover:bg-gray-50 relative"
- >
- <div class="p-4 relative">
- <svg
- xmlns="http://www.w3.org/2000/svg"
- viewBox="0 0 24 24"
- fill="currentColor"
- class="w-8 h-8 text-blue-500"
- >
- <path
- d="M11.25 5.337c0-.355-.186-.676-.401-.959a1.647 1.647 0 01-.349-1.003c0-1.036 1.007-1.875 2.25-1.875S15 2.34 15 3.375c0 .369-.128.713-.349 1.003-.215.283-.401.604-.401.959 0 .332.278.598.61.578 1.91-.114 3.79-.342 5.632-.676a.75.75 0 01.878.645 49.17 49.17 0 01.376 5.452.657.657 0 01-.66.664c-.354 0-.675-.186-.958-.401a1.647 1.647 0 00-1.003-.349c-1.035 0-1.875 1.007-1.875 2.25s.84 2.25 1.875 2.25c.369 0 .713-.128 1.003-.349.283-.215.604-.401.959-.401.31 0 .557.262.534.571a48.774 48.774 0 01-.595 4.845.75.75 0 01-.61.61c-1.82.317-3.673.533-5.555.642a.58.58 0 01-.611-.581c0-.355.186-.676.401-.959.221-.29.349-.634.349-1.003 0-1.035-1.007-1.875-2.25-1.875s-2.25.84-2.25 1.875c0 .369.128.713.349 1.003.215.283.401.604.401.959a.641.641 0 01-.658.643 49.118 49.118 0 01-4.708-.36.75.75 0 01-.645-.878c.293-1.614.504-3.257.629-4.924A.53.53 0 005.337 15c-.355 0-.676.186-.959.401-.29.221-.634.349-1.003.349-1.036 0-1.875-1.007-1.875-2.25s.84-2.25 1.875-2.25c.369 0 .713.128 1.003.349.283.215.604.401.959.401a.656.656 0 00.659-.663 47.703 47.703 0 00-.31-4.82.75.75 0 01.83-.832c1.343.155 2.703.254 4.077.294a.64.64 0 00.657-.642z"
+ <div
+ class="rounded-md border p-6 flex flex-col items-center cursor-pointer hover:bg-neutral-50 relative"
+ >
+ <div class="p-4">
+ <UIcon
+ name="i-heroicons-squares-2x2"
+ class="w-8 h-8 text-blue-500"
/>
- </svg>
+ </div>
+ <p class="font-medium">
+ Browse templates <Icon name="heroicons:arrow-top-right-on-square-20-solid" class="w-3 h-3 text-neutral-500" />
+ </p>
+ <NuxtLink
+ v-track.select_form_base="{ base: 'template' }"
+ :to="{ name: 'templates' }"
+ class="absolute inset-0"
+ />
</div>
- <p class="font-medium">
- Start from a template
- </p>
- <NuxtLink
- v-track.select_form_base="{ base: 'template' }"
- :to="{ name: 'templates' }"
- class="absolute inset-0"
- />
</div>
- </div>
- <div v-else-if="state == 'ai'">
- <a
- class="absolute top-4 left-4"
- href="#"
- role="button"
- @click.prevent="state = 'default'"
- >
- <svg
- xmlns="http://www.w3.org/2000/svg"
- viewBox="0 0 24 24"
- fill="currentColor"
- class="w-4 h-4 inline -mt-1"
+ <div v-else-if="state === 'ai'">
+ <text-area-input
+ label="Form Description"
+ :disabled="loading ? true : null"
+ :form="aiForm"
+ name="form_prompt"
+ help="Give us a description of the form you want to build (the more details the better)"
+ placeholder="A simple contact form, with a name, email and message field"
+ />
+ <UButton
+ class="mt-4"
+ block
+ :loading="loading"
+ @click="generateForm"
+ label="Generate a form"
+ />
+ <p class="text-neutral-500 text-xs text-center mt-1">
+ ~30 sec
+ </p>
+ <div
+ v-if="loading"
+ class="my-4"
>
- <path
- fill-rule="evenodd"
- d="M7.72 12.53a.75.75 0 010-1.06l7.5-7.5a.75.75 0 111.06 1.06L9.31 12l6.97 6.97a.75.75 0 11-1.06 1.06l-7.5-7.5z"
- clip-rule="evenodd"
+ <AIFormLoadingMessages />
+ </div>
+ <div class="flex gap-2 mt-4">
+ <UButton
+ variant="ghost"
+ color="neutral"
+ icon="i-heroicons-arrow-left"
+ @click="state = 'default'"
+ label="Back to form types"
/>
- </svg>
- Back
- </a>
- <text-area-input
- label="Form Description"
- :disabled="loading ? true : null"
- :form="aiForm"
- name="form_prompt"
- help="Give us a description of the form you want to build (the more details the better)"
- placeholder="A simple contact form, with a name, email and message field"
- />
- <div
- v-if="loading"
- class="my-4"
- >
- <AIFormLoadingMessages />
+ </div>
</div>
- <v-button
- class="w-full mt-4"
- :loading="loading"
- @click.prevent="generateForm"
- >
- Generate a form
- </v-button>
- <p class="text-gray-500 text-xs text-center mt-1">
- ~60 sec
- </p>
- </div>
- </Modal>
+ </template>
+ </UModal>
</template>
-<script>
+<script setup>
import AIFormLoadingMessages from "~/components/open/forms/components/AIFormLoadingMessages.vue"
+import { formsApi } from "~/api/forms"
-export default {
- components: {
- AIFormLoadingMessages,
- },
- props: {
- show: { type: Boolean, required: true },
+const props = defineProps({
+ show: { type: Boolean, required: true },
+})
+
+const emit = defineEmits(["close", "form-generated"])
+
+// Modal state
+const isOpen = computed({
+ get() {
+ return props.show
},
- emits: ["close", "form-generated"],
- setup() {
- return {
- useAlert: useAlert(),
- runtimeConfig: useRuntimeConfig(),
+ set(value) {
+ if (!value) {
+ emit("close")
}
- },
- data: () => ({
- state: "default",
- aiForm: useForm({
- form_prompt: "",
- }),
- loading: false,
- }),
+ }
+})
- methods: {
- generateForm() {
- if (this.loading) return
+const state = ref("default")
+const aiForm = useForm({
+ form_prompt: "",
+})
+const loading = ref(false)
- this.loading = true
- this.aiForm
- .post("/forms/ai/generate")
- .then((response) => {
- this.useAlert.success(response.message)
- this.fetchGeneratedForm(response.ai_form_completion_id)
- })
- .catch((error) => {
- console.error(error)
- this.loading = false
- this.state = "ai"
- })
- },
- fetchGeneratedForm(generationId) {
- // check every 4 seconds if form is generated
- setTimeout(() => {
- opnFetch("/forms/ai/" + generationId)
- .then((data) => {
- if (data.ai_form_completion.status === "completed") {
- this.useAlert.success(data.message)
- this.$emit(
- "form-generated",
- JSON.parse(data.ai_form_completion.result),
- )
- this.$emit("close")
- } else if (data.ai_form_completion.status === "failed") {
- this.useAlert.error("Something went wrong, please try again.")
- this.state = "default"
- this.loading = false
- } else {
- this.fetchGeneratedForm(generationId)
- }
- })
- .catch((error) => {
- if (error?.data?.message) {
- this.useAlert.error(error.data.message)
- }
- this.state = "default"
- this.loading = false
- })
- }, 4000)
- },
- },
+const generateForm = () => {
+ if (loading.value) return
+
+ loading.value = true
+ aiForm
+ .post("/forms/ai/generate")
+ .then((response) => {
+ useAlert().success(response.message)
+ fetchGeneratedForm(response.ai_form_completion_id)
+ })
+ .catch((error) => {
+ console.error(error)
+ loading.value = false
+ state.value = "ai"
+ })
+}
+
+const fetchGeneratedForm = (generationId) => {
+ // check every 4 seconds if form is generated
+ setTimeout(() => {
+ formsApi.ai.get(generationId)
+ .then((data) => {
+ if (data.ai_form_completion.status === "completed") {
+ useAlert().success(data.message)
+ emit(
+ "form-generated",
+ JSON.parse(data.ai_form_completion.result),
+ )
+ emit("close")
+ } else if (data.ai_form_completion.status === "failed") {
+ useAlert().error("Something went wrong, please try again.")
+ state.value = "default"
+ loading.value = false
+ } else {
+ fetchGeneratedForm(generationId)
+ }
+ })
+ .catch((error) => {
+ if (error?.data?.message) {
+ useAlert().error(error.data.message)
+ }
+ state.value = "default"
+ loading.value = false
+ })
+ }, 4000)
}
</script>
diff --git a/client/components/pages/forms/show/AdvancedFormUrlSettingsPopover.vue b/client/components/pages/forms/show/AdvancedFormUrlSettingsPopover.vue
new file mode 100644
index 000000000..2008a470b
--- /dev/null
+++ b/client/components/pages/forms/show/AdvancedFormUrlSettingsPopover.vue
@@ -0,0 +1,62 @@
+<template>
+ <UPopover arrow :content="{ align: 'end' }">
+ <TrackClick
+ name="advanced_form_url_settings_click"
+ :properties="{form_id: form.id}"
+ >
+ <UButton
+ variant="ghost"
+ color="neutral"
+ icon="i-heroicons-cog-6-tooth"
+ >
+ </UButton>
+ </TrackClick>
+
+ <template #content>
+ <div class="p-4 w-80">
+ <h3 class="font-semibold text-medium">
+ Advanced Settings
+ </h3>
+ <p class="text-sm text-neutral-600">Configure advanced sharing options for your form.</p>
+
+ <div class="space-y-4">
+ <toggle-switch-input
+ :model-value="modelValue.auto_submit"
+ name="auto_submit"
+ label="Auto Submit Form"
+ help="Submits immediately after opening URL"
+ @update:model-value="onChangeAutoSubmit"
+ />
+ </div>
+ </div>
+ </template>
+ </UPopover>
+</template>
+
+<script>
+import TrackClick from '~/components/global/TrackClick.vue'
+
+export default {
+ name: "AdvancedFormUrlSettingsPopover",
+ components: { TrackClick },
+ props: {
+ form: {
+ type: Object,
+ required: true,
+ },
+ modelValue: {
+ type: Object,
+ required: true,
+ },
+ },
+
+ emits: ['update:modelValue'],
+
+ methods: {
+ onChangeAutoSubmit(val) {
+ const updatedValue = { ...this.modelValue, auto_submit: val }
+ this.$emit('update:modelValue', updatedValue)
+ },
+ },
+}
+</script>
\ No newline at end of file
diff --git a/client/components/pages/forms/show/EmbedCode.vue b/client/components/pages/forms/show/EmbedCode.vue
index 83bf47ea9..10e00545d 100644
--- a/client/components/pages/forms/show/EmbedCode.vue
+++ b/client/components/pages/forms/show/EmbedCode.vue
@@ -1,32 +1,10 @@
<template>
- <div>
- <h3 class="font-semibold text-xl">
- Embed
- </h3>
- <p>Embed your form on your website by copying the HTML code below.</p>
<copy-content
:content="embedCode"
- button-text="Copy Code"
- >
- <template #icon>
- <svg
- class="h-4 w-4 -mt-1 text-blue-600 inline mr-1"
- viewBox="0 0 18 18"
- fill="none"
- xmlns="http://www.w3.org/2000/svg"
- >
- <path
- d="M11.0833 11.5L13.5833 9L11.0833 6.5M6.91667 6.5L4.41667 9L6.91667 11.5M5.5 16.5H12.5C13.9001 16.5 14.6002 16.5 15.135 16.2275C15.6054 15.9878 15.9878 15.6054 16.2275 15.135C16.5 14.6002 16.5 13.9001 16.5 12.5V5.5C16.5 4.09987 16.5 3.3998 16.2275 2.86502C15.9878 2.39462 15.6054 2.01217 15.135 1.77248C14.6002 1.5 13.9001 1.5 12.5 1.5H5.5C4.09987 1.5 3.3998 1.5 2.86502 1.77248C2.39462 2.01217 2.01217 2.39462 1.77248 2.86502C1.5 3.3998 1.5 4.09987 1.5 5.5V12.5C1.5 13.9001 1.5 14.6002 1.77248 15.135C2.01217 15.6054 2.39462 15.9878 2.86502 16.2275C3.3998 16.5 4.09987 16.5 5.5 16.5Z"
- stroke="currentColor"
- stroke-width="1.66667"
- stroke-linecap="round"
- stroke-linejoin="round"
- />
- </svg>
- </template>
- Copy Code
- </copy-content>
- </div>
+ label="Copy Code"
+ tracking-event="embed_code_copy_click"
+ :tracking-properties="{form_id: form.id, form_slug: form.slug}"
+ />
</template>
<script>
diff --git a/client/components/pages/forms/show/EmbedFormAsPopupModal.vue b/client/components/pages/forms/show/EmbedFormAsPopupModal.vue
index f9641372b..ff65993ea 100644
--- a/client/components/pages/forms/show/EmbedFormAsPopupModal.vue
+++ b/client/components/pages/forms/show/EmbedFormAsPopupModal.vue
@@ -1,56 +1,32 @@
<template>
<div>
- <v-button
- v-track.share_embed_form_popup_click="{
+ <TrackClick
+ name="share_embed_form_popup_click"
+ :properties="{
form_id: form.id,
form_slug: form.slug,
}"
- class="w-full"
- color="light-gray"
- @click="showEmbedFormAsPopupModal = true"
>
- <svg
- xmlns="http://www.w3.org/2000/svg"
- class="h-6 w-6 mr-2 text-blue-600 inline"
- fill="none"
- viewBox="0 0 24 24"
- stroke-width="1.5"
- stroke="currentColor"
+ <UButton
+ variant="outline"
+ color="neutral"
+ icon="i-heroicons-chat-bubble-bottom-center-text"
+ @click="showEmbedFormAsPopupModal = true"
>
- <path
- stroke-linecap="round"
- stroke-linejoin="round"
- d="M2.25 12.76c0 1.6 1.123 2.994 2.707 3.227 1.068.157 2.148.279 3.238.364.466.037.893.281 1.153.671L12 21l2.652-3.978c.26-.39.687-.634 1.153-.67 1.09-.086 2.17-.208 3.238-.365 1.584-.233 2.707-1.626 2.707-3.228V6.741c0-1.602-1.123-2.995-2.707-3.228A48.394 48.394 0 0012 3c-2.392 0-4.744.175-7.043.513C3.373 3.746 2.25 5.14 2.25 6.741v6.018z"
- />
- </svg>
- Embed as popup
- </v-button>
+ Embed as popup
+ </UButton>
+ </TrackClick>
- <modal
- :show="showEmbedFormAsPopupModal"
- @close="onClose"
+ <UModal
+ v-model:open="isModalOpen"
+ :ui="{ content: 'sm:max-w-2xl' }"
+ title="Add the popup to your website"
+ :content="{
+ onPointerDownOutside: (event) => { if (event.target?.closest('.nf-main')) {return event.preventDefault()}}
+ }"
>
- <template #icon>
- <svg
- xmlns="http://www.w3.org/2000/svg"
- class="w-10 h-10 text-blue"
- fill="none"
- viewBox="0 0 24 24"
- stroke="currentColor"
- >
- <path
- stroke-linecap="round"
- stroke-linejoin="round"
- d="M2.25 12.76c0 1.6 1.123 2.994 2.707 3.227 1.068.157 2.148.279 3.238.364.466.037.893.281 1.153.671L12 21l2.652-3.978c.26-.39.687-.634 1.153-.67 1.09-.086 2.17-.208 3.238-.365 1.584-.233 2.707-1.626 2.707-3.228V6.741c0-1.602-1.123-2.995-2.707-3.228A48.394 48.394 0 0012 3c-2.392 0-4.744.175-7.043.513C3.373 3.746 2.25 5.14 2.25 6.741v6.018z"
- />
- </svg>
- </template>
- <template #title>
- <span>Add the popup to your website</span>
- </template>
-
- <div class="p-4">
- <h3 class="border-t text-xl font-semibold mb-2 pt-6">
+ <template #body>
+ <h3 class="text-xl font-semibold mb-2">
Demo
</h3>
<p class="pb-6">
@@ -67,96 +43,68 @@
your website.
</p>
- <div
- class="border border-nt-blue-light bg-blue-50 dark:bg-notion-dark-light rounded-md p-4 mb-5 w-full mx-auto mt-4 select-all"
- >
+ <div class="border border-blue-300 bg-blue-50 dark:bg-notion-dark-light rounded-md p-4 mb-5 w-full mx-auto mt-4 select-all">
<div class="flex items-center">
- <p class="select-all text-nt-blue flex-grow break-all">
+ <p class="select-all text-blue-500 flex-grow break-all">
{{ embedPopupCode }}
</p>
<div
- class="hover:bg-nt-blue-lighter rounded transition-colors cursor-pointer"
+ class="hover:bg-blue-100 rounded-sm transition-colors cursor-pointer"
@click="copyToClipboard"
>
- <svg
- xmlns="http://www.w3.org/2000/svg"
- class="h-6 w-6 text-nt-blue"
- fill="none"
- viewBox="0 0 24 24"
- stroke="currentColor"
- >
- <path
- stroke-linecap="round"
- stroke-linejoin="round"
- stroke-width="2"
- d="M8 5H6a2 2 0 00-2 2v12a2 2 0 002 2h10a2 2 0 002-2v-1M8 5a2 2 0 002 2h2a2 2 0 002-2M8 5a2 2 0 012-2h2a2 2 0 012 2m0 0h2a2 2 0 012 2v3m2 4H10m0 0l3-3m-3 3l3 3"
+ <Icon
+ name="heroicons:clipboard-document"
+ class="h-6 w-6 text-blue-500"
/>
- </svg>
</div>
</div>
</div>
- <collapse
- class="py-5 w-full border rounded-md px-4"
- :model-value="true"
- >
- <template #title>
- <div class="flex">
- <h3 class="font-semibold block text-lg">
- Advanced options
- </h3>
- </div>
- </template>
- <div class="border-t mt-4 -mx-4" />
- <color-input
+ <div class="border-t my-4" />
+ <VForm size="sm">
+ <h3 class="text-xl font-semibold mb-2">
+ Customization
+ </h3>
+
+ <ColorInput
v-model="advancedOptions.bgcolor"
name="bgcolor"
- class="mt-4"
label="Circle Background Color"
/>
- <text-input
+ <TextInput
v-model="advancedOptions.emoji"
name="emoji"
- class="mt-4"
+ class="mt-4 max-w-xs"
label="Emoji"
:max-char-limit="2"
/>
- <flat-select-input
+ <FlatSelectInput
v-model="advancedOptions.position"
name="position"
- class="mt-4"
+ class="mt-4 max-w-xs"
label="Position"
:options="[
{ name: 'Bottom Right', value: 'right' },
{ name: 'Bottom Left', value: 'left' },
]"
/>
- <text-input
+ <TextInput
v-model="advancedOptions.width"
name="width"
- class="mt-4"
+ class="mt-4 max-w-xs"
label="Form pop max width (px)"
native-type="number"
/>
- </collapse>
-
- <div class="flex justify-end mt-4">
- <v-button
- color="gray"
- shade="light"
- @click="onClose"
- >
- Close
- </v-button>
- </div>
- </div>
- </modal>
+ </VForm>
+ </template>
+ </UModal>
</div>
</template>
<script setup>
import { ref, defineProps, computed } from "vue"
import { appUrl } from "~/lib/utils.js"
+import TrackClick from "~/components/global/TrackClick.vue"
const { copy } = useClipboard()
const crisp = useCrisp()
@@ -166,6 +114,19 @@ const props = defineProps({
const embedScriptUrl = "/widgets/embed-min.js"
const showEmbedFormAsPopupModal = ref(false)
+
+// Modal state
+const isModalOpen = computed({
+ get() {
+ return showEmbedFormAsPopupModal.value
+ },
+ set(value) {
+ if (!value) {
+ onClose()
+ }
+ }
+})
+
const advancedOptions = ref({
emoji: "💬",
position: "right",
diff --git a/client/components/pages/forms/show/ExtraMenu.vue b/client/components/pages/forms/show/ExtraMenu.vue
index 403a709f3..ac22d9df2 100644
--- a/client/components/pages/forms/show/ExtraMenu.vue
+++ b/client/components/pages/forms/show/ExtraMenu.vue
@@ -1,72 +1,54 @@
<template>
<div v-if="form">
- <div
- v-if="loadingDuplicate || loadingDelete"
- class="pr-4 pt-2"
- >
- <Loader class="h-6 w-6 mx-auto" />
- </div>
- <UDropdown
- v-else
+ <UDropdownMenu
+ class="z-50"
+ arrow
:items="items"
+ :content="content"
+ :modal="false"
+ :portal="portal"
>
+ <slot :loading="deleteFormMutation.isPending.value || duplicateFormMutation.isPending.value">
<UButton
- color="white"
+ color="neutral"
+ variant="outline"
icon="i-heroicons-ellipsis-horizontal"
size="md"
+ :loading="deleteFormMutation.isPending.value || duplicateFormMutation.isPending.value"
/>
- </UDropdown>
+ </slot>
+ </UDropdownMenu>
<!-- Delete Form Modal -->
- <modal
- :show="showDeleteFormModal"
- icon-color="red"
- max-width="sm"
- @close="showDeleteFormModal = false"
+ <UModal
+ v-model:open="showDeleteFormModal"
+ :ui="{ content: 'sm:max-w-sm' }"
+ title="Delete form"
>
- <template #icon>
- <svg
- class="w-10 h-10"
- xmlns="http://www.w3.org/2000/svg"
- fill="none"
- viewBox="0 0 24 24"
- stroke="currentColor"
- >
- <path
- stroke-linecap="round"
- stroke-linejoin="round"
- stroke-width="2"
- d="M19 7l-.867 12.142A2 2 0 0116.138 21H7.862a2 2 0 01-1.995-1.858L5 7m5 4v6m4-6v6m1-10V4a1 1 0 00-1-1h-4a1 1 0 00-1 1v3M4 7h16"
- />
- </svg>
- </template>
- <template #title>
- Delete form
- </template>
- <div class="p-3">
+ <template #body>
<p>
If you want to permanently delete this form and all of its data, you
can do so below.
</p>
- <div class="flex mt-4">
- <v-button
- class="sm:w-1/2 mr-4"
- color="white"
- @click.prevent="showDeleteFormModal = false"
- >
- Cancel
- </v-button>
- <v-button
- class="sm:w-1/2"
- color="red"
- :loading="loadingDelete"
- @click.prevent="deleteForm"
- >
- Yes, delete it
- </v-button>
+ </template>
+
+ <template #footer>
+ <div class="flex justify-between gap-3 w-full">
+ <UButton
+ color="neutral"
+ variant="outline"
+ @click="showDeleteFormModal = false"
+ label="Cancel"
+ />
+ <UButton
+ color="error"
+ :loading="deleteFormMutation.isPending.value"
+ @click="deleteForm"
+ label="Yes, delete it"
+ />
</div>
- </div>
- </modal>
+ </template>
+ </UModal>
<form-template-modal
v-if="!isMainPage && user"
:form="form"
@@ -93,27 +75,33 @@ const router = useRouter()
const props = defineProps({
form: { type: Object, required: true },
isMainPage: { type: Boolean, required: false, default: false },
+ content: {
+ type: Object,
+ required: false,
+ default: () => ({side: 'bottom', align: 'end'})
+ },
+ portal: { type: [Boolean, String], required: false, default: false }
})
-const authStore = useAuthStore()
-const formsStore = useFormsStore()
-const formEndpoint = "/open/forms/{id}"
-const user = computed(() => authStore.user)
-const workspace = computed(() => useWorkspacesStore().getCurrent)
+const { data: user } = useAuth().user()
+const { current: workspace } = useCurrentWorkspace()
+
+const { remove, duplicate } = useForms()
-const loadingDuplicate = ref(false)
-const loadingDelete = ref(false)
const showDeleteFormModal = ref(false)
const showFormTemplateModal = ref(false)
const showFormWorkspaceModal = ref(false)
+const deleteFormMutation = remove()
+const duplicateFormMutation = duplicate()
+
const items = computed(() => {
return [
[
...props.isMainPage ? [{
- label: 'View form',
- icon: 'i-heroicons-eye-16-solid',
- click: () => {
+ label: 'Open form',
+ icon: 'i-heroicons-arrow-top-right-on-square',
+ onClick: () => {
if (props.isMainPage && props.form.visibility === 'draft') {
showDraftFormWarningNotification()
} else {
@@ -121,15 +109,13 @@ const items = computed(() => {
}
}
}] : [],
- ...props.isMainPage ? [{
+ {
label: 'Copy link to share',
icon: 'i-heroicons-clipboard-document-check-20-solid',
- click: () => {
- copyLink()
- }
- }] : []
+ onClick: copyLink
+ }
],
- ...workspace.value.is_readonly ? [] : [
+ ...workspace.value?.is_readonly ? [] : [
[
...props.isMainPage ? [{
label: 'Edit',
@@ -139,22 +125,21 @@ const items = computed(() => {
{
label: 'Duplicate form',
icon: 'i-heroicons-document-duplicate-20-solid',
- click: () => {
- duplicateForm()
- }
+ onClick: duplicateForm
+
}],
[
...props.isMainPage ? [] : [{
label: 'Create Template',
icon: 'i-heroicons-document-plus-20-solid',
- click: () => {
+ onClick: () => {
showFormTemplateModal.value = true
}
}],
{
label: 'Change workspace',
icon: 'i-heroicons-building-office-2-20-solid',
- click: () => {
+ onClick: () => {
showFormWorkspaceModal.value = true
}
},
@@ -162,7 +147,7 @@ const items = computed(() => {
{
label: 'Delete form',
icon: 'i-heroicons-trash-20-solid',
- click: () => {
+ onClick: () => {
showDeleteFormModal.value = true
},
class: 'text-red-800 hover:bg-red-50 hover:text-red-600 group',
@@ -177,40 +162,27 @@ const copyLink = () => {
copy(props.form.share_url)
useAlert().success("Copied!")
}
+
const duplicateForm = () => {
- if (loadingDuplicate.value) return
- loadingDuplicate.value = true
- opnFetch(formEndpoint.replace("{id}", props.form.id) + "/duplicate", {
- method: "POST",
- })
- .then((data) => {
- formsStore.save(data.new_form)
- router.push({
- name: "forms-slug-show",
- params: { slug: data.new_form.slug },
- })
- useAlert().success(data.message)
- loadingDuplicate.value = false
- })
- .catch((error) => {
- useAlert().error(error.data.message)
- loadingDuplicate.value = false
+ duplicateFormMutation.mutateAsync(props.form.id).then((data) => {
+ router.push({
+ name: "forms-slug-show",
+ params: { slug: data.new_form.slug },
})
+ useAlert().success(data.message)
+ }).catch((error) => {
+ useAlert().error(error.data?.message || "Failed to duplicate form")
+ })
}
+
const deleteForm = () => {
- if (loadingDelete.value) return
- loadingDelete.value = true
- opnFetch(formEndpoint.replace("{id}", props.form.id), { method: "DELETE" })
- .then((data) => {
- formsStore.remove(props.form)
- router.push({ name: "home" })
- useAlert().success(data.message)
- loadingDelete.value = false
- })
- .catch((error) => {
- useAlert().error(error.data.message)
- loadingDelete.value = false
- })
+ deleteFormMutation.mutateAsync(props.form.id).then((data) => {
+ useAlert().success(data.message)
+ showDeleteFormModal.value = false
+ router.push({ name: "home" })
+ }).catch((error) => {
+ useAlert().error(error.data?.message || "Failed to delete form")
+ })
}
const showDraftFormWarningNotification = () => {
diff --git a/client/components/pages/forms/show/FormCleanings.vue b/client/components/pages/forms/show/FormCleanings.vue
index ca18df796..075b8db29 100644
--- a/client/components/pages/forms/show/FormCleanings.vue
+++ b/client/components/pages/forms/show/FormCleanings.vue
@@ -1,14 +1,14 @@
<template>
<VTransition>
<section
- v-if="hasCleanings && !hideWarning"
+ v-if="shouldShowWarning"
class="flex gap-3 p-4 bg-blue-50 dark:bg-blue-950 rounded-lg border border-blue-300 border-solid max-md:flex-wrap mb-2"
aria-labelledby="notification-title"
>
<div class="flex justify-center items-center self-start py-px">
<Icon
name="i-heroicons-sparkles-16-solid"
- class="w-6 h-6 text-nt-blue"
+ class="w-6 h-6 text-blue-500"
/>
</div>
<div class="flex flex-col flex-1 max-md:max-w-full">
@@ -29,22 +29,26 @@
/>
</div>
<div class="flex gap-0 self-start mt-2 text-xs font-medium leading-3 text-center">
- <UButton
- v-track.form_cleanings_unlock_all_features
- icon="i-heroicons-check-badge-16-solid"
- @click.prevent="onUpgradeClick"
+ <TrackClick
+ name="form_cleanings_unlock_all_features"
+ :properties="{}"
>
- <template v-if="form.is_pro">
- Upgrade plan - Unlock all features
- </template>
- <template v-else>
- Start free trial - Unlock all features
- </template>
- </UButton>
+ <UButton
+ icon="i-heroicons-check-badge-16-solid"
+ @click.prevent="onUpgradeClick"
+ >
+ <template v-if="form.is_pro">
+ Upgrade plan - Unlock all features
+ </template>
+ <template v-else>
+ Start free trial - Unlock all features
+ </template>
+ </UButton>
+ </TrackClick>
<UButton
v-if="specifyFormOwner"
variant="link"
- @click.prevent="hideWarning=true"
+ @click.prevent="dismissWarning"
>
Dismiss
</UButton>
@@ -54,60 +58,93 @@
</VTransition>
</template>
-<script>
+<script setup>
import VTransition from '~/components/global/transitions/VTransition.vue'
+import TrackClick from '~/components/global/TrackClick.vue'
-export default {
- name: 'FormCleanings',
- components: { VTransition },
- props: {
- form: { type: Object, required: true },
- specifyFormOwner: { type: Boolean, default: false },
- hideable: { type: Boolean, default: false }
- },
- setup () {
- const subscriptionModalStore = useSubscriptionModalStore()
- return {
- subscriptionModalStore
- }
- },
- data () {
- return {
- collapseOpened: false,
- hideWarning: false
- }
- },
- computed: {
- hasCleanings () {
- return this.form.cleanings && Object.keys(this.form.cleanings).length > 0
- },
- cleanings () {
- return this.form.cleanings
- },
- cleaningContent () {
- let message = ''
- Object.keys(this.cleanings).forEach((key) => {
- let fieldName = key.charAt(0).toUpperCase() + key.slice(1)
- if (fieldName !== 'Form') {
- fieldName = '"' + fieldName + '" field'
- }
- let fieldInfo = '<br><span class="font-semibold">' + fieldName + '</span><br/><ul class=\'list-disc list-inside\'>'
- this.cleanings[key].forEach((msg) => {
- if (!msg) return
- fieldInfo = fieldInfo + '<li>' + msg + '</li>'
- })
- if (fieldInfo) {
- message = message + fieldInfo + '</ul>'
- }
- })
- return message
+const props = defineProps({
+ form: { type: Object, required: true },
+ specifyFormOwner: { type: Boolean, default: false },
+ hideable: { type: Boolean, default: false },
+ useCookieDismissal: { type: Boolean, default: false }
+})
+
+const { openSubscriptionModal } = useAppModals()
+
+// Create a cookie to store dismissal state for each form
+const cookieName = `form_cleanings_dismissed_${props.form.id}`
+const dismissedCookie = useCookie(cookieName, {
+ default: () => null,
+ maxAge: 60 * 60 // 1 hour in seconds
+})
+
+// Reactive data
+const hideWarning = ref(false)
+
+// Computed properties
+const hasCleanings = computed(() => {
+ return props.form.cleanings && Object.keys(props.form.cleanings).length > 0
+})
+
+const shouldShowWarning = computed(() => {
+ // Don't show if manually dismissed
+ if (hideWarning.value) return false
+
+ // Don't show if no cleanings
+ if (!hasCleanings.value) return false
+
+ // If cookie dismissal is enabled, check if dismissed within last hour
+ if (props.useCookieDismissal && dismissedCookie.value && isWithinLastHour(dismissedCookie.value)) {
+ return false
+ }
+
+ return true
+})
+
+const cleanings = computed(() => {
+ return props.form.cleanings
+})
+
+const cleaningContent = computed(() => {
+ let message = ''
+ Object.keys(cleanings.value).forEach((key) => {
+ let fieldName = key.charAt(0).toUpperCase() + key.slice(1)
+ if (fieldName !== 'Form') {
+ fieldName = '"' + fieldName + '" field'
}
- },
- methods: {
- onUpgradeClick () {
- this.subscriptionModalStore.setModalContent('Upgrade to unlock all features for your form', 'Some features are disabled on the published form. Upgrade your plan to unlock these features and much more. Gain full access to all advanced features.')
- this.subscriptionModalStore.openModal()
+ let fieldInfo = '<br><span class="font-semibold">' + fieldName + '</span><br/><ul class=\'list-disc list-inside\'>'
+ cleanings.value[key].forEach((msg) => {
+ if (!msg) return
+ fieldInfo = fieldInfo + '<li>' + msg + '</li>'
+ })
+ if (fieldInfo) {
+ message = message + fieldInfo + '</ul>'
}
+ })
+ return message
+})
+
+// Methods
+const onUpgradeClick = () => {
+ openSubscriptionModal({
+ modal_title: 'Upgrade to unlock all features for your form',
+ modal_description: 'Some features are disabled on the published form. Upgrade your plan to unlock these features and much more. Gain full access to all advanced features.'
+ })
+}
+
+const dismissWarning = () => {
+ // Set the cookie with current timestamp (only if cookie dismissal is enabled)
+ if (props.useCookieDismissal) {
+ dismissedCookie.value = Date.now()
}
+ hideWarning.value = true
}
+
+const isWithinLastHour = (timestamp) => {
+ const now = Date.now()
+ const oneHour = 60 * 60 * 1000 // 1 hour in milliseconds
+ return (now - timestamp) < oneHour
+}
+
+
</script>
diff --git a/client/components/pages/forms/show/FormQrCode.vue b/client/components/pages/forms/show/FormQrCode.vue
index 0e52706ab..023e3445e 100644
--- a/client/components/pages/forms/show/FormQrCode.vue
+++ b/client/components/pages/forms/show/FormQrCode.vue
@@ -1,23 +1,63 @@
<template>
- <div>
- <h3 class="font-semibold text-xl">
- QR Code
- </h3>
- <p>Scan the QR code to open the form (Right click to copy the image)</p>
- <div class="flex items-center">
- <img
- v-if="QrUrl"
- :src="QrUrl"
- class="m-auto"
- >
- </div>
- </div>
+ <UPopover arrow>
+ <TrackClick
+ name="form_qr_code_click"
+ :properties="{form_id: form.id, form_slug: form.slug}"
+ >
+ <UTooltip text="QR Code">
+ <UButton
+ variant="outline"
+ color="neutral"
+ icon="i-heroicons-qr-code"
+ />
+ </UTooltip>
+ </TrackClick>
+
+ <template #content>
+ <div class="p-4 w-80">
+
+ <h3 class="font-semibold text-medium">
+ QR Code
+ </h3>
+ <p class="text-sm text-neutral-600">Scan the QR code to open the form.</p>
+ <div class="flex justify-center">
+ <img
+ v-if="QrUrl"
+ ref="qrImage"
+ :src="QrUrl"
+ class="max-w-full h-auto"
+ alt="QR Code for form"
+ >
+ </div>
+ <div class="space-y-2">
+ <TrackClick
+ name="qr_code_copy_image_click"
+ :properties="{form_id: form.id, form_slug: form.slug}"
+ >
+ <UButton
+ @click="copyImage"
+ :color="imageCopied ? 'success' : 'neutral'"
+ :icon="imageCopied ? 'i-heroicons-check' : 'i-heroicons-document-duplicate'"
+ variant="outline"
+ block
+ >
+ {{ imageCopied ? 'Image Copied!' : 'Copy Image' }}
+ </UButton>
+ </TrackClick>
+ </div>
+ </div>
+ </template>
+ </UPopover>
</template>
<script>
import QRCode from "qrcode"
+import { useClipboard } from '@vueuse/core'
+import TrackClick from '~/components/global/TrackClick.vue'
+
export default {
name: "FormQrCode",
+ components: { TrackClick },
props: {
form: { type: Object, required: true },
extraQueryParam: { type: String, default: "" },
@@ -26,6 +66,7 @@ export default {
data() {
return {
QrUrl: null,
+ imageCopied: false,
}
},
@@ -37,6 +78,18 @@ export default {
},
},
+ setup() {
+ // Use VueUse clipboard for URL copying
+ const { copy: copyToClipboard, copied: urlCopied } = useClipboard({
+ copiedDuring: 2000 // Reset after 2 seconds
+ })
+
+ return {
+ copyToClipboard,
+ urlCopied
+ }
+ },
+
watch: {
shareUrl() {
this.generateQR()
@@ -53,6 +106,28 @@ export default {
this.QrUrl = url
})
},
+
+ copyImage() {
+ // Convert data URL to blob
+ fetch(this.QrUrl).then((response) => {
+ return response.blob()
+ }).then((blob) => {
+ // Copy to clipboard
+ return navigator.clipboard.write([
+ new ClipboardItem({
+ [blob.type]: blob
+ })
+ ])
+ }).then(() => {
+ // Show success state
+ this.imageCopied = true
+ setTimeout(() => {
+ this.imageCopied = false
+ }, 2000)
+ }).catch((error) => {
+ console.error('Failed to copy image:', error)
+ })
+ },
},
}
</script>
diff --git a/client/components/pages/forms/show/PoweredBy.vue b/client/components/pages/forms/show/PoweredBy.vue
new file mode 100644
index 000000000..d44c8692f
--- /dev/null
+++ b/client/components/pages/forms/show/PoweredBy.vue
@@ -0,0 +1,61 @@
+<template>
+ <UButton
+ :to="targetLink"
+ color="form"
+ :label="props.label"
+ trailing-icon="i-heroicons-arrow-up-right-20-solid"
+ class="fixed bottom-4 right-4 hover:no-underline powered-by-button"
+ :class="textColorClass"
+ target="_blank"
+ />
+</template>
+
+<script setup>
+const props = defineProps({
+ source: {
+ type: String,
+ default: 'form'
+ },
+ label: {
+ type: String,
+ default: 'Made with OpnForm'
+ },
+ color: {
+ type: String,
+ default: '#3B82F6' // Default blue
+ }
+})
+
+const targetLink = computed(() => {
+ return 'https://opnform.com?utm_source=' + props.source + '&utm_content=powered_by_btn'
+})
+
+function getLuminanceFromHex (hex) {
+ if (!hex) { return 0 }
+ // Expand shorthand form (e.g. "03F") to full form (e.g. "0033FF")
+ const shorthandRegex = /^#?([a-f\d])([a-f\d])([a-f\d])$/i
+ hex = hex.replace(shorthandRegex, (m, r, g, b) => {
+ return r + r + g + g + b + b
+ })
+
+ const result = /^#?([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})$/i.exec(hex)
+ if (!result) { return 0 }
+
+ const r = parseInt(result[1], 16)
+ const g = parseInt(result[2], 16)
+ const b = parseInt(result[3], 16)
+
+ return (0.299 * r + 0.587 * g + 0.114 * b)
+}
+
+const isBright = computed(() => {
+ return getLuminanceFromHex(props.color) > 150
+})
+
+const textColorClass = computed(() => {
+ if (isBright.value) {
+ return 'text-black hover:text-black'
+ }
+ return 'text-white hover:text-white'
+})
+</script>
diff --git a/client/components/pages/forms/show/RegenerateFormLink.vue b/client/components/pages/forms/show/RegenerateFormLink.vue
index 1a14088d4..fb58fb03f 100644
--- a/client/components/pages/forms/show/RegenerateFormLink.vue
+++ b/client/components/pages/forms/show/RegenerateFormLink.vue
@@ -1,157 +1,142 @@
<template>
<div>
- <v-button
- v-track.regenerate_form_link_click="{
- form_id: form.id,
- form_slug: form.slug,
- }"
- class="w-full"
- color="light-gray"
- @click="showGenerateFormLinkModal = true"
+ <TrackClick
+ name="regenerate_form_link_click"
+ :properties="{form_id: form.id, form_slug: form.slug}"
>
- <svg
- xmlns="http://www.w3.org/2000/svg"
- class="h-6 w-6 mr-2 text-blue-600 inline"
- fill="none"
- viewBox="0 0 24 24"
- stroke="currentColor"
- >
- <path
- stroke-linecap="round"
- stroke-linejoin="round"
- stroke-width="2"
- d="M13.828 10.172a4 4 0 00-5.656 0l-4 4a4 4 0 105.656 5.656l1.102-1.101m-.758-4.899a4 4 0 005.656 0l4-4a4 4 0 00-5.656-5.656l-1.1 1.1"
- />
- </svg>
- Regenerate link
- </v-button>
+ <UButton
+ variant="outline"
+ color="neutral"
+ icon="i-heroicons-arrow-path"
+ @click="showGenerateFormLinkModal = true"
+ label="Regenerate link"
+ />
+ </TrackClick>
<!-- Regenerate form link modal -->
- <modal
- :show="showGenerateFormLinkModal"
- @close="showGenerateFormLinkModal = false"
+ <UModal
+ v-model:open="isModalOpen"
+ :ui="{ content: 'sm:max-w-2xl' }"
>
- <template #icon>
- <svg
- xmlns="http://www.w3.org/2000/svg"
- class="w-10 h-10 text-blue-600"
- fill="none"
- viewBox="0 0 24 24"
- stroke="currentColor"
+ <template #header>
+ <div class="flex items-center w-full gap-4 px-2">
+ <h2 class="font-semibold">
+ Generate new form link
+ </h2>
+ </div>
+ <UButton
+ color="neutral"
+ variant="outline"
+ icon="i-heroicons-question-mark-circle"
+ size="sm"
+ @click="crisp.openHelpdeskArticle('how-to-change-my-form-url-171rjw7')"
>
- <path
- stroke-linecap="round"
- stroke-linejoin="round"
- stroke-width="2"
- d="M13.828 10.172a4 4 0 00-5.656 0l-4 4a4 4 0 105.656 5.656l1.102-1.101m-.758-4.899a4 4 0 005.656 0l4-4a4 4 0 00-5.656-5.656l-1.1 1.1"
- />
- </svg>
- </template>
- <template #title>
- Generate new form link
- </template>
- <div class="p-4">
+ Help
+ </UButton>
+ </template>
+
+ <template #body>
<p>
You can choose between two different URL formats for your form.
<span class="font-semibold">Be careful, changing your form URL is not a reversible
operation</span>. Make sure to update your form URL everywhere where it's used.
</p>
<div class="border-t py-4 mt-4">
- <h3 class="text-xl text-gray-700 font-semibold">
+ <h3 class="text-xl text-neutral-700 font-semibold">
Human Readable URL
</h3>
<p>
If your users are going to see this url, you might want to make nice
and readable. Example:
</p>
- <p class="text-gray-600 border p-4 bg-gray-50 rounded-md mt-4">
- https://opnform.com/forms/contact
+ <p class="text-neutral-600 border p-4 bg-neutral-50 rounded-md mt-4">
+ https://opnform.com/forms/contact-form-e68des
</p>
<div class="text-center mt-4">
- <v-button
- :loading="loadingNewLink"
- color="outline-blue"
- @click="regenerateLink('slug')"
+ <TrackClick
+ name="regenerate_form_link_readable_click"
+ :properties="{form_id: form.id, form_slug: form.slug, type: 'slug'}"
>
- Generate a Human Readable URL
- </v-button>
+ <UButton
+ :loading="regenerateLinkMutationInstance.isPending.value"
+ variant="outline"
+ color="primary"
+ @click="regenerateLink('slug')"
+ >
+ Generate a Human Readable URL
+ </UButton>
+ </TrackClick>
</div>
</div>
<div class="border-t pt-4 mt-4">
- <h3 class="text-xl text-gray-700 font-semibold">
+ <h3 class="text-xl text-neutral-700 font-semibold">
Random ID URL
</h3>
<p>
If your user are not going to see your form url (if it's embedded),
and if you prefer to have a random non-guessable URL. Example:
</p>
- <p class="text-gray-600 p-4 border bg-gray-50 rounded-md mt-4">
+ <p class="text-neutral-600 p-4 border bg-neutral-50 rounded-md mt-4">
https://opnform.com/forms/b4417f9c-34ae-4421-8006-832ee47786e7
</p>
<div class="text-center mt-4">
- <v-button
- :loading="loadingNewLink"
- color="outline-blue"
- @click="regenerateLink('uuid')"
+ <TrackClick
+ name="regenerate_form_link_random_click"
+ :properties="{form_id: form.id, form_slug: form.slug, type: 'uuid'}"
>
- Generate a Random ID URL
- </v-button>
+ <UButton
+ :loading="regenerateLinkMutationInstance.isPending.value"
+ variant="outline"
+ color="primary"
+ @click="regenerateLink('uuid')"
+ >
+ Generate a Random ID URL
+ </UButton>
+ </TrackClick>
</div>
</div>
- </div>
- </modal>
+ </template>
+ </UModal>
</div>
</template>
-<script>
-import { useFormsStore } from "../../../../stores/forms"
+<script setup>
+import TrackClick from "~/components/global/TrackClick.vue"
-export default {
- name: "RegenerateFormLink",
- components: {},
- props: {
- form: { type: Object, required: true },
- },
-
- setup() {
- const formsStore = useFormsStore()
- return {
- formsStore,
- }
- },
+const props = defineProps({
+ form: { type: Object, required: true },
+})
- data: () => ({
- loadingNewLink: false,
- showGenerateFormLinkModal: false,
- }),
+const crisp = useCrisp()
+const router = useRouter()
+const showGenerateFormLinkModal = ref(false)
- computed: {
- formEndpoint: () => "/open/forms/{id}",
+// Modal state
+const isModalOpen = computed({
+ get() {
+ return showGenerateFormLinkModal.value
},
+ set(value) {
+ showGenerateFormLinkModal.value = value
+ }
+})
- methods: {
- regenerateLink(option) {
- if (this.loadingNewLink) return
- this.loadingNewLink = true
- opnFetch(
- this.formEndpoint.replace("{id}", this.form.id) +
- "/regenerate-link/" +
- option,
- { method: "PUT" },
- )
- .then((data) => {
- this.formsStore.save(data.form)
- this.$router.push({
- name: "forms-slug-show-share",
- params: { slug: data.form.slug },
- })
- useAlert().success(data.message)
- this.loadingNewLink = false
- })
- .finally(() => {
- this.showGenerateFormLinkModal = false
- })
- },
- },
+const { regenerateLink: regenerateLinkMutation } = useForms()
+const regenerateLinkMutationInstance = regenerateLinkMutation()
+
+const regenerateLink = (option) => {
+ regenerateLinkMutationInstance.mutateAsync({
+ id: props.form.id,
+ option
+ }).then((data) => {
+ router.push({
+ name: "forms-slug-show-share",
+ params: { slug: data.form.slug },
+ })
+ useAlert().success(data.message)
+ showGenerateFormLinkModal.value = false
+ }).catch((error) => {
+ useAlert().error(error?.data?.message || "Something went wrong")
+ })
}
</script>
diff --git a/client/components/pages/forms/show/ShareLink.vue b/client/components/pages/forms/show/ShareLink.vue
index 6d5fdfc0e..a0bc40a92 100644
--- a/client/components/pages/forms/show/ShareLink.vue
+++ b/client/components/pages/forms/show/ShareLink.vue
@@ -4,12 +4,14 @@
Share Link
</h3>
<p>
- Your form is now published and ready to be shared with the world! Copy
- this link to share your form on social media, messaging apps or via email.
+ Share your form with anyone by copying this link. You can use it on social media,
+ in messages, or send it via email to reach your audience.
</p>
<copy-content
:content="share_url"
:is-draft="form.visibility == 'draft'"
+ tracking-event="share_link_copy_click"
+ :tracking-properties="{form_id: form.id, form_slug: form.slug}"
>
<template #icon>
<svg
diff --git a/client/components/pages/forms/show/SocialShareButton.vue b/client/components/pages/forms/show/SocialShareButton.vue
new file mode 100644
index 000000000..35bc2eb04
--- /dev/null
+++ b/client/components/pages/forms/show/SocialShareButton.vue
@@ -0,0 +1,95 @@
+<template>
+ <UDropdownMenu :items="shareItems" :content="{ align: 'end' }" arrow>
+ <TrackClick
+ name="social_share_button_click"
+ :properties="{form_id: form.id, form_slug: form.slug}"
+ >
+ <UTooltip text="Share">
+ <UButton
+ variant="outline"
+ color="neutral"
+ icon="i-heroicons-share"
+ />
+ </UTooltip>
+ </TrackClick>
+ </UDropdownMenu>
+</template>
+
+<script>
+import TrackClick from '~/components/global/TrackClick.vue'
+
+export default {
+ name: "SocialShareButton",
+ components: { TrackClick },
+ props: {
+ form: {
+ type: Object,
+ required: true,
+ },
+ shareUrl: {
+ type: String,
+ required: true,
+ },
+ },
+
+ computed: {
+ shareItems() {
+ return [
+ [{
+ label: 'Share via Email',
+ icon: 'i-heroicons-envelope',
+ onSelect: () => this.shareViaEmail()
+ }, {
+ label: 'Share on Twitter',
+ icon: 'i-simple-icons-twitter',
+ onSelect: () => this.shareOnTwitter()
+ }, {
+ label: 'Share on LinkedIn',
+ icon: 'i-simple-icons-linkedin',
+ onSelect: () => this.shareOnLinkedIn()
+ }]
+ ]
+ }
+ },
+
+ methods: {
+ shareViaEmail() {
+ const { logEvent } = useAmplitude()
+ logEvent('share_form_email', {
+ form_id: this.form.id,
+ form_slug: this.form.slug,
+ method: 'email'
+ })
+
+ const subject = encodeURIComponent(`Check out this form: ${this.form.title}`)
+ const body = encodeURIComponent(`I'd like to share this form with you: ${this.shareUrl}`)
+ window.open(`mailto:?subject=${subject}&body=${body}`)
+ },
+
+ shareOnTwitter() {
+ const { logEvent } = useAmplitude()
+ logEvent('share_form_social', {
+ form_id: this.form.id,
+ form_slug: this.form.slug,
+ method: 'twitter'
+ })
+
+ const text = encodeURIComponent(`Check out this form: ${this.form.title}`)
+ const url = encodeURIComponent(this.shareUrl)
+ window.open(`https://twitter.com/intent/tweet?text=${text}&url=${url}`, '_blank')
+ },
+
+ shareOnLinkedIn() {
+ const { logEvent } = useAmplitude()
+ logEvent('share_form_social', {
+ form_id: this.form.id,
+ form_slug: this.form.slug,
+ method: 'linkedin'
+ })
+
+ const url = encodeURIComponent(this.shareUrl)
+ window.open(`https://www.linkedin.com/sharing/share-offsite/?url=${url}`, '_blank')
+ },
+ },
+}
+</script>
\ No newline at end of file
diff --git a/client/components/pages/forms/show/UrlFormPrefill.vue b/client/components/pages/forms/show/UrlFormPrefill.vue
index e8f0d8813..096af78fb 100644
--- a/client/components/pages/forms/show/UrlFormPrefill.vue
+++ b/client/components/pages/forms/show/UrlFormPrefill.vue
@@ -1,126 +1,124 @@
<template>
<div class="flex">
- <v-button
- v-track.url_form_prefill_click="{
+ <TrackClick
+ name="url_form_prefill_click"
+ :properties="{
form_id: form.id,
form_slug: form.slug,
}"
- class="w-full"
- color="light-gray"
- @click="showUrlFormPrefillModal = true"
>
- <svg
- xmlns="http://www.w3.org/2000/svg"
- class="h-6 w-6 mr-2 text-blue-600 inline"
- fill="none"
- viewBox="0 0 24 24"
- stroke="currentColor"
- >
- <path
- stroke-linecap="round"
- stroke-linejoin="round"
- stroke-width="2"
- d="M17 16v2a2 2 0 01-2 2H5a2 2 0 01-2-2v-7a2 2 0 012-2h2m3-4H9a2 2 0 00-2 2v7a2 2 0 002 2h10a2 2 0 002-2V7a2 2 0 00-2-2h-1m-1 4l-3 3m0 0l-3-3m3 3V3"
- />
- </svg>
- Url pre-fill
- </v-button>
-
- <modal
- :show="showUrlFormPrefillModal"
- @close="showUrlFormPrefillModal = false"
+ <UButton
+ variant="outline"
+ color="neutral"
+ icon="i-heroicons-link"
+ @click="showUrlFormPrefillModal = true"
+ label="URL Pre-fill"
+ />
+ </TrackClick>
+
+ <UModal
+ v-model:open="isModalOpen"
+ :ui="{ content: 'sm:max-w-2xl' }"
>
- <template #icon>
- <svg
- xmlns="http://www.w3.org/2000/svg"
- class="w-10 h-10 text-blue"
- fill="none"
- viewBox="0 0 24 24"
- stroke="currentColor"
+ <template #header>
+ <div class="flex items-center w-full gap-4 px-2">
+ <h2 class="font-semibold">
+ Url Form Prefill
+ </h2>
+ </div>
+ <UButton
+ color="neutral"
+ variant="outline"
+ icon="i-heroicons-question-mark-circle"
+ size="sm"
+ @click="crisp.openHelpdeskArticle('how-to-use-url-form-pre-fill-1juyi21')"
>
- <path
- stroke-linecap="round"
- stroke-linejoin="round"
- stroke-width="2"
- d="M17 16v2a2 2 0 01-2 2H5a2 2 0 01-2-2v-7a2 2 0 012-2h2m3-4H9a2 2 0 00-2 2v7a2 2 0 002 2h10a2 2 0 002-2V7a2 2 0 00-2-2h-1m-1 4l-3 3m0 0l-3-3m3 3V3"
- />
- </svg>
- </template>
- <template #title>
- <span>Url Form Prefill</span>
+ Help
+ </UButton>
</template>
- <div
- ref="content"
- class="p-4"
- >
- <p>
- Create dynamic links when sharing your form (whether it's embedded or
- not), that allows you to prefill your form fields. You can use this to
- personalize the form when sending it to multiple contacts for
- instance.
- </p>
-
- <h3 class="mt-6 border-t text-xl font-semibold mb-4 pt-6">
- How does it work?
- </h3>
-
- <p>
- Complete your form below and fill only the fields you want to prefill.
- You can even leave the required fields empty.
- </p>
-
- <div class="rounded-lg p-5 bg-gray-100 dark:bg-gray-900 mt-4">
- <open-form
- v-if="formManager"
- :theme="theme"
- :form-manager="formManager"
- @submit="generateUrl"
- >
- <template #submit-btn="{loading}">
- <v-button
- class="mt-2 px-8 mx-1"
- :loading="loading"
- @click.prevent="generateUrl"
- >
- Generate Pre-filled URL
- </v-button>
- </template>
- </open-form>
- </div>
+ <template #body>
+ <div ref="content">
+ <p>
+ Create dynamic links when sharing your form (whether it's embedded or
+ not), that allows you to prefill your form fields. You can use this to
+ personalize the form when sending it to multiple contacts for
+ instance.
+ </p>
- <template v-if="prefillFormData">
- <h3 class="mt-6 text-xl font-semibold mb-4 pt-6">
- Your Prefill url
+ <h3 class="mt-6 border-t text-xl font-semibold mb-4 pt-6">
+ How does it work?
</h3>
- <form-url-prefill
- :form="form"
- :form-data="prefillFormData"
- :extra-query-param="extraQueryParam"
- />
- </template>
- </div>
- </modal>
+
+ <p>
+ Complete your form below and fill only the fields you want to prefill.
+ You can even leave the required fields empty.
+ </p>
+
+ <div class="rounded-lg p-5 bg-neutral-100 dark:bg-neutral-900 mt-4">
+ <OpenForm
+ v-if="formManager"
+ :theme="theme"
+ :form-manager="formManager"
+ @submit="generateUrl"
+ >
+ <template #submit-btn="{loading}">
+ <UButton
+ class="mt-4"
+ :loading="loading"
+ @click="generateUrl"
+ label="Generate Pre-filled URL"
+ />
+ </template>
+ </OpenForm>
+ </div>
+
+ <template v-if="prefillFormData">
+ <h3 class="mt-6 text-xl font-semibold mb-4 pt-6">
+ Your Prefill url
+ </h3>
+ <FormUrlPrefill
+ :form="form"
+ :form-data="prefillFormData"
+ :extra-query-param="extraQueryParam"
+ />
+ </template>
+ </div>
+ </template>
+ </UModal>
</div>
</template>
<script setup>
import ThemeBuilder from "~/lib/forms/themes/ThemeBuilder"
-import FormUrlPrefill from "../../../open/forms/components/FormUrlPrefill.vue"
-import OpenForm from "../../../open/forms/OpenForm.vue"
+import FormUrlPrefill from "~/components/open/forms/components/FormUrlPrefill.vue"
+import OpenForm from "~/components/open/forms/OpenForm.vue"
import { FormMode } from "~/lib/forms/FormModeStrategy.js"
import { useFormManager } from '~/lib/forms/composables/useFormManager'
+import TrackClick from "~/components/global/TrackClick.vue"
const props = defineProps({
form: { type: Object, required: true },
extraQueryParam: { type: String, default: "" },
})
+const crisp = useCrisp()
+
// State variables
const prefillFormData = ref(null)
const showUrlFormPrefillModal = ref(false)
const content = ref(null)
+// Modal state
+const isModalOpen = computed({
+ get() {
+ return showUrlFormPrefillModal.value
+ },
+ set(value) {
+ showUrlFormPrefillModal.value = value
+ }
+})
+
// Theme computation
const theme = computed(() => {
return new ThemeBuilder(props.form.theme, {
diff --git a/client/components/pages/home/FormCard.vue b/client/components/pages/home/FormCard.vue
new file mode 100644
index 000000000..00bbb2e0c
--- /dev/null
+++ b/client/components/pages/home/FormCard.vue
@@ -0,0 +1,68 @@
+<template>
+ <div class="p-4 flex gap-2 group items-center relative border rounded-lg shadow-xs hover:bg-neutral-100 transition-all cursor-pointer">
+ <!-- Title -->
+ <div class="flex-grow items-center truncate relative">
+ <span class="font-semibold text-neutral-900 dark:text-white">{{ form.title }}</span>
+ </div>
+
+ <!-- Stats and Menu -->
+ <div class="flex items-center gap-4 relative text-sm text-neutral-500">
+ <!-- Status Badges -->
+ <FormStatusBadges class="hidden md:block" :form="form" :with-tags="false" size="sm" />
+
+ <!-- Last Updated -->
+ <span class="hidden lg:inline text-xs whitespace-nowrap" title="Last updated">Updated {{ form.last_edited_human }}</span>
+
+ <!-- Views -->
+ <UTooltip :text="`${formatNumberWithCommas(form.views_count)} views`">
+ <div class="flex items-center gap-1" title="Form views">
+ <UIcon name="i-heroicons-eye" />
+ <span>{{ formatNumber(form.views_count) }}</span>
+ </div>
+ </UTooltip>
+
+ <!-- Submissions -->
+ <UTooltip :text="`${formatNumberWithCommas(form.submissions_count)} submissions`">
+ <div class="flex items-center gap-1" title="Form submissions">
+ <UIcon name="i-heroicons-document-text" />
+ <span>{{ formatNumber(form.submissions_count) }}</span>
+ </div>
+ </UTooltip>
+
+ <!-- Extra Menu -->
+ <div class="relative z-20">
+ <ExtraMenu :form="form" :is-main-page="true" portal="#home-portals">
+ <template #default="{ loading }">
+ <UButton
+ class="hover:bg-neutral-200"
+ color="neutral"
+ variant="ghost"
+ icon="i-heroicons-ellipsis-horizontal"
+ size="md"
+ :loading="loading"
+ />
+ </template>
+ </ExtraMenu>
+ </div>
+ </div>
+
+ <!-- Link overlay covering entire card -->
+ <NuxtLink
+ :to="{name:'forms-slug-show-submissions', params: {slug:form.slug}}"
+ class="absolute inset-0 z-10"
+ />
+ </div>
+</template>
+
+<script setup>
+import ExtraMenu from "~/components/pages/forms/show/ExtraMenu.vue"
+import FormStatusBadges from "~/components/open/forms/components/FormStatusBadges.vue"
+import { formatNumber, formatNumberWithCommas } from "~/lib/utils.js"
+
+defineProps({
+ form: {
+ type: Object,
+ required: true,
+ },
+})
+</script>
\ No newline at end of file
diff --git a/client/components/pages/home/FormCardSkeleton.vue b/client/components/pages/home/FormCardSkeleton.vue
new file mode 100644
index 000000000..d9ddc3a4c
--- /dev/null
+++ b/client/components/pages/home/FormCardSkeleton.vue
@@ -0,0 +1,30 @@
+<template>
+ <div class="p-4 flex gap-2 group items-center relative border rounded-lg shadow-xs">
+ <!-- Title Skeleton -->
+ <div class="flex-grow items-center truncate relative">
+ <USkeleton class="h-5 w-2/5" />
+ </div>
+
+ <!-- Stats and Menu Skeleton -->
+ <div class="flex items-center gap-4 relative text-sm">
+ <!-- Last Updated Skeleton -->
+ <USkeleton class="h-4 w-24 hidden md:inline" />
+ <USkeleton class="h-4 w-2 hidden md:inline" />
+
+ <!-- Views Skeleton -->
+ <div class="flex items-center gap-1">
+ <USkeleton class="h-5 w-5" />
+ <USkeleton class="h-4 w-6" />
+ </div>
+
+ <!-- Submissions Skeleton -->
+ <div class="flex items-center gap-1">
+ <USkeleton class="h-5 w-5" />
+ <USkeleton class="h-4 w-6" />
+ </div>
+
+ <!-- Extra Menu Skeleton -->
+ <USkeleton class="h-8 w-8" />
+ </div>
+ </div>
+</template>
\ No newline at end of file
diff --git a/client/components/pages/notion/CustomBlock.vue b/client/components/pages/notion/CustomBlock.vue
index c421616bc..f45030986 100644
--- a/client/components/pages/notion/CustomBlock.vue
+++ b/client/components/pages/notion/CustomBlock.vue
@@ -16,11 +16,11 @@
:key="question.label"
class="space-y-2"
>
- <dt class="font-semibold text-gray-900 dark:text-gray-100">
+ <dt class="font-semibold text-neutral-900 dark:text-neutral-100">
{{ question.label }}
</dt>
<dd
- class="leading-6 text-gray-600 dark:text-gray-400"
+ class="leading-6 text-neutral-600 dark:text-neutral-400"
v-html="question.content"
/>
</div>
@@ -45,7 +45,8 @@
</h2>
<UButton
to="/register"
- color="white"
+ color="neutral"
+ variant="outline"
class="hover:no-underline"
icon="i-heroicons-arrow-right"
trailing
diff --git a/client/components/pages/pricing/CustomPlan.vue b/client/components/pages/pricing/CustomPlan.vue
index f69c58984..2cd9cc3a6 100644
--- a/client/components/pages/pricing/CustomPlan.vue
+++ b/client/components/pages/pricing/CustomPlan.vue
@@ -1,23 +1,23 @@
<template>
<section class="relative">
<div class="px-4 mx-auto max-w-7xl sm:px-6 lg:px-8">
- <div class="max-w-5xl mx-auto bg-white shadow-xl rounded-3xl ring-1 ring-gray-200 lg:flex isolate">
+ <div class="max-w-5xl mx-auto bg-white shadow-xl rounded-3xl ring-1 ring-neutral-200 lg:flex isolate">
<div class="p-8 sm:p-8 lg:flex-auto">
<h3 class="text-3xl font-semibold tracking-tight text-blue-500">
Enterprise Plan
</h3>
- <p class="mt-2 text-base font-medium leading-7 text-gray-600">
+ <p class="mt-2 text-base font-medium leading-7 text-neutral-600">
Unlock ultimate scalability and enterprise-grade features with the Enterprise Plan. Tailored to meet the needs of organizations requiring dedicated infrastructure, advanced security, and priority support.
</p>
<div class="flex items-center mt-6 gap-x-4">
- <h4 class="flex-none text-sm font-semibold leading-6 tracking-widest text-gray-400 uppercase">
+ <h4 class="flex-none text-sm font-semibold leading-6 tracking-widest text-neutral-400 uppercase">
What's included
</h4>
- <div class="flex-auto h-px bg-gray-200" />
+ <div class="flex-auto h-px bg-neutral-200" />
</div>
<ul
role="list"
- class="grid grid-cols-1 gap-4 mt-4 text-sm font-medium leading-6 text-gray-900 sm:grid-cols-2 sm:gap-x-6 sm:gap-y-2"
+ class="grid grid-cols-1 gap-4 mt-4 text-sm font-medium leading-6 text-neutral-900 sm:grid-cols-2 sm:gap-x-6 sm:gap-y-2"
>
<li class="flex gap-x-3">
<svg
@@ -148,29 +148,29 @@
</ul>
</div>
<div class="p-2 -mt-2 flex-col lg:mt-0 lg:w-full lg:max-w-md lg:flex-shrink-0">
- <div class="grow h-full py-10 text-center rounded-2xl bg-gray-50 ring-1 ring-inset ring-gray-900/5 lg:flex lg:flex-col lg:justify-center lg:py-12">
+ <div class="grow h-full py-10 text-center rounded-2xl bg-neutral-50 ring-1 ring-inset ring-neutral-900/5 lg:flex lg:flex-col lg:justify-center lg:py-12">
<div class="max-w-xs px-8 mx-auto space-y-6">
<div class="flex items-center justify-center mb-10">
<monthly-yearly-selector v-model="isYearly" />
</div>
<p class="flex flex-col items-center">
- <span class="text-6xl font-semibold tracking-tight text-gray-950">
+ <span class="text-6xl font-semibold tracking-tight text-neutral-950">
<template v-if="isYearly">$79</template>
<template v-else>$100</template>
</span>
- <span class="text-sm font-medium leading-6 text-gray-600">
+ <span class="text-sm font-medium leading-6 text-neutral-600">
starting from per month
</span>
</p>
<div class="flex justify-center">
<button
- class="v-btn py-2 px-4 bg-blue-600 hover:bg-blue-700 focus:ring-blue-500 focus:ring-offset-blue-200 text-white transition ease-in duration-200 text-center text-base font-medium focus:outline-none focus:ring-2 focus:ring-offset-2 rounded-lg flex items-center hover:no-underline"
+ class="v-btn py-2 px-4 bg-blue-600 hover:bg-blue-700 focus:ring-blue-500 focus:ring-offset-blue-200 text-white transition ease-in duration-200 text-center text-base font-medium focus:outline-hidden focus:ring-2 focus:ring-offset-2 rounded-lg flex items-center hover:no-underline"
@click="customPlanClick"
>
<span class="no-underline mx-auto">Contact Us</span>
</button>
</div>
- <p class="text-xs font-medium leading-5 text-gray-600">
+ <p class="text-xs font-medium leading-5 text-neutral-600">
Let us design a tailored plan to meet your enterprise needs.
</p>
</div>
diff --git a/client/components/pages/pricing/MonthlyYearlySelector.vue b/client/components/pages/pricing/MonthlyYearlySelector.vue
index c81e2a812..f20cf40cf 100644
--- a/client/components/pages/pricing/MonthlyYearlySelector.vue
+++ b/client/components/pages/pricing/MonthlyYearlySelector.vue
@@ -3,7 +3,7 @@
<button class="font-medium block flex-grow cursor-pointer">
<div
class="py-1.5 px-3 rounded-lg transition-colors transition-colors text-slate-500"
- :class="{ 'bg-white shadow text-slate-900': !modelValue }"
+ :class="{ 'bg-white shadow-sm text-slate-900': !modelValue }"
@click="set(false)"
>
Monthly
@@ -15,7 +15,7 @@
>
<div
class="py-1.5 px-4 rounded-lg transition-colors text-slate-500"
- :class="{ 'bg-white shadow text-slate-900': modelValue }"
+ :class="{ 'bg-white shadow-sm text-slate-900': modelValue }"
>
Yearly
</div>
diff --git a/client/components/pages/pricing/PricingTable.vue b/client/components/pages/pricing/PricingTable.vue
index 069198baa..321b19da0 100644
--- a/client/components/pages/pricing/PricingTable.vue
+++ b/client/components/pages/pricing/PricingTable.vue
@@ -6,21 +6,21 @@
class="absolute inset-0 grid"
aria-hidden="true"
>
- <div class="bg-gray-100" />
+ <div class="bg-neutral-100" />
<div class="bg-white" />
</div>
<div class="px-4 mx-auto max-w-7xl sm:px-6 lg:px-8">
<div
- class="max-w-5xl mx-auto bg-white shadow-xl rounded-3xl ring-1 ring-gray-200 lg:flex isolate"
+ class="max-w-5xl mx-auto bg-white shadow-xl rounded-3xl ring-1 ring-neutral-200 lg:flex isolate"
>
<div class="p-8 sm:p-8 lg:flex-auto">
<h3
v-if="homePage"
- class="text-3xl font-semibold tracking-tight text-gray-950"
+ class="text-3xl font-semibold tracking-tight text-neutral-950"
>
Check out our
- <span class="ml-2 text-nt-blue">
+ <span class="ml-2 text-blue-500">
<svg
class="inline w-10 h-10"
viewBox="0 0 32 32"
@@ -54,27 +54,27 @@
</h3>
<h3
v-else
- class="text-3xl font-semibold tracking-tight text-gray-950"
+ class="text-3xl font-semibold tracking-tight text-neutral-950"
>
Pro Plan
</h3>
- <p class="mt-2 text-base font-medium leading-7 text-gray-600">
+ <p class="mt-2 text-base font-medium leading-7 text-neutral-600">
OpnForm Pro offers empowering features tailored to the advanced
needs of teams and creators. Enjoy our free 3-day trial!
</p>
<div class="flex items-center mt-6 gap-x-4">
<h4
- class="flex-none text-sm font-semibold leading-6 tracking-widest text-gray-400 uppercase"
+ class="flex-none text-sm font-semibold leading-6 tracking-widest text-neutral-400 uppercase"
>
What's included
</h4>
- <div class="flex-auto h-px bg-gray-200" />
+ <div class="flex-auto h-px bg-neutral-200" />
</div>
<ul
role="list"
- class="grid grid-cols-1 gap-4 mt-4 text-sm font-medium leading-6 text-gray-900 sm:grid-cols-2 sm:gap-x-6 sm:gap-y-2"
+ class="grid grid-cols-1 gap-4 mt-4 text-sm font-medium leading-6 text-neutral-900 sm:grid-cols-2 sm:gap-x-6 sm:gap-y-2"
>
<li
v-for="(title, i) in pricingInfo"
@@ -108,7 +108,7 @@
class="p-2 -mt-2 flex-col lg:mt-0 lg:w-full lg:max-w-md lg:flex-shrink-0"
>
<div
- class="grow h-full py-10 text-center rounded-2xl bg-gray-50 ring-1 ring-inset ring-gray-900/5 lg:flex lg:flex-col lg:justify-center lg:py-12"
+ class="grow h-full py-10 text-center rounded-2xl bg-neutral-50 ring-1 ring-inset ring-neutral-900/5 lg:flex lg:flex-col lg:justify-center lg:py-12"
>
<div class="max-w-xs px-8 mx-auto space-y-6">
<div class="flex items-center justify-center mb-10">
@@ -118,46 +118,43 @@
<p class="flex flex-col items-center">
<span
- class="text-6xl font-semibold tracking-tight text-gray-950"
+ class="text-6xl font-semibold tracking-tight text-neutral-950"
>
<template v-if="isYearly">$16</template>
<template v-else>$19</template>
</span>
- <span class="text-sm font-medium leading-6 text-gray-600">
+ <span class="text-sm font-medium leading-6 text-neutral-600">
per month
</span>
</p>
<div class="flex justify-center">
- <v-button
+ <UButton
v-if="!authenticated"
class="mr-1"
:to="{ name: 'register' }"
- :arrow="true"
- >
- Start free trial
- </v-button>
- <v-button
+ trailing-icon="i-heroicons-arrow-right"
+ label="Start free trial"
+ />
+ <UButton
v-else-if="authenticated && user.is_subscribed"
class="mr-1"
- :arrow="true"
+ trailing-icon="i-heroicons-arrow-right"
:to="{ name: 'redirect-billing-portal' }"
target="_blank"
- >
- View Billing
- </v-button>
- <v-button
+ label="View Billing"
+ />
+ <UButton
v-else
class="mr-1"
- :arrow="true"
- @click.prevent="subscriptionModalStore.openModal('default', isYearly)"
- >
- Start free trial
- </v-button>
+ trailing-icon="i-heroicons-arrow-right"
+ @click.prevent="openSubscriptionModal({ plan: 'default', yearly: isYearly })"
+ label="Start free trial"
+ />
</div>
<p
v-if="!homePage"
- class="text-xs font-medium leading-5 text-gray-600"
+ class="text-xs font-medium leading-5 text-neutral-600"
>
Invoices and receipts available for easy company
reimbursement.
@@ -178,9 +175,9 @@
<script>
import { computed } from "vue"
-import { useAuthStore } from "../../../stores/auth"
import MonthlyYearlySelector from "./MonthlyYearlySelector.vue"
import CustomPlan from "./CustomPlan.vue"
+import { useIsAuthenticated } from "~/composables/useAuthFlow"
MonthlyYearlySelector.compatConfig = { MODE: 3 }
@@ -196,17 +193,20 @@ export default {
},
},
setup() {
- const subscriptionModalStore = useSubscriptionModalStore()
- const authStore = useAuthStore()
+ const { openSubscriptionModal } = useAppModals()
+ const { isAuthenticated: authenticated } = useIsAuthenticated()
+ const auth = useAuth()
+
return {
- subscriptionModalStore,
- authenticated: computed(() => authStore.check),
- user: computed(() => authStore.user),
+ openSubscriptionModal,
+ authenticated,
+ user: computed(() => auth.user().data.value),
}
},
data: () => ({
isYearly: true,
pricingInfo: [
+ "Unlimited workspaces",
"Form confirmation emails",
"Slack notifications",
"Discord notifications",
diff --git a/client/components/pages/pricing/SubscriptionModal.vue b/client/components/pages/pricing/SubscriptionModal.vue
index 50bbad932..34fa7fdcf 100644
--- a/client/components/pages/pricing/SubscriptionModal.vue
+++ b/client/components/pages/pricing/SubscriptionModal.vue
@@ -1,344 +1,374 @@
<template>
- <modal
- :show="subscriptionModalStore.show"
- compact-header
- max-width="screen-lg"
- backdrop-blur
- class="z-50"
- @close="subscriptionModalStore.closeModal()"
+ <UModal
+ v-model:open="isOpen"
+ :ui="{ content: 'sm:max-w-5xl' }"
+ :close="false"
>
- <div class="overflow-hidden">
- <SlidingTransition
- direction="horizontal"
- :step="currentStep"
- >
- <div
- :key="currentStep"
- class="w-full"
+ <template #body>
+ <div class="overflow-hidden">
+ <SlidingTransition
+ direction="horizontal"
+ :step="currentStep"
>
<div
- v-if="currentStep === 1"
- key="step1"
- class="flex flex-col items-center px-4 pb-20 rounded-2xl relative"
+ :key="currentStep"
+ class="w-full"
>
- <main class="flex flex-col mt-4 max-w-full text-center w-[591px] max-md:mt-10">
- <img
- src="/img/subscription-modal-icon.svg"
- alt="Subscription Icon"
- class="self-center max-w-full aspect-[0.98] w-[107px]"
- >
- <section class="flex flex-col mt-2 max-md:max-w-full">
- <h1 class="text-2xl font-bold tracking-tight leading-9 text-slate-800 max-md:max-w-full">
- {{ subscriptionModalStore.modal_title }}
- </h1>
- <p class="mt-4 text-base leading-6 text-slate-500 max-md:max-w-full">
- {{ subscriptionModalStore.modal_description }}
- </p>
- </section>
- </main>
- <div class="mt-8 mb-4 flex items-center justify-center">
- <MonthlyYearlySelector
- v-model="isYearly"
- />
- </div>
- <section class="flex flex-col w-full max-w-[800px] max-md:max-w-full">
- <div class="bg-white max-md:max-w-full">
- <div class="flex gap-2 max-md:flex-col max-md:gap-0">
- <article
- v-if="!isSubscribed"
- class="flex flex-col w-6/12 max-md:ml-0 max-md:w-full m-auto"
- >
- <div class="flex flex-col grow justify-between p-6 w-full bg-blue-50 rounded-2xl max-md:px-5 max-md:mt-2">
- <div class="flex flex-col items-center">
- <div class="flex gap-2 py-px">
- <h2 class="my-auto text-xl font-semibold tracking-tighter leading-5 text-slate-900">
- Pro
- </h2>
- <span
- v-if="isYearly"
- class="justify-center px-2 py-1 text-xs font-semibold tracking-wide text-center text-emerald-600 uppercase bg-emerald-50 rounded-md"
- >
- Save 20%
- </span>
- </div>
- <div class="flex flex-col justify-end mt-4 leading-[100%]">
- <p class="text-2xl font-semibold tracking-tight text-slate-900 text-center">
- <template v-if="isYearly">
- $16
- </template>
- <template v-else>
- $19
- </template>
- </p>
- <p class="text-xs text-slate-500">
- per month, billed
- <template v-if="isYearly">
- yearly
- </template>
- <template v-else>
- monthly
- </template>
- </p>
+ <div
+ v-if="currentStep === 1"
+ key="step1"
+ class="flex flex-col items-center px-4 rounded-2xl relative"
+ >
+ <main class="flex flex-col mt-4 max-w-full text-center w-[591px] max-md:mt-10">
+ <img
+ src="/img/subscription-modal-icon.svg"
+ alt="Subscription Icon"
+ class="self-center max-w-full aspect-[0.98] w-[107px]"
+ >
+ <section class="flex flex-col mt-2 max-md:max-w-full">
+ <h1 class="text-2xl font-bold tracking-tight leading-9 text-slate-800 max-md:max-w-full">
+ {{ modal_title }}
+ </h1>
+ <p class="mt-4 text-base leading-6 text-slate-500 max-md:max-w-full">
+ {{ modal_description }}
+ </p>
+ </section>
+ </main>
+ <div class="mt-8 mb-4 flex items-center justify-center">
+ <MonthlyYearlySelector
+ v-model="isYearly"
+ />
+ </div>
+ <section class="flex flex-col w-full max-w-[800px] max-md:max-w-full">
+ <div class="bg-white max-md:max-w-full">
+ <div class="flex gap-2 max-md:flex-col max-md:gap-0">
+ <article
+ v-if="!isSubscribed"
+ class="flex flex-col w-6/12 max-md:ml-0 max-md:w-full m-auto"
+ >
+ <div class="flex flex-col grow justify-between p-6 w-full bg-blue-50 rounded-2xl max-md:px-5 max-md:mt-2">
+ <div class="flex flex-col items-center">
+ <div class="flex gap-2 py-px">
+ <h2 class="my-auto text-xl font-semibold tracking-tighter leading-5 text-slate-900">
+ Pro
+ </h2>
+ <span
+ v-if="isYearly"
+ class="justify-center px-2 py-1 text-xs font-semibold tracking-wide text-center text-emerald-600 uppercase bg-emerald-50 rounded-md"
+ >
+ Save 20%
+ </span>
+ </div>
+ <div class="flex flex-col justify-end mt-4 leading-[100%]">
+ <p class="text-2xl font-semibold tracking-tight text-slate-900 text-center">
+ <template v-if="isYearly">
+ $16
+ </template>
+ <template v-else>
+ $19
+ </template>
+ </p>
+ <p class="text-xs text-slate-500">
+ per month, billed
+ <template v-if="isYearly">
+ yearly
+ </template>
+ <template v-else>
+ monthly
+ </template>
+ </p>
+ </div>
</div>
+ <TrackClick
+ v-if="!user?.is_subscribed"
+ name="upgrade_modal_start_trial"
+ :properties="{plan: 'default', period: isYearly?'yearly':'monthly'}"
+ class="w-full"
+ >
+ <UButton
+ class="relative border border-white border-opacity-20 h-10 inline-flex px-4 items-center rounded-lg text-sm font-semibold w-full justify-center mt-4"
+ @click.prevent="onSelectPlan('default')"
+ label="Start 3-day trial"
+ />
+ </TrackClick>
+ <UButton
+ v-else
+ :loading="billingLoading"
+ :to="{ name: 'redirect-billing-portal' }"
+ target="_blank"
+ class="relative border border-white border-opacity-20 h-10 inline-flex px-4 items-center rounded-lg text-sm font-semibold w-full justify-center mt-4"
+ label="Manage Plan"
+ />
</div>
- <v-button
- v-if="!user?.is_subscribed"
- v-track.upgrade_modal_start_trial="{plan: 'default', period: isYearly?'yearly':'monthly'}"
- class="relative border border-white border-opacity-20 h-10 inline-flex px-4 items-center rounded-lg text-sm font-semibold w-full justify-center mt-4"
- @click.prevent="onSelectPlan('default')"
- >
- Start 3-day trial
- </v-button>
- <v-button
- v-else
- :loading="billingLoading"
- :to="{ name: 'redirect-billing-portal' }"
- target="_blank"
- class="relative border border-white border-opacity-20 h-10 inline-flex px-4 items-center rounded-lg text-sm font-semibold w-full justify-center mt-4"
- >
- Manage Plan
- </v-button>
- </div>
- </article>
+ </article>
+ </div>
</div>
- </div>
- </section>
- <section class="flex flex-col self-stretch mt-12 max-md:mt-10 max-md:max-w-full">
- <div class="justify-center max-md:pr-5 max-md:max-w-full">
- <div class="flex gap-5 max-md:flex-col max-md:gap-0">
- <article class="flex flex-col w-[33%] max-md:ml-0 max-md:w-full">
- <div class="flex flex-col grow text-base leading-6 text-slate-500 max-md:mt-10">
- <Icon
- name="mdi:star-outline"
- class="w-5 h-5 text-nt-blue"
- />
- <p class="mt-2">
- <strong class="font-semibold text-slate-800">Remove OpnForm branding.</strong>
- <span class="text-slate-500"> Remove our watermark, create forms that match your brand.</span>
- </p>
- </div>
- </article>
- <article class="flex flex-col ml-5 w-[33%] max-md:ml-0 max-md:w-full">
- <div class="flex flex-col grow text-base leading-6 text-slate-500 max-md:mt-10">
- <Icon
- name="ion:brush-outline"
- class="w-5 h-5 text-nt-blue"
- />
- <p class="mt-2">
- <strong class="font-semibold text-slate-800">Full form customization.</strong>
- <span class="text-slate-500"> Customize the colors, themes, images etc of your forms. Inject custom CSS and JS code.</span>
- </p>
- </div>
- </article>
- <article class="flex flex-col w-[33%] max-md:ml-0 max-md:w-full">
- <div class="flex flex-col grow text-base leading-6 text-slate-500 max-md:mt-10">
- <Icon
- name="icons8:upload-2"
- class="w-5 h-5 text-nt-blue"
- />
- <p class="mt-2">
- <strong class="font-semibold text-slate-800">Larger File uploads.</strong>
- <span class="text-slate-500"> Larger files upload in your forms (up to 50 mb). This allows you to collect bigger attachments.</span>
- </p>
- </div>
- </article>
+ </section>
+ <section class="flex flex-col self-stretch mt-12 max-md:mt-10 max-md:max-w-full">
+ <div class="justify-center max-md:pr-5 max-md:max-w-full">
+ <div class="flex gap-5 max-md:flex-col max-md:gap-0">
+ <article class="flex flex-col w-[33%] max-md:ml-0 max-md:w-full">
+ <div class="flex flex-col grow text-base leading-6 text-slate-500 max-md:mt-10">
+ <Icon
+ name="mdi:star-outline"
+ class="w-5 h-5 text-blue-500"
+ />
+ <p class="mt-2">
+ <strong class="font-semibold text-slate-800">Remove OpnForm branding.</strong>
+ <span class="text-slate-500"> Remove our watermark, create forms that match your brand.</span>
+ </p>
+ </div>
+ </article>
+ <article class="flex flex-col ml-5 w-[33%] max-md:ml-0 max-md:w-full">
+ <div class="flex flex-col grow text-base leading-6 text-slate-500 max-md:mt-10">
+ <Icon
+ name="ion:brush-outline"
+ class="w-5 h-5 text-blue-500"
+ />
+ <p class="mt-2">
+ <strong class="font-semibold text-slate-800">Full form customization.</strong>
+ <span class="text-slate-500"> Customize the colors, themes, images etc of your forms. Inject custom CSS and JS code.</span>
+ </p>
+ </div>
+ </article>
+ <article class="flex flex-col w-[33%] max-md:ml-0 max-md:w-full">
+ <div class="flex flex-col grow text-base leading-6 text-slate-500 max-md:mt-10">
+ <Icon
+ name="icons8:upload-2"
+ class="w-5 h-5 text-blue-500"
+ />
+ <p class="mt-2">
+ <strong class="font-semibold text-slate-800">Larger File uploads.</strong>
+ <span class="text-slate-500"> Larger files upload in your forms (up to 50 mb). This allows you to collect bigger attachments.</span>
+ </p>
+ </div>
+ </article>
+ </div>
</div>
- </div>
- <div class="justify-center mt-12 max-md:pr-5 max-md:mt-10 max-md:max-w-full">
- <div class="flex gap-5 max-md:flex-col max-md:gap-0">
- <article class="flex flex-col w-[33%] max-md:ml-0 max-md:w-full">
- <div class="flex flex-col grow text-base leading-6 text-slate-500 max-md:mt-10">
- <Icon
- name="heroicons:bell"
- class="w-5 h-5 text-nt-blue"
- />
- <p class="mt-2">
- <strong class="font-semibold text-slate-800">All ntegrations & API access.</strong>
- <span class="text-slate-500"> Setup email, Slack, Discord notifications or GSheet, Zapier or webhooks integrations.</span>
- </p>
- </div>
- </article>
- <article class="flex flex-col ml-5 w-[33%] max-md:ml-0 max-md:w-full">
- <div class="flex flex-col grow text-base leading-6 text-slate-500 max-md:mt-10">
- <Icon
- name="heroicons:globe-alt"
- class="w-5 h-5 text-nt-blue"
- />
- <p class="mt-2">
- <strong class="font-semibold text-slate-800">1 custom domain.</strong>
- <span class="text-slate-500"> Host your form on your own domain for a professional look and improved branding.</span>
- </p>
- </div>
- </article>
- <article class="flex flex-col ml-5 w-[33%] max-md:ml-0 max-md:w-full">
- <div class="flex flex-col grow text-base leading-6 text-slate-500 max-md:mt-10">
- <Icon
- name="mdi:pencil-outline"
- class="w-5 h-5 text-nt-blue"
- />
- <p class="mt-2">
- <strong class="font-semibold text-slate-800">Editable submissions.</strong>
- <span class="text-slate-500"> Form respondents can go back and edit their form submissions, allowing for updates and corrections.</span>
- </p>
- </div>
- </article>
+ <div class="justify-center mt-12 max-md:pr-5 max-md:mt-10 max-md:max-w-full">
+ <div class="flex gap-5 max-md:flex-col max-md:gap-0">
+ <article class="flex flex-col w-[33%] max-md:ml-0 max-md:w-full">
+ <div class="flex flex-col grow text-base leading-6 text-slate-500 max-md:mt-10">
+ <Icon
+ name="heroicons:bell"
+ class="w-5 h-5 text-blue-500"
+ />
+ <p class="mt-2">
+ <strong class="font-semibold text-slate-800">All integrations & API access.</strong>
+ <span class="text-slate-500"> Setup email, Slack, Discord notifications or GSheet, Zapier or webhooks integrations.</span>
+ </p>
+ </div>
+ </article>
+ <article class="flex flex-col ml-5 w-[33%] max-md:ml-0 max-md:w-full">
+ <div class="flex flex-col grow text-base leading-6 text-slate-500 max-md:mt-10">
+ <Icon
+ name="heroicons:globe-alt"
+ class="w-5 h-5 text-blue-500"
+ />
+ <p class="mt-2">
+ <strong class="font-semibold text-slate-800">1 custom domain.</strong>
+ <span class="text-slate-500"> Host your form on your own domain for a professional look and improved branding.</span>
+ </p>
+ </div>
+ </article>
+ <article class="flex flex-col ml-5 w-[33%] max-md:ml-0 max-md:w-full">
+ <div class="flex flex-col grow text-base leading-6 text-slate-500 max-md:mt-10">
+ <Icon
+ name="mdi:pencil-outline"
+ class="w-5 h-5 text-blue-500"
+ />
+ <p class="mt-2">
+ <strong class="font-semibold text-slate-800">Editable submissions.</strong>
+ <span class="text-slate-500"> Form respondents can go back and edit their form submissions, allowing for updates and corrections.</span>
+ </p>
+ </div>
+ </article>
+ </div>
</div>
- </div>
- </section>
- <footer
- class="justify-center py-1.5 mt-12 text-base font-medium leading-6 text-center text-blue-500 max-md:mt-10"
- >
- <NuxtLink
- :to="{ name: 'pricing' }"
- target="_blank"
- class="focus:outline-none focus:ring-2 focus:ring-blue-500"
+ </section>
+ <footer
+ class="justify-center py-1.5 mt-12 text-base font-medium leading-6 text-center text-blue-500 max-md:mt-10"
>
- And much more. See full plans comparison
- <Icon
- class="h-6 w-5"
- name="heroicons:arrow-small-right"
- />
- </NuxtLink>
- </footer>
- </div>
- <section
- v-else-if="currentStep === 2"
- key="step2"
- class="flex flex-col items-center px-6 pb-4 bg-white rounded-2xl w-full"
- >
- <div class="flex gap-2 max-md:flex-wrap">
- <div class="flex justify-center items-center p-2 rounded-[1000px]">
- <Icon
- name="heroicons:chevron-left-16-solid"
- class="h-6 w-6 cursor-pointer"
- @click.prevent="goBackToStep1"
+ <UButton
+ class="font-bold"
+ :to="{ name: 'pricing' }"
+ target="_blank"
+ trailing-icon="heroicons:arrow-small-right"
+ variant="link"
+ label="And much more. See full plans comparison"
/>
- </div>
- <h1 class="flex-1 my-auto text-xl font-bold leading-8 text-center text-slate-800 max-md:max-w-full">
- Confirm
- <template v-if="isSubscribed">
- Upgrade
- </template>
- <template v-else>
- Subscription
- </template>
- </h1>
+ </footer>
</div>
- <div class="flex-grow w-full max-w-sm">
- <div
- v-if="!isSubscribed"
- class="bg-blue-50 rounded-md p-4 border border-blue-200 flex flex-col my-4 gap-1"
- >
- <div class="flex w-full">
- <p class="text-blue-500 capitalize font-medium flex-grow">
- OpnForm - {{ currentPlan == 'default' ? 'Pro' : 'Team' }} plan
- </p>
- <UBadge
- :color="isYearly?'green':'amber'"
- variant="subtle"
- >
- {{ !isYearly ? 'No Discount' : 'Discount Applied' }}
- </UBadge>
- </div>
-
- <p class="text-sm leading-5 text-slate-500">
- <span
- v-if="isYearly"
- class="font-medium line-through mr-2"
- v-text="'$19'"
- />
- <span
- class="font-medium"
- :class="{'text-green-700':isYearly}"
- v-text="isYearly ? '$16' : '$19'"
+ <section
+ v-else-if="currentStep === 2"
+ key="step2"
+ class="flex flex-col items-center px-6 pb-4 bg-white rounded-2xl w-full"
+ >
+ <div class="flex gap-2 max-md:flex-wrap">
+ <div class="flex justify-center items-center p-2 rounded-[1000px]">
+ <Icon
+ name="heroicons:chevron-left-16-solid"
+ class="h-6 w-6 cursor-pointer"
+ @click.prevent="goBackToStep1"
/>
- <span
- class="text-xs"
- :class="{'text-green-700':isYearly}"
- >
- per month, billed
- <template v-if="isYearly">
- yearly
- </template>
- <template v-else>
- monthly
- </template>
- </span>
- </p>
- <div v-if="shouldShowUpsell">
- <v-form size="sm">
- <toggle-switch-input
- v-model="isYearly"
- label="20% off with the yearly plan"
- size="sm"
- wrapper-class="mb-0"
- />
- </v-form>
</div>
- </div>
- <text-input
- ref="companyName"
- label="Company Name"
- name="name"
- :required="true"
- :form="form"
- help="Name that will appear on invoices"
- />
- <text-input
- label="Invoicing Email"
- name="email"
- native-type="email"
- :required="true"
- :form="form"
- help="Where invoices will be sent"
- />
- <div
- class="flex gap-2 mt-6 w-full"
- >
- <UButton
- v-track.upgrade_modal_confirm_submit="{plan: currentPlan.value, period: isYearly?'yearly':'monthly'}"
- block
- size="md"
- class="w-auto flex-grow"
- :loading="form.busy || loading"
- :disabled="form.busy || loading"
- :to="checkoutUrl"
- target="_blank"
- >
+ <h1 class="flex-1 my-auto text-xl font-bold leading-8 text-center text-slate-800 max-md:max-w-full">
+ Confirm
<template v-if="isSubscribed">
Upgrade
</template>
<template v-else>
- Subscribe
+ Subscription
</template>
- </UButton>
- <UButton
- size="md"
- color="white"
- @click="goBackToStep1"
+ </h1>
+ </div>
+ <div class="flex-grow w-full max-w-sm">
+ <div
+ v-if="!isSubscribed"
+ class="bg-blue-50 rounded-md p-4 border border-blue-200 flex flex-col my-4 gap-1"
+ >
+ <div class="flex w-full">
+ <p class="text-blue-500 capitalize font-medium flex-grow">
+ OpnForm - {{ currentPlan == 'default' ? 'Pro' : 'Team' }} plan
+ </p>
+ <UBadge
+ :color="isYearly?'green':'amber'"
+ variant="subtle"
+ >
+ {{ !isYearly ? 'No Discount' : 'Discount Applied' }}
+ </UBadge>
+ </div>
+
+ <p class="text-sm leading-5 text-slate-500">
+ <span
+ v-if="isYearly"
+ class="font-medium line-through mr-2"
+ v-text="'$19'"
+ />
+ <span
+ class="font-medium"
+ :class="{'text-green-700':isYearly}"
+ v-text="isYearly ? '$16' : '$19'"
+ />
+ <span
+ class="text-xs"
+ :class="{'text-green-700':isYearly}"
+ >
+ per month, billed
+ <template v-if="isYearly">
+ yearly
+ </template>
+ <template v-else>
+ monthly
+ </template>
+ </span>
+ </p>
+ <div v-if="shouldShowUpsell">
+ <v-form size="sm">
+ <toggle-switch-input
+ v-model="isYearly"
+ label="20% off with the yearly plan"
+ size="sm"
+ wrapper-class="mb-0"
+ />
+ </v-form>
+ </div>
+ </div>
+ <text-input
+ ref="companyName"
+ label="Company Name"
+ name="name"
+ :required="true"
+ :form="form"
+ help="Name that will appear on invoices"
+ />
+ <text-input
+ label="Invoicing Email"
+ name="email"
+ native-type="email"
+ :required="true"
+ :form="form"
+ help="Where invoices will be sent"
+ />
+ <div
+ class="flex gap-2 mt-6 w-full"
>
- Back
- </UButton>
+ <TrackClick
+ name="upgrade_modal_confirm_submit"
+ :properties="{plan: currentPlan.value, period: isYearly?'yearly':'monthly'}"
+ >
+ <UButton
+ block
+ size="md"
+ class="w-auto flex-grow"
+ :loading="form.busy || loading"
+ :disabled="form.busy || loading"
+ :to="checkoutUrl"
+ target="_blank"
+ >
+ <template v-if="isSubscribed">
+ Upgrade
+ </template>
+ <template v-else>
+ Subscribe
+ </template>
+ </UButton>
+ </TrackClick>
+ <UButton
+ size="md"
+ color="neutral"
+ variant="outline"
+ @click="goBackToStep1"
+ >
+ Back
+ </UButton>
+ </div>
</div>
- </div>
- </section>
- </div>
- </SlidingTransition>
- </div>
- </modal>
+ </section>
+ </div>
+ </SlidingTransition>
+ </div>
+ </template>
+ </UModal>
</template>
<script setup>
import SlidingTransition from '~/components/global/transitions/SlidingTransition.vue'
-import { fetchAllWorkspaces } from '~/stores/workspaces.js'
-import { useCheckoutUrl } from '@/composables/useCheckoutUrl'
+import TrackClick from '~/components/global/TrackClick.vue'
+
+import { useCheckoutUrl } from '@/composables/components/stripe/useCheckoutUrl'
+import { authApi } from '~/api'
+
+const props = defineProps({
+ modelValue: {
+ type: Boolean,
+ default: false
+ },
+ modal_title: {
+ type: String,
+ default: 'Upgrade to Pro'
+ },
+ modal_description: {
+ type: String,
+ default: 'Unlock all features and get the most out of OpnForm.'
+ },
+ plan: {
+ type: String,
+ default: 'default'
+ },
+ yearly: {
+ type: Boolean,
+ default: false
+ }
+})
+
+const emit = defineEmits(['close'])
const router = useRouter()
-const subscriptionModalStore = useSubscriptionModalStore()
-const currentPlan = ref(subscriptionModalStore.plan || 'default')
+const currentPlan = ref(props.plan)
const currentStep = ref(1)
-const isYearly = ref(subscriptionModalStore.yearly)
+const isYearly = ref(props.yearly)
const loading = ref(false)
const billingLoading = ref(false)
const shouldShowUpsell = ref(false)
@@ -347,14 +377,21 @@ const form = useForm({
email: ''
})
+const isOpen = computed({
+ get: () => props.modelValue,
+ set: (value) => emit('close', value)
+})
+
+const closeModal = () => {
+ isOpen.value = false
+}
+
const subscribeBroadcast = useBroadcastChannel('subscribe')
const broadcastData = subscribeBroadcast.data
const confetti = useConfetti()
-const authStore = useAuthStore()
-const workspacesStore = useWorkspacesStore()
-const authenticated = computed(() => authStore.check)
-const user = computed(() => authStore.user)
-const isSubscribed = computed(() => workspacesStore.isSubscribed)
+const { isAuthenticated: authenticated } = useIsAuthenticated()
+const { data: user } = useAuth().user()
+const isSubscribed = computed(() => user.value.is_pro)
const currency = 'usd'
const checkoutUrl = useCheckoutUrl(
@@ -366,34 +403,34 @@ const checkoutUrl = useCheckoutUrl(
)
// When opening modal with a plan already (and user not subscribed yet) - skip first step
-watch(() => subscriptionModalStore.show, () => {
+watch(() => props.modelValue, () => {
currentStep.value = 1
// Update user data when modal opens
- if (subscriptionModalStore.show) {
+ if (props.modelValue) {
updateUser()
- if (subscriptionModalStore.plan) {
+ if (props.plan) {
if (user.value.is_subscribed) {
return
}
- isYearly.value = subscriptionModalStore.yearly
+ isYearly.value = props.yearly
shouldShowUpsell.value = !isYearly.value
currentStep.value = 2
- currentPlan.value = subscriptionModalStore.plan
+ currentPlan.value = props.plan
}
}
})
watch(broadcastData, () => {
- if (import.meta.server || !subscriptionModalStore.show || !broadcastData.value || !broadcastData.value.type) {
+ if (import.meta.server || !props.modelValue || !broadcastData.value || !broadcastData.value.type) {
return
}
if (broadcastData.value.type === 'success') {
// Now we need to reload workspace and user
- opnFetch('user').then((userData) => {
- authStore.setUser(userData)
+ authApi.user.get().then((_userData) => {
+ useAuth().invalidateUser()
try {
const eventData = {
@@ -410,9 +447,8 @@ watch(broadcastData, () => {
console.error('Failed to register subscription event 😔',error)
}
})
- fetchAllWorkspaces().then((workspaces) => {
- workspacesStore.set(workspaces.data.value)
- })
+ const { invalidateAll } = useWorkspaces()
+ invalidateAll() // Refresh all workspace data
if (user.value.has_enterprise_subscription) {
useAlert().success(
@@ -426,7 +462,7 @@ watch(broadcastData, () => {
)
}
confetti.play()
- subscriptionModalStore.closeModal()
+ closeModal()
} else {
useAlert().error(
'Unfortunately we could not confirm your subscription. Please try again and contact us if the issue persists.'
@@ -463,7 +499,7 @@ watch(user, () => {
const onSelectPlan = (planName) => {
if (!authenticated.value) {
- subscriptionModalStore.closeModal()
+ closeModal()
router.push({ name: "register" })
return
}
diff --git a/client/components/pages/settings/SettingsModal.vue b/client/components/pages/settings/SettingsModal.vue
new file mode 100644
index 000000000..db6767241
--- /dev/null
+++ b/client/components/pages/settings/SettingsModal.vue
@@ -0,0 +1,278 @@
+<template>
+ <UModal
+ v-model:open="isOpen"
+ :ui="{
+ content: 'max-w-5xl h-[80vh] overflow-hidden',
+ }"
+ :content="{
+ onPointerDownOutside: (event) => { if (event.target?.closest('.crisp-client')) {return event.preventDefault()}}
+ }"
+ >
+ <template #content>
+ <div class="flex h-full flex-col sm:flex-row">
+ <!-- Left Sidebar -->
+ <aside class="flex flex-col border-b border-neutral-200 bg-neutral-50 sm:w-56 sm:shrink-0 sm:border-r sm:border-b-0">
+ <!-- Navigation Menu -->
+ <nav class="relative p-2 pt-2 sm:flex-1 sm:overflow-y-auto sm:pt-4">
+ <slot name="nav-top" />
+ <div class="relative">
+ <!-- Left Arrow -->
+ <VTransition name="fade">
+ <UButton
+ v-if="showLeftArrow"
+ variant="ghost"
+ color="neutral"
+ icon="i-heroicons-chevron-left"
+ class="absolute -left-px top-0 z-10 h-full bg-gradient-to-r from-neutral-50 via-neutral-50 to-transparent"
+ :ui="{ rounded: 'rounded-none', padding: { sm: 'px-4' } }"
+ @click="scrollNav(-1)"
+ />
+ </VTransition>
+
+ <NavigationList
+ ref="navContainer"
+ :items="registeredPages.map(page => ({ ...createNavItem(page), id: page.id }))"
+ :tracking-enabled="false"
+ button-class="justify-start whitespace-nowrap !w-auto sm:!w-full"
+ list-class="flex flex-row space-x-1 overflow-x-auto sm:flex-col sm:space-y-1 sm:space-x-0"
+ @item-click="(item) => setActiveItem(item.id)"
+ />
+
+ <!-- Right Arrow -->
+ <VTransition name="fade">
+ <UButton
+ v-if="showRightArrow"
+ variant="ghost"
+ color="neutral"
+ icon="i-heroicons-chevron-right"
+ class="absolute -right-px top-0 z-10 h-full bg-gradient-to-l from-neutral-50 via-neutral-50 to-transparent"
+ :ui="{ rounded: 'rounded-none', padding: { sm: 'px-4' } }"
+ @click="scrollNav(1)"
+ />
+ </VTransition>
+ </div>
+ </nav>
+ </aside>
+
+ <!-- Main Content -->
+ <main class="relative flex flex-1 flex-col overflow-hidden">
+ <!-- Content Body -->
+ <div class="flex-1 overflow-y-auto">
+ <div class="p-6">
+ <!-- Modal pages will register themselves and render here -->
+ <slot />
+
+ <!-- Default content if no pages registered -->
+ <div v-if="registeredPages.length === 0" class="py-12 text-center">
+ <UIcon
+ name="i-heroicons-cog-6-tooth"
+ class="mx-auto mb-4 h-12 w-12 text-neutral-400"
+ />
+ <h3 class="mb-2 text-lg font-medium text-neutral-900">
+ Select a setting
+ </h3>
+ <p class="text-neutral-500">
+ Choose an option from the sidebar to configure your settings.
+ </p>
+ </div>
+ </div>
+ </div>
+ </main>
+ </div>
+ </template>
+ </UModal>
+</template>
+
+<script setup>
+import { useScroll, useResizeObserver } from '@vueuse/core'
+import { nextTick, ref, computed, watch, provide } from 'vue'
+import VTransition from '@/components/global/transitions/VTransition.vue'
+import NavigationList from '~/components/global/NavigationList.vue'
+
+const emit = defineEmits(['close', 'item-changed', 'update:activeTab'])
+
+// Registered pages for auto-registration
+const registeredPages = ref([])
+
+const props = defineProps({
+ modelValue: {
+ type: Boolean,
+ default: false
+ },
+ activeTab: {
+ type: String,
+ default: null
+ }
+})
+
+// Modal state
+const isOpen = computed({
+ get: () => props.modelValue,
+ set: (value) => emit('close', value)
+})
+
+// Get first item ID from menu sections
+function getFirstItemId() {
+ if (registeredPages.value.length > 0) {
+ return registeredPages.value[0].id
+ }
+ return null
+}
+
+// Reactive reference for the currently active tab
+const activeTabRef = ref(props.activeTab)
+
+// --- Responsive Nav Scrolling ---
+const navContainer = ref(null)
+const { x: scrollX } = useScroll(navContainer)
+const contentWidth = ref(0)
+const containerWidth = ref(0)
+
+const showLeftArrow = computed(() => scrollX.value > 0)
+const showRightArrow = computed(() => {
+ if (containerWidth.value === 0 || contentWidth.value === 0) return false
+ return scrollX.value < contentWidth.value - containerWidth.value - 1 // -1 for subpixel precision
+})
+
+useResizeObserver(navContainer, (entries) => {
+ const entry = entries[0]
+ containerWidth.value = entry.contentRect.width
+ if (navContainer.value) {
+ contentWidth.value = navContainer.value.scrollWidth
+ }
+})
+
+function scrollNav(direction) {
+ if (navContainer.value) {
+ // Scroll by 80% of the container's width for a better user experience
+ const scrollAmount = containerWidth.value * 0.8 * direction
+ navContainer.value.scrollBy({ left: scrollAmount, behavior: 'smooth' })
+ }
+}
+
+// Keep local ref in sync with incoming prop
+watch(() => props.activeTab, (newVal) => {
+ activeTabRef.value = newVal
+})
+
+// Default button configuration
+const defaultButtonProps = {
+ variant: 'ghost',
+ activeVariant: 'soft',
+ color: 'neutral',
+ block: true,
+}
+
+// Helper function to apply defaults to navigation items
+const createNavItem = (item) => {
+ const baseItem = {
+ ...defaultButtonProps,
+ label: item.label,
+ icon: item.icon,
+ active: activeTabRef.value === item.id
+ }
+
+ // Add custom classes to darken ghost/soft variants for better visibility on neutral-50 background
+ const customClasses = ['group']
+
+ // For ghost variant (default), darken hover state
+ if (baseItem.variant === 'ghost' && baseItem.color === 'neutral') {
+ customClasses.push('hover:bg-neutral-200/80')
+ baseItem.ui = {
+ leadingIcon: 'text-neutral-400 group-hover:text-neutral-500'
+ }
+ }
+
+ // For soft variant (active state), darken background
+ if (baseItem.active && baseItem.activeVariant === 'soft' && baseItem.color === 'neutral') {
+ customClasses.push('bg-neutral-200/90 text-neutral-800')
+ }
+
+ return {
+ ...baseItem,
+ class: customClasses.length > 0 ? customClasses.join(' ') : undefined
+ }
+}
+
+// Set active item
+const setActiveItem = (itemId) => {
+ activeTabRef.value = itemId
+ emit('item-changed', itemId)
+ emit('update:activeTab', itemId)
+}
+
+// Reset to default item only when modal opens
+watch(isOpen, (newValue) => {
+ if (newValue) {
+ // Use nextTick to allow child pages to register themselves first, fixing the race condition.
+ nextTick(() => {
+ const isValidPropTab = props.activeTab && registeredPages.value.some(p => p.id === props.activeTab)
+
+ if (isValidPropTab) {
+ // If the prop provides a valid tab, use it.
+ activeTabRef.value = props.activeTab
+ } else {
+ // Otherwise, fallback to the first item if the current selection is invalid.
+ const isCurrentTabValid = registeredPages.value.some(p => p.id === activeTabRef.value)
+ if (!isCurrentTabValid) {
+ activeTabRef.value = getFirstItemId()
+ }
+ }
+ })
+ }
+})
+
+// Ensure activeTabRef stays in sync with registered pages
+watch(registeredPages, () => {
+ // If prop specifies a valid tab and it's not already active, set it
+ if (props.activeTab && props.activeTab !== activeTabRef.value && registeredPages.value.some(p => p.id === props.activeTab)) {
+ activeTabRef.value = props.activeTab
+ return
+ }
+
+ // If current active item has been removed, fall back to first available
+ if (!registeredPages.value.some(p => p.id === activeTabRef.value)) {
+ activeTabRef.value = getFirstItemId()
+ }
+}, { deep: true })
+
+// Registration functions for modal pages
+function registerModalPage(id, label, icon) {
+ const existingIndex = registeredPages.value.findIndex(page => page.id === id)
+ if (existingIndex !== -1) {
+ registeredPages.value[existingIndex] = { id, label, icon }
+ } else {
+ registeredPages.value.push({ id, label, icon })
+ if (registeredPages.value.length === 1) {
+ activeTabRef.value = id
+ }
+ }
+}
+
+function unregisterModalPage(id) {
+ const index = registeredPages.value.findIndex(page => page.id === id)
+ if (index !== -1) {
+ registeredPages.value.splice(index, 1)
+ // If the page being removed was the active one, select a new one.
+ if (activeTabRef.value === id) {
+ if (registeredPages.value.length > 0) {
+ setActiveItem(registeredPages.value[0].id)
+ } else {
+ activeTabRef.value = null
+ }
+ }
+ }
+}
+
+// Provide functions for child components (after they're defined)
+provide('activeModalItem', activeTabRef)
+provide('registerModalPage', registerModalPage)
+provide('unregisterModalPage', unregisterModalPage)
+</script>
+
+<style scoped>
+/* Hide scrollbar for Chrome, Safari and Opera */
+ul::-webkit-scrollbar {
+ display: none;
+}
+</style>
\ No newline at end of file
diff --git a/client/components/pages/settings/SettingsModalPage.vue b/client/components/pages/settings/SettingsModalPage.vue
new file mode 100644
index 000000000..9692499c7
--- /dev/null
+++ b/client/components/pages/settings/SettingsModalPage.vue
@@ -0,0 +1,53 @@
+<template>
+ <div class="settings-modal-page">
+ <Suspense v-if="isActive">
+ <slot />
+ <template #fallback>
+ <!-- Loading skeleton while component loads -->
+ <div class="space-y-4">
+ <USkeleton class="h-8 w-1/3" />
+ <USkeleton class="h-4 w-full" />
+ <USkeleton class="h-4 w-2/3" />
+ <div class="space-y-3 mt-6">
+ <USkeleton class="h-10 w-full" />
+ <USkeleton class="h-10 w-full" />
+ <USkeleton class="h-24 w-full" />
+ </div>
+ </div>
+ </template>
+ </Suspense>
+ </div>
+</template>
+
+<script setup>
+import { inject, computed, onMounted, onBeforeUnmount } from 'vue'
+
+const props = defineProps({
+ id: {
+ type: String,
+ required: true
+ },
+ label: {
+ type: String,
+ required: true
+ },
+ icon: {
+ type: String,
+ required: true
+ }
+})
+
+const activeItem = inject('activeModalItem', ref(''))
+const registerModalPage = inject('registerModalPage', () => {})
+const unregisterModalPage = inject('unregisterModalPage', () => {})
+
+const isActive = computed(() => activeItem.value === props.id)
+
+onMounted(() => {
+ registerModalPage(props.id, props.label, props.icon)
+})
+
+onBeforeUnmount(() => {
+ unregisterModalPage(props.id)
+})
+</script>
\ No newline at end of file
diff --git a/client/components/pages/settings/WorkSpaceCustomDomains.vue b/client/components/pages/settings/WorkSpaceCustomDomains.vue
deleted file mode 100644
index c99bd50b3..000000000
--- a/client/components/pages/settings/WorkSpaceCustomDomains.vue
+++ /dev/null
@@ -1,125 +0,0 @@
-<template>
- <div
- v-if="useFeatureFlag('custom_domains')"
- id="custom-domains"
- >
- <UButton
- color="gray"
- label="Custom Domains Settings"
- icon="i-heroicons-globe-alt"
- @click="showCustomDomainModal = !showCustomDomainModal"
- />
-
- <modal
- :show="showCustomDomainModal"
- max-width="lg"
- @close="showCustomDomainModal = false"
- >
- <h4 class="mb-4 font-medium">
- Custom Domains Settings
- </h4>
- <UAlert
- v-if="!workspace.is_pro"
- icon="i-heroicons-user-group-20-solid"
- class="mb-4"
- color="orange"
- variant="subtle"
- title="Pro plan required"
- >
- <template #description>
- Please <NuxtLink
- :to="{name:'pricing'}"
- class="underline"
- >
- upgrade your account
- </NuxtLink> to setup a custom domain.
- </template>
- </UAlert>
- <p class="text-gray-500 text-sm mb-4">
- Read
- <a
- href="#"
- class="underline"
- @click.prevent="
- crisp.openHelpdeskArticle('how-to-use-my-own-domain-9m77g7')
- "
- >our instructions</a>
- to learn how to setup your own domain.
- </p>
- <text-area-input
- :form="customDomainsForm"
- name="custom_domains"
- :required="false"
- :disabled="!workspace.is_pro"
- label="Workspace Custom Domains"
- wrapper-class=""
- placeholder="yourdomain.com - 1 per line"
- />
- <UButton
- class="mt-3"
- :loading="customDomainsLoading"
- :disabled="!workspace.is_pro"
- icon="i-heroicons-check"
- @click="saveChanges"
- >
- Save Domain(s)
- </UButton>
- </modal>
- </div>
-</template>
-
-<script setup>
-import {watch} from "vue"
-
-const crisp = useCrisp()
-const workspacesStore = useWorkspacesStore()
-const workspace = computed(() => workspacesStore.getCurrent)
-
-const customDomainsForm = useForm({
- custom_domain: "",
-})
-const customDomainsLoading = ref(false)
-const showCustomDomainModal = ref(false)
-
-onMounted(() => {
- initCustomDomains()
-})
-
-watch(
- () => workspace,
- () => {
- initCustomDomains()
- },
-)
-
-const saveChanges = () => {
- if (customDomainsLoading.value) return
- customDomainsLoading.value = true
-
- // Update the workspace custom domain
- customDomainsForm
- .put("/open/workspaces/" + workspace.value.id + "/custom-domains", {
- data: {
- custom_domains: customDomainsForm?.custom_domains
- ?.split("\n")
- .map((domain) => (domain ? domain.trim() : null))
- .filter((domain) => domain && domain.length > 0),
- },
- })
- .then((data) => {
- workspacesStore.save(data)
- useAlert().success("Custom domains saved.")
- })
- .catch((error) => {
- useAlert().error(error.response._data.message ?? 'Failed to update custom domains')
- })
- .finally(() => {
- customDomainsLoading.value = false
- })
-}
-
-const initCustomDomains = () => {
- if (!workspace || !workspace.value.custom_domains) return
- customDomainsForm.custom_domains = workspace.value?.custom_domains.join("\n")
-}
-</script>
diff --git a/client/components/pages/settings/WorkSpaceEmailSettings.vue b/client/components/pages/settings/WorkSpaceEmailSettings.vue
deleted file mode 100644
index 08bccb376..000000000
--- a/client/components/pages/settings/WorkSpaceEmailSettings.vue
+++ /dev/null
@@ -1,185 +0,0 @@
-<template>
- <div id="email-settings">
- <UButton
- color="gray"
- label="Email Settings"
- icon="i-heroicons-envelope"
- @click="showEmailSettingsModal = !showEmailSettingsModal"
- />
-
- <modal
- :show="showEmailSettingsModal"
- max-width="lg"
- @close="showEmailSettingsModal = false"
- >
- <h4 class="font-medium">
- Email Settings
- </h4>
- <p class="mb-4 text-gray-500 text-sm">
- Customize email sender - connect your SMTP server.
- </p>
- <UAlert
- v-if="!workspace.is_pro"
- icon="i-heroicons-user-group-20-solid"
- class="my-4 !text-orange-500"
- color="orange"
- variant="subtle"
- title="Pro plan required"
- >
- <template #description>
- Please <a
- href="#"
- class="text-orange-500 underline"
- @click.prevent="openSubscriptionModal"
- >
- upgrade your account
- </a> to setup an email settings.
- </template>
- </UAlert>
-
- <TextInput
- :form="emailSettingsForm"
- name="host"
- :required="true"
- :disabled="!workspace.is_pro"
- label="Host/Server"
- class="mt-2"
- placeholder="smtp.example.com"
- />
- <TextInput
- :form="emailSettingsForm"
- name="port"
- :required="true"
- :disabled="!workspace.is_pro"
- label="Port"
- placeholder="587"
- />
- <TextInput
- :form="emailSettingsForm"
- name="username"
- :required="true"
- :disabled="!workspace.is_pro"
- label="Username"
- placeholder="Username"
- />
- <TextInput
- :form="emailSettingsForm"
- name="password"
- native-type="password"
- :required="true"
- :disabled="!workspace.is_pro"
- label="Password"
- placeholder="Password"
- />
- <TextInput
- :form="emailSettingsForm"
- name="sender_address"
- :disabled="!workspace.is_pro"
- label="Sender address"
- placeholder="[email protected]"
- />
-
- <div class="flex justify-between gap-2">
- <UButton
- class="mt-3 px-6"
- :loading="emailSettingsLoading"
- :disabled="!workspace.is_pro"
- icon="i-heroicons-check"
- @click="saveChanges"
- >
- Update
- </UButton>
- <UButton
- class="mt-3 ml-2"
- color="white"
- size="sm"
- :loading="emailSettingsLoading"
- :disabled="!workspace.is_pro"
- icon="i-heroicons-x-mark"
- @click="clearEmailSettings"
- >
- Clear
- </UButton>
- </div>
- </modal>
- </div>
-</template>
-
-<script setup>
-import {watch} from "vue"
-
-const workspacesStore = useWorkspacesStore()
-const workspace = computed(() => workspacesStore.getCurrent)
-const subscriptionModalStore = useSubscriptionModalStore()
-
-const openSubscriptionModal = () => {
- showEmailSettingsModal.value = false
- subscriptionModalStore.setModalContent('Upgrade to send emails using your own domain')
- subscriptionModalStore.openModal()
-}
-
-const emailSettingsForm = useForm({
- host: '',
- port: '',
- username: '',
- password: '',
- sender_address: ''
-})
-const emailSettingsLoading = ref(false)
-const showEmailSettingsModal = ref(false)
-
-onMounted(() => {
- initEmailSettings()
-})
-
-watch(
- () => workspace,
- () => {
- initEmailSettings()
- },
-)
-
-const clearEmailSettings = () => {
- emailSettingsForm.reset()
- saveChanges()
-}
-
-const saveChanges = () => {
- if (emailSettingsLoading.value) return
- emailSettingsLoading.value = true
-
- // Update the workspace Email Settings
- emailSettingsForm
- .put("/open/workspaces/" + workspace.value.id + "/email-settings", {
- data: {
- host: emailSettingsForm?.host,
- port: emailSettingsForm?.port,
- username: emailSettingsForm?.username,
- password: emailSettingsForm?.password,
- sender_address: emailSettingsForm?.sender_address,
- },
- })
- .then((data) => {
- workspacesStore.save(data)
- useAlert().success("Email settings saved.")
- })
- .catch((error) => {
- useAlert().error(
- "Failed to update email settings: " + error.response.data.message,
- )
- })
- .finally(() => {
- emailSettingsLoading.value = false
- })
-}
-
-const initEmailSettings = () => {
- if (!workspace || !workspace.value.settings.email_settings) return
- const emailSettings = workspace.value?.settings?.email_settings
- emailSettingsForm.host = emailSettings?.host
- emailSettingsForm.port = emailSettings?.port
- emailSettingsForm.username = emailSettings?.username
- emailSettingsForm.password = emailSettings?.password
- emailSettingsForm.sender_address = emailSettings?.sender_address
-}
-</script>
diff --git a/client/components/pages/settings/WorkSpaceUser.vue b/client/components/pages/settings/WorkSpaceUser.vue
deleted file mode 100644
index 7024dc2d2..000000000
--- a/client/components/pages/settings/WorkSpaceUser.vue
+++ /dev/null
@@ -1,363 +0,0 @@
-<template>
- <div class="border rounded-md p-4">
- <div class="flex items-center justify-between">
- <h4 class="font-semibold">
- Workspace Members
- </h4>
- <UButton
- v-if="!workspace.is_readonly"
- label="Invite User"
- icon="i-heroicons-user-plus-20-solid"
- :loading="loading"
- @click="userInviteModal = true"
- />
- </div>
- <!-- User invite modal -->
- <modal
- :show="userInviteModal"
- max-width="lg"
- @close="userInviteModal = false"
- >
- <h4 class="mb-4 font-medium">
- Invite a new user and collaborate on building forms
- </h4>
-
- <template v-if="paidPlansEnabled && !hasActiveLicense">
- <UAlert
- v-if="workspace.is_pro"
- icon="i-heroicons-credit-card"
- color="primary"
- variant="subtle"
- title="This is a billable event."
- >
- <template #description>
- You will be charged $6/month for each user you invite to this workspace. More details on the
- <NuxtLink
- target="_blank"
- class="underline"
- :to="{name:'settings-billing'}"
- >
- billing
- </NuxtLink>
- and
- <NuxtLink
- target="_blank"
- class="underline"
- :to="{name:'pricing'}"
- >
- pricing
- </NuxtLink>
- page.
- </template>
- </UAlert>
- <UAlert
- v-else
- icon="i-heroicons-user-group-20-solid"
- color="orange"
- variant="subtle"
- title="Pro plan required"
- >
- <template #description>
- You need a Pro plan to invite new users on OpnForm. Please upgrade on our
- <NuxtLink
- target="_blank"
- class="underline"
- :to="{name:'pricing'}"
- >
- pricing
- </NuxtLink>
- page.
- </template>
- </UAlert>
- </template>
-
- <AddUserToWorkspace
- :disabled="!canInviteUser"
- :is-workspace-admin="isWorkspaceAdmin"
- @fetch-users="getWorkspaceUsers"
- />
- </modal>
- <UTable
- class="-mx-4 border-y mt-4"
- :loading="loadingUsers"
- :rows="users"
- :columns="columns"
- >
- <template
- v-if="isWorkspaceAdmin"
- #actions-data="{ row, index }"
- >
- <div class="space-x-2 flex justify-center">
- <template v-if="row.type == 'user'">
- <p
- v-if="row.is_current_user"
- class="text-gray-500 text-center text-sm"
- >
- -
- </p>
- <UButtonGroup
- v-else
- size="2xs"
- >
- <UTooltip
- text="Edit user"
- >
- <UButton
- icon="i-heroicons-pencil"
- color="gray"
- class="hover:text-blue-500"
- square
- @click="editUser(index)"
- />
- </UTooltip>
- <UTooltip
- text="Remove user"
- >
- <UButton
- v-if="row.type == 'user'"
- icon="i-heroicons-trash"
- color="gray"
- class="hover:text-red-500"
- square
- @click="removeUser(index)"
- />
- </UTooltip>
- </UButtonGroup>
- </template>
- <UButtonGroup
- v-else-if="row.type == 'invitee'"
- size="2xs"
- >
- <UTooltip
- text="Resend Invite"
- >
- <UButton
- icon="i-heroicons-envelope"
- color="gray"
- class="hover:text-blue-500"
- square
- @click="resendInvite(index)"
- />
- </UTooltip>
- <UTooltip
- text="Cancel Invite"
- >
- <UButton
- icon="i-heroicons-trash"
- color="gray"
- class="hover:text-red-500"
- square
- @click="cancelInvite(index)"
- />
- </UTooltip>
- </UButtonGroup>
- </div>
- </template>
- </UTable>
-
- <EditWorkSpaceUser
- :user="selectedUser"
- :show-edit-user-modal="showEditUserModal"
- @close="showEditUserModal = false"
- @fetch-users="getWorkspaceUsers"
- />
-
- <div class="flex gap-2 mt-4">
- <UButton
- v-if="users.length > 1"
- color="gray"
- icon="i-heroicons-arrow-left-start-on-rectangle-20-solid"
- :loading="leaveWorkspaceLoadingState"
- @click="leaveWorkSpace(workspace.id)"
- >
- Leave Workspace
- </UButton>
-
- <UButton
- v-if="isWorkspaceAdmin && users.length == 1"
- icon="i-heroicons-trash"
- color="gray"
- :loading="loading"
- @click="deleteWorkspace(workspace.id)"
- >
- Remove workspace
- </UButton>
- </div>
- </div>
-</template>
-
-<script setup>
-const workspacesStore = useWorkspacesStore()
-const authStore = useAuthStore()
-
-const workspace = computed(() => workspacesStore.getCurrent)
-const loading = computed(() => workspacesStore.loading)
-const workspaces = computed(() => workspacesStore.getAll)
-
-const users = ref([])
-const loadingUsers = ref(true)
-const leaveWorkspaceLoadingState = ref(false)
-
-const userInviteModal = ref(false)
-const showEditUserModal = ref(false)
-const selectedUser = ref(null)
-const userNewRole = ref("")
-
-const paidPlansEnabled = ref(useFeatureFlag('billing.enabled'))
-const canInviteUser = computed(() => {
- return paidPlansEnabled.value ? workspace.value.is_pro : true
-})
-const hasActiveLicense = computed(() => authStore.has_active_license)
-
-onMounted(() => {
- getWorkspaceUsers()
-})
-
-const getWorkspaceUsers = async () => {
- userInviteModal.value = false
- loadingUsers.value = true
- let data = await workspacesStore.getWorkspaceUsers()
- data = data.map(d => {
- return {
- ...d,
- id: d.id,
- is_current_user: d.id === authStore.user.id,
- name: d.name,
- email: d.email,
- status: 'accepted',
- role: d.pivot.role,
- type: 'user'
- }
- })
- let invites = await workspacesStore.getWorkspaceInvites()
- invites = invites.filter(i => i.status !== 'accepted').map(i => {
- return {
- ...i,
- name: 'Invitee',
- email: i.email,
- status: i.status,
- type: 'invitee'
- }
- })
- users.value = [...data, ...invites]
- loadingUsers.value = false
-}
-
-const isWorkspaceAdmin = computed(() => {
- if (!users.value) return false
- const user = users.value.find((user) => user.id === authStore.user.id)
- return user && user.pivot.role === "admin"
-})
-
-const columns = computed(() => {
- return [
- {key: 'name', label: 'Name'},
- {key: 'email', label: 'Email'},
- {key: 'role', label: 'Role'},
- ...(isWorkspaceAdmin.value ? [{key: 'actions', label: 'Action', class: 'text-center'}] : [])
- ]
-})
-
-
-const editUser = (row) => {
- selectedUser.value = users.value[row]
- userNewRole.value = selectedUser.value.pivot.role
- showEditUserModal.value = true
-}
-
-
-const removeUser = (index) => {
- const user = users.value[index]
- useAlert().confirm(
- "Do you really want to remove " + user.name + " from this workspace?",
- () => {
- loadingUsers.value = true
- opnFetch(
- "/open/workspaces/" + workspacesStore.currentId + "/users/" + user.id + "/remove",
- {
- method: "DELETE",
- },
- {showSuccess: false},
- ).then(() => {
- useAlert().success("User successfully removed.")
- getWorkspaceUsers()
- }).catch(() => {
- useAlert().error("There was an error removing user")
- }).finally(() => {
- loadingUsers.value = false
- })
- },
- )
-}
-
-const deleteWorkspace = (workspaceId) => {
- if (workspaces.length <= 1) {
- useAlert().error("You cannot delete your only workspace.")
- return
- }
- useAlert().confirm(
- "Do you really want to delete this workspace? All forms created in this workspace will be removed.",
- () => {
- opnFetch("/open/workspaces/" + workspaceId, {method: "DELETE"}).then(
- () => {
- useAlert().success("Workspace successfully removed.")
- workspacesStore.remove(workspaceId)
- },
- )
- },
- )
-}
-
-const leaveWorkSpace = (workspaceId) => {
- useAlert().confirm(
- "Do you really want to leave this workspace? You will lose access to all forms in this workspace.",
- () => {
- leaveWorkspaceLoadingState.value = true
- opnFetch("/open/workspaces/" + workspaceId + "/leave", {
- method: "POST",
- }).then(() => {
- useAlert().success("You have left the workspace.")
- workspacesStore.remove(workspaceId)
- getWorkspaceUsers()
- }).catch(() => {
- useAlert().error("There was an error leaving the workspace.")
- }).finally(() => {
- leaveWorkspaceLoadingState.value = false
- })
- },
- )
-}
-
-const resendInvite = (id) => {
- const inviteId = users.value[id].id
- useAlert().confirm(
- "Do you really want to resend invite email to this user?",
- () => {
- opnFetch("/open/workspaces/" + workspace.value.id + "/invites/" + inviteId + "/resend", {method: "POST"}).then(
- () => {
- useAlert().success("Invitation resent successfully.")
- getWorkspaceUsers()
- },
- ).catch(err => {
- useAlert().error(err.response._data?.message)
- })
- })
-}
-
-const cancelInvite = (id) => {
- const inviteId = users.value[id].id
- useAlert().confirm(
- "Do you really want to cancel this user's invitation to this workspace?",
- () => {
- opnFetch("/open/workspaces/" + workspace.value.id + "/invites/" + inviteId + "/cancel", {method: "DELETE"}).then(
- () => {
- useAlert().success("Invitation cancelled successfully.")
- getWorkspaceUsers()
- },
- ).catch(err => {
- useAlert().error(err.response._data?.message)
- })
- })
-}
-
-</script>
diff --git a/client/components/pages/templates/SingleTemplate.vue b/client/components/pages/templates/SingleTemplate.vue
index bc4b8375f..5c6adf37b 100644
--- a/client/components/pages/templates/SingleTemplate.vue
+++ b/client/components/pages/templates/SingleTemplate.vue
@@ -27,21 +27,32 @@
</span>
</div>
- <div class="aspect-[4/3] rounded-lg shadow-sm overflow-hidden">
+ <div class="aspect-[4/3] rounded-lg shadow-xs overflow-hidden bg-neutral-50">
<img
- v-if="template.image_url"
+ v-if="template.image_url && !imageError"
class="group-hover:scale-110 transition-all duration-200 h-full object-cover w-full"
:src="template.image_url"
alt=""
width="450px"
+ @error="handleImageError"
>
+ <!-- Fallback when no image or image error -->
+ <div
+ v-else
+ class="h-full w-full flex items-center justify-center bg-neutral-100"
+ >
+ <UIcon
+ name="i-heroicons-document-duplicate"
+ class="h-16 w-16 text-neutral-400"
+ />
+ </div>
</div>
<p
- class="text-lg font-semibold leading-tight tracking-tight text-gray-900 mt-4 group-hover:text-blue-500 transition-all duration-150"
+ class="text-lg font-semibold leading-tight tracking-tight text-neutral-900 mt-4 group-hover:text-blue-500 transition-all duration-150"
>
{{ template.name }}
</p>
- <p class="line-clamp-2 mt-2 text-sm font-normal text-gray-600">
+ <p class="line-clamp-2 mt-2 text-sm font-normal text-neutral-600">
{{ cleanQuotes(template.short_description) }}
</p>
<template-tags
@@ -72,11 +83,20 @@ export default {
},
},
+ data() {
+ return {
+ imageError: false,
+ }
+ },
+
methods: {
cleanQuotes(str) {
// Remove starting and ending quotes if any
return str ? str.replace(/^"/, "").replace(/"$/, "") : ""
},
+ handleImageError() {
+ this.imageError = true
+ },
},
}
</script>
diff --git a/client/components/pages/templates/TemplateTags.vue b/client/components/pages/templates/TemplateTags.vue
index 3d1595db6..793d8bcf3 100644
--- a/client/components/pages/templates/TemplateTags.vue
+++ b/client/components/pages/templates/TemplateTags.vue
@@ -23,14 +23,14 @@
<span
v-for="item in types"
:key="item.slug"
- class="inline-flex items-center rounded-full bg-gray-50 dark:bg-gray-800 dark:text-gray-400 px-2 py-1 text-xs font-medium text-gray-600 ring-1 ring-inset ring-gray-500/10"
+ class="inline-flex items-center rounded-full bg-neutral-50 dark:bg-neutral-800 dark:text-neutral-400 px-2 py-1 text-xs font-medium text-neutral-600 ring-1 ring-inset ring-neutral-500/10"
>
{{ item.name }}
</span>
<span
v-for="item in industries"
:key="item.slug"
- class="inline-flex items-center rounded-full bg-blue-50 dark:bg-blue-900 dark:text-gray-400 px-2 py-1 text-xs font-medium text-blue-700 ring-1 ring-inset ring-blue-700/10"
+ class="inline-flex items-center rounded-full bg-blue-50 dark:bg-blue-900 dark:text-neutral-400 px-2 py-1 text-xs font-medium text-blue-700 ring-1 ring-inset ring-blue-700/10"
>
{{ item.name }}
</span>
@@ -38,7 +38,7 @@
<template v-else>
<span
v-if="types.length > 0"
- class="inline-flex items-center rounded-full bg-gray-50 px-2 py-1 text-xs font-medium text-gray-600 ring-1 ring-inset ring-gray-500/10"
+ class="inline-flex items-center rounded-full bg-neutral-50 px-2 py-1 text-xs font-medium text-neutral-600 ring-1 ring-inset ring-neutral-500/10"
>
{{ types[0].name }}
<template v-if="types.length > 1">+{{ types.length - 1 }}</template>
@@ -55,6 +55,9 @@
</template>
<script setup>
+import { computed } from "vue"
+import { useTemplateMeta } from "~/composables/data/useTemplateMeta"
+
const props = defineProps({
template: {
type: Object,
@@ -66,11 +69,9 @@ const props = defineProps({
},
})
-const templatesStore = useTemplatesStore()
-const types = computed(() =>
- templatesStore.getTemplateTypes(props.template.types),
-)
+const { getTemplateTypes, getTemplateIndustries } = useTemplateMeta()
+const types = computed(() => getTemplateTypes(props.template.types))
const industries = computed(() =>
- templatesStore.getTemplateIndustries(props.template.industries),
+ getTemplateIndustries(props.template.industries),
)
</script>
diff --git a/client/components/pages/templates/TemplatesList.vue b/client/components/pages/templates/TemplatesList.vue
index 90b5b8db6..917b60e2b 100644
--- a/client/components/pages/templates/TemplatesList.vue
+++ b/client/components/pages/templates/TemplatesList.vue
@@ -1,18 +1,18 @@
<template>
<div>
- <section class="bg-white py-12">
- <div class="px-4 sm:px-6 lg:px-8 max-w-7xl mx-auto">
- <div
- class="flex flex-col sm:flex-row sm:items-center sm:justify-between gap-4 sm:gap-6 relative z-20"
+ <section class="bg-white">
+ <VForm
+ size="sm"
+ class="flex flex-col sm:flex-row sm:items-center sm:justify-between gap-2 relative z-20"
>
- <div class="flex items-center gap-4">
+ <div class="flex items-center gap-2">
<div class="flex-1 sm:flex-none">
<select-input
v-if="filterTypes"
v-model="selectedType"
name="type"
:options="typesOptions"
- class="w-full sm:w-auto md:w-56"
+ class="w-full sm:w-auto md:min-w-48"
/>
</div>
<div class="flex-1 sm:flex-none">
@@ -21,7 +21,7 @@
v-model="selectedIndustry"
name="industry"
:options="industriesOptions"
- class="w-full sm:w-auto md:w-56"
+ class="w-full sm:w-auto md:min-w-48"
/>
</div>
</div>
@@ -33,13 +33,44 @@
placeholder="Search..."
/>
</div>
- </div>
+ </VForm>
<div
v-if="loading"
- class="text-center mt-4"
+ class="relative z-10"
>
- <Loader class="h-6 w-6 text-nt-blue mx-auto" />
+ <div
+ class="grid gap-8 sm:gap-y-12"
+ :class="gridClasses"
+ >
+ <div
+ v-for="i in 8"
+ :key="i"
+ class="w-full"
+ >
+ <!-- Template Card Skeleton -->
+ <div class="w-full">
+ <!-- Image Skeleton -->
+ <USkeleton class="aspect-[4/3] rounded-lg w-full" />
+
+ <!-- Title Skeleton -->
+ <USkeleton class="h-6 mt-4 mb-2 w-full" />
+
+ <!-- Description Skeleton -->
+ <div class="space-y-2 mt-2 mb-4">
+ <USkeleton class="h-4 w-full" />
+ <USkeleton class="h-4 w-3/4" />
+ </div>
+
+ <!-- Tags Skeleton -->
+ <div class="flex flex-wrap gap-2 mt-4">
+ <USkeleton class="h-6 rounded-full w-16" />
+ <USkeleton class="h-6 rounded-full w-20" />
+ <USkeleton class="h-6 rounded-full w-14" />
+ </div>
+ </div>
+ </div>
+ </div>
</div>
<p
v-else-if="enrichedTemplates.length === 0"
@@ -52,7 +83,8 @@
class="relative z-10"
>
<div
- class="grid grid-cols-1 mt-8 sm:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4 gap-8 sm:gap-y-12"
+ class="grid gap-8 sm:gap-y-12"
+ :class="gridClasses"
>
<single-template
v-for="template in enrichedTemplates"
@@ -61,31 +93,29 @@
/>
</div>
</div>
- </div>
</section>
<slot name="before-lists" />
<section
v-if="showTypes"
- class="py-12 bg-white border-t border-gray-200 sm:py-16"
+ class="py-12 bg-white border-t border-neutral-200 sm:py-16"
>
<div class="px-4 mx-auto sm:px-6 lg:px-8 max-w-7xl">
<div class="flex items-center justify-between">
<h4
- class="text-xl font-bold tracking-tight text-gray-900 sm:text-2xl"
+ class="text-xl font-bold tracking-tight text-neutral-900 sm:text-2xl"
>
All Types
</h4>
- <v-button
+ <UButton
v-if="$route.name !== 'templates'"
:to="{ name: 'templates' }"
- color="white"
- size="small"
- :arrow="true"
- >
- View All Templates
- </v-button>
+ color="neutral"
+ size="sm"
+ trailing-icon="i-heroicons-arrow-right"
+ label="View All Templates"
+ />
</div>
<div
@@ -96,7 +126,7 @@
:key="row.slug"
:to="{ params: { slug: row.slug }, name: 'templates-types-slug' }"
:title="row.name"
- class="text-gray-600 dark:text-gray-400 transition-colors duration-300 hover:text-nt-blue"
+ class="text-neutral-600 dark:text-neutral-400 transition-colors duration-300 hover:text-blue-500"
>
{{ row.name }}
</NuxtLink>
@@ -106,24 +136,23 @@
<section
v-if="showIndustries"
- class="py-12 bg-white border-t border-gray-200 sm:py-16"
+ class="py-12 bg-white border-t border-neutral-200 sm:py-16"
>
<div class="px-4 mx-auto sm:px-6 lg:px-8 max-w-7xl">
<div class="flex items-center justify-between">
<h4
- class="text-xl font-bold tracking-tight text-gray-900 sm:text-2xl"
+ class="text-xl font-bold tracking-tight text-neutral-900 sm:text-2xl"
>
All Industries
</h4>
- <v-button
+ <UButton
v-if="$route.name !== 'templates'"
:to="{ name: 'templates' }"
- color="white"
- size="small"
- :arrow="true"
- >
- View All Templates
- </v-button>
+ color="neutral"
+ size="sm"
+ trailing-icon="i-heroicons-arrow-right"
+ label="View All Templates"
+ />
</div>
<div
@@ -137,7 +166,7 @@
name: 'templates-industries-slug',
}"
:title="row.name"
- class="text-gray-600 dark:text-gray-400 transition-colors duration-300 hover:text-nt-blue"
+ class="text-neutral-600 dark:text-neutral-400 transition-colors duration-300 hover:text-blue-500"
>
{{ row.name }}
</NuxtLink>
@@ -152,6 +181,7 @@ import { computed } from "vue"
import Fuse from "fuse.js"
import SingleTemplate from "./SingleTemplate.vue"
import { refDebounced } from "@vueuse/core"
+import { useTemplateMeta } from "~/composables/data/useTemplateMeta"
export default {
name: "TemplatesList",
@@ -181,19 +211,22 @@ export default {
type: Boolean,
default: true,
},
+ gridClasses: {
+ type: String,
+ default: "grid-cols-1 mt-8 sm:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4",
+ },
},
setup() {
- const authStore = useAuthStore()
- const templatesStore = useTemplatesStore()
+ const { industries, types } = useTemplateMeta()
const search = ref("")
const debouncedSearch = refDebounced(search, 500)
return {
search,
debouncedSearch,
- user: computed(() => authStore.user),
- industries: computed(() => [...templatesStore.industries.values()]),
- types: computed(() => [...templatesStore.types.values()]),
+ user: computed(() => useAuth().user().data.value),
+ industries: computed(() => [...industries.values()]),
+ types: computed(() => [...types.values()]),
}
},
diff --git a/client/components/pages/welcome/AiFeature.vue b/client/components/pages/welcome/AiFeature.vue
index 80d3cbb8f..b68439e22 100644
--- a/client/components/pages/welcome/AiFeature.vue
+++ b/client/components/pages/welcome/AiFeature.vue
@@ -3,7 +3,7 @@
<section>
<div class="mx-auto max-w-7xl isolate sm:px-6 lg:px-8">
<div
- class="relative px-4 py-8 overflow-hidden bg-blue-100 ring-blue-100 ring-1 sm:shadow-lg isolate sm:rounded-2xl sm:px-16 md:pt-20 lg:flex lg:gap-x-20 lg:px-16 lg:py-0 sm:shadow-gray-600/10"
+ class="relative px-4 py-8 overflow-hidden bg-blue-100 ring-blue-100 ring-1 sm:shadow-lg isolate sm:rounded-2xl sm:px-16 md:pt-20 lg:flex lg:gap-x-20 lg:px-16 lg:py-0 sm:shadow-neutral-600/10"
>
<div class="absolute inset-0">
<img
@@ -17,7 +17,7 @@
class="relative max-w-md mx-auto text-center xl:max-w-lg lg:mx-0 lg:flex-auto lg:py-16 lg:text-left"
>
<span
- class="bg-white text-xs font-semibold inline-flex items-center shadow-sm ring-blue-200 ring-1 text-blue-600 px-2.5 py-1.5 rounded-full"
+ class="bg-white text-xs font-semibold inline-flex items-center shadow-xs ring-blue-200 ring text-blue-600 px-2.5 py-1.5 rounded-full"
>
<svg
aria-hidden="true"
@@ -36,7 +36,7 @@
</span>
<h2
- class="mt-6 text-2xl font-semibold tracking-tight text-gray-900 sm:text-3xl lg:text-4xl"
+ class="mt-6 text-2xl font-semibold tracking-tight text-neutral-900 sm:text-3xl lg:text-4xl"
>
Say goodbye to tedious form building with OpnForm's new
<span
@@ -44,31 +44,32 @@
>AI-powered feature!</span>
</h2>
<p
- class="mt-4 text-base font-medium leading-7 text-gray-500 sm:text-lg sm:leading-8"
+ class="mt-4 text-base font-medium leading-7 text-neutral-500 sm:text-lg sm:leading-8"
>
Easily generate a fully working form in seconds with just a simple
description.
</p>
<div class="flex justify-center lg:justify-start mt-4">
- <v-button
- v-track.welcome_ai_builder_click
- class="block"
- :to="{ name: 'forms-create-guest' }"
- :arrow="true"
- color="blue"
- >
- Try our AI form builder
- </v-button>
+ <TrackClick name="welcome_ai_builder_click">
+ <UButton
+ class="block"
+ :to="{ name: 'forms-create-guest' }"
+ :trailing="true"
+ color="primary"
+ size="lg"
+ label="Try our AI form builder"
+ />
+ </TrackClick>
</div>
<ul
- class="flex flex-wrap items-center justify-center mt-4 gap-4 text-sm font-medium text-gray-900 lg:justify-start"
+ class="flex flex-wrap items-center justify-center mt-4 gap-4 text-sm font-medium text-neutral-900 lg:justify-start"
>
<li class="flex items-center gap-2">
<svg
aria-hidden="true"
- class="w-5 h-5 text-gray-400 shrink-0"
+ class="w-5 h-5 text-neutral-400 shrink-0"
xmlns="http://www.w3.org/2000/svg"
viewBox="0 0 20 20"
fill="currentColor"
@@ -85,7 +86,7 @@
<li class="flex items-center gap-2">
<svg
aria-hidden="true"
- class="w-5 h-5 text-gray-400 shrink-0"
+ class="w-5 h-5 text-neutral-400 shrink-0"
xmlns="http://www.w3.org/2000/svg"
viewBox="0 0 20 20"
fill="currentColor"
@@ -102,7 +103,7 @@
<li class="flex items-center gap-2">
<svg
aria-hidden="true"
- class="w-5 h-5 text-gray-400 shrink-0"
+ class="w-5 h-5 text-neutral-400 shrink-0"
xmlns="http://www.w3.org/2000/svg"
viewBox="0 0 20 20"
fill="currentColor"
@@ -116,20 +117,6 @@
No-coding required
</li>
</ul>
-
- <div
- class="mt-6 sm:mt-8 flex text-center justify-center lg:justify-start"
- >
- <!-- <v-button v-if="!authenticated" class="mr-2 block" :to="{ name: 'forms-create-guest' }" :arrow="true">-->
- <!-- Get started for free-->
- <!-- </v-button>-->
- <!-- <v-button v-else class="mr-2 block" :to="{ name: 'forms-create' }" :arrow="true">-->
- <!-- Get started for free-->
- <!-- </v-button>-->
- <!-- <v-button color="light-gray" class="mr-1 block" :to="{ name: 'aiformbuilder' }">-->
- <!-- Learn more-->
- <!-- </v-button>-->
- </div>
</div>
<div
@@ -147,20 +134,6 @@
</div>
</template>
-<script>
-import { computed } from "vue"
-import { useAuthStore } from "../../../stores/auth"
-
-export default {
- props: {},
- setup() {
- const authStore = useAuthStore()
- return {
- authenticated: computed(() => authStore.check),
- }
- },
- data: () => ({}),
- computed: {},
- methods: {},
-}
+<script setup>
+import TrackClick from '~/components/global/TrackClick.vue'
</script>
diff --git a/client/components/pages/welcome/Features.vue b/client/components/pages/welcome/Features.vue
index 47d971329..52407a46f 100644
--- a/client/components/pages/welcome/Features.vue
+++ b/client/components/pages/welcome/Features.vue
@@ -5,12 +5,12 @@
>
<div class="mb-16 max-w-xl md:mx-auto sm:text-center lg:max-w-2xl">
<h2
- class="mb-6 font-sans text-4xl font-semibold leading-none tracking-tight text-gray-900 dark:text-gray-100 sm:text-4xl md:mx-auto"
+ class="mb-6 font-sans text-4xl font-semibold leading-none tracking-tight text-neutral-900 dark:text-neutral-100 sm:text-4xl md:mx-auto"
>
The easiest way to create forms. <br>
- Generous unlimited <span class="text-nt-blue">free plan.</span>
+ Generous unlimited <span class="text-blue-500">free plan.</span>
</h2>
- <p class="text-base text-gray-700 dark:text-gray-300 md:text-lg">
+ <p class="text-base text-neutral-700 dark:text-neutral-300 md:text-lg">
Need a contact form? Doing a survey? Create a form in 2 minutes and
start receiving submissions.
</p>
@@ -61,7 +61,7 @@
fill="none"
xmlns="http://www.w3.org/2000/svg"
stroke="currentColor"
- class="w-10 h-10 text-nt-blue"
+ class="w-10 h-10 text-blue-500"
>
<path
d="M22 7.99997H13.6C10.2397 7.99997 8.55953 7.99997 7.27606 8.65393C6.14708 9.22917 5.2292 10.1471 4.65396 11.276C4 12.5595 4 14.2397 4 17.6V34.4C4 37.7603 4 39.4404 4.65396 40.7239C5.2292 41.8529 6.14708 42.7708 7.27606 43.346C8.55953 44 10.2397 44 13.6 44H30.4C33.7603 44 35.4405 44 36.7239 43.346C37.8529 42.7708 38.7708 41.8529 39.346 40.7239C40 39.4404 40 37.7603 40 34.4V26M15.9999 32H19.349C20.3274 32 20.8166 32 21.2769 31.8894C21.6851 31.7915 22.0753 31.6298 22.4331 31.4105C22.8368 31.1632 23.1827 30.8173 23.8745 30.1255L43 11C44.6569 9.34311 44.6569 6.65682 43 4.99997C41.3431 3.34311 38.6569 3.34311 37 4.99996L17.8745 24.1255C17.1827 24.8173 16.8368 25.1632 16.5894 25.5668C16.3701 25.9247 16.2085 26.3149 16.1105 26.723C15.9999 27.1834 15.9999 27.6726 15.9999 28.6509V32Z"
@@ -77,7 +77,7 @@
fill="none"
xmlns="http://www.w3.org/2000/svg"
stroke="currentColor"
- class="w-10 h-10 text-nt-blue"
+ class="w-10 h-10 text-blue-500"
>
<path
d="M17.18 27.02L30.84 34.98M30.82 13.02L17.18 20.98M42 10C42 13.3137 39.3137 16 36 16C32.6863 16 30 13.3137 30 10C30 6.68629 32.6863 4 36 4C39.3137 4 42 6.68629 42 10ZM18 24C18 27.3137 15.3137 30 12 30C8.68629 30 6 27.3137 6 24C6 20.6863 8.68629 18 12 18C15.3137 18 18 20.6863 18 24ZM42 38C42 41.3137 39.3137 44 36 44C32.6863 44 30 41.3137 30 38C30 34.6863 32.6863 32 36 32C39.3137 32 42 34.6863 42 38Z"
@@ -88,7 +88,7 @@
</svg>
<svg
v-else-if="step.title == 'Get Results'"
- class="w-10 h-10 text-nt-blue"
+ class="w-10 h-10 text-blue-500"
viewBox="0 0 48 48"
fill="none"
xmlns="http://www.w3.org/2000/svg"
@@ -120,7 +120,7 @@
viewBox="0 0 24 24"
stroke-width="1.5"
stroke="currentColor"
- class="w-4 h-4 mt-1 mr-2 text-nt-blue"
+ class="w-4 h-4 mt-1 mr-2 text-blue-500"
>
<path
stroke-linecap="round"
@@ -149,7 +149,7 @@
<div class="grid md:grid-cols-3 mt-20">
<div class="mb-8 md:mr-10">
<svg
- class="w-10 h-10 text-nt-blue"
+ class="w-10 h-10 text-blue-500"
viewBox="0 0 44 42"
fill="none"
xmlns="http://www.w3.org/2000/svg"
@@ -172,7 +172,7 @@
</div>
<div class="mb-8 md:mr-10">
<svg
- class="w-10 h-10 text-nt-blue"
+ class="w-10 h-10 text-blue-500"
viewBox="0 0 45 44"
fill="none"
xmlns="http://www.w3.org/2000/svg"
@@ -195,7 +195,7 @@
</div>
<div class="mb-8 md:mr-10">
<svg
- class="w-10 h-10 text-nt-blue"
+ class="w-10 h-10 text-blue-500"
viewBox="0 0 45 44"
fill="none"
xmlns="http://www.w3.org/2000/svg"
diff --git a/client/components/pages/welcome/MoreFeatures.vue b/client/components/pages/welcome/MoreFeatures.vue
index 6c2056a1f..068e6e84e 100644
--- a/client/components/pages/welcome/MoreFeatures.vue
+++ b/client/components/pages/welcome/MoreFeatures.vue
@@ -1,5 +1,5 @@
<template>
- <div class="bg-gray-50 dark:bg-notion-dark py-8">
+ <div class="bg-neutral-50 dark:bg-notion-dark py-8">
<div class="md:max-w-5xl md:mx-auto w-full">
<div class="my-5 text-center">
<h3 class="font-semibold text-3xl">
@@ -13,7 +13,7 @@
>
<div class="flex font-semibold my-3">
<svg
- class="w-5 h-5 mr-2 text-nt-blue"
+ class="w-5 h-5 mr-2 text-blue-500"
viewBox="0 0 23 22"
fill="none"
xmlns="http://www.w3.org/2000/svg"
@@ -30,7 +30,7 @@
</div>
<div class="flex font-semibold my-3">
<svg
- class="w-5 h-5 mr-2 text-nt-blue"
+ class="w-5 h-5 mr-2 text-blue-500"
viewBox="0 0 23 22"
fill="none"
xmlns="http://www.w3.org/2000/svg"
@@ -47,7 +47,7 @@
</div>
<div class="flex font-semibold my-3">
<svg
- class="w-5 h-5 mr-2 text-nt-blue"
+ class="w-5 h-5 mr-2 text-blue-500"
viewBox="0 0 20 20"
fill="none"
xmlns="http://www.w3.org/2000/svg"
@@ -64,7 +64,7 @@
</div>
<div class="flex font-semibold my-3">
<svg
- class="w-5 h-5 mr-2 text-nt-blue"
+ class="w-5 h-5 mr-2 text-blue-500"
viewBox="0 0 23 20"
fill="none"
xmlns="http://www.w3.org/2000/svg"
@@ -81,7 +81,7 @@
</div>
<div class="flex font-semibold my-3">
<svg
- class="w-5 h-5 mr-2 text-nt-blue"
+ class="w-5 h-5 mr-2 text-blue-500"
viewBox="0 0 19 20"
fill="none"
xmlns="http://www.w3.org/2000/svg"
@@ -98,7 +98,7 @@
</div>
<div class="flex font-semibold my-3">
<svg
- class="w-5 h-5 mr-2 text-nt-blue"
+ class="w-5 h-5 mr-2 text-blue-500"
viewBox="0 0 21 20"
fill="none"
xmlns="http://www.w3.org/2000/svg"
@@ -115,7 +115,7 @@
</div>
<div class="flex font-semibold my-3">
<svg
- class="w-5 h-5 mr-2 text-nt-blue"
+ class="w-5 h-5 mr-2 text-blue-500"
viewBox="0 0 21 20"
fill="none"
xmlns="http://www.w3.org/2000/svg"
@@ -132,7 +132,7 @@
</div>
<div class="flex font-semibold my-3">
<svg
- class="w-5 h-5 mr-2 text-nt-blue"
+ class="w-5 h-5 mr-2 text-blue-500"
viewBox="0 0 21 22"
fill="none"
xmlns="http://www.w3.org/2000/svg"
@@ -149,7 +149,7 @@
</div>
<div class="flex font-semibold my-3">
<svg
- class="w-5 h-5 mr-2 text-nt-blue"
+ class="w-5 h-5 mr-2 text-blue-500"
viewBox="0 0 19 18"
fill="none"
xmlns="http://www.w3.org/2000/svg"
diff --git a/client/components/pages/welcome/TemplatesSlider.vue b/client/components/pages/welcome/TemplatesSlider.vue
index a6bcc00d6..264f0f5c4 100644
--- a/client/components/pages/welcome/TemplatesSlider.vue
+++ b/client/components/pages/welcome/TemplatesSlider.vue
@@ -5,11 +5,11 @@
Single or multi-page forms
</h2>
<p
- class="mt-2 text-3xl font-semibold tracking-tight text-gray-900 sm:text-4xl"
+ class="mt-2 text-3xl font-semibold tracking-tight text-neutral-900 sm:text-4xl"
>
Discover our beautiful templates
</p>
- <p class="mt-3 px-8 text-center text-lg text-gray-400">
+ <p class="mt-3 px-8 text-center text-lg text-neutral-400">
If you need inspiration, checkout our templates.
</p>
</div>
@@ -53,27 +53,16 @@
</template>
<script>
-import { computed } from "vue"
import SingleTemplate from "../templates/SingleTemplate.vue"
export default {
components: { SingleTemplate },
setup() {
- const templatesStore = useTemplatesStore()
- templatesStore.initTypesAndIndustries()
-
- onMounted(() => {
- if (templatesStore.getAll.length < 10) {
- opnFetch("templates", { query: { limit: 10 } }).then((data) => {
- templatesStore.set(data)
- })
- }
- })
+ const { list } = useTemplates()
+ const { data: templates } = list({ limit: 10 })
return {
- templatesStore,
- allLoaded: computed(() => templatesStore.allLoaded),
- sliderTemplates: computed(() => templatesStore.getAll.slice(0, 10)),
+ sliderTemplates: computed(() => templates.value ?? []),
}
},
diff --git a/client/components/settings/widget/TelegramWidget.vue b/client/components/provider/widget/TelegramWidget.vue
similarity index 97%
rename from client/components/settings/widget/TelegramWidget.vue
rename to client/components/provider/widget/TelegramWidget.vue
index e1baf65b3..5e644329c 100644
--- a/client/components/settings/widget/TelegramWidget.vue
+++ b/client/components/provider/widget/TelegramWidget.vue
@@ -3,7 +3,7 @@
id="widget_login"
class="flex flex-col gap-4"
>
- <p class="text-sm text-gray-500">
+ <p class="text-sm text-neutral-500">
<a
href="https://telegram.org"
target="_blank"
diff --git a/client/components/settings/AccessTokenCard.vue b/client/components/settings/AccessTokenCard.vue
deleted file mode 100644
index 645c7cd99..000000000
--- a/client/components/settings/AccessTokenCard.vue
+++ /dev/null
@@ -1,83 +0,0 @@
-<template>
- <div
- class="text-gray-500 border shadow rounded-md p-5 mt-4 relative flex items-center"
- >
- <div class="flex-grow flex items-center">
- <div>
- <div class="flex space-x-3 font-semibold mr-2">
- {{ token.name }}
- </div>
-
- <div class="">
- <span
- v-for="(ability, index) in token.abilities"
- :key="index"
- >
- {{ accessTokenStore.getAbility(ability).title }}
- <template v-if="index !== token.abilities.length - 1">
- ,&nbsp;
- </template>
- </span>
- </div>
- </div>
- </div>
-
- <div class="flex items-center gap-4">
- <dropdown
- class="inline"
- >
- <template #trigger="{ toggle }">
- <v-button
- color="white"
- @click="toggle"
- >
- <Icon
- name="heroicons:ellipsis-horizontal"
- class="w-4 h-4 -mt-1"
- />
- </v-button>
- </template>
-
- <a
- href="#"
- class="flex px-4 py-2 text-md text-red-600 hover:bg-red-50 hover:no-underline items-center"
- @click.prevent="destroy"
- >
- <Icon
- name="heroicons:trash"
- class="w-5 h-5 mr-2"
- />
-
- Delete
- </a>
- </dropdown>
- </div>
- </div>
-</template>
-
-<script setup>
-const props = defineProps({
- token: Object
-})
-
-const accessTokenStore = useAccessTokenStore()
-const alert = useAlert()
-
-function destroy() {
- alert.confirm("Do you really want to delete this token?", () => {
- opnFetch(`/settings/tokens/${props.token.id}`, {
- method: 'DELETE'
- })
- .then(() => {
- accessTokenStore.remove(props.token.id)
- })
- .catch((error) => {
- try {
- alert.error(error.data.message)
- } catch {
- alert.error("An error occurred while disconnecting an account")
- }
- })
- })
-}
-</script>
diff --git a/client/components/settings/AccessTokenModal.vue b/client/components/settings/AccessTokenModal.vue
deleted file mode 100644
index b2bd34d68..000000000
--- a/client/components/settings/AccessTokenModal.vue
+++ /dev/null
@@ -1,143 +0,0 @@
-<template>
- <modal
- :show="show"
- max-width="lg"
- @close="emit('close')"
- >
- <template #icon>
- <svg
- class="w-8 h-8"
- viewBox="0 0 24 24"
- fill="none"
- xmlns="http://www.w3.org/2000/svg"
- >
- <path
- d="M12 8V16M8 12H16M22 12C22 17.5228 17.5228 22 12 22C6.47715 22 2 17.5228 2 12C2 6.47715 6.47715 2 12 2C17.5228 2 22 6.47715 22 12Z"
- stroke="currentColor"
- stroke-width="2"
- stroke-linecap="round"
- stroke-linejoin="round"
- />
- </svg>
- </template>
-
- <template #title>
- Create an access token
- </template>
-
- <div class="px-4">
- <form
- @submit.prevent="createToken"
- @keydown="form.onKeydown($event)"
- >
- <div v-if="!token">
- <text-input
- name="name"
- class="mt-4"
- :form="form"
- :required="true"
- label="Name"
- />
-
- <div>
- <label class="input-label">Abilities</label>
-
- <div class="mt-2">
- <checkbox-input
- v-for="ability in abilities"
- :key="ability.name"
- v-model="form.abilities"
- :value="ability.name"
- :label="ability.title"
- :disabled="ability.disabled ?? false"
- />
- </div>
- </div>
- </div>
-
- <UAlert
- v-if="token"
- icon="i-heroicons-key-20-solid"
- color="green"
- variant="subtle"
- title="Copy your access token"
- description="Your token will only be shown once. Make sure to save it safely."
- />
-
- <div class="flex">
- <copy-content
- v-if="token"
- :content="token"
- >
- <template #icon>
- <Icon
- name="heroicons:link"
- class="w-4 h-4 -mt-1 text-blue-600 mr-3"
- />
- </template>
- Copy Token
- </copy-content>
- </div>
-
- <div class="w-full mt-6">
- <v-button
- v-if="!token"
- :loading="form.busy"
- class="w-full my-3"
- >
- Save
- </v-button>
-
- <v-button
- v-else
- class="w-full my-3"
- @click.prevent="emit('close')"
- >
- Close
- </v-button>
- </div>
- </form>
- </div>
- </modal>
-</template>
-
-<script setup>
-import CopyContent from "../open/forms/components/CopyContent.vue"
-
-const props = defineProps({
- show: Boolean
-})
-
-const emit = defineEmits(['close'])
-
-const accessTokenStore = useAccessTokenStore()
-const abilities = computed(() => accessTokenStore.abilities)
-
-const form = useForm({
- name: "",
- abilities: abilities.value.map(ability => ability.name),
-})
-
-const token = ref('')
-
-function createToken() {
- form.post("/settings/tokens").then((data) => {
- // workspacesStore.save(data.workspace)
- // workspacesStore.currentId = data.workspace.id
- // workspaceModal.value = false
-
- token.value = data.token
- accessTokenStore.fetchTokens()
-
- useAlert().success(
- "Access token successfully created!",
- )
- })
-}
-
-watch(() => props.show, () => {
- form.name = ''
- form.abilities = abilities.value.map(ability => ability.name),
- token.value = ''
-})
-</script>
diff --git a/client/components/settings/ProviderCard.vue b/client/components/settings/ProviderCard.vue
deleted file mode 100644
index 02b4d15eb..000000000
--- a/client/components/settings/ProviderCard.vue
+++ /dev/null
@@ -1,110 +0,0 @@
-<template>
- <div
- class="text-gray-500 border shadow rounded-md p-5 mt-4 relative flex items-center"
- >
- <div class="flex-grow flex items-center">
- <div
- class="mr-4 text-blue-500"
- >
- <Icon
- :name="service?.icon"
- size="32px"
- />
- </div>
- <div>
- <div class="flex space-x-3 font-semibold mr-2">
- {{ provider.name }}
- </div>
-
- <div>
- {{ provider.email }}
- </div>
- </div>
- </div>
-
- <div class="flex items-center gap-4">
- <dropdown
- class="inline"
- >
- <template #trigger="{ toggle }">
- <v-button
- color="white"
- @click="toggle"
- >
- <svg
- class="w-4 h-4 inline -mt-1"
- viewBox="0 0 16 4"
- fill="none"
- xmlns="http://www.w3.org/2000/svg"
- >
- <path
- d="M8.00016 2.83366C8.4604 2.83366 8.8335 2.46056 8.8335 2.00033C8.8335 1.54009 8.4604 1.16699 8.00016 1.16699C7.53993 1.16699 7.16683 1.54009 7.16683 2.00033C7.16683 2.46056 7.53993 2.83366 8.00016 2.83366Z"
- stroke="#344054"
- stroke-width="1.66667"
- stroke-linecap="round"
- stroke-linejoin="round"
- />
- <path
- d="M13.8335 2.83366C14.2937 2.83366 14.6668 2.46056 14.6668 2.00033C14.6668 1.54009 14.2937 1.16699 13.8335 1.16699C13.3733 1.16699 13.0002 1.54009 13.0002 2.00033C13.0002 2.46056 13.3733 2.83366 13.8335 2.83366Z"
- stroke="#344054"
- stroke-width="1.66667"
- stroke-linecap="round"
- stroke-linejoin="round"
- />
- <path
- d="M2.16683 2.83366C2.62707 2.83366 3.00016 2.46056 3.00016 2.00033C3.00016 1.54009 2.62707 1.16699 2.16683 1.16699C1.70659 1.16699 1.3335 1.54009 1.3335 2.00033C1.3335 2.46056 1.70659 2.83366 2.16683 2.83366Z"
- stroke="#344054"
- stroke-width="1.66667"
- stroke-linecap="round"
- stroke-linejoin="round"
- />
- </svg>
- </v-button>
- </template>
- <a
- v-track.delete_provider_click="{
- provider_id: provider.id,
- }"
- href="#"
- class="flex px-4 py-2 text-md text-red-600 hover:bg-red-50 hover:no-underline items-center"
- @click.prevent="disconnect"
- >
- <Icon
- name="heroicons:trash"
- class="w-5 h-5 mr-2"
- />
-
- Disconnect
- </a>
- </dropdown>
- </div>
- </div>
-</template>
-
-<script setup>
-const props = defineProps({
- provider: Object
-})
-
-const providersStore = useOAuthProvidersStore()
-const service = computed(() => providersStore.getService(props.provider?.provider))
-const alert = useAlert()
-
-function disconnect() {
- alert.confirm("Do you really want to disconnect this account?", () => {
- opnFetch(`/settings/providers/${props.provider.id}`, {
- method: 'DELETE'
- })
- .then(() => {
- providersStore.remove(props.provider.id)
- })
- .catch((error) => {
- try {
- alert.error(error.data.message)
- } catch {
- alert.error("An error occurred while disconnecting an account")
- }
- })
- })
-}
-</script>
diff --git a/client/components/settings/ProviderModal.vue b/client/components/settings/ProviderModal.vue
deleted file mode 100644
index 3551489db..000000000
--- a/client/components/settings/ProviderModal.vue
+++ /dev/null
@@ -1,103 +0,0 @@
-<template>
- <modal
- :show="show"
- max-width="lg"
- @close="emit('close')"
- >
- <template #icon>
- <svg
- class="w-8 h-8"
- viewBox="0 0 24 24"
- fill="none"
- xmlns="http://www.w3.org/2000/svg"
- >
- <path
- d="M12 8V16M8 12H16M22 12C22 17.5228 17.5228 22 12 22C6.47715 22 2 17.5228 2 12C2 6.47715 6.47715 2 12 2C17.5228 2 22 6.47715 22 12Z"
- stroke="currentColor"
- stroke-width="2"
- stroke-linecap="round"
- stroke-linejoin="round"
- />
- </svg>
- </template>
-
- <template #title>
- Connect account
- </template>
-
- <div v-if="loading">
- <Loader class="h-6 w-6 mx-auto" />
- </div>
- <div
- v-else
- class="flex"
- >
- <div
- v-for="service in services"
- :key="service.name"
- role="button"
- class="mr-2 bg-gray-50 border border-gray-200 rounded-md transition-colors p-4 pb-2 items-center justify-center w-[170px] h-[110px] flex flex-col relative"
- :class="{
- 'hover:bg-blue-50 group cursor-pointer': service.enabled,
- 'cursor-not-allowed': !service.enabled,
- }"
- @click="connect(service)"
- >
- <div class="flex justify-center">
- <div class="h-10 w-10 text-gray-500 group-hover:text-blue-500 transition-colors flex items-center">
- <Icon
- :name="service.icon"
- class=""
- size="40px"
- />
- </div>
- </div>
-
- <div class="flex-grow flex items-center">
- <div class="text-gray-400 font-medium text-sm text-center">
- {{ service.title }}
- </div>
- </div>
- </div>
- </div>
- </modal>
-
- <!-- Add widget modal -->
- <ProviderWidgetModal
- v-if="showWidgetModal"
- :show="showWidgetModal"
- :service="selectedService"
- @close="showWidgetModal = false"
- />
-</template>
-
-<script setup>
-defineProps({
- show: Boolean
-})
-
-const emit = defineEmits(['close'])
-
-const providersStore = useOAuthProvidersStore()
-const services = computed(() => providersStore.services)
-const loading = ref(false)
-const showWidgetModal = ref(false)
-const selectedService = ref(null)
-
-function connect(service) {
- if (!service.enabled) {
- useAlert().error('This service is not enabled. Please contact support.')
- return
- }
-
- if (service.auth_type === 'widget') {
- emit('close')
- selectedService.value = service
- showWidgetModal.value = true
- } else {
- // Use existing redirect flow
- loading.value = true
- providersStore.connect(service.name)
- }
-}
-</script>
\ No newline at end of file
diff --git a/client/components/settings/ProviderWidgetModal.vue b/client/components/settings/ProviderWidgetModal.vue
deleted file mode 100644
index c74d3fb82..000000000
--- a/client/components/settings/ProviderWidgetModal.vue
+++ /dev/null
@@ -1,70 +0,0 @@
-<template>
- <modal
- :show="show"
- max-width="md"
- @close="emit('close')"
- >
- <template #title>
- <div class="flex items-center justify-center mb-4">
- <Icon
- :name="service.icon"
- class="h-8 w-8 text-gray-500"
- />
- <span class="ml-2 text-gray-700 font-medium">{{ service.title }}</span>
- </div>
- </template>
-
- <div class="p-4 flex items-center justify-center">
- <!-- Dynamic component loading based on service -->
- <component
- :is="widgetComponent"
- v-if="widgetComponent"
- :service="service"
- @auth-data="handleAuthData"
- />
- </div>
- </modal>
-</template>
-
-<script setup>
-const props = defineProps({
- show: Boolean,
- service: Object
-})
-
-const providersStore = useOAuthProvidersStore()
-const router = useRouter()
-const alert = useAlert()
-const emit = defineEmits(['close'])
-
-// Dynamically compute which widget component to load
-const widgetComponent = computed(() => {
- if (!props.service?.widget_file) return null
- return resolveComponent(props.service.widget_file)
-})
-
-const handleAuthData = async (data) => {
- try {
- if (!data) {
- alert.error('Authentication failed')
- return
- }
-
- const response = await opnFetch(`/settings/providers/widget-callback/${props.service.name}`, {
- method: 'POST',
- body: data
- })
-
- if (response.intention) {
- router.push(response.intention)
- } else {
- alert.success('Successfully connected')
- emit('close')
- providersStore.fetchOAuthProviders()
- }
- } catch (error) {
- alert.error(error?.data?.message || 'Failed to authenticate')
- providersStore.fetchOAuthProviders()
- }
-}
-</script>
\ No newline at end of file
diff --git a/client/components/tools/StopImpersonation.vue b/client/components/tools/StopImpersonation.vue
index c4e10c367..dfcc08c8b 100644
--- a/client/components/tools/StopImpersonation.vue
+++ b/client/components/tools/StopImpersonation.vue
@@ -1,73 +1,38 @@
<template>
- <transition name="fade">
- <button
- v-if="isImpersonating"
- class="cursor-pointer group hover:bg-blue-50 text-gray-600 py-2 px-5 fixed bottom-0 left-0 rounded-tr-md bg-white border-t border-r"
+ <UTooltip
+ v-if="isImpersonating"
+ text="Stop Impersonation"
+ >
+ <UButton
+ color="neutral"
+ variant="outline"
+ :loading="loading"
+ icon="i-heroicons-arrow-left-start-on-rectangle-20-solid"
@click="reverseImpersonation"
- >
- <template v-if="!loading">
- <svg
- xmlns="http://www.w3.org/2000/svg"
- class="h-5 w-5 -mt-1 group-hover:text-blue-500 inline text-gray-400"
- fill="none"
- viewBox="0 0 24 24"
- stroke="currentColor"
- stroke-width="2"
- >
- <path
- stroke-linecap="round"
- stroke-linejoin="round"
- d="M17 16l4-4m0 0l-4-4m4 4H7m6 4v1a3 3 0 01-3 3H6a3 3 0 01-3-3V7a3 3 0 013-3h4a3 3 0 013 3v1"
- />
- </svg>
- Stop Impersonation
- </template>
- <template v-else>
- <div class="px-6">
- <Loader class="h-4 w-4 inline" />
- </div>
- </template>
- </button>
- </transition>
+ />
+ </UTooltip>
</template>
-<script>
-import { computed } from "vue"
-import { useAuthStore } from "../../stores/auth.js"
-import { useWorkspacesStore } from "../../stores/workspaces.js"
+<script setup>
+import { authApi } from "~/api/auth"
-export default {
- setup() {
- const authStore = useAuthStore()
- const workspacesStore = useWorkspacesStore()
- return {
- authStore,
- workspacesStore,
- isImpersonating: computed(() => authStore.isImpersonating),
- }
- },
+const authStore = useAuthStore()
+const router = useRouter()
- data: () => ({
- loading: false,
- }),
+const isImpersonating = computed(() => authStore.isImpersonating)
+const loading = ref(false)
- computed: {},
+function reverseImpersonation() {
+ loading.value = true
+ authStore.stopImpersonating()
- mounted() {},
-
- methods: {
- async reverseImpersonation() {
- this.loading = true
- this.authStore.stopImpersonating()
-
- // Fetch the user.
- const userData = await opnFetch("user")
- this.authStore.setUser(userData)
- const workspaces = await fetchAllWorkspaces()
- this.workspacesStore.set(workspaces.data.value)
- this.$router.push({ name: "settings-admin" })
- this.loading = false
- },
- },
+ // Fetch the user.
+ authApi.user.get().then(() => {
+ useAuth().invalidateUser()
+ useWorkspaces().invalidateAll()
+ router.push({ name: 'admin' })
+ loading.value = false
+ })
}
</script>
+
diff --git a/client/components/users/settings/AccessTokenModal.vue b/client/components/users/settings/AccessTokenModal.vue
new file mode 100644
index 000000000..27cb728c6
--- /dev/null
+++ b/client/components/users/settings/AccessTokenModal.vue
@@ -0,0 +1,135 @@
+<template>
+ <UModal
+ v-model:open="isOpen"
+ @close="closeModal"
+ >
+ <template #header>
+ <div class="flex items-center w-full gap-4 px-2">
+ <h2 class="font-semibold">
+ Create an access token
+ </h2>
+ </div>
+ <UButton
+ color="neutral"
+ variant="outline"
+ icon="i-heroicons-question-mark-circle"
+ size="sm"
+ @click="crisp.openHelpdesk()"
+ >
+ Help
+ </UButton>
+ </template>
+
+ <template #body>
+ <template v-if="token">
+ <UAlert
+ icon="i-heroicons-key-20-solid"
+ color="success"
+ variant="subtle"
+ title="Copy your access token"
+ description="Your token will only be shown once. Make sure to save it safely."
+ />
+ <CopyContent
+ class="mt-4"
+ :content="token"
+ label="Copy Token"
+ />
+ </template>
+
+ <VForm v-else size="sm">
+ <form
+ @submit.prevent="createToken"
+ >
+ <div v-if="!token">
+ <TextInput
+ :form="tokenForm"
+ name="name"
+ :required="true"
+ label="Name"
+ />
+
+ <FlatSelectInput
+ :form="tokenForm"
+ name="abilities"
+ label="Abilities"
+ :options="abilitiesOptions"
+ multiple
+ />
+ </div>
+ </form>
+ </VForm>
+ </template>
+
+ <template #footer>
+ <UButton
+ color="neutral"
+ variant="outline"
+ @click="closeModal"
+ >
+ Close
+ </UButton>
+ <UButton
+ v-if="!token"
+ type="submit"
+ block
+ size="lg"
+ :loading="tokenForm.busy"
+ @click="createToken"
+ >
+ Create Token
+ </UButton>
+ </template>
+ </UModal>
+</template>
+
+<script setup>
+import CopyContent from "~/components/open/forms/components/CopyContent.vue"
+
+const props = defineProps({
+ modelValue: {
+ type: Boolean,
+ default: false
+ }
+})
+
+const emit = defineEmits(['close'])
+
+const { abilities, create } = useTokens()
+const alert = useAlert()
+
+const abilitiesOptions = computed(() => abilities.map(ability => ({
+ name: ability.title,
+ value: ability.name
+})))
+
+const token = ref('')
+const tokenForm = useForm({
+ name: "",
+ abilities: abilitiesOptions.value.map(ability => ability.value),
+})
+
+// Create token mutation
+const createTokenMutation = create()
+
+// Modal state
+const isOpen = computed({
+ get: () => props.modelValue,
+ set: (value) => emit('close', value)
+})
+
+// Methods
+const closeModal = () => {
+ tokenForm.reset()
+ token.value = ''
+ isOpen.value = false
+}
+
+function createToken() {
+ tokenForm.mutate(createTokenMutation).then((response) => {
+ // Assuming the response contains the token
+ token.value = response.token || response.data?.token || response
+ }).catch(() => {
+ alert.error("An error occurred while creating the token")
+ })
+}
+</script>
diff --git a/client/components/users/settings/AccessTokens.vue b/client/components/users/settings/AccessTokens.vue
new file mode 100644
index 000000000..3b34bf383
--- /dev/null
+++ b/client/components/users/settings/AccessTokens.vue
@@ -0,0 +1,211 @@
+<template>
+ <div class="space-y-6">
+ <!-- Header -->
+ <div class="flex flex-col flex-wrap items-start justify-between gap-4 sm:flex-row sm:items-center">
+ <div>
+ <h3 class="text-lg font-medium text-neutral-900">API Access Tokens</h3>
+ <p class="mt-1 text-sm text-neutral-500">
+ Manage your API access tokens for programmatic access.
+ </p>
+ </div>
+
+ <div class="flex shrink-0 items-center gap-2">
+ <UButton
+ label="API Docs"
+ icon="i-heroicons-book-open"
+ variant="outline"
+ color="primary"
+ :to="opnformConfig.links.api_docs"
+ target="_blank"
+ />
+
+ <UButton
+ label="Create New Token"
+ icon="i-heroicons-plus"
+ :loading="loading"
+ :disabled="!user.is_pro"
+ @click="accessTokenModal = true"
+ />
+ </div>
+ </div>
+
+ <UAlert
+ v-if="!user.is_pro"
+ icon="i-heroicons-user-group-20-solid"
+ color="warning"
+ variant="subtle"
+ title="Pro plan required"
+ description="Please upgrade your account to create and manage access tokens."
+ :actions="[{
+ label: 'Try Pro plan',
+ color: 'warning',
+ variant: 'solid',
+ onClick: () => openSubscriptionModal({
+ modal_title: 'Upgrade to start using our API',
+ modal_description: 'Try our Pro plan for free today, and unlock access to our API but also to our other features such as curstomized branding, forms analytics, custom domains, and more!'
+ })
+ }]"
+ />
+
+ <!-- Tokens List -->
+ <div v-if="user.is_pro" class="space-y-4">
+ <div v-if="tokens?.length === 0 && !loading" class="text-center py-12">
+ <UIcon
+ name="i-heroicons-key"
+ class="w-12 h-12 text-neutral-400 mx-auto mb-4"
+ />
+ <h4 class="text-lg font-medium text-neutral-900 mb-2">
+ No access tokens yet
+ </h4>
+ <p class="text-neutral-500 mb-4">
+ Create your first API access token to start using our API programmatically.
+ </p>
+ <UButton
+ label="Create Your First Token"
+ icon="i-heroicons-plus"
+ @click="accessTokenModal = true"
+ />
+ </div>
+
+ <UTable
+ v-if="tokens?.length > 0"
+ v-model:column-pinning="columnPinning"
+ :data="tokens"
+ :columns="tableColumns"
+ :loading="loading"
+ class="w-full"
+ >
+ <template #name-cell="{ row: { original: item } }">
+ <span class="font-semibold">{{ item.name }}</span>
+ </template>
+
+ <template #abilities-cell="{ row: { original: item } }">
+ <AbilitiesBadges :abilities="item.abilities" />
+ </template>
+
+ <template #actions-cell="{ row: { original: item } }">
+ <div class="flex justify-end">
+ <UButton
+ color="error"
+ variant="soft"
+ icon="i-heroicons-trash"
+ square
+ size="sm"
+ @click="deleteToken(item)"
+ />
+ </div>
+ </template>
+ </UTable>
+ </div>
+
+ <!-- API Information -->
+ <div v-if="user.is_pro" class="space-y-4 pt-8 border-t border-neutral-200">
+ <div>
+ <h3 class="text-lg font-medium text-neutral-900">API Information</h3>
+ <p class="text-sm text-neutral-500 mt-1">
+ Learn how to use your access tokens with our API.
+ </p>
+ </div>
+
+ <div class="bg-neutral-50 border border-neutral-200 rounded-lg p-4">
+ <div class="space-y-3">
+ <div class="flex items-start gap-3">
+ <UIcon name="i-heroicons-information-circle" class="w-5 h-5 text-blue-500 mt-0.5 flex-shrink-0" />
+ <div>
+ <h4 class="text-sm font-medium text-neutral-900">Getting Started</h4>
+ <p class="text-sm text-neutral-600 mt-1">
+ Use your access tokens in the Authorization header: <code class="bg-neutral-200 px-1 rounded text-xs">Bearer YOUR_TOKEN</code>
+ </p>
+ </div>
+ </div>
+
+ <div class="flex items-start gap-3">
+ <UIcon name="i-heroicons-shield-check" class="w-5 h-5 text-green-500 mt-0.5 flex-shrink-0" />
+ <div>
+ <h4 class="text-sm font-medium text-neutral-900">Security</h4>
+ <p class="text-sm text-neutral-600 mt-1">
+ Keep your tokens secure and never share them publicly. Rotate them regularly for better security.
+ </p>
+ </div>
+ </div>
+
+ <div class="flex items-start gap-3">
+ <UIcon name="i-heroicons-clock" class="w-5 h-5 text-yellow-500 mt-0.5 flex-shrink-0" />
+ <div>
+ <h4 class="text-sm font-medium text-neutral-900">Rate Limits</h4>
+ <p class="text-sm text-neutral-600 mt-1">
+ API requests are rate limited. <a href="https://docs.opnform.com/api-reference/introduction#rate-limits" target="_blank" class="text-blue-500 hover:underline">Check our documentation</a> for current limits and best practices.
+ </p>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <!-- Access Token Modal -->
+ <UsersSettingsAccessTokenModal
+ v-model="accessTokenModal"
+ @close="accessTokenModal = false"
+ />
+ </div>
+</template>
+
+<script setup>
+import opnformConfig from '~/opnform.config.js'
+import AbilitiesBadges from '~/components/users/settings/access-tokens/AbilitiesBadges.vue'
+
+const accessTokenModal = ref(false)
+const { openSubscriptionModal } = useAppModals()
+const alert = useAlert()
+
+const { data: user } = useAuth().user()
+
+// Use TanStack Query instead of Pinia store
+const { list, remove: removeToken } = useTokens()
+
+// Fetch tokens only if user is pro
+const { data: tokens, isLoading: loading } = list({}, {
+ enabled: computed(() => user.value?.is_pro || false)
+})
+
+// Delete token mutation
+const deleteTokenMutation = removeToken()
+
+// Column pinning state
+const columnPinning = ref({
+ left: [],
+ right: ['actions']
+})
+
+// Table columns configuration
+const tableColumns = [
+ {
+ id: 'name',
+ accessorKey: 'name',
+ header: 'Name',
+ enableSorting: true
+ },
+ {
+ id: 'abilities',
+ accessorKey: 'abilities',
+ header: 'Abilities',
+ enableSorting: false
+ },
+ {
+ id: 'actions',
+ header: '',
+ enableSorting: false,
+ enableHiding: false
+ }
+]
+
+const deleteToken = (token) => {
+ alert.confirm("Do you really want to delete this token?", () => {
+ deleteTokenMutation.mutateAsync(token.id).then(() => {
+ alert.success("Token deleted successfully")
+ }).catch(() => {
+ alert.error("An error occurred while deleting the token")
+ })
+ })
+}
+</script>
\ No newline at end of file
diff --git a/client/components/users/settings/Account.vue b/client/components/users/settings/Account.vue
new file mode 100644
index 000000000..445d8e25e
--- /dev/null
+++ b/client/components/users/settings/Account.vue
@@ -0,0 +1,143 @@
+<template>
+ <div class="space-y-8">
+ <!-- Profile Information Section -->
+ <div class="space-y-4">
+ <div>
+ <h3 class="text-lg font-medium text-neutral-900">Profile Information</h3>
+ <p class="text-sm text-neutral-500 mt-1">
+ Update your account profile information and email address.
+ </p>
+ </div>
+
+ <VForm size="sm">
+ <form
+ @submit.prevent="updateProfile"
+ >
+ <div class="max-w-sm">
+ <text-input
+ :form="profileForm"
+ name="name"
+ label="Full Name"
+ placeholder="Enter your full name"
+ :required="true"
+ />
+ <text-input
+ :form="profileForm"
+ name="email"
+ label="Email Address"
+ type="email"
+ placeholder="Enter your email"
+ :required="true"
+ />
+ </div>
+
+ <div class="mt-4">
+ <UButton
+ type="submit"
+ :loading="profileForm.busy"
+ color="primary"
+ >
+ Save Changes
+ </UButton>
+ </div>
+ </form>
+ </VForm>
+ </div>
+
+ <div class="pt-8 border-t border-neutral-200">
+ <div class="flex flex-col gap-2 items-start">
+ <div>
+ <h4 class="font-medium text-red-800">Delete Account</h4>
+ <p class="mt-1 text-sm text-neutral-500">
+ This will permanently delete your entire account. This cannot be undone.
+ </p>
+ </div>
+
+ <UButton
+ color="error"
+ :loading="deleteMutation.isPending.value"
+ @click="confirmDeleteAccount"
+ >
+ Delete Account
+ </UButton>
+
+ </div>
+ </div>
+ </div>
+</template>
+
+<script setup>
+// Use useAuth composable for all user-related mutations
+const alert = useAlert()
+
+// Auth composable (TanStack Query powered)
+const {
+ updateProfile: updateProfileMutationFactory,
+ deleteAccount: deleteAccountFactory,
+ invalidateUser
+} = useAuth()
+
+// Query mutations
+const updateMutation = updateProfileMutationFactory()
+const deleteMutation = deleteAccountFactory()
+
+const { data: user } = useAuth().user()
+
+// Profile form
+const profileForm = useForm({
+ name: '',
+ email: '',
+})
+
+// Update profile
+const updateProfile = () => {
+ profileForm.mutate(updateMutation)
+ .then(() => {
+ invalidateUser()
+ alert.success('Your info has been updated!')
+ })
+ .catch((error) => {
+ console.error(error)
+ alert.error(error?.data?.message || 'Error updating profile')
+ })
+}
+
+// Delete account confirmation
+const confirmDeleteAccount = () => {
+ alert.confirm(
+ 'Do you really want to delete your account?',
+ deleteAccount
+ )
+}
+
+// Delete account
+const deleteAccount = () => {
+ deleteMutation.mutateAsync()
+ .then((data) => {
+ alert.success(data?.message || 'Your account has been deleted')
+ // Navigation handled by deleteAccount mutation
+ })
+ .catch((error) => {
+ alert.error(error?.data?.message || 'Error deleting account')
+ })
+}
+
+// Initialize form with user data
+onBeforeMount(() => {
+ if (user.value) {
+ profileForm.keys().forEach((key) => {
+ profileForm[key] = user.value[key]
+ })
+ }
+})
+
+// Watch for user changes
+watch(user, (newUser) => {
+ if (newUser) {
+ profileForm.keys().forEach((key) => {
+ profileForm[key] = newUser[key]
+ })
+ }
+}, { immediate: true })
+
+</script>
\ No newline at end of file
diff --git a/client/components/users/settings/Billing.vue b/client/components/users/settings/Billing.vue
new file mode 100644
index 000000000..2d8a488cb
--- /dev/null
+++ b/client/components/users/settings/Billing.vue
@@ -0,0 +1,122 @@
+<template>
+ <div class="space-y-6">
+ <!-- Header -->
+ <div class="flex flex-col items-start justify-between gap-4 sm:flex-row sm:items-center">
+ <div>
+ <h3 class="text-lg font-medium text-neutral-900">Billing Details</h3>
+ <p class="mt-1 text-sm text-neutral-500">
+ Manage your billing. Download invoices, update your plan, or cancel it at any time.
+ </p>
+ </div>
+ </div>
+
+ <!-- Billing Management -->
+ <template v-if="user.has_customer_id">
+ <div class="space-y-4 rounded-lg border border-neutral-200 p-4 shadow-sm">
+ <p
+ v-if="usersCount"
+ class="text-neutral-600"
+ >
+ You currently have <span class="font-medium">{{ usersCount }} users</span> in your different workspaces.
+ </p>
+
+ <div class="flex flex-wrap gap-3">
+ <UButton
+ icon="i-heroicons-credit-card"
+ :loading="billingLoading"
+ :to="{ name: 'redirect-billing-portal' }"
+ target="_blank"
+ >
+ <span v-if="canCancel">Manage Subscription & Invoices</span>
+ <span v-else>Billing & Invoices</span>
+ </UButton>
+
+ <UButton
+ v-if="canCancel"
+ color="error"
+ variant="soft"
+ :loading="cancelLoading"
+ @click.prevent="cancelSubscription"
+ >
+ Cancel Subscription
+ </UButton>
+ </div>
+ </div>
+ </template>
+
+ <!-- AppSumo Billing -->
+ <AppSumoBilling />
+ </div>
+</template>
+
+<script setup>
+import { computed } from "vue"
+
+import AppSumoBilling from "../../vendor/appsumo/AppSumoBilling.vue"
+import { billingApi, authApi } from '~/api'
+
+const alert = useAlert()
+
+const { data: user } = useAuth().user()
+const billingLoading = ref(false)
+const cancelLoading = ref(false)
+const usersCount = ref(0)
+
+onMounted(() => {
+ loadUsersCount()
+})
+
+const loadUsersCount = () => {
+ billingApi.getUsersCount()
+ .then((data) => {
+ usersCount.value = data.count
+ })
+ .catch((error) => {
+ alert.error(error.data.message)
+ })
+}
+
+const canCancel = computed(() => {
+ return user.value.subscriptions.some(sub => (sub.stripe_status === 'active') || (sub.stripe_status === 'trialing' && sub.ends_at == null))
+})
+
+const cancelSubscription = () => {
+ cancelLoading.value = true
+ billingApi.getSubscription().then((data) => {
+ if (data && data.length) {
+ window.profitwell('init_cancellation_flow', { subscription_id: data[0].stripe_id }).then(result => {
+ // This means the customer either aborted the flow (i.e.
+ // they clicked on "never mind, I don't want to cancel"), or
+ // accepted a salvage attempt or salvage offer.
+ // Thus, do nothing since they won't cancel.
+ if (result.status === 'retained' || result.status === 'aborted') {
+ console.log('Retained 🥳')
+ } else {
+ billingApi.cancelSubscription(data[0].id)
+ .then(() => {
+ alert.success('Subscription cancelled. Sorry to see you leave 😢')
+ })
+ .catch(() => {
+ alert.error('Sorry to see you leave 😢 We\'re currently having issues with subscriptions. Please ' +
+ 'send us a message via the livechat, and we will cancel your subscription.')
+ }).finally(() => {
+ cancelLoading.value = false
+ useAmplitude().logEvent('subscription_cancelled')
+ useCrisp().pushEvent('subscription_cancelled')
+
+ // Now we need to reload workspace and user
+ authApi.user.get().then((_userData) => {
+ useAuth().invalidateUser()
+ })
+ const { invalidateAll } = useWorkspaces()
+ invalidateAll() // Refresh all workspace data
+ })
+ }
+ })
+ }
+ }).finally(() => {
+ useCrisp().pushEvent('subscription_cancelled')
+ cancelLoading.value = false
+ })
+}
+</script>
\ No newline at end of file
diff --git a/client/components/users/settings/ConnectionModal.vue b/client/components/users/settings/ConnectionModal.vue
new file mode 100644
index 000000000..4bece208d
--- /dev/null
+++ b/client/components/users/settings/ConnectionModal.vue
@@ -0,0 +1,136 @@
+<template>
+ <UModal
+ v-model:open="isOpen"
+ @close="closeModal"
+ >
+ <template #header>
+ <div class="flex items-center w-full gap-4 px-2">
+ <h2 class="font-semibold">
+ Connect account
+ </h2>
+ </div>
+ </template>
+
+ <template #body>
+ <div v-if="loading" class="text-center py-8">
+ <Loader class="h-8 w-8 mx-auto mb-4" />
+ <h3 class="text-lg font-medium text-neutral-900 mb-2">
+ Connecting your account...
+ </h3>
+ <p class="text-sm text-neutral-500">
+ Complete the authentication in the new tab that opened.
+ </p>
+ <UButton
+ color="neutral"
+ variant="soft"
+ label="Cancel"
+ class="mt-4"
+ @click="loading = false"
+ />
+ </div>
+ <div
+ v-else
+ class="flex"
+ >
+ <div
+ v-for="service in services"
+ :key="service.name"
+ role="button"
+ class="mr-2 bg-neutral-50 border border-neutral-200 rounded-md transition-colors p-4 pb-2 items-center justify-center w-[170px] h-[110px] flex flex-col relative"
+ :class="{
+ 'hover:bg-blue-50 group cursor-pointer': service.enabled,
+ 'cursor-not-allowed': !service.enabled,
+ }"
+ @click="connect(service)"
+ >
+ <div class="flex justify-center">
+ <div class="h-10 w-10 text-neutral-500 group-hover:text-blue-500 transition-colors flex items-center">
+ <Icon
+ :name="service.icon"
+ class=""
+ size="40px"
+ />
+ </div>
+ </div>
+
+ <div class="flex-grow flex items-center">
+ <div class="text-neutral-400 font-medium text-sm text-center">
+ {{ service.title }}
+ </div>
+ </div>
+ </div>
+ </div>
+ </template>
+ </UModal>
+
+ <!-- Add widget modal -->
+ <UsersSettingsProviderWidgetModal
+ v-if="showWidgetModal"
+ :show="showWidgetModal"
+ :service="selectedService"
+ @close="showWidgetModal = false"
+ />
+</template>
+
+<script setup>
+import { WindowMessageTypes, useWindowMessage } from '~/composables/useWindowMessage'
+
+const props = defineProps({
+ modelValue: {
+ type: Boolean,
+ default: false
+ }
+})
+
+const emit = defineEmits(['close'])
+
+const oAuth = useOAuth()
+const services = oAuth.services
+const loading = ref(false)
+const showWidgetModal = ref(false)
+const selectedService = ref(null)
+const alert = useAlert()
+
+// Listen for OAuth completion to close modal and refresh
+onMounted(() => {
+ const windowMessage = useWindowMessage(WindowMessageTypes.OAUTH_PROVIDER_CONNECTED)
+
+ windowMessage.listen((_event) => {
+ // OAuth connection completed, close modal and refresh
+ loading.value = false
+ closeModal()
+ alert.success('Account connected successfully!')
+ }, {
+ useMessageChannel: false,
+ acknowledge: false
+ })
+})
+
+// Modal state
+const isOpen = computed({
+ get: () => props.modelValue,
+ set: (value) => emit('close', value)
+})
+
+// Methods
+const closeModal = () => {
+ isOpen.value = false
+}
+
+function connect(service) {
+ if (!service.enabled) {
+ useAlert().error('This service is not enabled. Please contact support.')
+ return
+ }
+
+ if (service.auth_type === 'widget') {
+ emit('close')
+ selectedService.value = service
+ showWidgetModal.value = true
+ } else {
+ // Open OAuth flow in new tab to avoid losing current page
+ loading.value = true
+ oAuth.connect(service.name, false, true, true)
+ }
+}
+</script>
\ No newline at end of file
diff --git a/client/components/users/settings/Connections.vue b/client/components/users/settings/Connections.vue
new file mode 100644
index 000000000..905874a2c
--- /dev/null
+++ b/client/components/users/settings/Connections.vue
@@ -0,0 +1,153 @@
+<template>
+ <div class="space-y-6">
+ <!-- Header -->
+ <div class="flex flex-col flex-wrap items-start justify-between gap-4 sm:flex-row sm:items-center">
+ <div>
+ <h3 class="text-lg font-medium text-neutral-900">External Connections</h3>
+ <p class="mt-1 text-sm text-neutral-500">
+ Manage your external connections and integrations.
+ </p>
+ </div>
+ <UButton
+ label="Connect Account"
+ icon="i-heroicons-plus"
+ :loading="isLoading"
+ @click="providerModal = true"
+ />
+ </div>
+
+ <!-- Providers List -->
+ <div class="space-y-4">
+ <div v-if="providers.length === 0 && !isLoading" class="text-center py-12">
+ <UIcon
+ name="i-heroicons-link"
+ class="w-12 h-12 text-neutral-400 mx-auto mb-4"
+ />
+ <h4 class="text-lg font-medium text-neutral-900 mb-2">
+ No connections yet
+ </h4>
+ <p class="text-neutral-500 mb-4">
+ Connect your accounts to enable integrations and streamline your workflow.
+ </p>
+ <UButton
+ label="Connect Your First Account"
+ icon="i-heroicons-plus"
+ @click="providerModal = true"
+ />
+ </div>
+
+ <UTable
+ v-if="providers.length > 0"
+ v-model:column-pinning="columnPinning"
+ :data="providers"
+ :columns="tableColumns"
+ :loading="isLoading"
+ class="w-full"
+ >
+ <template #provider-cell="{ row: { original: item } }">
+ <div class="flex items-center gap-3">
+ <Icon
+ :name="getService(item.provider)?.icon"
+ size="24px"
+ class="text-blue-500"
+ />
+ <span class="font-semibold">{{ getService(item.provider)?.name || item.provider }}</span>
+ </div>
+ </template>
+
+ <template #email-cell="{ row: { original: item } }">
+ <div class="flex flex-col items-start" v-if="item.name || item.email">
+ <span class="text-neutral-600" v-if="item.name">{{ item.name }}</span>
+ <span class="text-neutral-400 text-xs" v-if="item.email">{{ item.email }}</span>
+ </div>
+ <span v-else class="text-neutral-400">
+ -
+ </span>
+ </template>
+
+ <template #actions-cell="{ row: { original: item } }">
+ <div class="flex justify-end">
+ <UButton
+ color="error"
+ variant="soft"
+ icon="i-heroicons-trash"
+ square
+ size="sm"
+ @click="disconnectProvider(item)"
+ />
+ </div>
+ </template>
+ </UTable>
+ </div>
+
+ <!-- Provider Modal -->
+ <UsersSettingsConnectionModal
+ v-model="providerModal"
+ @close="providerModal = false"
+ />
+ </div>
+</template>
+
+<script setup>
+const providerModal = ref(false)
+const oAuth = useOAuth()
+const alert = useAlert()
+
+const { data: providersData, isLoading: isLoading, refetch } = oAuth.providers()
+const providers = computed(() => providersData.value || [])
+
+// Column pinning state
+const columnPinning = ref({
+ left: [],
+ right: ['actions']
+})
+
+// Table columns configuration
+const tableColumns = [
+ {
+ id: 'provider',
+ accessorKey: 'provider',
+ header: 'Service',
+ enableSorting: true
+ },
+ {
+ id: 'email',
+ accessorKey: 'email',
+ header: 'Account',
+ enableSorting: true
+ },
+ {
+ id: 'actions',
+ header: '',
+ enableSorting: false,
+ enableHiding: false
+ }
+]
+
+// Get service information
+const getService = (providerName) => {
+ return oAuth.getService(providerName)
+}
+
+// Disconnect provider mutation
+const removeMutation = oAuth.remove()
+
+// Disconnect provider
+const disconnectProvider = (provider) => {
+ alert.confirm("Do you really want to disconnect this account?", () => {
+ removeMutation.mutateAsync(provider.id).then(() => {
+ alert.success('Account disconnected successfully')
+ refetch()
+ }).catch((error) => {
+ try {
+ alert.error(error.data.message)
+ } catch {
+ alert.error("An error occurred while disconnecting the account")
+ }
+ })
+ })
+}
+
+// Fetch providers on mount
+await oAuth.fetchOAuthProviders()
+</script>
\ No newline at end of file
diff --git a/client/components/users/settings/Modal.vue b/client/components/users/settings/Modal.vue
new file mode 100644
index 000000000..c72c2918f
--- /dev/null
+++ b/client/components/users/settings/Modal.vue
@@ -0,0 +1,91 @@
+<template>
+ <SettingsModal
+ v-model="isOpen"
+ v-model:active-tab="localActiveTab"
+ @close="closeModal"
+ >
+ <!-- Settings Pages - Auto-register themselves -->
+ <SettingsModalPage
+ id="account"
+ label="Account"
+ icon="i-heroicons-user"
+ >
+ <LazyUsersSettingsAccount />
+ </SettingsModalPage>
+
+ <SettingsModalPage
+ id="security"
+ label="Security"
+ icon="i-heroicons-shield-check"
+ >
+ <LazyUsersSettingsSecurity />
+ </SettingsModalPage>
+
+ <SettingsModalPage
+ v-if="workspace && !workspace.is_readonly"
+ id="connections"
+ label="Connections"
+ icon="i-heroicons-link"
+ >
+ <LazyUsersSettingsConnections />
+ </SettingsModalPage>
+
+ <SettingsModalPage
+ v-if="workspace && !workspace.is_readonly"
+ id="access-tokens"
+ label="Access Tokens"
+ icon="i-heroicons-key"
+ >
+ <LazyUsersSettingsAccessTokens />
+ </SettingsModalPage>
+
+ <SettingsModalPage
+ v-if="user && user.has_customer_id"
+ id="billing"
+ label="Billing"
+ icon="i-heroicons-credit-card"
+ >
+ <LazyUsersSettingsBilling />
+ </SettingsModalPage>
+ </SettingsModal>
+</template>
+
+<script setup>
+import { computed } from 'vue'
+import SettingsModal from '~/components/pages/settings/SettingsModal.vue'
+import SettingsModalPage from '~/components/pages/settings/SettingsModalPage.vue'
+
+const emit = defineEmits(['update:activeTab'])
+
+const props = defineProps({
+ activeTab: {
+ type: String,
+ default: null
+ }
+})
+
+const { current: workspace } = useCurrentWorkspace()
+const { data: user } = useAuth().user()
+
+// Modal state is now derived from the presence of an active tab
+const isOpen = computed({
+ get: () => !!props.activeTab,
+ set: (value) => {
+ // When the modal is closed (e.g., via v-model), we signal this by nullifying the active tab.
+ if (!value) {
+ emit('update:activeTab', null)
+ }
+ }
+})
+
+// Two-way binding for the active tab with the parent
+const localActiveTab = computed({
+ get: () => props.activeTab,
+ set: (value) => emit('update:activeTab', value)
+})
+
+// The @close event from SettingsModal triggers this
+const closeModal = () => {
+ emit('update:activeTab', null)
+}
+</script>
\ No newline at end of file
diff --git a/client/components/users/settings/ProviderWidgetModal.vue b/client/components/users/settings/ProviderWidgetModal.vue
new file mode 100644
index 000000000..7399a3ad4
--- /dev/null
+++ b/client/components/users/settings/ProviderWidgetModal.vue
@@ -0,0 +1,103 @@
+<template>
+ <UModal
+ v-model:open="isOpen"
+ :ui="{ content: 'sm:max-w-md' }"
+ >
+ <template #header>
+ <div class="flex items-center justify-center">
+ <Icon
+ :name="service.icon"
+ class="h-8 w-8 text-neutral-500"
+ />
+ <span class="ml-2 text-neutral-700 font-medium">{{ service.title }}</span>
+ </div>
+ </template>
+
+ <template #body>
+ <div class="flex items-center justify-center">
+ <!-- Dynamic component loading based on service -->
+ <Suspense v-if="service?.widget_file">
+ <component
+ :is="widgetComponent"
+ v-if="widgetComponent"
+ :service="service"
+ @auth-data="handleAuthData"
+ />
+ <template #fallback>
+ <div class="flex items-center justify-center p-8">
+ <USkeleton class="h-24 w-full" />
+ </div>
+ </template>
+ </Suspense>
+ </div>
+ </template>
+
+ <template #footer>
+ <UButton
+ color="neutral"
+ variant="outline"
+ @click="closeModal"
+ >
+ Close
+ </UButton>
+ </template>
+ </UModal>
+</template>
+
+<script setup>
+import { useComponentRegistry } from "~/composables/components/useComponentRegistry"
+
+const props = defineProps({
+ show: Boolean,
+ service: Object
+})
+
+const oAuth = useOAuth()
+const router = useRouter()
+const alert = useAlert()
+const { getProviderWidget } = useComponentRegistry()
+const emit = defineEmits(['close'])
+
+// Modal state
+const isOpen = computed({
+ get: () => props.show,
+ set: (value) => {
+ if (!value) {
+ emit('close')
+ }
+ }
+})
+
+const closeModal = () => {
+ isOpen.value = false
+}
+
+// Dynamically compute which widget component to load
+const widgetComponent = computed(() => {
+ if (!props.service?.widget_file) return null
+ return getProviderWidget(props.service.widget_file)
+})
+
+// Widget callback mutation
+const widgetCallbackMutation = oAuth.widgetCallback()
+
+const handleAuthData = (data) => {
+ if (!data) {
+ alert.error('Authentication failed')
+ return
+ }
+
+ widgetCallbackMutation.mutateAsync({ service: props.service.name, data }).then((response) => {
+ if (response.intention) {
+ router.push(response.intention)
+ } else {
+ alert.success('Successfully connected')
+ emit('close')
+ oAuth.fetchOAuthProviders()
+ }
+ }).catch((error) => {
+ alert.error(error?.data?.message || 'Failed to authenticate')
+ oAuth.fetchOAuthProviders()
+ })
+}
+</script>
\ No newline at end of file
diff --git a/client/components/users/settings/Security.vue b/client/components/users/settings/Security.vue
new file mode 100644
index 000000000..3db803c73
--- /dev/null
+++ b/client/components/users/settings/Security.vue
@@ -0,0 +1,92 @@
+<template>
+ <div class="space-y-8">
+ <!-- Password Section -->
+ <div class="space-y-4">
+ <div>
+ <h3 class="text-lg font-medium text-neutral-900">Change Password</h3>
+ <p class="text-sm text-neutral-500 mt-1">
+ Update your password to keep your account secure.
+ </p>
+ </div>
+
+ <VForm size="sm">
+ <form
+ @submit.prevent="updatePassword"
+ >
+ <div class="max-w-sm">
+ <text-input
+ :form="passwordForm"
+ name="password"
+ label="New Password"
+ native-type="password"
+ placeholder="Enter new password"
+ :required="true"
+ />
+
+ <text-input
+ :form="passwordForm"
+ name="password_confirmation"
+ label="Confirm Password"
+ native-type="password"
+ placeholder="Confirm new password"
+ :required="true"
+ />
+ </div>
+
+ <div class="mt-4">
+ <UButton
+ type="submit"
+ :loading="passwordForm.busy"
+ color="primary"
+ >
+ Update Password
+ </UButton>
+ </div>
+ </form>
+ </VForm>
+ </div>
+
+ <!-- Two-Factor Authentication (Future Enhancement) -->
+ <div class="pt-8 border-t border-neutral-200">
+ <div class="flex flex-col gap-2 items-start">
+ <div>
+ <h3 class="text-lg font-medium text-neutral-900">Two-Factor Authentication</h3>
+ <p class="text-sm text-neutral-500 mt-1">
+ Add an extra layer of security to your account.
+ </p>
+ </div>
+
+ <UButton
+ color="primary"
+ disabled
+ >
+ Coming Soon
+ </UButton>
+
+ </div>
+ </div>
+ </div>
+</template>
+
+<script setup>
+const alert = useAlert()
+
+// Password form
+const passwordForm = useForm({
+ password: '',
+ password_confirmation: ''
+})
+
+// Update password
+const updatePassword = () => {
+ passwordForm
+ .patch('/settings/password')
+ .then(() => {
+ passwordForm.reset()
+ alert.success('Password updated.')
+ })
+ .catch((error) => {
+ console.error(error)
+ })
+}
+</script>
\ No newline at end of file
diff --git a/client/components/users/settings/access-tokens/AbilitiesBadges.vue b/client/components/users/settings/access-tokens/AbilitiesBadges.vue
new file mode 100644
index 000000000..7899f44c4
--- /dev/null
+++ b/client/components/users/settings/access-tokens/AbilitiesBadges.vue
@@ -0,0 +1,44 @@
+<template>
+ <div class="flex items-center gap-1 flex-wrap">
+ <!-- First 2 abilities as badges -->
+ <UBadge
+ v-for="(ability, index) in abilities.slice(0, limit)"
+ :key="index"
+ variant="soft"
+ color="neutral"
+ size="sm"
+ >
+ {{ getAbility(ability).title }}
+ </UBadge>
+
+ <!-- "+x more" badge with tooltip if there are more than 2 abilities -->
+ <UTooltip
+ v-if="abilities.length > limit"
+ :text="abilities.slice(limit).map(ability => getAbility(ability).title).join(', ')"
+ class="max-w-xs"
+ >
+ <UBadge
+ variant="soft"
+ color="primary"
+ size="sm"
+ >
+ +{{ abilities.length - limit }}
+ </UBadge>
+ </UTooltip>
+ </div>
+</template>
+
+<script setup>
+defineProps({
+ abilities: {
+ type: Array,
+ required: true
+ },
+ limit: {
+ type: Number,
+ default: 4
+ }
+})
+
+const { getAbility } = useTokens()
+</script>
\ No newline at end of file
diff --git a/client/components/vendor/FeatureBase.vue b/client/components/vendor/FeatureBase.vue
index 54a156be7..0a4813f06 100644
--- a/client/components/vendor/FeatureBase.vue
+++ b/client/components/vendor/FeatureBase.vue
@@ -1,22 +1,51 @@
-<template></template>
+<template>
+ <button
+ v-if="user && featureBaseOrganization"
+ v-show="scriptLoaded && appStore.featureBaseButtonVisible"
+ data-featurebase-feedback
+ class="fixed -right-9 top-1/2 -translate-y-1/2 z-20 bg-blue-600 hover:bg-blue-700 text-white font-medium py-2 px-3 rounded-t-lg shadow-lg transition-all duration-200 hover:shadow-xl transform hover:scale-105 flex items-center space-x-1 -rotate-90 origin-center"
+ >
+ <Icon name="i-heroicons-chat-bubble-left-ellipsis" class="w-4 h-4" />
+ <span class="text-xs">Feedback</span>
+ </button>
+</template>
<script setup>
import { onMounted } from "vue"
import { default as _has } from "lodash/has"
const scriptLoaded = ref(false)
+let setupQueue = []
+
const authStore = useAuthStore()
-const user = computed(() => authStore.user)
+const appStore = useAppStore()
+const { data: user } = useAuth().user()
const isImpersonating = computed(() => authStore.isImpersonating)
const featureBaseOrganization =
useRuntimeConfig().public.featureBaseOrganization
+const runSetupQueue = () => {
+ while (setupQueue.length > 0) {
+ const setupFn = setupQueue.shift()
+ try {
+ setupFn()
+ } catch (error) {
+ console.error("Error running FeatureBase setup", error)
+ }
+ }
+}
+
const loadScript = () => {
if (scriptLoaded.value || !user.value || !featureBaseOrganization) return
+ if (document.getElementById("featurebase-sdk")) return
+
const script = document.createElement("script")
script.src = "https://do.featurebase.app/js/sdk.js"
script.id = "featurebase-sdk"
document.head.appendChild(script)
- scriptLoaded.value = true
+ script.onload = () => {
+ scriptLoaded.value = true
+ runSetupQueue()
+ }
}
const setupForUser = () => {
@@ -25,13 +54,15 @@ const setupForUser = () => {
!user.value ||
!featureBaseOrganization ||
isImpersonating.value
- )
+ ) {
return
+ }
+
window.Featurebase("identify", {
organization: featureBaseOrganization,
email: user.value.email,
name: user.value.name,
- id: user.value.id.toString(),
+ id: user.value.id != null ? String(user.value.id) : undefined,
profilePicture: user.value.photo_url,
})
@@ -47,12 +78,23 @@ const setupForUser = () => {
window.Featurebase("initialize_feedback_widget", {
organization: featureBaseOrganization,
theme: "light",
- placement: "right",
email: user.value?.email,
usersName: user.value?.name,
})
}
+const scheduleSetup = () => {
+ if (import.meta.server) return
+
+ setupQueue.push(setupForUser)
+
+ if (scriptLoaded.value) {
+ runSetupQueue()
+ } else {
+ loadScript()
+ }
+}
+
onMounted(() => {
if (import.meta.server || !user.value) return
@@ -62,32 +104,30 @@ onMounted(() => {
typeof window.Featurebase !== "function"
) {
window.Featurebase = function () {
- (window.Featurebase.q = window.Featurebase.q || []).push(arguments)
+ ;(window.Featurebase.q = window.Featurebase.q || []).push(arguments)
}
}
- loadScript()
- try {
- setupForUser()
- } catch (error) {
- console.error(error)
+ if (user.value) {
+ scheduleSetup()
}
})
-watch(user, (val) => {
- if (import.meta.server || !val) return
-
- loadScript()
- try {
- setupForUser()
- } catch (error) {
- console.error(error)
- }
-})
+watch(
+ user,
+ (val) => {
+ if (val) {
+ scheduleSetup()
+ }
+ },
+ { immediate: false }
+)
</script>
<style>
-.fb-feedback-widget-feedback-button {
- z-index: 20 !important;
+/* Hide native FeatureBase button if it appears */
+.fb-feedback-widget-feedback-button[data-placement="right"],
+.fb-feedback-widget-feedback-button[data-placement="left"] {
+ display: none !important;
}
</style>
diff --git a/client/components/vendor/GoogleOneTap.vue b/client/components/vendor/GoogleOneTap.vue
new file mode 100644
index 000000000..0d6533a68
--- /dev/null
+++ b/client/components/vendor/GoogleOneTap.vue
@@ -0,0 +1,178 @@
+<template>
+ <div
+ v-if="shouldShowOneTap"
+ id="g_id_onload"
+ :data-client_id="googleClientId"
+ :data-context="context"
+ :data-cancel_on_tap_outside="false"
+ data-use_fedcm_for_prompt="false"
+ />
+</template>
+
+<script setup>
+const { context = 'signin' } = defineProps({
+ context: {
+ type: String,
+ default: 'signin'
+ }
+})
+
+const { data: user } = useAuth().user()
+const { widgetCallback } = useOAuth()
+const widgetCallbackMutation = widgetCallback()
+const scriptLoaded = ref(false)
+const oneTapInitialized = ref(false)
+const googleClientId = computed(() => useFeatureFlag('services.google.client_id'))
+const authFlow = useAuthFlow()
+const router = useRouter()
+
+// Only show One Tap if Google auth is enabled and user is not authenticated
+const shouldShowOneTap = computed(() => {
+ return !user.value &&
+ useFeatureFlag('services.google.auth') &&
+ !useFeatureFlag('self_hosted') &&
+ googleClientId.value &&
+ scriptLoaded.value
+})
+
+const loadGoogleScript = () => {
+ if (scriptLoaded.value || !googleClientId.value) return
+
+ // Check if script is already loaded or being loaded
+ const existingScript = document.getElementById('google-one-tap-script')
+ if (existingScript) {
+ // Script already exists, check if Google API is available
+ if (window.google?.accounts?.id) {
+ scriptLoaded.value = true
+ initializeOneTap()
+ }
+ return
+ }
+
+ const script = document.createElement('script')
+ script.src = 'https://accounts.google.com/gsi/client'
+ script.id = 'google-one-tap-script'
+ script.async = true
+ script.defer = true
+ document.head.appendChild(script)
+
+ script.onload = () => {
+ scriptLoaded.value = true
+ initializeOneTap()
+ }
+
+ script.onerror = () => {
+ console.error('Failed to load Google One Tap script')
+ }
+}
+
+const initializeOneTap = () => {
+ if (!window.google?.accounts?.id || !shouldShowOneTap.value || oneTapInitialized.value) return
+
+ oneTapInitialized.value = true
+
+ try {
+ window.google.accounts.id.initialize({
+ client_id: googleClientId.value,
+ callback: handleCredentialResponse,
+ cancel_on_tap_outside: false,
+ use_fedcm_for_prompt: false, // Temporarily disabled for testing
+ auto_select: false,
+ ux_mode: 'popup'
+ })
+
+ // Show the One Tap prompt - FedCM compliant (no status checking)
+ window.google.accounts.id.prompt()
+ } catch (error) {
+ console.error('Google One Tap initialization failed:', error)
+
+ // Reset the flag so we can try again later
+ oneTapInitialized.value = false
+ }
+}
+
+const handleAuthenticationResponse = async (response) => {
+ try {
+ // Handle authentication flow (user was not logged in)
+ await authFlow.handleAuthSuccess(response, 'google_one_tap', response.new_user)
+
+ if (!response.new_user) {
+ // Handle existing user login
+ useAlert().success('Successfully signed in with Google!')
+
+ // Redirect to home if no specific redirect
+ router.push({ name: "home" })
+ } else {
+ // Handle new user registration
+ router.push({ name: "forms-create" })
+ useAlert().success("You're now registered with your Google account! Welcome to OpnForm.")
+ useAlert().success("Time to create your first form!")
+ }
+ } catch (error) {
+ console.error('Google One Tap auth flow error:', error)
+ useAlert().error('Authentication failed')
+ }
+}
+
+
+
+const handleCredentialResponse = (response) => {
+ if (!response.credential) {
+ console.error('Google One Tap: No credential in response')
+ useAlert().error('Google One Tap authentication failed')
+ return
+ }
+
+ // Send JWT to backend widget callback
+ widgetCallbackMutation.mutateAsync({
+ service: 'google_one_tap',
+ data: {
+ credential: response.credential,
+ intent: 'auth'
+ }
+ }).then((response) => {
+ // Handle both authentication and integration responses
+ if (response.token) {
+ // Authentication flow - user was not logged in
+ handleAuthenticationResponse(response)
+ } else {
+ useAlert().error('Google One Tap authentication failed')
+ }
+ }).catch((error) => {
+ console.error('Google One Tap authentication error:', error)
+ useAlert().error(error.response?.data?.message || 'Google One Tap authentication failed')
+ })
+}
+
+// Initialize when component is mounted
+ onMounted(() => {
+ if (import.meta.client) {
+ loadGoogleScript()
+ }
+ })
+
+// Watch for changes in shouldShowOneTap to re-initialize
+watch(shouldShowOneTap, (newVal) => {
+ if (newVal && scriptLoaded.value) {
+ nextTick(() => {
+ initializeOneTap()
+ })
+ }
+})
+
+// Watch for user changes to reset One Tap
+watch(user, (newUser) => {
+ if (newUser) {
+ // User logged in, reset One Tap flag
+ oneTapInitialized.value = false
+ }
+})
+
+// Cleanup on unmount
+onUnmounted(() => {
+ if (window.google?.accounts?.id) {
+ window.google.accounts.id.cancel()
+ }
+ oneTapInitialized.value = false
+})
+</script>
\ No newline at end of file
diff --git a/client/components/vendor/appsumo/AppSumoBilling.vue b/client/components/vendor/appsumo/AppSumoBilling.vue
index d0d80b7fa..9d207b018 100644
--- a/client/components/vendor/appsumo/AppSumoBilling.vue
+++ b/client/components/vendor/appsumo/AppSumoBilling.vue
@@ -40,32 +40,28 @@
</li>
</ul>
<div class="w-max">
- <v-button
- color="outline-gray"
- shade="lighter"
+ <UButton
+ variant="outline"
+ color="neutral"
class="mt-4 block"
href="https://appsumo.com/account/products/"
target="_blank"
- >
- Manage in AppSumo
- </v-button>
+ label="Manage in AppSumo"
+ />
</div>
</div>
</template>
<script>
import { computed } from "vue"
-import VButton from "~/components/global/VButton.vue"
export default {
name: "AppSumoBilling",
- components: { VButton },
setup() {
- const authStore = useAuthStore()
- return {
- user: computed(() => authStore.user),
- }
+ return {
+ user: computed(() => useAuth().user().data.value),
+ }
},
data() {
diff --git a/client/components/workspaces/CreateWorkspaceModal.vue b/client/components/workspaces/CreateWorkspaceModal.vue
new file mode 100644
index 000000000..a6e342407
--- /dev/null
+++ b/client/components/workspaces/CreateWorkspaceModal.vue
@@ -0,0 +1,123 @@
+<template>
+ <UModal
+ v-model:open="isOpen"
+ :ui="{
+ content: 'w-full max-w-md'
+ }"
+ >
+ <template #header>
+ <div class="flex items-center w-full gap-4 px-2">
+ <h2 class="font-semibold">
+ Create Workspace
+ </h2>
+ </div>
+ <UButton
+ color="neutral"
+ variant="outline"
+ icon="i-heroicons-question-mark-circle"
+ size="sm"
+ @click="crisp.openHelpdeskArticle('how-many-workspaces-can-i-create-r4dvt6')"
+ >
+ Help
+ </UButton>
+ </template>
+
+ <template #body>
+ <VForm size="sm">
+ <form
+ @submit.prevent="handleSubmit"
+ >
+ <text-input
+ name="name"
+ :form="form"
+ :required="true"
+ :disabled="form.busy"
+ label="Workspace Name"
+ placeholder="My Workspace"
+ />
+ <text-input
+ name="emoji"
+ class="mt-4"
+ :form="form"
+ :required="false"
+ :disabled="form.busy"
+ label="Emoji (optional)"
+ placeholder="🚀"
+ help="Choose an emoji to represent your workspace"
+ />
+ </form>
+ </VForm>
+ </template>
+ <template #footer>
+ <div class="flex gap-2 w-full">
+ <UButton color="neutral" variant="outline" @click="closeModal">Cancel</UButton>
+ <UButton block type="submit" :loading="form.busy" @click="handleSubmit">Create Workspace</UButton>
+ </div>
+ </template>
+ </UModal>
+</template>
+
+<script setup>
+const emit = defineEmits(['created', 'close'])
+
+const props = defineProps({
+ modelValue: {
+ type: Boolean,
+ default: false
+ }
+})
+
+const { create } = useWorkspaces()
+const appStore = useAppStore()
+const crisp = useCrisp()
+const alert = useAlert()
+
+// Modal state
+const isOpen = computed({
+ get: () => props.modelValue,
+ set: (value) => emit('close', value)
+})
+
+// Form state
+const form = useForm({
+ name: '',
+ emoji: ''
+})
+
+// Handle form submission
+const createMutation = create()
+
+const handleSubmit = () => {
+ form.mutate(createMutation).then((response) => {
+ const newWorkspace = response.workspace
+ appStore.setCurrentId(newWorkspace.id)
+
+ // Show success message
+ alert.success('You are now working in your new workspace.', 10000, {
+ title: 'Workspace created successfully!'
+ })
+
+ // Emit created event and close modal
+ emit('created', newWorkspace)
+ closeModal()
+ }).catch((error) => {
+ console.error('Error creating workspace:', error)
+ alert.error(error.data?.message || 'Something went wrong. Please try again.', 10000, {
+ title: 'Error creating workspace'
+ })
+ })
+}
+
+// Close modal and reset form
+const closeModal = () => {
+ form.reset()
+ isOpen.value = false
+}
+
+// Reset form when modal opens
+watch(isOpen, (newValue) => {
+ if (newValue) {
+ form.reset()
+ }
+})
+</script>
\ No newline at end of file
diff --git a/client/components/workspaces/WorkspaceIcon.vue b/client/components/workspaces/WorkspaceIcon.vue
index 21a0302e9..8dca4bede 100644
--- a/client/components/workspaces/WorkspaceIcon.vue
+++ b/client/components/workspaces/WorkspaceIcon.vue
@@ -1,47 +1,81 @@
<template>
+ <div
+ :class="[size, colorClasses]"
+ class="rounded-full text-xs truncate text-center flex items-center justify-center overflow-hidden shrink-0"
+ >
<img
v-if="isUrl(workspace.icon)"
:src="workspace.icon"
:alt="`${workspace.name} icon`"
- class="flex-shrink-0 rounded"
- :class="size"
- >
- <div
- v-else
+ class="flex-shrink-0 rounded-sm"
:class="size"
- class="rounded text-xs truncate bg-neutral-100 text-center flex items-center justify-center"
>
- <p
- class="font-semibold text-neutral-500"
- v-text="workspace.icon"
+ <p v-else
+ class="font-semibold"
+ v-text="displayText"
/>
</div>
</template>
-<script>
-export default {
- name: 'WorkspaceIcon',
- components: {},
- props: {
- workspace: {
- type: Object,
- required: true,
- },
- size: {
- type: String,
- default: 'h-6 w-6',
- },
+<script setup>
+import { computed } from 'vue'
+
+const props = defineProps({
+ workspace: {
+ type: Object,
+ required: true,
},
- methods: {
- isUrl(str) {
- try {
- new URL(str)
- }
- catch {
- return false
- }
- return true
- },
+ size: {
+ type: String,
+ default: 'h-6 w-6',
},
+})
+
+const colorClasses = computed(() => {
+ if (!props.workspace?.id) {
+ return 'bg-neutral-200 text-neutral-500'
+ }
+
+ const colors = [
+ { bg: 'bg-red-200', text: 'text-red-600' },
+ { bg: 'bg-orange-200', text: 'text-orange-600' },
+ { bg: 'bg-amber-200', text: 'text-amber-600' },
+ { bg: 'bg-yellow-200', text: 'text-yellow-600' },
+ { bg: 'bg-lime-200', text: 'text-lime-600' },
+ { bg: 'bg-green-200', text: 'text-green-600' },
+ { bg: 'bg-emerald-200', text: 'text-emerald-600' },
+ { bg: 'bg-teal-200', text: 'text-teal-600' },
+ { bg: 'bg-cyan-200', text: 'text-cyan-600' },
+ { bg: 'bg-sky-200', text: 'text-sky-600' },
+ { bg: 'bg-blue-200', text: 'text-blue-600' },
+ { bg: 'bg-indigo-200', text: 'text-indigo-600' },
+ { bg: 'bg-violet-200', text: 'text-violet-600' },
+ { bg: 'bg-purple-200', text: 'text-purple-600' },
+ { bg: 'bg-fuchsia-200', text: 'text-fuchsia-600' },
+ { bg: 'bg-pink-200', text: 'text-pink-600' },
+ { bg: 'bg-rose-200', text: 'text-rose-600' },
+ ]
+
+ const colorPair = colors[props.workspace.id % colors.length]
+
+ return `${colorPair.bg} ${colorPair.text}`
+})
+
+const isUrl = (str) => {
+ try {
+ new URL(str)
+ }
+ catch {
+ return false
+ }
+ return true
}
+
+const displayText = computed(() => {
+ if (props.workspace.icon) {
+ return props.workspace.icon
+ }
+ // Fallback to first letter of workspace name, capitalized
+ return props.workspace.name ? props.workspace.name.charAt(0).toUpperCase() : ''
+})
</script>
diff --git a/client/components/workspaces/settings/Domains.vue b/client/components/workspaces/settings/Domains.vue
new file mode 100644
index 000000000..b6edbd904
--- /dev/null
+++ b/client/components/workspaces/settings/Domains.vue
@@ -0,0 +1,176 @@
+<template>
+ <div class="space-y-4">
+ <div class="flex flex-col flex-wrap items-start justify-between gap-4 sm:flex-row sm:items-center">
+ <div>
+ <h3 class="text-lg font-medium text-neutral-900">Custom Domains Settings</h3>
+ <p class="mt-1 text-sm text-neutral-500">
+ Manage your custom domains.
+ </p>
+ </div>
+
+ <div class="flex shrink-0 items-center gap-2">
+ <UButton
+ label="Help"
+ icon="i-heroicons-question-mark-circle"
+ variant="outline"
+ color="neutral"
+ @click="crisp.openHelpdeskArticle('how-to-use-my-own-domain-9m77g7')"
+ />
+ </div>
+ </div>
+
+ <UAlert
+ v-if="!workspace.is_pro"
+ icon="i-heroicons-user-group-20-solid"
+ class="mb-4"
+ color="warning"
+ variant="subtle"
+ title="Pro plan required"
+ description="Please upgrade your account to setup a custom domain."
+ :actions="[{
+ label: 'Try Pro plan',
+ color: 'warning',
+ variant: 'solid',
+ onClick: () => openSubscriptionModal({
+ modal_title: 'Upgrade to use your own domain',
+ modal_description: 'Try our Pro plan for free today, and unlock custom domains and other features such as advanced customization, forms analytics, integrations, and more!'
+ })
+ }]"
+ />
+
+ <div class="space-y-4">
+ <div class="flex max-w-sm items-center gap-2">
+ <UInput
+ v-model="newDomain"
+ :disabled="!workspace.is_pro"
+ :variant="workspace.is_pro ? 'outline' : 'subtle'"
+ placeholder="yourdomain.com"
+ class="flex-1"
+ @keydown.enter.prevent="addDomain"
+ />
+ <UButton
+ :disabled="!workspace.is_pro || !newDomain.trim()"
+ icon="i-heroicons-plus"
+ @click="addDomain"
+ >
+ Add
+ </UButton>
+ </div>
+
+ <div v-if="domains.length > 0" class="max-w-sm space-y-2">
+ <div
+ v-for="(domain, index) in domains"
+ :key="index"
+ class="group flex items-center justify-between rounded-md border border-neutral-200 bg-white p-2"
+ >
+ <span class="text-sm text-neutral-800">{{ domain }}</span>
+ <UButton
+ :disabled="!workspace.is_pro"
+ icon="i-heroicons-x-mark"
+ color="red"
+ variant="ghost"
+ class="opacity-0 group-hover:opacity-100"
+ @click="removeDomain(index)"
+ />
+ </div>
+ </div>
+ <div v-else class="max-w-sm rounded-md border border-dashed border-neutral-300 p-4 text-center">
+ <p class="text-sm text-neutral-500">
+ No custom domains added yet.
+ </p>
+ </div>
+ </div>
+
+ <UButton
+ type="submit"
+ :loading="isLoading"
+ :disabled="!workspace.is_pro || !isChanged"
+ @click="saveChanges"
+ >
+ Save Domain(s)
+ </UButton>
+
+ </div>
+</template>
+
+<script setup>
+const { updateCustomDomains } = useWorkspaces()
+const alert = useAlert()
+const crisp = useCrisp()
+const { current: workspace } = useCurrentWorkspace()
+
+const { openSubscriptionModal } = useAppModals()
+
+const newDomain = ref('')
+const domains = ref([])
+const isLoading = ref(false)
+const isChanged = ref(false)
+
+onMounted(() => {
+ initCustomDomains()
+})
+
+watch(
+ () => workspace.value,
+ () => {
+ initCustomDomains()
+ },
+ { deep: true },
+)
+
+const addDomain = () => {
+ const domainToAdd = newDomain.value.trim()
+ if (domainToAdd) {
+ // Remove protocol and path to get the clean domain
+ const cleanedDomain = domainToAdd
+ .replace(/^https?:\/\//i, '')
+ .split('/')[0]
+
+ // Basic domain validation
+ const domainRegex = /^((?!-))(xn--)?[a-z0-9][a-z0-9-_]{0,61}[a-z0-9]{0,1}\.(xn--)?([a-z0-9-]{1,61}|[a-z0-9-]{1,30}\.[a-z]{2,})$/i
+ if (!domainRegex.test(cleanedDomain)) {
+ return alert.error('Invalid domain format. Please use a format like "domain.com".')
+ }
+
+ if (domains.value.includes(cleanedDomain)) {
+ return alert.info('Domain already in the list.')
+ }
+
+ domains.value.push(cleanedDomain)
+ newDomain.value = ''
+ isChanged.value = true
+ }
+}
+
+const removeDomain = (index) => {
+ domains.value.splice(index, 1)
+ isChanged.value = true
+}
+
+const updateMutation = updateCustomDomains(workspace.value?.id)
+
+const saveChanges = () => {
+ if (!workspace.value?.id) return
+
+ isLoading.value = true
+ updateMutation.mutateAsync({
+ custom_domains: domains.value,
+ }).then(() => {
+ alert.success('Custom domains saved.')
+ isChanged.value = false
+ isLoading.value = false
+ }).catch((error) => {
+ alert.error(error.response?._data?.message ?? 'Failed to update custom domains')
+ isLoading.value = false
+ })
+}
+
+const initCustomDomains = () => {
+ if (workspace.value?.custom_domains) {
+ domains.value = [...workspace.value.custom_domains]
+ } else {
+ domains.value = []
+ }
+ isChanged.value = false
+}
+</script>
\ No newline at end of file
diff --git a/client/components/workspaces/settings/Emails.vue b/client/components/workspaces/settings/Emails.vue
new file mode 100644
index 000000000..581a0cbc6
--- /dev/null
+++ b/client/components/workspaces/settings/Emails.vue
@@ -0,0 +1,173 @@
+<template>
+ <div class="space-y-4">
+ <div class="flex flex-col flex-wrap items-start justify-between gap-4 sm:flex-row sm:items-center">
+ <div>
+ <h3 class="text-lg font-medium text-neutral-900">Email Settings</h3>
+ <p class="mt-1 text-sm text-neutral-500">
+ Customize email sender - connect your SMTP server.
+ </p>
+ </div>
+
+ <UButton
+ label="Help"
+ icon="i-heroicons-question-mark-circle"
+ variant="outline"
+ color="neutral"
+ @click="crisp.openHelpdeskArticle('how-to-send-emails-using-your-own-domain-name-and-email-address-13kkcif')"
+ />
+ </div>
+
+ <UAlert
+ v-if="!workspace.is_pro"
+ icon="i-heroicons-user-group-20-solid"
+ class="mb-4"
+ color="warning"
+ variant="subtle"
+ title="Pro plan required"
+ description="Please upgrade your account to setup an email settings."
+ :actions="[{
+ label: 'Try Pro plan',
+ color: 'warning',
+ variant: 'solid',
+ onClick: () => openSubscriptionModal()
+ }]"
+ />
+
+ <VForm size="sm">
+ <form
+ @submit.prevent="saveChanges"
+ >
+ <div class="max-w-sm">
+ <TextInput
+ :form="emailSettingsForm"
+ name="host"
+ :required="true"
+ :disabled="!workspace.is_pro"
+ label="Host/Server"
+ class="mt-2"
+ placeholder="smtp.example.com"
+ />
+ <TextInput
+ :form="emailSettingsForm"
+ name="port"
+ :required="true"
+ :disabled="!workspace.is_pro"
+ label="Port"
+ placeholder="587"
+ />
+ <TextInput
+ :form="emailSettingsForm"
+ name="username"
+ :required="true"
+ :disabled="!workspace.is_pro"
+ label="Username"
+ placeholder="Username"
+ />
+ <TextInput
+ :form="emailSettingsForm"
+ name="password"
+ native-type="password"
+ :required="true"
+ :disabled="!workspace.is_pro"
+ label="Password"
+ placeholder="Password"
+ />
+ <TextInput
+ :form="emailSettingsForm"
+ name="sender_address"
+ :disabled="!workspace.is_pro"
+ label="Sender address"
+ placeholder="[email protected]"
+ />
+ </div>
+
+ <div class="mt-4 flex items-center justify-between w-full max-w-sm flex-wrap gap-2">
+ <UButton
+ type="submit"
+ :loading="emailSettingsForm.busy"
+ :disabled="!workspace.is_pro"
+ >
+ Save Domain(s)
+ </UButton>
+ <UButton
+ color="neutral"
+ variant="outline"
+ :loading="emailSettingsForm.busy"
+ :disabled="!workspace.is_pro"
+ @click="clearEmailSettings"
+ >
+ Clear settings
+ </UButton>
+ </div>
+ </form>
+ </VForm>
+ </div>
+</template>
+
+<script setup>
+const alert = useAlert()
+
+const { current: workspace } = useCurrentWorkspace()
+
+const { openSubscriptionModal: openModal } = useAppModals()
+const crisp = useCrisp()
+
+const openSubscriptionModal = () => {
+ openModal({ modal_title: 'Upgrade to send emails using your own domain' })
+}
+
+const emailSettingsForm = useForm({
+ host: '',
+ port: '',
+ username: '',
+ password: '',
+ sender_address: ''
+})
+
+onMounted(() => {
+ initEmailSettings()
+})
+
+watch(
+ () => workspace,
+ () => {
+ initEmailSettings()
+ },
+)
+
+const clearEmailSettings = () => {
+ emailSettingsForm.reset()
+ saveChanges()
+}
+
+const saveChanges = () => {
+ // Update the workspace Email Settings
+ emailSettingsForm
+ .put("/open/workspaces/" + workspace.value.id + "/email-settings", {
+ data: {
+ host: emailSettingsForm?.host,
+ port: emailSettingsForm?.port,
+ username: emailSettingsForm?.username,
+ password: emailSettingsForm?.password,
+ sender_address: emailSettingsForm?.sender_address,
+ },
+ })
+ .then((_data) => {
+ // Cache is updated automatically by TanStack Query mutations
+ alert.success("Email settings saved.")
+ })
+ .catch((error) => {
+ alert.error("Failed to update email settings: " + error.response.data.message)
+ })
+}
+
+const initEmailSettings = () => {
+ if (!workspace || !workspace.value.settings.email_settings) return
+ const emailSettings = workspace.value?.settings?.email_settings
+ emailSettingsForm.host = emailSettings?.host
+ emailSettingsForm.port = emailSettings?.port
+ emailSettingsForm.username = emailSettings?.username
+ emailSettingsForm.password = emailSettings?.password
+ emailSettingsForm.sender_address = emailSettings?.sender_address
+}
+</script>
\ No newline at end of file
diff --git a/client/components/workspaces/settings/Information.vue b/client/components/workspaces/settings/Information.vue
new file mode 100644
index 000000000..40330c97c
--- /dev/null
+++ b/client/components/workspaces/settings/Information.vue
@@ -0,0 +1,163 @@
+<template>
+ <div class="space-y-4">
+ <div class="flex flex-col flex-wrap items-start justify-between gap-4 sm:flex-row sm:items-center">
+ <div>
+ <h3 class="text-lg font-medium text-neutral-900">Workspace Information</h3>
+ <p class="mt-1 text-sm text-neutral-500">
+ Update your workspace information.
+ </p>
+ </div>
+ </div>
+
+ <VForm @submit.prevent="updateProfile" size="sm">
+
+ <div class="max-w-sm">
+ <TextInput
+ :disabled="workspace.is_readonly"
+ :form="workspaceForm"
+ name="name"
+ label="Workspace Name"
+ placeholder="My Workspace"
+ :required="true"
+ />
+ <TextInput
+ :disabled="workspace.is_readonly"
+ :form="workspaceForm"
+ name="emoji"
+ label="Emoji (optional)"
+ placeholder="Emoji"
+ help="Choose an emoji to represent your workspace"
+ />
+ </div>
+
+ <div class="mt-4">
+ <UButton
+ :disabled="workspace.is_readonly"
+ type="submit"
+ :loading="workspaceForm.busy"
+ color="primary"
+ >
+ Save Changes
+ </UButton>
+ </div>
+ </VForm>
+
+ <div class="pt-8 border-t border-neutral-200">
+ <div
+ v-if="workspace.is_admin"
+ class="space-y-2"
+ >
+ <h4 class="text-red-800 font-medium">Delete Workspace</h4>
+ <p class="text-neutral-500 text-sm">
+ This will permanently delete your entire workspace. All forms created in this workspace will be removed. This cannot be undone.
+ </p>
+ <UButton
+ color="error"
+ :loading="removeMutation.isPending.value"
+ @click="confirmDeleteWorkspace"
+ >
+ Delete workspace
+ </UButton>
+ </div>
+
+ <div
+ v-else
+ class="space-y-2"
+ >
+ <h4 class="text-neutral-900 font-medium">Leave Workspace</h4>
+ <p class="text-neutral-500 text-sm">
+ This will remove you from the workspace. You will lose access to all forms in this workspace.
+ </p>
+ <UButton
+ color="error"
+ :loading="leaveMutation.isPending.value"
+ @click="leaveWorkSpace"
+ >
+ Leave workspace
+ </UButton>
+ </div>
+ </div>
+ </div>
+</template>
+
+<script setup>
+const { update, remove, leave } = useWorkspaces()
+
+const alert = useAlert()
+const { closeWorkspaceSettings } = useAppModals()
+const router = useRouter()
+
+const { current: workspace } = useCurrentWorkspace()
+
+const updateMutation = update()
+const removeMutation = remove()
+const leaveMutation = leave()
+
+// Workspace form
+const workspaceForm = useForm({
+ name: '',
+ emoji: ''
+})
+
+// Update profile
+const updateProfile = () => {
+ workspaceForm.mutate(updateMutation, {
+ data: { id: workspace.value.id }
+ }).then(() => {
+ useAlert().success('Workspace information successfully updated!')
+ }).catch((error) => {
+ console.error('Error updating workspace:', error)
+ })
+}
+
+// Delete workspace confirmation
+const confirmDeleteWorkspace = () => {
+ alert.confirm(
+ 'Do you really want to delete your workspace?',
+ deleteWorkspace
+ )
+}
+
+// Delete workspace
+const deleteWorkspace = () => {
+ removeMutation.mutateAsync(workspace.value.id).then((data) => {
+ alert.success(data.message)
+ closeWorkspaceSettings()
+ nextTick(() => {
+ router.push({ name: "home", query: {} })
+ })
+ }).catch((error) => {
+ alert.error(error.data?.message || 'Error deleting workspace')
+ })
+}
+
+// Leave workspace
+const leaveWorkSpace = () => {
+ alert.confirm(
+ "Do you really want to leave this workspace? You will lose access to all forms in this workspace.",
+ () => {
+ leaveMutation.mutateAsync(workspace.value.id).then(() => {
+ alert.success("You have left the workspace.")
+ closeWorkspaceSettings()
+ nextTick(() => {
+ router.push({ name: "home", query: {} })
+ })
+ }).catch((error) => {
+ console.error('Error leaving workspace:', error)
+ alert.error("There was an error leaving the workspace.")
+ })
+ },
+ )
+}
+
+
+// Watch for user changes
+watch(workspace, (newWorkspace) => {
+ if (newWorkspace) {
+ workspaceForm.fill({
+ name: newWorkspace.name || '',
+ emoji: newWorkspace.icon || ''
+ })
+ }
+}, { immediate: true })
+</script>
\ No newline at end of file
diff --git a/client/components/workspaces/settings/InviteUser.vue b/client/components/workspaces/settings/InviteUser.vue
new file mode 100644
index 000000000..c070917e2
--- /dev/null
+++ b/client/components/workspaces/settings/InviteUser.vue
@@ -0,0 +1,184 @@
+<template>
+ <UModal
+ v-model:open="isOpen"
+ :content="{
+ onPointerDownOutside: (event) => { if (event.target?.closest('.crisp-client')) {return event.preventDefault()}}
+ }"
+ >
+ <template #header>
+ <div class="flex items-center w-full gap-4 px-2">
+ <h2 class="font-semibold">
+ Invite a new user
+ </h2>
+ </div>
+ <UButton
+ color="neutral"
+ variant="outline"
+ icon="i-heroicons-question-mark-circle"
+ size="sm"
+ @click="crisp.openHelpdeskArticle('how-to-invite-users-team-members-to-my-workspace-qyw16g')"
+ >
+ Help
+ </UButton>
+ </template>
+
+ <template #body>
+ <template v-if="paidPlansEnabled && !hasActiveLicense">
+ <UAlert
+ v-if="workspace.is_pro"
+ icon="i-heroicons-credit-card"
+ color="primary"
+ variant="subtle"
+ title="This is a billable event."
+ >
+ <template #description>
+ You will be charged $6/month for each user you invite to this workspace. More details on the
+ <NuxtLink
+ target="_blank"
+ class="underline cursor-pointer"
+ @click="openBilling"
+ >
+ billing
+ </NuxtLink>
+ and
+ <NuxtLink
+ target="_blank"
+ class="underline"
+ :to="{name:'pricing'}"
+ >
+ pricing
+ </NuxtLink>
+ page.
+ </template>
+ </UAlert>
+ <UAlert
+ v-else
+ icon="i-heroicons-user-group-20-solid"
+ class="mb-4"
+ color="warning"
+ variant="subtle"
+ title="Pro plan required"
+ description="Please upgrade your account to invite users to your workspace."
+ :actions="[{
+ label: 'Try Pro plan',
+ color: 'warning',
+ variant: 'solid',
+ onClick: () => openSubscriptionModal({
+ modal_title: 'Upgrade to invite users to your workspace',
+ modal_description: 'Try our Pro plan for free today, and unlock team collaboration features along with customized branding, form analytics, custom domains, and more!'
+ })
+ }]"
+ />
+ </template>
+
+ <VForm
+ size="sm"
+ class="my-2"
+ @submit.prevent="addUser"
+ >
+ <TextInput
+ :form="inviteUserForm"
+ name="email"
+ label="Email"
+ :required="true"
+ :disabled="!workspace.is_pro"
+ placeholder="Add a new user by email"
+ />
+ <SelectInput
+ :form="inviteUserForm"
+ name="role"
+ :options="roleOptions"
+ :disabled="!workspace.is_pro"
+ placeholder="Select User Role"
+ label="Role"
+ :required="true"
+ />
+ <div class="flex justify-center mt-4">
+ <UButton
+ type="submit"
+ :disabled="!workspace.is_pro"
+ :loading="inviteUserMutation.isPending.value"
+ icon="i-heroicons-envelope"
+ >
+ Invite User
+ </UButton>
+ </div>
+ </VForm>
+ </template>
+ </UModal>
+</template>
+
+<script setup>
+const props = defineProps({
+ modelValue: {
+ type: Boolean,
+ default: false
+ }
+})
+
+const { data: user } = useAuth().user()
+const { addUser: addUserMutation } = useWorkspaceUsers()
+
+// Local computed for active license check
+const hasActiveLicense = computed(() => {
+ return user.value !== null && user.value !== undefined && user.value.active_license !== null
+})
+const crisp = useCrisp()
+const { openSubscriptionModal: openModal } = useAppModals()
+const { current: workspace, currentId: workspaceId } = useCurrentWorkspace()
+const alert = useAlert()
+
+const emit = defineEmits(['update:modelValue', 'user-added'])
+
+const roleOptions = [
+ {name: "User", value: "user"},
+ {name: "Admin", value: "admin"},
+ {name: "Read Only", value: "readonly"}
+]
+
+// Modal state
+const isOpen = computed({
+ get: () => props.modelValue,
+ set: (value) => emit('update:modelValue', value)
+})
+
+// Create mutation during setup
+const inviteUserMutation = addUserMutation(workspaceId)
+
+// Methods
+const closeModal = () => {
+ isOpen.value = false
+}
+
+const openSubscriptionModal = () => {
+ openModal({ modal_title: 'Upgrade to invite users to your workspace' })
+}
+
+const paidPlansEnabled = ref(useFeatureFlag('billing.enabled'))
+
+const inviteUserForm = useForm({
+ email: '',
+ role: 'user'
+})
+
+const openBilling = () => {
+ closeModal()
+ useAppModals().openUserSettings('billing')
+}
+
+const addUser = () => {
+ if (!workspaceId.value) return
+
+ inviteUserMutation.mutateAsync({
+ email: inviteUserForm.email,
+ role: inviteUserForm.role
+ }).then((data) => {
+ inviteUserForm.reset()
+ alert.success(data.message || 'User invited successfully')
+ emit('user-added')
+ closeModal()
+ }).catch((error) => {
+ alert.error(error.response?.data?.message || "There was an error adding user")
+ })
+}
+</script>
diff --git a/client/components/workspaces/settings/Members.vue b/client/components/workspaces/settings/Members.vue
new file mode 100644
index 000000000..ba1757a36
--- /dev/null
+++ b/client/components/workspaces/settings/Members.vue
@@ -0,0 +1,303 @@
+<template>
+ <div class="space-y-4">
+ <div class="flex flex-col flex-wrap items-start justify-between gap-4 sm:flex-row sm:items-center">
+ <div>
+ <h3 class="text-lg font-medium text-neutral-900">Workspace Members</h3>
+ <p class="mt-1 text-sm text-neutral-500">
+ Manage your workspace members and their roles.
+ </p>
+ </div>
+
+ <div class="flex shrink-0 items-center gap-2">
+ <UButton
+ v-if="!workspace.is_readonly"
+ label="Invite User"
+ icon="i-heroicons-user-plus-20-solid"
+ :loading="isLoadingData"
+ @click="showInviteUserModal = true"
+ />
+ </div>
+ </div>
+
+ <UTable
+ class="w-full"
+ :loading="isLoadingData"
+ :data="combinedUsers"
+ :columns="tableColumns"
+ v-model:column-pinning="columnPinning"
+ >
+ <template #actions-cell="{ row: { original: item } }">
+ <div class="space-x-2 flex justify-center">
+ <template v-if="item.type == 'user'">
+ <p
+ v-if="item.is_current_user"
+ class="text-neutral-500 text-center text-sm"
+ >
+ -
+ </p>
+ <div v-else class="flex items-center gap-1">
+ <UTooltip text="Edit user">
+ <UButton
+ icon="i-heroicons-pencil-square"
+ color="primary"
+ variant="soft"
+ size="xs"
+ square
+ @click="editUser(item)"
+ />
+ </UTooltip>
+ <UTooltip text="Remove user">
+ <UButton
+ v-if="item.type == 'user'"
+ color="error"
+ variant="soft"
+ icon="i-heroicons-trash"
+ size="xs"
+ square
+ :loading="removeMutation.isPending.value"
+ @click="removeUserHandler(item)"
+ />
+ </UTooltip>
+ </div>
+ </template>
+ <div
+ v-else-if="item.type == 'invitee'"
+ class="flex items-center gap-1"
+ >
+ <UTooltip text="Resend Invite">
+ <UButton
+ icon="i-heroicons-envelope"
+ color="neutral"
+ variant="soft"
+ size="xs"
+ :loading="resendMutation.isPending.value"
+ @click="resendInviteHandler(item)"
+ />
+ </UTooltip>
+ <UTooltip text="Cancel Invite">
+ <UButton
+ icon="i-heroicons-x-mark"
+ color="error"
+ variant="soft"
+ size="xs"
+ :loading="cancelMutation.isPending.value"
+ @click="cancelInviteHandler(item)"
+ />
+ </UTooltip>
+ </div>
+ </div>
+ </template>
+ </UTable>
+
+ <UModal
+ v-model:open="showEditUserModal"
+ @close="showEditUserModal = false"
+ title="Edit User Role"
+ >
+ <template #body>
+ <form
+ @submit.prevent="updateUserRole"
+ >
+ <div>
+ <FlatSelectInput
+ :form="editUserForm"
+ name="role"
+ :label="'New Role for '+selectedUser.name"
+ :options="[
+ { name: 'User', value: 'user' },
+ { name: 'Admin', value: 'admin' },
+ { name: 'Read Only', value: 'readonly' },
+ ]"
+ option-key="value"
+ display-key="name"
+ />
+ </div>
+
+ <div class="flex justify-center mt-4">
+ <UButton
+ type="submit"
+ :loading="updateMutation.isPending.value"
+ >
+ Update
+ </UButton>
+ </div>
+ </form>
+ </template>
+ </UModal>
+
+ <WorkspacesSettingsInviteUser
+ v-model="showInviteUserModal"
+ @user-added="handleUserAdded"
+ />
+ </div>
+</template>
+
+<script setup>
+import WorkspacesSettingsInviteUser from '~/components/workspaces/settings/InviteUser.vue'
+
+// Composables
+const {
+ users,
+ invites,
+ updateUserRole: updateUserRoleMutation,
+ removeUser: removeUserMutation,
+ resendInvite: resendInviteMutation,
+ cancelInvite: cancelInviteMutation
+} = useWorkspaceUsers()
+
+const alert = useAlert()
+const { current: workspace, currentId: workspaceId } = useCurrentWorkspace()
+const auth = useAuth()
+
+// Get current user
+const { data: user } = auth.user()
+
+// Reactive state
+const showEditUserModal = ref(false)
+const showInviteUserModal = ref(false)
+const selectedUser = ref(null)
+const editUserForm = useForm({
+ role: 'user'
+})
+
+// Create all mutations during setup
+const updateMutation = updateUserRoleMutation(workspaceId)
+const removeMutation = removeUserMutation(workspaceId)
+const resendMutation = resendInviteMutation(workspaceId)
+const cancelMutation = cancelInviteMutation(workspaceId)
+
+// Column pinning state
+const columnPinning = ref({
+ left: [],
+ right: ['actions']
+})
+
+// Get workspace users and invites reactively
+const { data: workspaceUsers, isLoading: isLoadingUsers } = users(workspaceId)
+const { data: workspaceInvites, isLoading: isLoadingInvites } = invites(workspaceId)
+
+// Combined loading state
+const isLoadingData = computed(() => (isLoadingUsers?.value || isLoadingInvites?.value) ?? false)
+
+// Transform and combine data reactively
+const combinedUsers = computed(() => {
+ const users = workspaceUsers?.value || []
+ const invites = workspaceInvites?.value || []
+
+ // Transform users
+ const transformedUsers = users.map(d => ({
+ ...d,
+ id: d.id,
+ is_current_user: d.id === user?.value?.id,
+ name: d.name,
+ email: d.email,
+ status: 'accepted',
+ role: d.pivot?.role,
+ type: 'user'
+ }))
+
+ // Transform invites (exclude accepted ones)
+ const transformedInvites = invites
+ .filter(i => i.status !== 'accepted')
+ .map(i => ({
+ ...i,
+ name: 'Invitee',
+ email: i.email,
+ status: i.status,
+ type: 'invitee'
+ }))
+
+ return [...transformedUsers, ...transformedInvites]
+})
+
+// Table columns configuration
+const tableColumns = computed(() => {
+ const isAdmin = workspace?.value?.is_admin ?? false
+ return [
+ {
+ id: 'name',
+ accessorKey: 'name',
+ header: 'Name'
+ },
+ {
+ id: 'email',
+ accessorKey: 'email',
+ header: 'Email'
+ },
+ {
+ id: 'role',
+ accessorKey: 'role',
+ header: 'Role'
+ },
+ ...(isAdmin ? [
+ {
+ id: 'actions',
+ header: '',
+ }] : [])
+ ]
+})
+
+// User management handlers
+const editUser = (user) => {
+ selectedUser.value = user
+ editUserForm.role = selectedUser.value.pivot?.role || selectedUser.value.role
+ showEditUserModal.value = true
+}
+
+const updateUserRole = () => {
+ if (!workspaceId.value || !selectedUser.value?.id) return
+
+ updateMutation.mutateAsync({
+ userId: selectedUser.value.id,
+ data: { role: editUserForm.role }
+ }).then((data) => {
+ alert.success(data.message || 'User role updated successfully')
+ showEditUserModal.value = false
+ }).catch((error) => {
+ alert.error(error.response?.data?.message || "There was an error updating user role")
+ })
+}
+
+const removeUserHandler = (user) => {
+ if (!workspaceId.value) return
+
+ alert.confirm("Do you really want to remove " + user.name + " from this workspace?", () => {
+ removeMutation.mutateAsync(user.id).then(() => {
+ alert.success("User successfully removed.")
+ }).catch((error) => {
+ alert.error(error.response?.data?.message || "There was an error removing user")
+ })
+ })
+}
+
+// Invite management handlers
+const resendInviteHandler = (invite) => {
+ if (!workspaceId.value) return
+
+ alert.confirm("Do you really want to resend invite email to this user?", () => {
+ resendMutation.mutateAsync(invite.id).then(() => {
+ alert.success("Invitation resent successfully.")
+ }).catch((error) => {
+ alert.error(error.response?.data?.message || "Failed to resend invitation")
+ })
+ })
+}
+
+const cancelInviteHandler = (invite) => {
+ if (!workspaceId.value) return
+
+ alert.confirm("Do you really want to cancel this user's invitation to this workspace?", () => {
+ cancelMutation.mutateAsync(invite.id).then(() => {
+ alert.success("Invitation cancelled successfully.")
+ }).catch((error) => {
+ alert.error(error.response?.data?.message || "Failed to cancel invitation")
+ })
+ })
+}
+
+// Handle user added event from invite modal
+const handleUserAdded = () => {
+ // TanStack Query will automatically update the cache, no manual refresh needed
+ showInviteUserModal.value = false
+}
+</script>
\ No newline at end of file
diff --git a/client/components/workspaces/settings/Modal.vue b/client/components/workspaces/settings/Modal.vue
new file mode 100644
index 000000000..e87e39c27
--- /dev/null
+++ b/client/components/workspaces/settings/Modal.vue
@@ -0,0 +1,83 @@
+<template>
+ <SettingsModal
+ v-model="isOpen"
+ v-model:active-tab="localActiveTab"
+ @close="closeModal"
+ v-if="workspace"
+ >
+ <!-- Settings Pages - Auto-register themselves -->
+ <SettingsModalPage
+ id="information"
+ label="Information"
+ icon="i-heroicons-information-circle"
+ >
+ <LazyWorkspacesSettingsInformation />
+ </SettingsModalPage>
+
+ <SettingsModalPage
+ v-if="workspace && !workspace.is_readonly"
+ id="domains"
+ label="Domains"
+ icon="i-heroicons-globe-alt"
+ >
+ <LazyWorkspacesSettingsDomains />
+ </SettingsModalPage>
+
+ <SettingsModalPage
+ v-if="workspace && !workspace.is_readonly"
+ id="emails"
+ label="Emails"
+ icon="i-heroicons-envelope"
+ >
+ <LazyWorkspacesSettingsEmails />
+ </SettingsModalPage>
+
+ <SettingsModalPage
+ id="members"
+ label="Members"
+ icon="i-heroicons-user-group"
+ >
+ <LazyWorkspacesSettingsMembers />
+ </SettingsModalPage>
+
+ </SettingsModal>
+</template>
+
+<script setup>
+import { computed } from 'vue'
+import SettingsModal from '~/components/pages/settings/SettingsModal.vue'
+import SettingsModalPage from '~/components/pages/settings/SettingsModalPage.vue'
+
+const emit = defineEmits(['update:activeTab'])
+
+const props = defineProps({
+ activeTab: {
+ type: String,
+ default: null
+ }
+})
+
+const { current: workspace } = useCurrentWorkspace()
+
+// Modal state is now derived from the presence of an active tab
+const isOpen = computed({
+ get: () => !!props.activeTab,
+ set: (value) => {
+ // When the modal is closed (e.g., via v-model), we signal this by nullifying the active tab.
+ if (!value) {
+ emit('update:activeTab', null)
+ }
+ }
+})
+
+// Two-way binding for the active tab with the parent
+const localActiveTab = computed({
+ get: () => props.activeTab,
+ set: (value) => emit('update:activeTab', value)
+})
+
+// The @close event from SettingsModal triggers this
+const closeModal = () => {
+ emit('update:activeTab', null)
+}
+</script>
\ No newline at end of file
diff --git a/client/composables/useCheckoutUrl.js b/client/composables/components/stripe/useCheckoutUrl.js
similarity index 100%
rename from client/composables/useCheckoutUrl.js
rename to client/composables/components/stripe/useCheckoutUrl.js
diff --git a/client/composables/useStripeElements.js b/client/composables/components/stripe/useStripeElements.js
similarity index 97%
rename from client/composables/useStripeElements.js
rename to client/composables/components/stripe/useStripeElements.js
index bc64ce947..f3a2ecf71 100644
--- a/client/composables/useStripeElements.js
+++ b/client/composables/components/stripe/useStripeElements.js
@@ -1,6 +1,6 @@
import { computed, reactive, readonly } from 'vue'
import { useI18n } from '#imports'
-import { opnFetch } from '~/composables/useOpnApi.js'
+import { formsApi } from '~/api'
/**
* Creates a Stripe elements instance with state management
@@ -105,7 +105,7 @@ export const createStripeElements = (initialAccountId = null) => {
fetchOptions.query = { oauth_provider_id: providerIdStr }
}
- const response = await opnFetch(`/forms/${formSlug}/stripe-connect/get-account`, fetchOptions)
+ const response = await formsApi.stripe.getAccount(formSlug, fetchOptions)
console.debug('[useStripeElements] Got account response:', response)
if (response?.type === 'success' && response?.stripeAccount) {
@@ -278,7 +278,7 @@ export const createStripeElements = (initialAccountId = null) => {
}
try {
- const responseIntent = await opnFetch('/forms/' + formSlug + '/stripe-connect/payment-intent')
+ const responseIntent = await formsApi.stripe.createPaymentIntent(formSlug)
if (responseIntent?.type === 'success') {
const intentSecret = responseIntent?.intent?.secret
diff --git a/client/composables/components/tables/useTableColumnPreferences.js b/client/composables/components/tables/useTableColumnPreferences.js
new file mode 100644
index 000000000..d226df933
--- /dev/null
+++ b/client/composables/components/tables/useTableColumnPreferences.js
@@ -0,0 +1,123 @@
+import { useStorage } from '@vueuse/core'
+import { computed, toValue } from 'vue'
+
+export function useTableColumnPreferences(formId) {
+ // Generate storage key
+ const storageKey = computed(() => {
+ if (import.meta.server) return ''
+ return `table-prefs-${toValue(formId)}`
+ })
+
+ // Simplified preferences structure - flat mapping of columnId -> preferences
+ const defaultPreferences = {
+ columns: {}, // columnId -> { visible, pinned, wrapped, order, size }
+ globalSizing: {}, // TanStack table sizing state
+ }
+
+ // Main reactive storage
+ const preferences = useStorage(
+ storageKey,
+ defaultPreferences,
+ import.meta.server ? undefined : localStorage,
+ {
+ mergeDefaults: true,
+ serializer: {
+ read: (v) => {
+ try {
+ return JSON.parse(v) || defaultPreferences
+ } catch {
+ return defaultPreferences
+ }
+ },
+ write: (v) => JSON.stringify(v)
+ }
+ }
+ )
+
+ // Column preference helpers
+ const getColumnPreference = (columnId) => {
+ if (import.meta.server) {
+ return {
+ visible: null, // null means use default
+ pinned: false,
+ wrapped: false,
+ order: null,
+ size: 200
+ }
+ }
+
+ return preferences.value.columns[columnId] || {
+ visible: null,
+ pinned: false,
+ wrapped: false,
+ order: null,
+ size: 200
+ }
+ }
+
+ const setColumnPreference = (columnId, updates) => {
+ if (import.meta.server) return
+
+ // Create a completely new object to ensure reactivity
+ const currentColumns = { ...preferences.value.columns }
+ currentColumns[columnId] = {
+ ...getColumnPreference(columnId),
+ ...updates
+ }
+
+ preferences.value = {
+ ...preferences.value,
+ columns: currentColumns
+ }
+ }
+
+ const setColumnsOrder = (newOrder) => {
+ if (import.meta.server) return
+
+ const newColumns = { ...preferences.value.columns }
+ newOrder.forEach((columnId, index) => {
+ newColumns[columnId] = {
+ ...getColumnPreference(columnId),
+ order: index
+ }
+ })
+
+ preferences.value = {
+ ...preferences.value,
+ columns: newColumns
+ }
+ }
+
+ const setColumnSizing = (newSizing) => {
+ if (import.meta.server) return
+ preferences.value = {
+ ...preferences.value,
+ globalSizing: { ...newSizing }
+ }
+ }
+
+ const resetPreferences = () => {
+ if (import.meta.server) return
+ preferences.value = { ...defaultPreferences }
+ }
+
+ const resetColumn = (columnId) => {
+ if (import.meta.server) return
+ const newColumns = { ...preferences.value.columns }
+ delete newColumns[columnId]
+ preferences.value = {
+ ...preferences.value,
+ columns: newColumns
+ }
+ }
+
+ return {
+ preferences: computed(() => preferences.value),
+ getColumnPreference,
+ setColumnPreference,
+ setColumnsOrder,
+ setColumnSizing,
+ resetPreferences,
+ resetColumn,
+ }
+}
\ No newline at end of file
diff --git a/client/composables/components/tables/useTableState.js b/client/composables/components/tables/useTableState.js
new file mode 100644
index 000000000..884cd5ea4
--- /dev/null
+++ b/client/composables/components/tables/useTableState.js
@@ -0,0 +1,407 @@
+import { computed } from 'vue'
+import { useTableColumnPreferences } from './useTableColumnPreferences'
+import debounce from 'debounce'
+
+// Provides a composable for managing the state of a table component, including column visibility, pinning, sizing, and wrapping.
+// It synchronizes table state with user preferences (such as column order and visibility) and supports dynamic updates based on form structure and workspace context.
+
+export function useTableState(form, withActions = false) {
+ // Internal preferences helper (hidden from consumers)
+ const columnPreferences = useTableColumnPreferences(
+ computed(() => form.value?.id || form.value?.slug)
+ )
+
+ const { getColumnPreference, setColumnPreference } = columnPreferences
+
+ /* -------------------------------------------------------------------------- */
+ /* Column config */
+ /* -------------------------------------------------------------------------- */
+
+ // Computed column configurations (base definition for every column)
+ const columnConfigurations = computed(() => {
+ try {
+ if (!form.value?.properties || !Array.isArray(form.value.properties)) return []
+
+ const baseColumns = form.value.properties
+ .filter((field) => {
+ return !['nf-text', 'nf-code', 'nf-page-break', 'nf-divider', 'nf-image'].includes(field.type)
+ })
+ .map(col => {
+ const { columns: matrixColumns, ...rest } = col
+ return {
+ ...rest,
+ ...(col.type === 'matrix' && { matrix_columns: matrixColumns }),
+ id: col.id,
+ accessorKey: col.id,
+ header: col.name,
+ isRemoved: false,
+ enableResizing: true,
+ minSize: 100,
+ maxSize: 500,
+ }
+ })
+
+ // Add removed properties
+ if (form.value?.removed_properties) {
+ form.value.removed_properties.forEach(property => {
+ const { columns: matrixColumns, ...rest } = property
+ baseColumns.push({
+ ...(property.type === 'matrix' ? { ...rest, matrix_columns: matrixColumns } : { ...rest }),
+ id: property.id,
+ accessorKey: property.id,
+ header: property.name,
+ isRemoved: true,
+ enableResizing: true,
+ minSize: 100,
+ maxSize: 500,
+ })
+ })
+ }
+
+ // Add created_at column if not present
+ if (!baseColumns.find(property => property.id === 'created_at')) {
+ baseColumns.push({
+ id: 'created_at',
+ accessorKey: 'created_at',
+ header: 'Created at',
+ type: 'date',
+ enableResizing: true,
+ minSize: 100,
+ maxSize: 500,
+ })
+ }
+
+ return baseColumns
+ } catch (error) {
+ console.error('Error in columnConfigurations computed:', error)
+ return []
+ }
+ })
+
+ /* -------------------------------------------------------------------------- */
+ /* Writable computed bridges (reactive) */
+ /* -------------------------------------------------------------------------- */
+
+ // Column visibility
+ const columnVisibility = computed({
+ get() {
+ // Establish dependency on the entire preferences object
+ const prefs = columnPreferences.preferences.value
+ const visibility = {}
+ const configCols = columnConfigurations.value || []
+ configCols.forEach(col => {
+ const pref = prefs.columns[col.id] || {}
+ // Use preference if set, otherwise default: visible for regular columns, hidden for removed columns
+ const visible = pref.visible !== null && pref.visible !== undefined ? pref.visible : !col.isRemoved
+ visibility[col.id] = visible
+ })
+ return visibility
+ },
+ set(newVisibility) {
+ Object.entries(newVisibility).forEach(([columnId, visible]) => {
+ const pref = getColumnPreference(columnId)
+ const currentVisible = pref.visible !== null && pref.visible !== undefined
+ ? pref.visible
+ : !columnConfigurations.value.find(c => c.id === columnId)?.isRemoved
+ if (currentVisible !== visible) {
+ setColumnPreference(columnId, { visible })
+ }
+ })
+ }
+ })
+
+ // Column pinning
+ const columnPinning = computed({
+ get() {
+ const prefs = columnPreferences.preferences.value
+ const pinning = { left: [], right: ['actions'] }
+ const configCols = columnConfigurations.value || []
+ configCols.forEach(col => {
+ const pref = prefs.columns[col.id] || {}
+ // Only allow left pinning for regular columns
+ if (pref.pinned === 'left') pinning.left.push(col.id)
+ // Actions column is always pinned right, other columns cannot be pinned right
+ })
+ return pinning
+ },
+ set(newPinning) {
+ const { left = [] } = newPinning || {}
+ const configCols = columnConfigurations.value || []
+
+ // First, clear pinning for all applicable columns (except actions)
+ configCols.forEach(col => {
+ if (col.id !== 'actions') setColumnPreference(col.id, { pinned: false })
+ })
+
+ // Apply new left pinning only
+ left.forEach(id => {
+ if (id !== 'actions') setColumnPreference(id, { pinned: 'left' })
+ })
+ // Note: actions column pinning is handled automatically in the getter
+ }
+ })
+
+ // Column sizing (table column resize)
+ const columnSizing = computed({
+ get() {
+ const savedSizing = columnPreferences.preferences.value.globalSizing
+ if (savedSizing && typeof savedSizing === 'object' && Object.keys(savedSizing).length > 0) {
+ // Ensure all columns have a size, fallback to 200 if missing
+ const sizing = {}
+ for (const col of tableColumns.value) {
+ sizing[col.id] = savedSizing[col.id] ?? 200
+ }
+ return sizing
+ }
+
+ // No saved sizing, use default 200 for all columns
+ const defaultSizing = {}
+ for (const col of tableColumns.value) {
+ if (col.id === 'actions') {
+ defaultSizing[col.id] = 80
+ } else {
+ defaultSizing[col.id] = 200
+ }
+ }
+ return defaultSizing
+ },
+ set(newSizing) {
+ columnPreferences.setColumnSizing(newSizing)
+ }
+ })
+
+ // Debounced resize handler to avoid excessive localStorage writes
+ const debouncedSetColumnSizing = debounce((newSizing) => {
+ columnPreferences.setColumnSizing(newSizing)
+ }, 50) // 150ms debounce
+
+ // Handle individual column resize - simple preference saving
+ const handleColumnResize = (columnId, size) => {
+ size = Math.min(Math.max(size, 80), 700)
+ const currentSizing = columnSizing.value || {}
+ const newSizing = {
+ ...currentSizing,
+ [columnId]: size
+ }
+
+ // Update the reactive state immediately for smooth UX
+ columnSizing.value = newSizing
+
+ // Save to preferences with debounce
+ debouncedSetColumnSizing(newSizing)
+ }
+
+
+
+ // Column wrapping (read-only)
+ const columnWrapping = computed(() => {
+ const prefs = columnPreferences.preferences.value
+ const wrapping = {}
+ const configCols = columnConfigurations.value || []
+ configCols.forEach(col => {
+ const pref = prefs.columns[col.id] || {}
+ wrapping[col.id] = pref.wrapped ?? false
+ })
+ return wrapping
+ })
+
+ /* -------------------------------------------------------------------------- */
+ /* Column ordering */
+ /* -------------------------------------------------------------------------- */
+
+ // Helper function to set a specific column to a specific index
+ const setColumnOrder = (columnId, newIndex) => {
+ try {
+ // Get the current list of VISIBLE column IDs, already in the correct order
+ let visibleColumnIds = orderedColumns.value
+ .filter(c => columnVisibility.value[c.id] !== false)
+ .map(c => c.id)
+
+ // Perform the move on this array
+ const currentIndex = visibleColumnIds.indexOf(columnId)
+ if (currentIndex > -1) {
+ visibleColumnIds.splice(currentIndex, 1)
+ }
+ visibleColumnIds.splice(newIndex, 0, columnId)
+
+ // Update the preferences based on the new order
+ const allColumnIds = columnConfigurations.value.map(c => c.id)
+ allColumnIds.forEach(id => {
+ const visibleIndex = visibleColumnIds.indexOf(id)
+ if (visibleIndex !== -1) {
+ // It's visible, set its order
+ columnPreferences.setColumnPreference(id, { order: visibleIndex })
+ } else {
+ // It's hidden, give it a high order number
+ columnPreferences.setColumnPreference(id, { order: 9999 })
+ }
+ })
+ } catch (error) {
+ console.error('Error in setColumnOrder:', error)
+ }
+ }
+
+ // Ordered columns for display
+ const orderedColumns = computed({
+ get() {
+ try {
+ const prefs = columnPreferences.preferences.value
+ const configCols = columnConfigurations.value || []
+ const columns = Array.isArray(configCols) ? [...configCols] : []
+
+ // Sort by order preference, then by original position
+ columns.sort((a, b) => {
+ const prefA = prefs.columns[a.id] || {}
+ const prefB = prefs.columns[b.id] || {}
+
+ const orderA = prefA.order ?? 9999
+ const orderB = prefB.order ?? 9999
+
+ if (orderA !== orderB) {
+ return orderA - orderB
+ }
+
+ // Fallback to original order
+ return configCols.indexOf(a) - configCols.indexOf(b)
+ })
+
+ return columns
+ } catch (error) {
+ console.error('Error in orderedColumns computed:', error)
+ return []
+ }
+ },
+ set(newOrderColumns) {
+ // Logic to update column order preferences
+ const allColumnIds = (columnConfigurations.value || []).map(c => c.id)
+ const newOrderIds = newOrderColumns.map(c => c.id)
+
+ allColumnIds.forEach(id => {
+ const order = newOrderIds.indexOf(id)
+ if (order !== -1) {
+ // If the column is in the new order, set its order
+ columnPreferences.setColumnPreference(id, { order })
+ } else {
+ // If it's not (e.g., it's a hidden column not in the ordered list),
+ // assign a high order number to keep it at the end if it becomes visible
+ columnPreferences.setColumnPreference(id, { order: 9999 })
+ }
+ })
+ },
+ })
+
+ // Final array of columns to be passed to the table component
+ const tableColumns = computed(() => {
+ try {
+ // Ensure we have a valid array to work with
+ const cols = orderedColumns.value && Array.isArray(orderedColumns.value) ? [...orderedColumns.value] : []
+
+ // Add status column if needed
+ if (form.value?.is_pro && (form.value.enable_partial_submissions ?? false)) {
+ cols.push({
+ id: 'status',
+ accessorKey: 'status',
+ header: 'Status',
+ type: 'status',
+ enableColumnFilter: true,
+ filterFn: 'equals',
+ enableResizing: true,
+ minSize: 100,
+ maxSize: 500,
+ })
+ }
+
+ // Add actions column if workspace is not readonly
+ if (import.meta.client && withActions) {
+ cols.push({
+ id: 'actions',
+ accessorKey: 'actions',
+ header: '',
+ enableResizing: false,
+ size: 80,
+ meta: {
+ class: {
+ th: 'bg-transparent',
+ td: 'backdrop-blur-xs bg-white/70'
+ }
+ }
+ })
+ }
+
+ return cols ?? []
+ } catch (error) {
+ console.error('Error in tableColumns computed:', error)
+ return []
+ }
+ })
+
+ /* -------------------------------------------------------------------------- */
+ /* Helper functions */
+ /* -------------------------------------------------------------------------- */
+
+ // Toggle column visibility
+ const toggleColumnVisibility = (columnId) => {
+ const currentVisibility = columnVisibility.value[columnId]
+ columnVisibility.value = {
+ ...columnVisibility.value,
+ [columnId]: !currentVisibility
+ }
+ }
+
+ // Toggle column wrapping
+ const toggleColumnWrapping = (columnId) => {
+ setColumnPreference(columnId, { wrapped: !(columnWrapping.value[columnId] || false) })
+ }
+
+ // Toggle column pinning
+ const toggleColumnPin = (columnId) => {
+ const pref = getColumnPreference(columnId) || {}
+
+ if (pref.pinned === 'left') {
+ // If currently pinned, just unpin it
+ setColumnPreference(columnId, { pinned: false })
+ } else {
+ // If not currently pinned, first unpin all other columns, then pin this one
+ const configCols = columnConfigurations.value || []
+
+ // Clear all existing pins
+ configCols.forEach(col => {
+ if (col.id !== 'actions' && col.id !== columnId) {
+ setColumnPreference(col.id, { pinned: false })
+ }
+ })
+
+ // Pin the target column and make it visible
+ setColumnPreference(columnId, { pinned: 'left', visible: true })
+ }
+ }
+
+ /* -------------------------------------------------------------------------- */
+ /* Public API */
+ /* -------------------------------------------------------------------------- */
+
+ return {
+ // Columns
+ tableColumns,
+ orderedColumns,
+ setColumnOrder,
+
+ // Preferences (writable computeds)
+ columnVisibility,
+ columnPinning,
+ columnWrapping,
+ columnSizing,
+
+ // Preference helpers (for components)
+ getColumnPreference,
+ setColumnPreference,
+ resetPreferences: columnPreferences.resetPreferences,
+ resetColumn: columnPreferences.resetColumn,
+ toggleColumnVisibility: toggleColumnVisibility,
+ toggleColumnWrapping,
+ toggleColumnPin: toggleColumnPin,
+ toggleColumnWrap: columnPreferences.toggleColumnWrap,
+ setColumnsOrder: columnPreferences.setColumnsOrder,
+ handleColumnResize,
+ }
+}
\ No newline at end of file
diff --git a/client/composables/components/useComponentRegistry.js b/client/composables/components/useComponentRegistry.js
new file mode 100644
index 000000000..bfe76da06
--- /dev/null
+++ b/client/composables/components/useComponentRegistry.js
@@ -0,0 +1,227 @@
+import { defineAsyncComponent } from 'vue'
+
+const integrationRegistry = new Map([
+ ['webhook', () => import('~/components/open/integrations/WebhookIntegration.vue')],
+ ['email', () => import('~/components/open/integrations/EmailIntegration.vue')],
+ ['slack', () => import('~/components/open/integrations/SlackIntegration.vue')],
+ ['discord', () => import('~/components/open/integrations/DiscordIntegration.vue')],
+ ['google_sheets', () => import('~/components/open/integrations/GoogleSheetsIntegration.vue')],
+ ['telegram', () => import('~/components/open/integrations/TelegramIntegration.vue')],
+ ['zapier', () => import('~/components/open/integrations/ZapierIntegration.vue')],
+])
+
+const clientOnlyHeavyFormComponentsRegistry = new Map([
+ ['RichTextAreaInput', () => import('~/components/forms/heavy/RichTextAreaInput.client.vue')],
+ ['PaymentInput', () => import('~/components/forms/heavy/PaymentInput.client.vue')],
+ ['CodeInput', () => import('~/components/forms/heavy/CodeInput.client.vue')],
+])
+
+const actionRegistry = new Map([
+ ['WebhookIntegrationActions', () => import('~/components/open/integrations/components/WebhookIntegrationActions.vue')],
+ ['SlackIntegrationActions', () => import('~/components/open/integrations/components/SlackIntegrationActions.vue')],
+ ['DiscordIntegrationActions', () => import('~/components/open/integrations/components/DiscordIntegrationActions.vue')],
+ ['GoogleSheetsIntegrationActions', () => import('~/components/open/integrations/components/GoogleSheetsIntegrationActions.vue')],
+ ['EmailIntegrationActions', () => import('~/components/open/integrations/components/EmailIntegrationActions.vue')],
+])
+
+const providerRegistry = new Map([
+ ['TelegramWidget', () => import('~/components/provider/widget/TelegramWidget.vue')],
+])
+
+const heavyFormComponentsRegistry = new Map([
+ ['BarcodeInput', () => import('~/components/forms/heavy/BarcodeInput.vue')],
+ ['DateInput', () => import('~/components/forms/heavy/DateInput.vue')],
+ ['SignatureInput', () => import('~/components/forms/heavy/SignatureInput.vue')],
+ ['FileInput', () => import('~/components/forms/heavy/FileInput.vue')],
+ ['ImageInput', () => import('~/components/forms/heavy/ImageInput.vue')],
+ ['LogicConfirmationModal', () => import('~/components/forms/heavy/LogicConfirmationModal.vue')],
+ ['MatrixInput', () => import('~/components/forms/heavy/MatrixInput.vue')],
+ ['PhoneInput', () => import('~/components/forms/heavy/PhoneInput.vue')],
+ ['RatingInput', () => import('~/components/forms/heavy/RatingInput.vue')],
+])
+
+// Component loading cache to avoid duplicate imports
+const componentCache = new Map()
+
+/**
+ * Composable for lazy loading components from registries
+ */
+export function useComponentRegistry() {
+
+ /**
+ * Load an integration component by ID
+ * @param {string} integrationId - The integration identifier
+ * @returns {Promise<Component>} The loaded component
+ */
+ const loadIntegrationComponent = async (integrationId) => {
+ const cacheKey = `integration:${integrationId}`
+
+ if (componentCache.has(cacheKey)) {
+ return componentCache.get(cacheKey)
+ }
+
+ const loader = integrationRegistry.get(integrationId)
+ if (!loader) {
+ console.warn(`Integration component not found: ${integrationId}`)
+ return null
+ }
+
+ try {
+ const component = await loader()
+ const resolvedComponent = component.default || component
+ componentCache.set(cacheKey, resolvedComponent)
+ return resolvedComponent
+ } catch (error) {
+ console.error(`Failed to load integration component: ${integrationId}`, error)
+ return null
+ }
+ }
+
+ /**
+ * Load an action component by name
+ * @param {string} actionName - The action component name
+ * @returns {Promise<Component>} The loaded component
+ */
+ const loadActionComponent = async (actionName) => {
+ const cacheKey = `action:${actionName}`
+
+ if (componentCache.has(cacheKey)) {
+ return componentCache.get(cacheKey)
+ }
+
+ const loader = actionRegistry.get(actionName)
+ if (!loader) {
+ console.warn(`Action component not found: ${actionName}`)
+ return null
+ }
+
+ try {
+ const component = await loader()
+ const resolvedComponent = component.default || component
+ componentCache.set(cacheKey, resolvedComponent)
+ return resolvedComponent
+ } catch (error) {
+ console.error(`Failed to load action component: ${actionName}`, error)
+ return null
+ }
+ }
+
+ /**
+ * Load a provider widget component by name
+ * @param {string} widgetName - The widget component name
+ * @returns {Promise<Component>} The loaded component
+ */
+ const loadProviderWidget = async (widgetName) => {
+ const cacheKey = `provider:${widgetName}`
+
+ if (componentCache.has(cacheKey)) {
+ return componentCache.get(cacheKey)
+ }
+
+ const loader = providerRegistry.get(widgetName)
+ if (!loader) {
+ console.warn(`Provider widget not found: ${widgetName}`)
+ return null
+ }
+
+ try {
+ const component = await loader()
+ const resolvedComponent = component.default || component
+ componentCache.set(cacheKey, resolvedComponent)
+ return resolvedComponent
+ } catch (error) {
+ console.error(`Failed to load provider widget: ${widgetName}`, error)
+ return null
+ }
+ }
+
+ /**
+ * Create a reactive async component that handles loading states
+ * @param {Function} loader - Function that returns a promise resolving to a component
+ * @returns {Object} Reactive component with loading/error states
+ */
+ const createAsyncComponent = (loader) => {
+ return defineAsyncComponent({
+ loader,
+ loadingComponent: {
+ template: '<div class="flex items-center justify-center p-4"><USkeleton class="h-8 w-full" /></div>'
+ },
+ errorComponent: {
+ template: '<div class="text-sm text-red-500 p-4">Failed to load component</div>'
+ },
+ delay: 200,
+ timeout: 10000
+ })
+ }
+
+ /**
+ * Resolves a form component. If the component is registered as "heavy",
+ * it returns an async component definition for lazy-loading.
+ * Otherwise, it returns the component name as a string for global resolution.
+ * @param {string} componentName - The name of the form component.
+ * @returns {Object|string} An async component definition or a string name.
+ */
+ const getFormComponent = (componentName) => {
+ if (!componentName) {
+ return null
+ }
+
+ if (clientOnlyHeavyFormComponentsRegistry.has(componentName)) {
+ const loader = clientOnlyHeavyFormComponentsRegistry.get(componentName)
+ return {
+ component: createAsyncComponent(loader),
+ clientOnly: true
+ }
+ }
+
+ if (heavyFormComponentsRegistry.has(componentName)) {
+ const loader = heavyFormComponentsRegistry.get(componentName)
+ return {
+ component: createAsyncComponent(loader),
+ clientOnly: false
+ }
+ }
+ return {
+ component: componentName,
+ clientOnly: false
+ }
+ }
+
+ /**
+ * Get a reactive integration component
+ * @param {string} integrationId - The integration identifier
+ * @returns {Object} Async component with loading states
+ */
+ const getIntegrationComponent = (integrationId) => {
+ return createAsyncComponent(() => loadIntegrationComponent(integrationId))
+ }
+
+ /**
+ * Get a reactive action component
+ * @param {string} actionName - The action component name
+ * @returns {Object} Async component with loading states
+ */
+ const getActionComponent = (actionName) => {
+ return createAsyncComponent(() => loadActionComponent(actionName))
+ }
+
+ /**
+ * Get a reactive provider widget component
+ * @param {string} widgetName - The widget component name
+ * @returns {Object} Async component with loading states
+ */
+ const getProviderWidget = (widgetName) => {
+ return createAsyncComponent(() => loadProviderWidget(widgetName))
+ }
+
+ return {
+ loadIntegrationComponent,
+ loadActionComponent,
+ loadProviderWidget,
+ getFormComponent,
+ getIntegrationComponent,
+ getActionComponent,
+ getProviderWidget,
+ createAsyncComponent
+ }
+}
\ No newline at end of file
diff --git a/client/composables/useParseMention.js b/client/composables/components/useParseMention.js
similarity index 100%
rename from client/composables/useParseMention.js
rename to client/composables/components/useParseMention.js
diff --git a/client/composables/components/useSharedNavigation.js b/client/composables/components/useSharedNavigation.js
new file mode 100644
index 000000000..70627b6f3
--- /dev/null
+++ b/client/composables/components/useSharedNavigation.js
@@ -0,0 +1,145 @@
+import opnformConfig from "~/opnform.config.js"
+
+export const useSharedNavigation = () => {
+ const appStore = useAppStore()
+ const crisp = useCrisp()
+
+ const isSelfHosted = computed(() => useFeatureFlag('self_hosted'))
+ const featurebaseLoaded = computed(() => {
+ return import.meta.client && window.Featurebase
+ })
+
+ // Check for new changes in changelog
+ const hasNewChanges = computed(() => {
+ if (import.meta.server || !window.Featurebase || !appStore.featureBaseEnabled) return false
+ return window.Featurebase("unviewed_changelog_count") > 0
+ })
+
+ // Open changelog modal
+ function openChangelog() {
+ if (import.meta.server || !window.Featurebase) return
+ window.Featurebase("manually_open_changelog_popup")
+ }
+
+ // Default button configuration
+ const defaultButtonProps = {
+ variant: 'ghost',
+ activeVariant: 'soft',
+ color: 'neutral',
+ block: true,
+ }
+
+ // Helper function to apply defaults to navigation items
+ const createNavItem = (item) => {
+ const baseItem = {
+ ...defaultButtonProps,
+ ...item
+ }
+
+ // Add custom classes to darken ghost/soft variants for better visibility on neutral-100 background
+ const customClasses = ['group']
+
+ // For ghost variant (default), darken hover state
+ if (baseItem.variant === 'ghost' && baseItem.color === 'neutral') {
+ customClasses.push('hover:bg-neutral-200/80')
+ baseItem.ui = {
+ ...baseItem.ui,
+ leadingIcon: 'text-neutral-400 group-hover:text-neutral-500'
+ }
+ }
+
+ // For soft variant (active state), darken background
+ if (baseItem.active && baseItem.activeVariant === 'soft' && baseItem.color === 'neutral') {
+ customClasses.push('bg-neutral-200/90 text-neutral-800')
+ }
+
+ // For primary color buttons, ensure good contrast
+ if (baseItem.color === 'primary') {
+ if (baseItem.variant === 'ghost') {
+ customClasses.push('hover:bg-primary-100/80')
+ }
+ if (baseItem.active && baseItem.activeVariant === 'soft') {
+ customClasses.push('data-[active=true]:bg-primary-100/90')
+ }
+ }
+
+ return {
+ ...baseItem,
+ class: customClasses.length > 0 ? customClasses.join(' ') : undefined
+ }
+ }
+
+ // Shared navigation sections (Product and Help)
+ const sharedNavigationSections = computed(() => [
+ // Product section
+ {
+ name: 'Product',
+ items: [
+ // What's new - only show if feature base enabled
+ ...(appStore.featureBaseEnabled ? [createNavItem({
+ label: "What's new",
+ icon: 'i-heroicons-megaphone',
+ color: hasNewChanges.value ? 'primary' : 'neutral',
+ trailingIcon: hasNewChanges.value ? 'i-heroicons-sparkles-solid' : undefined,
+ ui: {
+ trailingIcon: 'text-blue-500'
+ },
+ onClick: openChangelog
+ })] : []),
+ createNavItem({
+ label: 'Roadmap',
+ icon: 'i-heroicons-map',
+ to: opnformConfig.links.roadmap,
+ target: '_blank'
+ }),
+ (featurebaseLoaded.value ? createNavItem({
+ label: 'Feature Requests',
+ icon: 'i-heroicons-light-bulb',
+ onClick: () => {
+ window.postMessage({
+ target: 'FeaturebaseWidget',
+ data: {
+ action: 'openFeedbackWidget',
+ setBoard: 'feature-requests', // optional - preselect a board
+ }
+ })
+ }
+ }): createNavItem({
+ label: 'Feature Requests',
+ icon: 'i-heroicons-light-bulb',
+ to: opnformConfig.links.feature_requests,
+ target: '_blank'
+ }))
+ ]
+ },
+ // Help section
+ {
+ name: 'Help',
+ items: [
+ createNavItem({
+ label: 'Help Center',
+ icon: 'i-heroicons-question-mark-circle',
+ to: opnformConfig.links.help_url,
+ target: '_blank'
+ }),
+ createNavItem({
+ label: 'API Docs',
+ icon: 'i-heroicons-code-bracket',
+ to: opnformConfig.links.api_docs,
+ target: '_blank'
+ }),
+ ...(isSelfHosted.value || !crisp ? [] : [createNavItem({
+ label: 'Contact Support',
+ icon: 'i-heroicons-chat-bubble-left-right',
+ onClick: () => crisp.openChat()
+ })])
+ ]
+ }
+ ])
+
+ return {
+ sharedNavigationSections,
+ createNavItem,
+ defaultButtonProps
+ }
+}
\ No newline at end of file
diff --git a/client/composables/data/useTemplateMeta.js b/client/composables/data/useTemplateMeta.js
new file mode 100644
index 000000000..5ed6d4bfc
--- /dev/null
+++ b/client/composables/data/useTemplateMeta.js
@@ -0,0 +1,28 @@
+import templateTypes from "~/data/forms/templates/types.json"
+import industryTypes from "~/data/forms/templates/industries.json"
+
+const typesMap = new Map(Object.entries(templateTypes))
+const industriesMap = new Map(Object.entries(industryTypes))
+
+export function useTemplateMeta() {
+ const getTemplateTypes = (slugs) => {
+ if (!slugs) return []
+ return slugs
+ .map((slug) => typesMap.get(slug))
+ .filter((item) => item !== undefined)
+ }
+
+ const getTemplateIndustries = (slugs) => {
+ if (!slugs) return []
+ return slugs
+ .map((slug) => industriesMap.get(slug))
+ .filter((item) => item !== undefined)
+ }
+
+ return {
+ types: typesMap,
+ industries: industriesMap,
+ getTemplateTypes,
+ getTemplateIndustries,
+ }
+}
\ No newline at end of file
diff --git a/client/composables/forms/usePartialSubmission.js b/client/composables/forms/usePartialSubmission.js
index 596a177ba..faa1fa753 100644
--- a/client/composables/forms/usePartialSubmission.js
+++ b/client/composables/forms/usePartialSubmission.js
@@ -1,4 +1,4 @@
-import { opnFetch } from "./../useOpnApi.js"
+import { formsApi } from "~/api"
import { watch, onBeforeUnmount, ref, toValue } from 'vue'
// Create a Map to store submission hashes for different forms
@@ -72,13 +72,10 @@ export function usePartialSubmission(formConfig, formDataRef, pendingSubmissionS
}
try {
- const response = await opnFetch(`/forms/${config.slug}/answer`, {
- method: "POST",
- body: {
- ...currentData,
- 'is_partial': true,
- 'submission_hash': getSubmissionHash() // Use the updated getter
- }
+ const response = await formsApi.submissions.answer(config.slug, {
+ ...currentData,
+ 'is_partial': true,
+ 'submission_hash': getSubmissionHash() // Use the updated getter
})
if (response.submission_hash) {
setSubmissionHash(response.submission_hash) // Use the updated setter
diff --git a/client/composables/index.js b/client/composables/index.js
new file mode 100644
index 000000000..9f0a93b4c
--- /dev/null
+++ b/client/composables/index.js
@@ -0,0 +1,16 @@
+// Re-export query composables for auto-import
+export { useWorkspaces } from './query/useWorkspaces.js'
+export { useCurrentWorkspace } from './query/useCurrentWorkspace.js'
+export { useWorkspaceUsers } from './query/useWorkspaceUsers.js'
+export { useAuth } from './query/useAuth.js'
+export { useOAuth } from './query/useOAuth.js'
+export { useTemplates } from './query/useTemplates.js'
+export { useTokens } from './query/useTokens.js'
+
+// Form-specific composables
+export { useForms } from './query/forms/useForms.js'
+export { useFormsList } from './query/forms/useFormsList.js'
+export { useFormSubmissions } from './query/forms/useFormSubmissions.js'
+export { useFormIntegrations } from './query/forms/useFormIntegrations.js'
+export { useFormAI } from './query/forms/useFormAI.js'
+export { useFormStats } from './query/forms/useFormStats.js'
\ No newline at end of file
diff --git a/client/composables/lib/vForm/Form.js b/client/composables/lib/vForm/Form.js
index c2e7097f9..665ae5b26 100644
--- a/client/composables/lib/vForm/Form.js
+++ b/client/composables/lib/vForm/Form.js
@@ -1,7 +1,7 @@
import { serialize } from "object-to-formdata"
import Errors from "./Errors"
import cloneDeep from "clone-deep"
-import { opnFetch } from "~/composables/useOpnApi.js"
+import { apiService } from "~/api"
function hasFiles(data) {
return (
data instanceof File ||
@@ -145,7 +145,7 @@ class Form {
}
}
return new Promise((resolve, reject) => {
- opnFetch(config.url, config)
+ apiService.mutate(config.url, config)
.then((data) => {
this.finishProcessing()
resolve(data)
@@ -182,7 +182,7 @@ class Form {
}
}
return new Promise((resolve, reject) => {
- opnFetch(config.url, config)
+ apiService.mutate(config.url, config)
.then((data) => {
this.finishProcessing()
resolve(data)
@@ -218,12 +218,41 @@ class Form {
return { ...data }
}
- onKeydown(event) {
- const target = event.target
+ /**
+ * Submit form data using TanStack Query mutation
+ * @param {Object} mutation - TanStack Query mutation object
+ * @param {Object} options - Additional options
+ * @returns {Promise}
+ */
+ mutate(mutation, options = {}) {
+ return this.mutateAsync(mutation, options)
+ }
- if (target.name) {
- this.errors.clear(target.name)
- }
+ /**
+ * Submit form data using TanStack Query mutation (async)
+ * @param {Object} mutation - TanStack Query mutation object
+ * @param {Object} options - Additional options
+ * @returns {Promise}
+ */
+ mutateAsync(mutation, options = {}) {
+ this.startProcessing()
+
+ const payload = { ...this.data(), ...options.data }
+
+ // Handle file uploads if needed
+ const processedPayload = hasFiles(payload) && options.transformRequest
+ ? options.transformRequest.reduce((data, fn) => fn(data), payload)
+ : payload
+
+ return mutation.mutateAsync(processedPayload)
+ .then((response) => {
+ this.finishProcessing()
+ return response
+ })
+ .catch((error) => {
+ this.handleErrors(error)
+ throw error
+ })
}
}
diff --git a/client/composables/query/forms/useFormAI.js b/client/composables/query/forms/useFormAI.js
new file mode 100644
index 000000000..a3a88e834
--- /dev/null
+++ b/client/composables/query/forms/useFormAI.js
@@ -0,0 +1,37 @@
+import { useQuery, useMutation } from '@tanstack/vue-query'
+import { formsApi } from '~/api/forms'
+
+export function useFormAI() {
+ const aiGeneration = (generationId, options = {}) => {
+ return useQuery({
+ queryKey: ['ai', 'generation', generationId],
+ queryFn: () => formsApi.ai.get(generationId, options),
+ enabled: !!generationId,
+ refetchInterval: (data) => {
+ // Poll if generation is in progress
+ return data?.status === 'processing' ? 2000 : false
+ },
+ ...options
+ })
+ }
+
+ const generateForm = (options = {}) => {
+ return useMutation({
+ mutationFn: (data) => formsApi.ai.generate(data),
+ ...options
+ })
+ }
+
+ const generateFields = (options = {}) => {
+ return useMutation({
+ mutationFn: (data) => formsApi.ai.generateFields(data),
+ ...options
+ })
+ }
+
+ return {
+ aiGeneration,
+ generateForm,
+ generateFields,
+ }
+}
\ No newline at end of file
diff --git a/client/composables/query/forms/useFormIntegrations.js b/client/composables/query/forms/useFormIntegrations.js
new file mode 100644
index 000000000..88cb70dd3
--- /dev/null
+++ b/client/composables/query/forms/useFormIntegrations.js
@@ -0,0 +1,182 @@
+import { useQueryClient, useQuery, useMutation } from '@tanstack/vue-query'
+import { formsApi } from '~/api/forms'
+import integrationsList from '~/data/forms/integrations.json'
+import { unref } from 'vue'
+
+export function useFormIntegrations() {
+ const queryClient = useQueryClient()
+ const { user } = useAuth()
+ const { data: userData } = user()
+
+ // Static integrations data
+ const integrations = ref(new Map())
+
+ // Initialize integrations from JSON
+ const initIntegrations = () => {
+ if (integrations.value.size === 0) {
+ integrations.value = new Map(Object.entries(integrationsList))
+ }
+ }
+
+ // Computed property for available integrations based on user subscription and feature flags
+ const availableIntegrations = computed(() => {
+ const featureFlagsStore = useFeatureFlagsStore()
+ if (!userData.value) return integrations.value
+
+ const enrichedIntegrations = new Map()
+ for (const [key, integration] of integrations.value.entries()) {
+ if (featureFlagsStore.getFlag(`integrations.${key}`, true)) {
+ enrichedIntegrations.set(key, {
+ ...integration,
+ id: key,
+ requires_subscription: !userData.value.is_subscribed && integration.is_pro,
+ })
+ }
+ }
+ return enrichedIntegrations
+ })
+
+ // Computed property for integrations grouped by section
+ const integrationsBySection = computed(() => {
+ const groupedObject = {}
+ for (const [key, integration] of availableIntegrations.value.entries()) {
+ const sectionName = integration.section_name
+ if (!groupedObject[sectionName]) {
+ groupedObject[sectionName] = {}
+ }
+ groupedObject[sectionName][key] = integration
+ }
+ return groupedObject
+ })
+
+ // TanStack Query functions
+ const list = (formId, options = {}) => {
+ return useQuery({
+ queryKey: ['forms', unref(formId), 'integrations'],
+ queryFn: () => formsApi.integrations.list(unref(formId), options),
+ enabled: !!unref(formId),
+ onSuccess: (data) => {
+ const formIdValue = unref(formId)
+ data?.forEach(integration => {
+ queryClient.setQueryData(['forms', formIdValue, 'integrations', integration.id], integration)
+ })
+ },
+ ...options
+ })
+ }
+
+ const integrationEvents = (formId, integrationId, options = {}) => {
+ return useQuery({
+ queryKey: ['forms', unref(formId), 'integrations', unref(integrationId), 'events'],
+ queryFn: () => formsApi.integrations.events(unref(formId), unref(integrationId), options),
+ enabled: !!(unref(formId) && unref(integrationId)),
+ ...options
+ })
+ }
+
+ const createIntegration = (options = {}) => {
+ return useMutation({
+ mutationFn: ({ formId, data }) => formsApi.integrations.create(formId, data),
+ onSuccess: (response, { formId }) => {
+ const newIntegration = response.form_integration
+ // Add to integrations list
+ queryClient.setQueryData(['forms', formId, 'integrations'], (old) => {
+ if (!old) return [newIntegration]
+ if (!Array.isArray(old)) return old
+ return [...old, newIntegration]
+ })
+ // Cache the individual integration
+ queryClient.setQueryData(['forms', formId, 'integrations', newIntegration.id], newIntegration)
+ },
+ ...options
+ })
+ }
+
+ const updateIntegration = (options = {}) => {
+ return useMutation({
+ mutationFn: ({ formId, integrationId, data }) => formsApi.integrations.update(formId, integrationId, data),
+ onSuccess: (response, { formId, integrationId }) => {
+ const updatedIntegration = response.form_integration
+ // Update individual integration cache
+ queryClient.setQueryData(['forms', formId, 'integrations', integrationId], updatedIntegration)
+
+ // Update in integrations list
+ queryClient.setQueryData(['forms', formId, 'integrations'], (old) => {
+ if (!Array.isArray(old)) return old
+ return old.map(integration =>
+ integration.id === integrationId ? { ...integration, ...updatedIntegration } : integration
+ )
+ })
+ },
+ ...options
+ })
+ }
+
+ const deleteIntegration = (options = {}) => {
+ return useMutation({
+ mutationFn: ({ formId, integrationId }) => formsApi.integrations.delete(formId, integrationId),
+ onSuccess: (_, { formId, integrationId }) => {
+ // Remove individual integration cache
+ queryClient.removeQueries({ queryKey: ['forms', formId, 'integrations', integrationId] })
+
+ // Remove from integrations list
+ queryClient.setQueryData(['forms', formId, 'integrations'], (old) => {
+ if (!Array.isArray(old)) return old
+ return old.filter(integration => integration.id !== integrationId)
+ })
+ },
+ ...options
+ })
+ }
+
+ const invalidateIntegrations = (formId) => {
+ const formIdValue = unref(formId)
+ queryClient.invalidateQueries({ queryKey: ['forms', formIdValue, 'integrations'] })
+ }
+
+ // Invalidate all integration-related queries for a form
+ const invalidateAllIntegrations = (formId) => {
+ const formIdValue = unref(formId)
+ queryClient.invalidateQueries({
+ queryKey: ['forms', formIdValue, 'integrations']
+ })
+ }
+
+ // Get a specific integration from cache
+ const getIntegrationById = (formId, integrationId) => {
+ const formIdValue = unref(formId)
+ const integrationIdValue = unref(integrationId)
+ return queryClient.getQueryData(['forms', formIdValue, 'integrations', integrationIdValue])
+ }
+
+ // Utility function to get all integrations by form ID from cache
+ const getAllByFormId = (formId) => {
+ const formIdValue = unref(formId)
+ const queryData = queryClient.getQueryData(['forms', formIdValue, 'integrations'])
+ return queryData || []
+ }
+
+ // Initialize integrations on first use
+ initIntegrations()
+
+ return {
+ // Static data
+ integrations: readonly(integrations),
+ availableIntegrations,
+ integrationsBySection,
+
+ // TanStack Query functions
+ list,
+ integrationEvents,
+ createIntegration,
+ updateIntegration,
+ deleteIntegration,
+ invalidateIntegrations,
+ invalidateAllIntegrations,
+
+ // Utility functions
+ getAllByFormId,
+ getIntegrationById,
+ initIntegrations,
+ }
+}
\ No newline at end of file
diff --git a/client/composables/query/forms/useFormStats.js b/client/composables/query/forms/useFormStats.js
new file mode 100644
index 000000000..4e6976c2c
--- /dev/null
+++ b/client/composables/query/forms/useFormStats.js
@@ -0,0 +1,37 @@
+import { useQueryClient, useQuery } from '@tanstack/vue-query'
+import { formsApi } from '~/api/forms'
+
+export function useFormStats() {
+ const queryClient = useQueryClient()
+
+ const stats = (workspaceId, formId, fromDate, toDate, options = {}) => {
+ return useQuery({
+ queryKey: ['forms', formId, 'stats', fromDate, toDate],
+ queryFn: () => formsApi.stats(workspaceId, formId, {...options, params: {date_from: fromDate.value, date_to: toDate.value}}),
+ ...options
+ })
+ }
+
+ const statsDetails = (workspaceId, formId, options = {}) => {
+ return useQuery({
+ queryKey: ['forms', formId, 'stats-details'],
+ queryFn: () => formsApi.statsDetails(workspaceId, formId, options),
+ ...options
+ })
+ }
+
+ // Utility functions
+ const invalidateStats = (formId) => {
+ queryClient.invalidateQueries({queryKey:['forms', formId, 'stats']})
+ queryClient.invalidateQueries({queryKey:['forms', formId, 'stats-details']})
+ }
+
+ return {
+ // Queries
+ stats,
+ statsDetails,
+
+ // Utilities
+ invalidateStats,
+ }
+}
\ No newline at end of file
diff --git a/client/composables/query/forms/useFormSubmissions.js b/client/composables/query/forms/useFormSubmissions.js
new file mode 100644
index 000000000..6b3deec42
--- /dev/null
+++ b/client/composables/query/forms/useFormSubmissions.js
@@ -0,0 +1,124 @@
+import { useQueryClient, useQuery, useMutation } from '@tanstack/vue-query'
+import { formsApi } from '~/api/forms'
+
+export function useFormSubmissions() {
+ const queryClient = useQueryClient()
+
+ const submissions = (formId, options = {}) => {
+ return useQuery({
+ queryKey: ['forms', formId, 'submissions', options.filters],
+ queryFn: () => formsApi.submissions.list(formId, options),
+ enabled: !!formId,
+ onSuccess: (data) => {
+ data?.forEach(submission => {
+ queryClient.setQueryData(['submissions', submission.id], submission)
+ })
+ },
+ ...options
+ })
+ }
+
+ const paginatedSubmissions = (formId, page = ref(1), filters = ref({}), options = {}) => {
+ return useQuery({
+ queryKey: ['forms', formId, 'submissions', { page: page.value, ...filters.value }],
+ queryFn: () => formsApi.submissions.list(formId, { page: page.value, ...filters.value }),
+ enabled: !!formId,
+ keepPreviousData: true,
+ onSuccess: (data) => {
+ data?.data?.forEach(submission => {
+ queryClient.setQueryData(['submissions', submission.id], submission)
+ })
+ },
+ ...options
+ })
+ }
+
+ const submissionDetail = (slug, submissionId, options = {}) => {
+ return useQuery({
+ queryKey: ['submissions', submissionId],
+ queryFn: () => formsApi.submissions.get(slug, submissionId, options),
+ enabled: !!(slug && submissionId),
+ ...options
+ })
+ }
+
+ const updateSubmission = (options = {}) => {
+ return useMutation({
+ mutationFn: ({ formId, submissionId, data }) => formsApi.submissions.update(formId, submissionId, data),
+ onSuccess: (updatedSubmission, { formId, submissionId }) => {
+ // Update submission cache
+ queryClient.setQueryData(['submissions', submissionId], updatedSubmission)
+
+ // Update in submissions list
+ queryClient.setQueryData(['forms', formId, 'submissions'], (old) => {
+ if (!old) return old
+ if (Array.isArray(old)) {
+ return old.map(submission =>
+ submission.id === submissionId ? { ...submission, ...updatedSubmission } : submission
+ )
+ }
+ if (old.data) {
+ return {
+ ...old,
+ data: old.data.map(submission =>
+ submission.id === submissionId ? { ...submission, ...updatedSubmission } : submission
+ )
+ }
+ }
+ return old
+ })
+ },
+ ...options
+ })
+ }
+
+ const deleteSubmission = (options = {}) => {
+ return useMutation({
+ mutationFn: ({ formId, submissionId }) => formsApi.submissions.delete(formId, submissionId),
+ onSuccess: (_, { formId, submissionId }) => {
+ // Remove from submission cache
+ queryClient.removeQueries({ queryKey: ['submissions', submissionId] })
+
+ // Remove from submissions list
+ queryClient.setQueryData(['forms', formId, 'submissions'], (old) => {
+ if (!old) return old
+ if (Array.isArray(old)) {
+ return old.filter(submission => submission.id !== submissionId)
+ }
+ if (old.data) {
+ return {
+ ...old,
+ data: old.data.filter(submission => submission.id !== submissionId)
+ }
+ }
+ return old
+ })
+
+ // Invalidate stats
+ queryClient.invalidateQueries(['forms', formId, 'stats'])
+ },
+ ...options
+ })
+ }
+
+ const exportSubmissions = (options = {}) => {
+ return useMutation({
+ mutationFn: ({ formId, data }) => formsApi.submissions.export(formId, data),
+ ...options
+ })
+ }
+
+ const invalidateSubmissions = (formId) => {
+ queryClient.invalidateQueries(['forms', formId, 'submissions'])
+ }
+
+ return {
+ submissions,
+ paginatedSubmissions,
+ submissionDetail,
+ updateSubmission,
+ deleteSubmission,
+ exportSubmissions,
+ invalidateSubmissions,
+ }
+}
\ No newline at end of file
diff --git a/client/composables/query/forms/useForms.js b/client/composables/query/forms/useForms.js
new file mode 100644
index 000000000..4cb9b9a08
--- /dev/null
+++ b/client/composables/query/forms/useForms.js
@@ -0,0 +1,234 @@
+import { useQueryClient, useQuery, useMutation } from '@tanstack/vue-query'
+import { toValue } from 'vue'
+import { formsApi } from '~/api/forms'
+import { useIsAuthenticated } from '~/composables/useAuthFlow'
+import { useFormsListCache } from './useFormsList'
+
+export function useForms() {
+ const queryClient = useQueryClient()
+ const { isAuthenticated } = useIsAuthenticated()
+ const formsListCache = useFormsListCache()
+
+ const detail = (slug, options = {}) => {
+ return useQuery({
+ queryKey: ['forms', 'slug', slug],
+ queryFn: () => {
+ if (isAuthenticated.value) {
+ return formsApi.get(slug, options)
+ }
+ return formsApi.publicGet(slug, options)
+ },
+ enabled: !!slug,
+ onSuccess: (form) => {
+ if (form) {
+ queryClient.setQueryData(['forms', form.id], form)
+ }
+ },
+ ...options,
+ })
+ }
+
+ const detailById = (id, options = {}) => {
+ return useQuery({
+ queryKey: ['forms', id],
+ queryFn: () => {
+ if (isAuthenticated.value) {
+ return formsApi.getById(id, options)
+ }
+ return formsApi.publicGetById(id, options)
+ },
+ enabled: !!id,
+ onSuccess: (form) => {
+ if (form) {
+ queryClient.setQueryData(['forms', 'slug', form.slug], form)
+ }
+ },
+ ...options,
+ })
+ }
+
+ // Form Mutations
+ const create = (options = {}) => {
+ return useMutation({
+ mutationFn: (data) => formsApi.create(data),
+ onSuccess: (response) => {
+ const newForm = response.form
+ formsListCache.add(newForm.workspace_id, newForm)
+ // Cache the new form
+ queryClient.setQueryData(['forms', newForm.id], newForm)
+ queryClient.setQueryData(['forms', 'slug', newForm.slug], newForm)
+ },
+ ...options
+ })
+ }
+
+ const update = (formId, options = {}) => {
+ return useMutation({
+ mutationFn: (data) => formsApi.update(toValue(formId), data),
+ onSuccess: (updatedForm) => {
+ const form = updatedForm.form
+ const currentFormId = toValue(formId)
+ console.log(updatedForm)
+
+ // Update individual form cache
+ queryClient.setQueryData(['forms', currentFormId], form)
+ if (form.slug) {
+ queryClient.setQueryData(['forms', 'slug', form.slug], form)
+ }
+
+ // Update in workspace lists
+ formsListCache.update(form.workspace_id, form)
+ },
+ ...options
+ })
+ }
+
+ const remove = (options = {}) => {
+ return useMutation({
+ mutationFn: (id) => formsApi.delete(id),
+ onSuccess: (_, deletedId) => {
+ const deletedForm = queryClient.getQueryData(['forms', deletedId])
+ if (!deletedForm) return
+
+ invalidateDetail(deletedForm)
+
+ // Remove from workspace lists
+ formsListCache.remove(deletedForm.workspace_id, deletedId)
+ },
+ ...options
+ })
+ }
+
+ const duplicate = (options = {}) => {
+ return useMutation({
+ mutationFn: (id) => formsApi.duplicate(id),
+ onSuccess: (response) => {
+ const duplicatedForm = response.new_form
+ // Add to workspace forms list
+ formsListCache.add(duplicatedForm.workspace_id, duplicatedForm)
+ // Cache the duplicated form
+ queryClient.setQueryData(['forms', duplicatedForm.id], duplicatedForm)
+ queryClient.setQueryData(['forms', 'slug', duplicatedForm.slug], duplicatedForm)
+ },
+ ...options
+ })
+ }
+
+ const regenerateLink = (options = {}) => {
+ return useMutation({
+ mutationFn: ({ id, option }) => formsApi.regenerateLink(id, option),
+ onSuccess: (updatedForm, { id }) => {
+ queryClient.setQueryData(['forms', id], (old) => {
+ return old ? { ...old, ...updatedForm } : updatedForm
+ })
+ if (updatedForm.slug) {
+ queryClient.setQueryData(['forms', 'slug', updatedForm.slug], (old) => {
+ return old ? { ...old, ...updatedForm } : updatedForm
+ })
+ }
+ },
+ ...options
+ })
+ }
+
+ const updateWorkspace = (options = {}) => {
+ return useMutation({
+ mutationFn: ({ id, workspaceId, data }) => formsApi.updateWorkspace(id, workspaceId, data),
+ onSuccess: (updatedForm, { id, workspaceId: newWorkspaceId }) => {
+ const oldForm = queryClient.getQueryData(['forms', id])
+ const oldWorkspaceId = oldForm?.workspace_id
+
+ // Update form cache
+ queryClient.setQueryData(['forms', id], updatedForm)
+ if (updatedForm.slug) {
+ queryClient.setQueryData(['forms', 'slug', updatedForm.slug], updatedForm)
+ }
+
+ // Remove from old workspace list
+ if (oldWorkspaceId) {
+ formsListCache.remove(oldWorkspaceId, id)
+ }
+
+ // Add to new workspace list
+ formsListCache.add(newWorkspaceId, updatedForm)
+ },
+ ...options
+ })
+ }
+
+ // Asset Upload Mutation
+ const uploadAsset = (options = {}) => {
+ return useMutation({
+ mutationFn: (data) => formsApi.assets.upload(data, options),
+ ...options
+ })
+ }
+
+ // Zapier Webhook Mutations
+ const createZapierWebhook = (options = {}) => {
+ return useMutation({
+ mutationFn: (data) => formsApi.zapier.store(data),
+ ...options
+ })
+ }
+
+ const deleteZapierWebhook = (options = {}) => {
+ return useMutation({
+ mutationFn: (id) => formsApi.zapier.delete(id),
+ ...options
+ })
+ }
+
+ // Utility functions
+ const prefetchDetail = (slug) => {
+ return queryClient.prefetchQuery({
+ queryKey: ['forms', 'slug', slug],
+ queryFn: () => formsApi.get(slug)
+ })
+ }
+
+ const prefetchDetailById = (id) => {
+ return queryClient.prefetchQuery({
+ queryKey: ['forms', id],
+ queryFn: () => formsApi.getById(id)
+ })
+ }
+
+ const invalidateAll = () => {
+ queryClient.removeQueries({ queryKey: ['forms', 'list'], exact: false })
+ }
+
+ const invalidateDetail = (form) => {
+ if (form.id) {
+ queryClient.removeQueries({ queryKey: ['forms', form.id] })
+ }
+ if (form.slug) {
+ queryClient.removeQueries({ queryKey: ['forms', 'slug', form.slug] })
+ }
+ }
+
+ return {
+ // Queries
+ detail,
+ detailById,
+
+ // Form Mutations
+ create,
+ update,
+ remove,
+ duplicate,
+ regenerateLink,
+ updateWorkspace,
+
+ // Other Mutations
+ uploadAsset,
+ createZapierWebhook,
+ deleteZapierWebhook,
+
+ // Utilities
+ prefetchDetail,
+ prefetchDetailById,
+ invalidateAll,
+ invalidateDetail
+ }
+}
\ No newline at end of file
diff --git a/client/composables/query/forms/useFormsList.js b/client/composables/query/forms/useFormsList.js
new file mode 100644
index 000000000..3130d2f30
--- /dev/null
+++ b/client/composables/query/forms/useFormsList.js
@@ -0,0 +1,156 @@
+import { useInfiniteQuery } from '@tanstack/vue-query'
+import { formsApi } from '~/api/forms'
+import { watchEffect, computed } from 'vue'
+import { useQueryClient } from '@tanstack/vue-query'
+
+export function useFormsList(workspaceId, options = {}) {
+ // Separate API filters and custom options from TanStack Query options
+ const { fetchAll, ...queryOptions } = options
+
+ const queryClient = useQueryClient()
+
+ const query = useInfiniteQuery({
+ queryKey: computed(() => ['forms', 'list', workspaceId.value]),
+ queryFn: ({ pageParam = 1 }) => {
+ const apiFilters = { page: pageParam }
+ return formsApi.list(workspaceId.value, { params: apiFilters }).then(res => {
+ // Prime cache for each form
+ res?.data?.forEach(form => {
+ queryClient.setQueryData(['forms', form.id], form)
+ if (form.slug) {
+ queryClient.setQueryData(['forms', 'slug', form.slug], form)
+ }
+ })
+ return res
+ })
+ },
+ initialPageParam: 1,
+ getNextPageParam: (lastPage) => {
+ if (!lastPage?.meta) {
+ console.warn('`meta` property not found in lastPage response. Cannot determine next page.')
+ return undefined
+ }
+ const { current_page, last_page } = lastPage.meta
+ const nextPage = current_page < last_page ? current_page + 1 : undefined
+ return nextPage
+ },
+ ...queryOptions,
+ })
+
+ // If fetchAll is true, automatically fetch all pages
+ if (fetchAll) {
+ watchEffect(() => {
+ if (
+ query.isSuccess.value &&
+ query.hasNextPage.value &&
+ !query.isFetchingNextPage.value
+ ) {
+ query.fetchNextPage()
+ }
+ })
+ }
+
+ // Computed values for easier access
+ const forms = computed(() =>
+ query.data.value?.pages?.filter(page => page !== null)?.flatMap(page => page.data) || []
+ )
+ const currentPage = computed(() => {
+ const pages = query.data.value?.pages
+ if (!pages || pages.length === 0) return 0
+ const lastPage = pages[pages.length - 1]
+ return lastPage?.meta?.current_page || pages.length
+ })
+ const totalPages = computed(() => query.data.value?.pages?.[0]?.meta?.last_page || 1)
+ const isComplete = computed(() => !query.hasNextPage.value)
+
+ return {
+ ...query,
+ forms,
+ currentPage,
+ totalPages,
+ isComplete,
+ isFetched: query.isFetched,
+ }
+}
+
+export function useFormsListCache() {
+ const queryClient = useQueryClient()
+
+ const add = (workspaceId, newForm) => {
+ const queryKey = ['forms', 'list', workspaceId]
+
+ // Cancel any in-flight queries to avoid overwriting the optimistic update
+ queryClient.cancelQueries({ queryKey, exact: true })
+
+ queryClient.setQueryData(queryKey, (oldData) => {
+ if (!oldData || !oldData.pages || oldData.pages.length === 0) {
+ return oldData
+ }
+
+ const newPages = [...oldData.pages]
+ newPages[0] = {
+ ...newPages[0],
+ data: [newForm, ...newPages[0].data],
+ }
+
+ const newData = {
+ ...oldData,
+ pages: newPages,
+ pageParams: oldData.pageParams, // Keep pageParams intact
+ }
+ return newData
+ })
+ }
+
+ const update = (workspaceId, updatedForm) => {
+ const queryKey = ['forms', 'list', workspaceId]
+
+ // Cancel any in-flight queries to avoid overwriting the optimistic update
+ queryClient.cancelQueries({ queryKey, exact: true })
+
+ queryClient.setQueryData(queryKey, (oldData) => {
+ if (!oldData) return oldData
+
+ const newPages = oldData.pages.map((page) => ({
+ ...page,
+ data: page.data.map((form) =>
+ form.id === updatedForm.id ? { ...form, ...updatedForm } : form
+ ),
+ }))
+
+ const newData = {
+ ...oldData,
+ pages: newPages,
+ pageParams: oldData.pageParams, // Keep pageParams intact
+ }
+ return newData
+ })
+ }
+
+ const remove = (workspaceId, formId) => {
+ const queryKey = ['forms', 'list', workspaceId]
+
+ // Cancel any in-flight fetches for this infinite query to prevent
+ // them from overwriting our manual cache update when they resolve.
+ queryClient.cancelQueries({ queryKey, exact: true })
+
+ queryClient.setQueryData(queryKey, (oldData) => {
+ if (!oldData) return oldData
+
+ const newPages = oldData.pages.map((page) => ({
+ ...page,
+ data: page.data.filter((form) => form.id !== formId),
+ }))
+
+ const newData = {
+ ...oldData,
+ pages: newPages,
+ pageParams: oldData.pageParams, // Keep pageParams intact
+ }
+
+ return newData
+ })
+ }
+
+ return { add, update, remove }
+}
\ No newline at end of file
diff --git a/client/composables/query/useAuth.js b/client/composables/query/useAuth.js
new file mode 100644
index 000000000..58536af6b
--- /dev/null
+++ b/client/composables/query/useAuth.js
@@ -0,0 +1,175 @@
+import { useQueryClient, useQuery, useMutation } from '@tanstack/vue-query'
+import { authApi } from '~/api/auth'
+import { initServiceClients } from '~/composables/useAuthFlow'
+
+export function useAuth() {
+ const queryClient = useQueryClient()
+ const { handleAuthSuccess, handleManualLogout } = useAuthFlow()
+ const { isAuthenticated } = useIsAuthenticated()
+
+ // Queries
+ const user = (options = {}) => {
+ return useQuery({
+ queryKey: ['user'],
+ queryFn: () => authApi.user.get(options),
+ onSuccess: (userData) => {
+ initServiceClients(userData)
+ },
+ enabled: () => isAuthenticated.value,
+ ...options
+ })
+ }
+
+ const updateProfile = (options = {}) => {
+ return useMutation({
+ mutationFn: (data) => authApi.user.updateProfile(data),
+ onSuccess: (updatedUser) => {
+ // Optimistically update user cache
+ queryClient.setQueryData(['user'], (old) => {
+ const newData = old ? { ...old, ...updatedUser } : updatedUser
+ // Re-initialize service clients with potentially updated data
+ initServiceClients(newData)
+ return newData
+ })
+ },
+ ...options
+ })
+ }
+
+ // Mutations
+ const updateCredentials = (options = {}) => {
+ return useMutation({
+ mutationFn: (data) => authApi.user.updateCredentials(data),
+ onSuccess: (updatedUser) => {
+ // Update user cache with optimistic updates
+ queryClient.setQueryData(['user'], (old) => {
+ const newData = old ? { ...old, ...updatedUser } : updatedUser
+ // Re-initialize service clients with updated data
+ initServiceClients(newData)
+ return newData
+ })
+ },
+ ...options
+ })
+ }
+
+ const deleteAccount = (options = {}) => {
+ return useMutation({
+ mutationFn: () => authApi.user.delete(),
+ onSuccess: () => {
+ // Clear cached data
+ queryClient.clear()
+
+ // Handle logout coordination (token clearing + navigation)
+ handleManualLogout()
+ },
+ ...options
+ })
+ }
+
+ const login = (options = {}) => {
+ return useMutation({
+ mutationFn: (data) => authApi.login(data),
+ onSuccess: (tokenData, variables) => {
+ // Cache user data if provided
+ if (tokenData.user) {
+ queryClient.setQueryData(['user'], tokenData.user)
+ } else {
+ queryClient.invalidateQueries({ queryKey: ['user'] })
+ }
+
+ // Invalidate workspaces to refetch with new auth context
+ queryClient.invalidateQueries({ queryKey: ['workspaces'] })
+
+ // Handle auth flow coordination
+ handleAuthSuccess(tokenData, variables?.source || 'credentials')
+ },
+ ...options
+ })
+ }
+
+ const register = (options = {}) => {
+ return useMutation({
+ mutationFn: (data) => authApi.register(data),
+ onSuccess: (tokenData, variables) => {
+ // Cache user data if provided
+ if (tokenData.user) {
+ queryClient.setQueryData(['user'], tokenData.user)
+ } else {
+ queryClient.invalidateQueries({ queryKey: ['user'] })
+ }
+
+ // Invalidate workspaces to refetch with new auth context
+ queryClient.invalidateQueries({ queryKey: ['workspaces'] })
+
+ // Handle auth flow coordination (includes AppSumo license handling)
+ handleAuthSuccess(tokenData, variables?.source, true)
+ },
+ ...options
+ })
+ }
+
+ const logout = (options = {}) => {
+ return useMutation({
+ mutationFn: () => authApi.logout(),
+ onSuccess: () => {
+ // Clear cached data
+ queryClient.clear()
+
+ // Handle manual logout coordination (token clearing + navigation)
+ handleManualLogout()
+ },
+ onError: (error) => {
+ console.error(error)
+ // Even if logout API fails, clear local state
+ queryClient.clear()
+
+ // Handle manual logout coordination (token clearing + navigation)
+ handleManualLogout()
+ },
+ ...options
+ })
+ }
+
+ const oauthCallback = (options = {}) => {
+ return useMutation({
+ mutationFn: ({ provider, data }) => authApi.oauth.callback(provider, data),
+ onSuccess: (response) => {
+ // Cache user data if provided
+ if (response.user) {
+ queryClient.setQueryData(['user'], response.user)
+ } else {
+ queryClient.invalidateQueries({ queryKey: ['user'] })
+ }
+
+ // Invalidate workspaces to refetch with new auth context
+ queryClient.invalidateQueries({ queryKey: ['workspaces'] })
+
+ // Handle auth flow coordination (token handling done there)
+ handleAuthSuccess(response, 'oauth', response.new_user)
+ },
+ ...options
+ })
+ }
+
+ const invalidateUser = () => {
+ return queryClient.invalidateQueries(['user'])
+ }
+
+ return {
+ // Queries
+ user,
+
+ // Mutations
+ login,
+ register,
+ updateProfile,
+ updateCredentials,
+ deleteAccount,
+ logout,
+ oauthCallback,
+
+ // Utilities
+ invalidateUser
+ }
+}
\ No newline at end of file
diff --git a/client/composables/query/useCurrentWorkspace.js b/client/composables/query/useCurrentWorkspace.js
new file mode 100644
index 000000000..4cebe69ae
--- /dev/null
+++ b/client/composables/query/useCurrentWorkspace.js
@@ -0,0 +1,90 @@
+import { computed, watch } from 'vue'
+
+
+/**
+ * Dedicated composable for reactive current workspace state
+ * Separates current workspace logic from CRUD operations
+ */
+export function useCurrentWorkspace() {
+ const appStore = useAppStore()
+ const { list } = useWorkspaces()
+ const { isAuthenticated } = useIsAuthenticated()
+
+ const workspacesQuery = list({
+ enabled: () => isAuthenticated.value
+ })
+
+ // Watch for workspaces data and auto-select first workspace if none is current
+ watch(
+ () => workspacesQuery.data.value,
+ (workspaces) => {
+ if (!workspaces) {
+ return
+ }
+
+ const currentWorkspaceExists = appStore.currentId && workspaces.some(ws => ws.id === appStore.currentId)
+
+ if (workspaces.length === 0) {
+ appStore.setCurrentId(null)
+ } else if (!currentWorkspaceExists) {
+ appStore.setCurrentId(workspaces[0].id)
+ }
+ },
+ { immediate: true }
+ )
+
+ // Reactive current workspace - combines store state with query data
+ const current = computed(() => {
+ const currentId = appStore.currentId
+ const workspaces = workspacesQuery.data.value
+
+ if (!currentId || !workspaces) {
+ return null
+ }
+
+ return workspaces.find(workspace => workspace.id === currentId) || null
+ })
+
+ // Derived state for easier consumption
+ const isLoading = computed(() => {
+ return workspacesQuery.isLoading.value && !workspacesQuery.data.value
+ })
+
+ const isError = computed(() => {
+ return workspacesQuery.isError.value
+ })
+
+ const error = computed(() => {
+ return workspacesQuery.error.value
+ })
+
+ // Helper to check if user has a current workspace
+ const hasWorkspace = computed(() => {
+ return !!current.value
+ })
+
+ // Helper to get current workspace ID
+ const currentId = computed(() => {
+ return appStore.currentId
+ })
+
+ // Helper to switch workspace (delegates to store)
+ const switchTo = (workspaceId) => {
+ appStore.setCurrentId(workspaceId)
+ }
+
+ return {
+ // Primary state
+ current,
+ currentId,
+
+ // Status indicators
+ isLoading,
+ isError,
+ error,
+ hasWorkspace,
+
+ // Actions
+ switchTo,
+ }
+}
\ No newline at end of file
diff --git a/client/composables/query/useOAuth.js b/client/composables/query/useOAuth.js
new file mode 100644
index 000000000..7cca1a9c8
--- /dev/null
+++ b/client/composables/query/useOAuth.js
@@ -0,0 +1,296 @@
+import { useQueryClient, useQuery, useMutation } from '@tanstack/vue-query'
+import { oauthApi } from '~/api/oauth'
+import { WindowMessageTypes, useWindowMessage } from '~/composables/useWindowMessage'
+
+export function useOAuth() {
+ const queryClient = useQueryClient()
+ const alert = useAlert()
+
+ // Constants
+ const googleDrivePermission = {
+ scope: 'https://www.googleapis.com/auth/drive.file',
+ access_type: 'offline',
+ prompt: 'consent',
+ response_type: 'code',
+ approval_prompt: 'force'
+ }
+
+ // Service definitions
+ const services = computed(() => {
+ return [
+ {
+ name: 'google',
+ title: 'Google',
+ icon: 'mdi:google',
+ enabled: useFeatureFlag('services.google.auth', false),
+ auth_type: 'redirect'
+ },
+ {
+ name: 'stripe',
+ title: 'Stripe',
+ icon: 'cib:stripe',
+ enabled: useFeatureFlag('billing.stripe_publishable_key', false),
+ auth_type: 'redirect'
+ },
+ {
+ name: 'telegram',
+ title: 'Telegram',
+ icon: 'mdi:telegram',
+ enabled: useFeatureFlag('services.telegram.bot_id', false),
+ auth_type: 'widget',
+ widget_file: 'TelegramWidget'
+ }
+ ]
+ })
+
+ // Utility to get service configuration
+ const getService = (service) => {
+ return services.value.find((item) => item.name === service)
+ }
+
+ // Enhanced error handling for OAuth operations
+ const handleOAuthError = (error) => {
+ const message = error.response?.data?.message || error.data?.message
+ alert.error(message ?? "An error occurred while connecting an account")
+ }
+
+ // Queries
+ const providers = (options = {}) => {
+ return useQuery({
+ queryKey: ['oauth', 'providers'],
+ queryFn: () => oauthApi.list(options),
+ onSuccess: (data) => {
+ data?.forEach(provider => {
+ queryClient.setQueryData(['oauth', 'providers', provider.id], provider)
+ })
+ },
+ ...options
+ })
+ }
+
+ const provider = (providerId, options = {}) => {
+ return useQuery({
+ queryKey: ['oauth', 'providers', providerId],
+ queryFn: () => {
+ // Since there's no individual get endpoint, we get from the cached list
+ const cachedProviders = queryClient.getQueryData(['oauth', 'providers'])
+ return cachedProviders?.find(p => p.id === providerId) || null
+ },
+ enabled: !!providerId,
+ ...options
+ })
+ }
+
+ // Enhanced connect method with redirect/newtab/autoClose support
+ const connect = (service, redirect = false, newtab = false, autoClose = false) => {
+ const serviceConfig = getService(service)
+ if (serviceConfig && serviceConfig.auth_type && serviceConfig.auth_type !== 'redirect') {
+ return Promise.resolve()
+ }
+
+ const intention = redirect ? new URL(window.location.href).pathname : undefined
+
+ return oauthApi.connect(service, {
+ ...(intention && { intention }),
+ autoClose: autoClose
+ })
+ .then((data) => {
+ if (newtab) {
+ window.open(data.url, '_blank')
+ } else {
+ window.location.href = data.url
+ }
+ })
+ .catch((error) => {
+ handleOAuthError(error)
+ })
+ }
+
+ // Guest connect method
+ const guestConnect = (service, redirect = false) => {
+ const intention = new URL(window.location.href).pathname
+
+ return oauthApi.redirect(service, {
+ ...redirect ? { intention } : {},
+ })
+ .then((data) => {
+ window.open(data.url, '_blank')
+ })
+ .catch((error) => {
+ handleOAuthError(error)
+ })
+ }
+
+ // Mutation for connect (programmatic)
+ const connectMutation = (options = {}) => {
+ return useMutation({
+ mutationFn: ({ service, data }) => oauthApi.connect(service, data),
+ onSuccess: (newProvider) => {
+ // Add to providers list
+ queryClient.setQueryData(['oauth', 'providers'], (old) => {
+ if (!old) return [newProvider]
+ if (!Array.isArray(old)) return [newProvider]
+ // Update if exists, add if new
+ const existingIndex = old.findIndex(p => p.service === newProvider.service)
+ if (existingIndex >= 0) {
+ const updated = [...old]
+ updated[existingIndex] = newProvider
+ return updated
+ }
+ return [...old, newProvider]
+ })
+ // Cache individual provider
+ queryClient.setQueryData(['oauth', 'providers', newProvider.id], newProvider)
+ },
+ ...options
+ })
+ }
+
+ const callback = (options = {}) => {
+ return useMutation({
+ mutationFn: ({ service, data }) => oauthApi.callback(service, data),
+ onSuccess: (updatedProvider) => {
+ // Update provider in cache
+ queryClient.setQueryData(['oauth', 'providers', updatedProvider.id], updatedProvider)
+
+ // Update providers list
+ queryClient.setQueryData(['oauth', 'providers'], (old) => {
+ if (!old) return [updatedProvider]
+ if (!Array.isArray(old)) return old
+ return old.map(provider =>
+ provider.id === updatedProvider.id ? { ...provider, ...updatedProvider } : provider
+ )
+ })
+ },
+ ...options
+ })
+ }
+
+ const widgetCallback = (options = {}) => {
+ return useMutation({
+ mutationFn: ({ service, data }) => oauthApi.widgetCallback(service, data),
+ onSuccess: (response) => {
+ if (response.provider) {
+ const updatedProvider = response.provider
+ // Update provider in cache
+ queryClient.setQueryData(['oauth', 'providers', updatedProvider.id], updatedProvider)
+
+ // Update providers list
+ queryClient.setQueryData(['oauth', 'providers'], (old) => {
+ if (!old) return [updatedProvider]
+ if (!Array.isArray(old)) return old
+ const existingIndex = old.findIndex(provider => provider.id === updatedProvider.id)
+ if (existingIndex >= 0) {
+ // Update existing
+ const updated = [...old]
+ updated[existingIndex] = { ...old[existingIndex], ...updatedProvider }
+ return updated
+ }
+ // Add as new if not found
+ return [...old, updatedProvider]
+ })
+ }
+ },
+ ...options
+ })
+ }
+
+ const remove = (options = {}) => {
+ return useMutation({
+ mutationFn: (providerId) => oauthApi.delete(providerId),
+ onSuccess: (_, deletedProviderId) => {
+ // Remove from individual cache
+ queryClient.removeQueries({ queryKey: ['oauth', 'providers', deletedProviderId] } )
+
+ // Remove from providers list
+ queryClient.setQueryData(['oauth', 'providers'], (old) => {
+ if (!Array.isArray(old)) return old
+ return old.filter(provider => provider.id !== deletedProviderId)
+ })
+ },
+ ...options
+ })
+ }
+
+ const redirect = (options = {}) => {
+ return useMutation({
+ mutationFn: ({ provider, data }) => oauthApi.redirect(provider, data),
+ // This mutation typically redirects to OAuth provider, so no cache update needed
+ ...options
+ })
+ }
+
+ // Window message integration for cache invalidation
+ onMounted(() => {
+ // Listen for OAuth provider connections to invalidate cache
+ const windowMessage = useWindowMessage(WindowMessageTypes.OAUTH_PROVIDER_CONNECTED)
+
+ windowMessage.listen((_event) => {
+ // Invalidate providers cache when OAuth connection completes
+ invalidateProviders()
+ }, {
+ useMessageChannel: false,
+ acknowledge: false
+ })
+ })
+
+ // Utility functions
+ const prefetchProviders = () => {
+ return queryClient.prefetchQuery({
+ queryKey: ['oauth', 'providers'],
+ queryFn: () => oauthApi.list()
+ })
+ }
+
+ const invalidateProviders = () => {
+ queryClient.invalidateQueries(['oauth', 'providers'])
+ }
+
+ const invalidateProvider = (providerId) => {
+ queryClient.invalidateQueries(['oauth', 'providers', providerId])
+ }
+
+ const getProviderByService = (service) => {
+ const providers = queryClient.getQueryData(['oauth', 'providers'])
+ return providers?.find(p => p.service === service) || null
+ }
+
+ // Fetch providers method (wrapper for the query)
+ const fetchOAuthProviders = () => {
+ return queryClient.fetchQuery({
+ queryKey: ['oauth', 'providers'],
+ queryFn: () => oauthApi.list()
+ })
+ }
+
+ return {
+ // Constants
+ googleDrivePermission,
+
+ // Service definitions
+ services,
+ getService,
+
+ // Queries
+ providers,
+ provider,
+
+ // Enhanced connect methods
+ connect,
+ guestConnect,
+ fetchOAuthProviders,
+
+ // Mutations
+ connectMutation,
+ callback,
+ widgetCallback,
+ remove,
+ redirect,
+
+ // Utilities
+ prefetchProviders,
+ invalidateProviders,
+ invalidateProvider,
+ getProviderByService
+ }
+}
\ No newline at end of file
diff --git a/client/composables/query/useTemplates.js b/client/composables/query/useTemplates.js
new file mode 100644
index 000000000..393ba5f0e
--- /dev/null
+++ b/client/composables/query/useTemplates.js
@@ -0,0 +1,218 @@
+import { useQueryClient, useQuery, useMutation } from '@tanstack/vue-query'
+import { templatesApi } from '~/api/templates'
+
+export function useTemplates() {
+ const queryClient = useQueryClient()
+
+ // Queries
+ const list = (options = {}) => {
+ return useQuery({
+ queryKey: ['templates', 'list', options.params || {}],
+ queryFn: () => templatesApi.list(options.params || {}),
+ onSuccess: (data) => {
+ data?.forEach(template => {
+ queryClient.setQueryData(['templates', template.id], template)
+ queryClient.setQueryData(['templates', 'slug', template.slug], template)
+ })
+ },
+ ...options
+ })
+ }
+
+ const detail = (slug, options = {}) => {
+ return useQuery({
+ queryKey: ['templates', 'slug', slug],
+ queryFn: () => templatesApi.get(slug),
+ enabled: !!slug,
+ onSuccess: (template) => {
+ if (template) {
+ queryClient.setQueryData(['templates', template.id], template)
+ }
+ },
+ ...options
+ })
+ }
+
+ const detailById = (id, options = {}) => {
+ return useQuery({
+ queryKey: ['templates', id],
+ queryFn: () => {
+ // Since there's no getById in the API, we get from cached list
+ const cachedTemplates = queryClient.getQueryData(['templates', 'list'])
+ return cachedTemplates?.find(t => t.id === id) || null
+ },
+ enabled: !!id,
+ onSuccess: (template) => {
+ if (template) {
+ queryClient.setQueryData(['templates', 'slug', template.slug], template)
+ }
+ },
+ ...options
+ })
+ }
+
+ // Paginated list
+ const paginatedList = (page = ref(1), filters = ref({}), options = {}) => {
+ return useQuery({
+ queryKey: ['templates', 'list', { page: page.value, ...filters.value }],
+ queryFn: () => templatesApi.list({ page: page.value, ...filters.value }),
+ keepPreviousData: true,
+ onSuccess: (data) => {
+ data?.data?.forEach(template => {
+ queryClient.setQueryData(['templates', template.id], template)
+ queryClient.setQueryData(['templates', 'slug', template.slug], template)
+ })
+ },
+ ...options
+ })
+ }
+
+ // Mutations
+ const create = (options = {}) => {
+ return useMutation({
+ mutationFn: (data) => templatesApi.create(data),
+ onSuccess: (newTemplate) => {
+ // Update templates list
+ queryClient.setQueryData(['templates', 'list'], (old) => {
+ if (!old) return [newTemplate]
+ if (Array.isArray(old)) return [newTemplate, ...old]
+ if (old.data) {
+ return {
+ ...old,
+ data: [newTemplate, ...old.data]
+ }
+ }
+ return old
+ })
+ // Cache the new template
+ queryClient.setQueryData(['templates', newTemplate.id], newTemplate)
+ queryClient.setQueryData(['templates', 'slug', newTemplate.slug], newTemplate)
+ },
+ ...options
+ })
+ }
+
+ const update = (options = {}) => {
+ return useMutation({
+ mutationFn: ({ id, data }) => templatesApi.update(id, data),
+ onSuccess: (updatedTemplate, { id }) => {
+ // Update individual template cache
+ queryClient.setQueryData(['templates', id], updatedTemplate)
+ if (updatedTemplate.slug) {
+ queryClient.setQueryData(['templates', 'slug', updatedTemplate.slug], updatedTemplate)
+ }
+
+ // Update in templates lists
+ queryClient.setQueryData(['templates', 'list'], (old) => {
+ if (!old) return old
+ if (Array.isArray(old)) {
+ return old.map(template =>
+ template.id === id ? { ...template, ...updatedTemplate } : template
+ )
+ }
+ if (old.data) {
+ return {
+ ...old,
+ data: old.data.map(template =>
+ template.id === id ? { ...template, ...updatedTemplate } : template
+ )
+ }
+ }
+ return old
+ })
+ },
+ ...options
+ })
+ }
+
+ const remove = (options = {}) => {
+ return useMutation({
+ mutationFn: (id) => templatesApi.delete(id),
+ onSuccess: (_, deletedId) => {
+ const deletedTemplate = queryClient.getQueryData(['templates', deletedId])
+
+ // Remove from all caches
+ queryClient.removeQueries({ queryKey: ['templates', deletedId] })
+ if (deletedTemplate?.slug) {
+ queryClient.removeQueries({ queryKey: ['templates', 'slug', deletedTemplate.slug] })
+ }
+
+ // Remove from templates lists
+ queryClient.setQueryData(['templates', 'list'], (old) => {
+ if (!old) return old
+ if (Array.isArray(old)) {
+ return old.filter(template => template.id !== deletedId)
+ }
+ if (old.data) {
+ return {
+ ...old,
+ data: old.data.filter(template => template.id !== deletedId)
+ }
+ }
+ return old
+ })
+ },
+ ...options
+ })
+ }
+
+ // Utility functions
+ const prefetchDetail = (slug) => {
+ return queryClient.prefetchQuery({
+ queryKey: ['templates', 'slug', slug],
+ queryFn: () => templatesApi.get(slug)
+ })
+ }
+
+ const prefetchDetailById = (id) => {
+ return queryClient.prefetchQuery({
+ queryKey: ['templates', id],
+ queryFn: () => {
+ const cachedTemplates = queryClient.getQueryData(['templates', 'list'])
+ return cachedTemplates?.find(t => t.id === id) || null
+ }
+ })
+ }
+
+ const invalidateAll = () => {
+ queryClient.invalidateQueries(['templates'])
+ }
+
+ const invalidateDetail = (id) => {
+ queryClient.invalidateQueries(['templates', id])
+ }
+
+ const invalidateList = () => {
+ queryClient.invalidateQueries(['templates', 'list'])
+ }
+
+ const getTemplateBySlug = (slug) => {
+ return queryClient.getQueryData(['templates', 'slug', slug])
+ }
+
+ const getTemplateById = (id) => {
+ return queryClient.getQueryData(['templates', id])
+ }
+
+ return {
+ // Queries
+ list,
+ detail,
+ detailById,
+ paginatedList,
+
+ // Mutations
+ create,
+ update,
+ remove,
+
+ // Utilities
+ prefetchDetail,
+ prefetchDetailById,
+ invalidateAll,
+ invalidateDetail,
+ invalidateList,
+ getTemplateBySlug,
+ getTemplateById
+ }
+}
\ No newline at end of file
diff --git a/client/composables/query/useTokens.js b/client/composables/query/useTokens.js
new file mode 100644
index 000000000..44a184b93
--- /dev/null
+++ b/client/composables/query/useTokens.js
@@ -0,0 +1,150 @@
+import { useQueryClient, useQuery, useMutation } from '@tanstack/vue-query'
+import { tokensApi } from '~/api/tokens'
+
+export function useTokens() {
+ const queryClient = useQueryClient()
+
+ // Abilities configuration (moved from store)
+ const abilities = [
+ {
+ title: 'Manage integrations',
+ name: 'manage-integrations',
+ },
+ {
+ title: 'Forms – Read',
+ name: 'forms-read',
+ },
+ {
+ title: 'Forms – Write',
+ name: 'forms-write',
+ },
+ {
+ title: 'Workspaces – Read',
+ name: 'workspaces-read',
+ },
+ {
+ title: 'Workspaces – Write',
+ name: 'workspaces-write',
+ },
+ {
+ title: 'Workspace Users – Read',
+ name: 'workspace-users-read',
+ },
+ {
+ title: 'Workspace Users – Write',
+ name: 'workspace-users-write',
+ },
+ ]
+
+ const getAbility = (name) => {
+ return abilities.find((ability) => ability.name === name) ?? {
+ name,
+ title: name,
+ }
+ }
+
+ // Queries
+ const list = (options = {}) => {
+ return useQuery({
+ queryKey: ['tokens', 'list'],
+ queryFn: () => tokensApi.list(options),
+ onSuccess: (data) => {
+ data?.forEach(token => {
+ queryClient.setQueryData(['tokens', token.id], token)
+ })
+ },
+ ...options
+ })
+ }
+
+ const detail = (tokenId, options = {}) => {
+ return useQuery({
+ queryKey: ['tokens', tokenId],
+ queryFn: () => {
+ // Since there's no individual get endpoint, we get from the cached list
+ const cachedTokens = queryClient.getQueryData(['tokens', 'list'])
+ return cachedTokens?.find(t => t.id === tokenId) || null
+ },
+ enabled: !!tokenId,
+ ...options
+ })
+ }
+
+ // Mutations
+ const create = (options = {}) => {
+ return useMutation({
+ mutationFn: (data) => tokensApi.create(data),
+ onSuccess: (newToken) => {
+ // Built-in cache management
+ queryClient.setQueryData(['tokens', newToken.id], newToken)
+
+ // Add to list query data
+ const currentList = queryClient.getQueryData(['tokens', 'list'])
+ if (currentList) {
+ queryClient.setQueryData(['tokens', 'list'], [newToken, ...currentList])
+ }
+ useAlert().success('Token created successfully')
+ },
+ ...options
+ })
+ }
+
+ const remove = (options = {}) => {
+ return useMutation({
+ mutationFn: (tokenId) => tokensApi.delete(tokenId),
+ onSuccess: (data, deletedTokenId) => {
+ // Built-in cache management
+ queryClient.removeQueries({ queryKey: ['tokens', deletedTokenId] })
+
+ // Remove from list query data if loaded
+ const currentList = queryClient.getQueryData(['tokens', 'list'])
+ if (currentList) {
+ queryClient.setQueryData(
+ ['tokens', 'list'],
+ currentList.filter(token => token.id != deletedTokenId) // Use != for loose equality
+ )
+ }
+ useAlert().success('Token deleted successfully')
+ },
+ ...options
+ })
+ }
+
+ const invalidateAll = () => {
+ queryClient.invalidateQueries({ queryKey: ['tokens'] })
+ }
+
+ const getTokenById = (tokenId) => {
+ return queryClient.getQueryData(['tokens', tokenId])
+ }
+
+ const getTokenByName = (name) => {
+ const tokens = queryClient.getQueryData(['tokens', 'list'])
+ if (Array.isArray(tokens)) {
+ return tokens.find(t => t.name === name) || null
+ }
+ if (tokens?.data) {
+ return tokens.data.find(t => t.name === name) || null
+ }
+ return null
+ }
+
+ return {
+ // Queries
+ list,
+ detail,
+
+ // Mutations
+ create,
+ remove,
+
+ // Utilities
+ invalidateAll,
+ getTokenById,
+ getTokenByName,
+
+ // Abilities (moved from store)
+ abilities,
+ getAbility
+ }
+}
\ No newline at end of file
diff --git a/client/composables/query/useWorkspaceUsers.js b/client/composables/query/useWorkspaceUsers.js
new file mode 100644
index 000000000..838d5b1ae
--- /dev/null
+++ b/client/composables/query/useWorkspaceUsers.js
@@ -0,0 +1,157 @@
+import { useQueryClient, useQuery, useMutation } from '@tanstack/vue-query'
+import { unref, computed } from 'vue'
+import { workspaceApi } from '~/api/workspace'
+
+export function useWorkspaceUsers() {
+ const queryClient = useQueryClient()
+ const appStore = useAppStore()
+
+ // Queries
+ const users = (workspaceId, options = {}) => {
+ return useQuery({
+ queryKey: ['workspaces', workspaceId, 'users'],
+ queryFn: () => workspaceApi.users.list(unref(workspaceId)),
+ enabled: computed(() => !!unref(workspaceId)),
+ ...options
+ })
+ }
+
+ const invites = (workspaceId, options = {}) => {
+ return useQuery({
+ queryKey: ['workspaces', workspaceId, 'invites'],
+ queryFn: () => workspaceApi.invites.list(unref(workspaceId)),
+ enabled: computed(() => !!unref(workspaceId)),
+ ...options
+ })
+ }
+
+ // Current workspace users and invites helpers
+ const currentUsers = computed(() => {
+ return users(appStore.currentId)
+ })
+
+ const currentInvites = computed(() => {
+ return invites(appStore.currentId)
+ })
+
+ // User management mutations
+ const addUser = (workspaceId, options = {}) => {
+ return useMutation({
+ mutationFn: (userData) => workspaceApi.users.add(unref(workspaceId), userData),
+ onSuccess: (response) => {
+ // Built-in cache management
+ // Extract invite from response if it exists, otherwise use the full response
+ const newInvite = response.invite || response
+ queryClient.setQueryData(['workspaces', unref(workspaceId), 'invites'], (old) => {
+ if (!old) return [newInvite]
+ if (!Array.isArray(old)) return old
+ return [...old, newInvite]
+ })
+ },
+ ...options
+ })
+ }
+
+ const removeUser = (workspaceId, options = {}) => {
+ return useMutation({
+ mutationFn: (userId) => workspaceApi.users.remove(unref(workspaceId), userId),
+ onSuccess: (data, removedUserId) => {
+ // Built-in cache management
+ queryClient.setQueryData(['workspaces', unref(workspaceId), 'users'], (old) => {
+ if (!Array.isArray(old)) return old
+ return old.filter(user => user.id !== removedUserId)
+ })
+ },
+ ...options
+ })
+ }
+
+ const updateUserRole = (workspaceId, options = {}) => {
+ return useMutation({
+ mutationFn: ({ userId, data }) => workspaceApi.users.updateRole(unref(workspaceId), userId, data),
+ onSuccess: (updatedUser, { userId }) => {
+ // Built-in cache management
+ queryClient.setQueryData(['workspaces', unref(workspaceId), 'users'], (old) => {
+ if (!Array.isArray(old)) return old
+ return old.map(user =>
+ user.id === userId ? { ...user, ...updatedUser } : user
+ )
+ })
+ },
+ ...options
+ })
+ }
+
+ // Invite management mutations
+ const resendInvite = (workspaceId, options = {}) => {
+ return useMutation({
+ mutationFn: (inviteId) => workspaceApi.invites.resend(unref(workspaceId), inviteId),
+ onSuccess: (updatedInvite, inviteId) => {
+ // Built-in cache management
+ queryClient.setQueryData(['workspaces', unref(workspaceId), 'invites'], (old) => {
+ if (!Array.isArray(old)) return old
+ return old.map(invite =>
+ invite.id === inviteId ? { ...invite, ...updatedInvite } : invite
+ )
+ })
+ },
+ ...options
+ })
+ }
+
+ const cancelInvite = (workspaceId, options = {}) => {
+ return useMutation({
+ mutationFn: (inviteId) => workspaceApi.invites.cancel(unref(workspaceId), inviteId),
+ onSuccess: (data, cancelledInviteId) => {
+ // Built-in cache management
+ queryClient.setQueryData(['workspaces', unref(workspaceId), 'invites'], (old) => {
+ if (!Array.isArray(old)) return old
+ return old.filter(invite => invite.id !== cancelledInviteId)
+ })
+ },
+ ...options
+ })
+ }
+
+ // Utility functions
+ const invalidateUsers = (workspaceId) => {
+ queryClient.invalidateQueries(['workspaces', workspaceId, 'users'])
+ }
+
+ const invalidateInvites = (workspaceId) => {
+ queryClient.invalidateQueries(['workspaces', workspaceId, 'invites'])
+ }
+
+ const invalidateCurrentUsers = () => {
+ if (appStore.currentId) {
+ invalidateUsers(appStore.currentId)
+ }
+ }
+
+ const invalidateCurrentInvites = () => {
+ if (appStore.currentId) {
+ invalidateInvites(appStore.currentId)
+ }
+ }
+
+ return {
+ // Queries
+ users,
+ invites,
+ currentUsers,
+ currentInvites,
+
+ // Mutations
+ addUser,
+ removeUser,
+ updateUserRole,
+ resendInvite,
+ cancelInvite,
+
+ // Utilities
+ invalidateUsers,
+ invalidateInvites,
+ invalidateCurrentUsers,
+ invalidateCurrentInvites
+ }
+}
\ No newline at end of file
diff --git a/client/composables/query/useWorkspaces.js b/client/composables/query/useWorkspaces.js
new file mode 100644
index 000000000..ff3bb58f8
--- /dev/null
+++ b/client/composables/query/useWorkspaces.js
@@ -0,0 +1,161 @@
+import { useQuery, useQueryClient, useMutation } from '@tanstack/vue-query'
+import { workspaceApi } from '~/api'
+
+export function useWorkspaces() {
+ const queryClient = useQueryClient()
+ const { isAuthenticated } = useIsAuthenticated()
+
+ // Queries
+ const list = (options = {}) => {
+ return useQuery({
+ queryKey: ['workspaces', 'list'],
+ queryFn: () => {
+ return workspaceApi.list()
+ },
+ enabled: () => isAuthenticated.value,
+ ...options
+ })
+ }
+
+ const listWithSuspense = (options = {}) => {
+ return useQuery({
+ queryKey: ['workspaces', 'list'],
+ queryFn: () => workspaceApi.list(),
+ staleTime: 5 * 60 * 1000, // 5 minutes
+ suspense: true,
+ onSuccess: (data) => {
+ data?.forEach((workspace) => {
+ queryClient.setQueryData(['workspaces', workspace.id], workspace)
+ })
+ },
+ ...options
+ })
+ }
+
+ const detail = (id, options = {}) => {
+ return useQuery({
+ queryKey: ['workspaces', id],
+ queryFn: () => opnFetch(`/open/workspaces/${id}`),
+ enabled: !!id,
+ ...options
+ })
+ }
+
+ // Mutations with manual cache updates
+ const create = (options = {}) => {
+ return useMutation({
+ mutationFn: (data) => workspaceApi.create(data),
+ onSuccess: (response) => {
+ const newWorkspace = response.workspace
+ // Cache the new item individually
+ queryClient.setQueryData(['workspaces', newWorkspace.id], newWorkspace)
+
+ // Add to list cache
+ queryClient.setQueryData(['workspaces', 'list'], (old) => {
+ if (!old) return [newWorkspace]
+ if (!Array.isArray(old)) return old
+ return [...old, newWorkspace]
+ })
+ },
+ ...options
+ })
+ }
+
+ const update = (options = {}) => {
+ return useMutation({
+ mutationFn: ({ id, data }) => opnFetch(`/open/workspaces/${id}`, {
+ method: 'PUT',
+ body: data
+ }),
+ onSuccess: (response, { id }) => {
+ const updatedWorkspace = response.workspace
+ // Update individual item cache
+ queryClient.setQueryData(['workspaces', id], response)
+
+ // Update in list cache
+ queryClient.setQueryData(['workspaces', 'list'], (old) => {
+ if (!Array.isArray(old)) return old
+ return old.map(workspace =>
+ workspace.id === id ? { ...workspace, ...updatedWorkspace } : workspace
+ )
+ })
+ },
+ ...options
+ })
+ }
+
+ const remove = (options = {}) => {
+ return useMutation({
+ mutationFn: (id) => workspaceApi.delete(id),
+ onSuccess: (_, deletedId) => {
+ // Remove from individual cache
+ queryClient.removeQueries({ queryKey: ['workspaces', deletedId] })
+
+ // Remove from list cache
+ queryClient.setQueryData(['workspaces', 'list'], (old) => {
+ if (!Array.isArray(old)) return old
+ return old.filter(workspace => workspace.id !== deletedId)
+ })
+ },
+ ...options
+ })
+ }
+
+ const leave = (options = {}) => {
+ return useMutation({
+ mutationFn: (workspaceId) => workspaceApi.leave(workspaceId),
+ onSuccess: () => {
+ invalidate()
+ },
+ ...options
+ })
+ }
+
+ // Custom domains mutation
+ const updateCustomDomains = (workspaceId, options = {}) => {
+ return useMutation({
+ mutationFn: (data) => workspaceApi.customDomains.update(workspaceId, data),
+ onSuccess: (updatedWorkspace) => {
+ // Update individual workspace cache with custom domain info
+ queryClient.setQueryData(['workspaces', workspaceId], (old) => {
+ if (!old) return updatedWorkspace
+ return { ...old, ...updatedWorkspace }
+ })
+ },
+ ...options
+ })
+ }
+
+ const invalidate = () => {
+ queryClient.invalidateQueries({ queryKey: ['workspaces'] })
+ }
+
+ const invalidateAll = () => {
+ queryClient.invalidateQueries({ queryKey: ['workspaces'] })
+ }
+
+ // Helper to get workspace from cache by ID
+ const getWorkspaceById = (id) => {
+ // Note: this is a non-reactive lookup
+ return queryClient.getQueryData(['workspaces', id])
+ }
+
+ return {
+ // Queries
+ list,
+ listWithSuspense,
+ detail,
+
+ // Mutations
+ create,
+ update,
+ remove,
+ leave,
+ updateCustomDomains,
+
+ // Utilities
+ invalidate,
+ invalidateAll,
+ getWorkspaceById,
+ }
+}
\ No newline at end of file
diff --git a/client/composables/useAlert.js b/client/composables/useAlert.js
index 67781d4e9..c929fcc38 100644
--- a/client/composables/useAlert.js
+++ b/client/composables/useAlert.js
@@ -1,12 +1,19 @@
+import { h } from 'vue'
+
export function useAlert () {
function success (message, autoClose = 10000, options = {}) {
+ if (typeof message === 'object' && message !== null) {
+ options = { ...message, ...options }
+ message = options.description || options.message || ''
+ }
return useToast().add({
icon: 'i-heroicons-check-circle',
title: options.title ?? 'Success',
description: message,
- color: 'green',
- timeout: autoClose,
+ color: 'success',
+ closeIcon: 'i-heroicons-x-mark-20-solid',
+ duration: autoClose,
...options
})
}
@@ -16,8 +23,9 @@ export function useAlert () {
icon: 'i-heroicons-exclamation-circle',
title: options.title ?? 'Error',
description: message,
- color: 'red',
- timeout: autoClose,
+ color: 'error',
+ duration: autoClose,
+ closeIcon: 'i-heroicons-x-mark-20-solid',
...options
})
}
@@ -27,8 +35,9 @@ export function useAlert () {
icon: 'i-heroicons-exclamation-triangle',
title: options.title ?? 'Warning',
description: message,
- color: 'yellow',
- timeout: autoClose,
+ color: 'warning',
+ duration: autoClose,
+ closeIcon: 'i-heroicons-x-mark-20-solid',
...options
})
}
@@ -44,17 +53,45 @@ export function useAlert () {
icon: 'i-heroicons-question-mark-circle',
title: options.title ?? 'Are you sure?',
description: message,
- color: 'blue',
- timeout: autoClose,
+ color: 'info',
+ duration: autoClose,
actions: [
- { label: options.successLabel ?? 'Yes', click: onSuccess },
- { label: options.failureLabel ?? 'No', click: onFailure }
+ { label: options.successLabel ?? 'Yes', onClick: onSuccess },
+ { label: options.failureLabel ?? 'No', onClick: onFailure }
],
...options
})
}
- function formValidationError(error, autoClose = 10000, options = {}) {
+ function remove (id) {
+ useToast().remove(id)
+ }
+
+ function validationError(error, autoClose = 10000, options = {}) {
+ const message = error.message || 'Validation Error'
+ let description = message
+
+ if (error.errors) {
+ description = Object.entries(error.errors)
+ .map(([field, messages]) => {
+ // Format the field name (remove dots and array indices)
+ const fieldName = field.split('.').pop().replace(/\d+/g, '')
+ return `${fieldName}: ${messages.join(', ')}`
+ })
+ .join('\n')
+ }
+
+ return useToast().add({
+ icon: 'i-heroicons-x-circle',
+ title: options.title ?? 'Validation Error',
+ description,
+ color: 'error',
+ duration: autoClose,
+ ...options
+ })
+ }
+
+ function formValidationError(error, form, autoClose = 10000, options = {}) {
if (!error || !error.errors) {
return error(error.message || 'An unknown validation error occurred', autoClose, options)
}
@@ -62,21 +99,17 @@ export function useAlert () {
// Count total errors
const errorCount = Object.keys(error.errors).length
- // Format error messages as HTML
+ // Create VNode for error messages instead of HTML strings
let description = ''
if (Object.keys(error.errors).length > 0) {
- const errorLines = Object.entries(error.errors)
- .map(([_, messages]) => {
- // Format each message
- const formattedMessages = messages.map(message => {
- return `<li>${message}</li>`
- })
-
- return formattedMessages.join('')
+ // Create list items as VNodes
+ const listItems = Object.entries(error.errors)
+ .flatMap(([_field, messages]) => {
+ return messages.map(message => h('li', message))
})
- .join('')
- description = `<ul class="list-disc pl-4">${errorLines}</ul>`
+ // Create the description as a VNode with an unordered list
+ description = h('ul', { class: 'list-disc pl-4' }, listItems)
}
// Add count of errors to the title
@@ -88,23 +121,19 @@ export function useAlert () {
icon: 'i-heroicons-x-circle',
title,
description,
- color: 'red',
- timeout: autoClose,
- html: true,
+ color: 'error',
+ duration: autoClose,
...options
})
}
- function remove (id) {
- useToast().remove(id)
- }
-
return {
success,
error,
warning,
confirm,
remove,
+ validationError,
formValidationError
}
}
diff --git a/client/composables/useAppModals.js b/client/composables/useAppModals.js
new file mode 100644
index 000000000..98627a446
--- /dev/null
+++ b/client/composables/useAppModals.js
@@ -0,0 +1,198 @@
+import { ref, watch, computed, readonly } from 'vue'
+import { useRouteQuery } from '@vueuse/router'
+import { createSharedComposable } from '@vueuse/core'
+// (No need for explicit imports of auto-imported composables)
+
+// Pre-import modal components so overlay receives component definitions, not promises
+import UsersSettingsModal from '~/components/users/settings/Modal.vue'
+import WorkspacesSettingsModal from '~/components/workspaces/settings/Modal.vue'
+import SubscriptionModal from '~/components/pages/pricing/SubscriptionModal.vue'
+
+/**
+ * Factory for creating URL-synced modals.
+ * It encapsulates the logic for opening, closing, and syncing state with a URL query parameter.
+ * @param {object} config - Configuration object.
+ * @param {object} config.component - The Vue component for the modal.
+ * @param {string} config.queryParam - The URL query parameter key.
+ * @param {string} config.defaultTab - The default tab to open.
+ * @returns {object} - Reactive state and methods to control the modal.
+ */
+const createUrlSyncedModal = ({ component, queryParam, defaultTab }) => {
+ const { isAuthenticated } = useIsAuthenticated()
+ const route = useRoute()
+ const router = useRouter()
+ const overlay = useOverlay()
+
+ const tab = ref(null)
+ const isOpen = ref(false)
+ const queryRef = useRouteQuery(queryParam)
+
+ const modal = overlay.create(component, {
+ destroyOnClose: false
+ })
+
+ const cleanUpUrl = () => {
+ const newQuery = { ...route.query }
+ if (queryParam in newQuery) {
+ delete newQuery[queryParam]
+ return router.replace({ query: newQuery })
+ }
+ return Promise.resolve()
+ }
+
+ // URL → State sync
+ watch([queryRef, isAuthenticated], ([queryTab, isLoggedIn]) => {
+ if (queryTab && isLoggedIn) {
+ tab.value = queryTab
+ isOpen.value = true
+ modal.open({
+ activeTab: queryTab,
+ 'onUpdate:activeTab': (val) => {
+ if (isOpen.value) {
+ tab.value = val
+ }
+ },
+ onClose: () => {
+ tab.value = null
+ cleanUpUrl()
+ }
+ })
+ } else if (!queryTab && (isOpen.value || tab.value)) {
+ tab.value = null
+ isOpen.value = false
+ modal.close()
+ }
+ }, { immediate: true })
+
+ // State → URL sync
+ watch(tab, (currentTab) => {
+ const newQuery = { ...route.query }
+ if (currentTab) {
+ newQuery[queryParam] = currentTab
+ router.replace({ query: newQuery })
+ }
+ })
+
+ const open = (openTab = defaultTab, options = {}) => {
+ tab.value = openTab
+ isOpen.value = true
+
+ // Update URL unless explicitly disabled, which triggers the watcher to open the modal
+ if (options.updateUrl !== false) {
+ queryRef.value = openTab
+ }
+
+ // Also call open directly to return the promise and handle complex cases
+ return modal.open({
+ activeTab: openTab,
+ 'onUpdate:activeTab': (val) => {
+ if (isOpen.value) {
+ tab.value = val
+ }
+ },
+ onClose: () => {
+ isOpen.value = false
+ tab.value = null
+ const newQuery = { ...route.query }
+ delete newQuery[queryParam]
+ router.replace({ query: newQuery })
+ }
+ })
+ }
+
+ const close = () => {
+ modal.close()
+ tab.value = null
+ return cleanUpUrl()
+ }
+
+ const handleClose = () => {
+ tab.value = null
+ }
+
+ return {
+ tab: readonly(tab),
+ isOpen: computed(() => tab.value !== null),
+ open,
+ close,
+ handleClose
+ }
+}
+
+/**
+ * Factory for creating simple, non-URL-synced modals.
+ * @param {object} config - Configuration object.
+ * @param {object} config.component - The Vue component for the modal.
+ * @returns {object} - Reactive state and methods to control the modal.
+ */
+const createSimpleModal = ({ component }) => {
+ const overlay = useOverlay()
+ const isOpen = ref(false)
+ const modal = overlay.create(component, {
+ destroyOnClose: false
+ })
+
+ const open = (props = {}) => {
+ isOpen.value = true
+ return modal.open({
+ ...props,
+ onClose: () => {
+ isOpen.value = false
+ // Allow consumer to hook into onClose
+ if (props.onClose) {
+ props.onClose()
+ }
+ }
+ })
+ }
+
+ const close = () => {
+ isOpen.value = false
+ modal.close()
+ }
+
+ return {
+ isOpen: readonly(isOpen),
+ open,
+ close
+ }
+}
+
+export const useAppModals = createSharedComposable(() => {
+ const userSettings = createUrlSyncedModal({
+ component: UsersSettingsModal,
+ queryParam: 'user-settings',
+ defaultTab: 'profile'
+ })
+
+ const workspaceSettings = createUrlSyncedModal({
+ component: WorkspacesSettingsModal,
+ queryParam: 'workspace-settings',
+ defaultTab: 'general'
+ })
+
+ const subscription = createSimpleModal({
+ component: SubscriptionModal
+ })
+
+ return {
+ // State (read-only)
+ userSettingsTab: userSettings.tab,
+ workspaceSettingsTab: workspaceSettings.tab,
+ isUserSettingsOpen: userSettings.isOpen,
+ isWorkspaceSettingsOpen: workspaceSettings.isOpen,
+ isSubscriptionModalOpen: subscription.isOpen,
+
+ // Actions
+ openUserSettings: userSettings.open,
+ openWorkspaceSettings: workspaceSettings.open,
+ openSubscriptionModal: subscription.open,
+ closeUserSettings: userSettings.close,
+ closeWorkspaceSettings: workspaceSettings.close,
+ closeSubscriptionModal: subscription.close,
+
+ // Event handlers for modal components
+ handleUserSettingsClose: userSettings.handleClose,
+ handleWorkspaceSettingsClose: workspaceSettings.handleClose
+ }
+})
diff --git a/client/composables/useAuth.js b/client/composables/useAuth.js
deleted file mode 100644
index 062cbb0d4..000000000
--- a/client/composables/useAuth.js
+++ /dev/null
@@ -1,176 +0,0 @@
-import { WindowMessageTypes, useWindowMessage } from "~/composables/useWindowMessage"
-
-export const useAuth = () => {
- const authStore = useAuthStore()
- const workspaceStore = useWorkspacesStore()
- const formsStore = useFormsStore()
- const logEvent = useAmplitude().logEvent
-
- /**
- * Core authentication logic used by both social and direct login
- */
- const authenticateUser = async ({ tokenData, source, isNewUser = false }) => {
- // Set token first
- authStore.setToken(tokenData.token, tokenData.expires_in)
-
- // Fetch initial data
- const [userData, workspaces] = await Promise.all([
- opnFetch("user"),
- fetchAllWorkspaces()
- ])
-
- // Setup stores
- authStore.setUser(userData)
- workspaceStore.set(workspaces.data.value)
-
- // Load forms for current workspace
- await formsStore.loadAll(workspaceStore.currentId)
-
- // Track analytics
- const eventName = isNewUser ? 'register' : 'login'
- logEvent(eventName, { source })
-
- try {
- // Check if GTM is available before using it
- const gtm = typeof useGtm === 'function' ? useGtm() : null
- if (gtm && typeof gtm.trackEvent === 'function') {
- gtm.trackEvent({
- event: eventName,
- source
- })
- }
- } catch (error) {
- console.error(error)
- }
-
- return { userData, workspaces, isNewUser }
- }
-
- /**
- * Verify that authentication is complete and user data is loaded
- * Useful for social auth flows where token might be set but user data not loaded yet
- */
- const verifyAuthentication = async () => {
- // If we already have user data, no need to verify
- if (authStore.check) {
- return true
- }
-
- // If we have a token but no user data, fetch the user data
- if (authStore.token && !authStore.check) {
- // Create a promise with retry logic
- return new Promise((resolve, reject) => {
- const maxRetries = 3
- let retryCount = 0
-
- const attemptFetch = async () => {
- try {
- const userData = await opnFetch("user")
-
- if (userData) {
- authStore.setUser(userData)
- resolve(true)
- } else {
- handleRetry("No user data returned")
- }
- } catch (error) {
- handleRetry(`Auth verification failed: ${error.message}`)
- }
- }
-
- const handleRetry = (reason) => {
- retryCount++
- if (retryCount < maxRetries) {
- console.log(`Retrying auth verification (${retryCount}/${maxRetries}): ${reason}`)
- // Exponential backoff
- setTimeout(attemptFetch, 100 * Math.pow(2, retryCount))
- } else {
- console.error(`Auth verification failed after ${maxRetries} attempts`)
- reject(new Error(`Auth verification failed after ${maxRetries} attempts`))
- }
- }
-
- // Start the first attempt
- attemptFetch()
- })
- }
-
- return false
- }
-
- /**
- * Handle direct login with form validation
- */
- const loginWithCredentials = async (form, remember) => {
- const tokenData = await form.submit('post', '/login', { data: { remember: remember } })
-
- return authenticateUser({
- tokenData,
- source: 'credentials'
- })
- }
-
- /**
- * Handle social login callback
- */
- const handleSocialCallback = async (provider, code, utmData) => {
- const tokenData = await opnFetch(`/oauth/${provider}/callback`, {
- method: 'POST',
- body: { code, utm_data: utmData }
- })
-
- // Send message to parent window if applicable
- if (window.opener && !window.opener.closed) {
- useWindowMessage(WindowMessageTypes.OAUTH_PROVIDER_CONNECTED).send(window.opener, {
- eventType: `${WindowMessageTypes.OAUTH_PROVIDER_CONNECTED}:${provider}`,
- useMessageChannel: false,
- waitForAcknowledgment: false
- })
- }
-
- return authenticateUser({
- tokenData,
- source: provider,
- isNewUser: tokenData.new_user
- })
- }
-
- /**
- * Handle user registration
- */
- const registerUser = async (form) => {
- // Register the user first
- const data = await form.submit('post', '/register')
-
- // Login the user
- const tokenData = await form.submit('post', '/login')
-
- const result = await authenticateUser({
- tokenData,
- source: form.hear_about_us,
- isNewUser: true
- })
-
- // Handle AppSumo license if present
- if (data.appsumo_license === false) {
- useAlert().error(
- "Invalid AppSumo license. This probably happened because this license was already" +
- " attached to another OpnForm account. Please contact support."
- )
- } else if (data.appsumo_license === true) {
- useAlert().success(
- "Your AppSumo license was successfully activated! You now have access to all the" +
- " features of the AppSumo deal."
- )
- }
-
- return { ...result, data }
- }
-
- return {
- loginWithCredentials,
- handleSocialCallback,
- registerUser,
- verifyAuthentication
- }
-}
\ No newline at end of file
diff --git a/client/composables/useAuthFlow.js b/client/composables/useAuthFlow.js
new file mode 100644
index 000000000..ca5ea2f1b
--- /dev/null
+++ b/client/composables/useAuthFlow.js
@@ -0,0 +1,159 @@
+import { WindowMessageTypes, useWindowMessage } from "~/composables/useWindowMessage"
+import { authApi } from "~/api"
+
+/**
+ * Lightweight authentication check that doesn't require Vue Query context
+ * Use this when you only need to check if user is authenticated
+ */
+export const useIsAuthenticated = () => {
+ const authStore = useAuthStore()
+
+ const isAuthenticated = computed(() => {
+ return !!authStore.token
+ })
+
+ return { isAuthenticated }
+}
+
+/**
+ * Initialize service clients without requiring Vue Query context
+ * Safe to call from middleware or anywhere outside setup context
+ */
+export const initServiceClients = (userData) => {
+ if (import.meta.server) return
+ if (!userData) return
+
+ useAmplitude().setUser(userData)
+ useCrisp().setUser(userData)
+}
+
+export const useAuthFlow = () => {
+ const authStore = useAuthStore()
+ const { logEvent } = useAmplitude()
+ const router = useRouter()
+
+ /**
+ * Core authentication success handler
+ * Coordinates token storage, analytics, and UI feedback (cache management handled by useAuth)
+ */
+ const handleAuthSuccess = async (tokenData, source, isNewUser = false) => {
+ // 1. Set token in store
+ authStore.setToken(tokenData.token, tokenData.expires_in)
+
+ // 2. Initialize service clients if user data is provided
+ if (tokenData.user) {
+ initServiceClients(tokenData.user)
+ }
+
+ // 3. Handle AppSumo license feedback (registration-specific)
+ if (isNewUser && tokenData.appsumo_license !== undefined) {
+ if (tokenData.appsumo_license === false) {
+ useAlert().error(
+ "Invalid AppSumo license. This probably happened because this license was already" +
+ " attached to another OpnForm account. Please contact support."
+ )
+ } else if (tokenData.appsumo_license === true) {
+ useAlert().success(
+ "Your AppSumo license was successfully activated! You now have access to all the" +
+ " features of the AppSumo deal."
+ )
+ }
+ }
+
+ // 4. Track analytics
+ const eventName = isNewUser ? 'register' : 'login'
+ logEvent(eventName, { source })
+
+ try {
+ // Check if GTM is available before using it
+ const gtm = typeof useGtm === 'function' ? useGtm() : null
+ if (gtm && typeof gtm.trackEvent === 'function') {
+ gtm.trackEvent({
+ event: eventName,
+ source
+ })
+ }
+ } catch (error) {
+ console.error(error)
+ }
+ }
+
+ /**
+ * Handle social login callback
+ */
+ const handleSocialCallback = async (provider, code, utmData) => {
+ const tokenData = await authApi.oauth.callback(provider, { code, utm_data: utmData })
+
+ // Send messages to parent window if applicable
+ if (window.opener && !window.opener.closed) {
+ // Send login complete message (for auth flows)
+ useWindowMessage(WindowMessageTypes.LOGIN_COMPLETE).send(window.opener, {
+ eventType: WindowMessageTypes.LOGIN_COMPLETE,
+ useMessageChannel: false,
+ waitForAcknowledgment: false
+ })
+
+ // Send OAuth provider connected message (for cache invalidation)
+ useWindowMessage(WindowMessageTypes.OAUTH_PROVIDER_CONNECTED).send(window.opener, {
+ eventType: `${WindowMessageTypes.OAUTH_PROVIDER_CONNECTED}:${provider}`,
+ useMessageChannel: false,
+ waitForAcknowledgment: false
+ })
+ }
+
+ return handleAuthSuccess(
+ tokenData,
+ provider,
+ tokenData.new_user
+ )
+ }
+
+ /**
+ * Handle manual logout (e.g., from UserDropdown)
+ * Clears tokens, cache, and navigates to login page
+ */
+ const handleManualLogout = async () => {
+ // Clear auth store tokens
+ authStore.clearToken()
+
+ // Clear user data
+ authStore.user = null
+
+ // Navigate to login page
+ await router.push({ name: 'login' })
+ }
+
+ /**
+ * Handle token expiry (401 errors)
+ * Preserves cache and work state, opens QuickRegister modal
+ */
+ const handleTokenExpiry = async () => {
+ const appStore = useAppStore()
+
+ // Handle admin token expiry by undoing impersonation
+ if (authStore.isImpersonating) {
+ console.log("Admin token expired, undoing impersonation")
+ authStore.stopImpersonating()
+ useAlert().error("User token expired. You have been logged out of the admin account.")
+ await router.push({ name: 'home' })
+ return
+ }
+
+ // Clear only the token, preserve user data and cache
+ authStore.clearToken()
+
+ // Set unauthorized error state and open quick login modal
+ appStore.isUnauthorizedError = true
+ appStore.quickLoginModal = true
+ }
+
+ return {
+ // Auth flow functions
+ handleAuthSuccess,
+ handleSocialCallback,
+
+ // Distinct logout methods
+ handleManualLogout,
+ handleTokenExpiry
+ }
+}
\ No newline at end of file
diff --git a/client/composables/useCrisp.js b/client/composables/useCrisp.js
index fb4c98c31..2ad62a1d9 100644
--- a/client/composables/useCrisp.js
+++ b/client/composables/useCrisp.js
@@ -23,14 +23,20 @@ export function useCrisp () {
if (!crisp)
return
crisp.chat.show()
- useAppStore().crisp.hidden = false
+ useAppStore().crisp = {
+ ...useAppStore().crisp,
+ hidden: false
+ }
}
function hideChat () {
if (!crisp)
return
crisp.chat.hide()
- useAppStore().crisp.hidden = true
+ useAppStore().crisp = {
+ ...useAppStore().crisp,
+ hidden: true
+ }
}
function closeChat () {
diff --git a/client/composables/useOpnApi.js b/client/composables/useOpnApi.js
index 2b2d43726..72a00ad75 100644
--- a/client/composables/useOpnApi.js
+++ b/client/composables/useOpnApi.js
@@ -52,20 +52,19 @@ export function getOpnRequestsOptions(request, opts) {
addPasswordToFormRequest(request, opts)
addCustomDomainHeader(request, opts)
- if (!opts.baseURL) opts.baseURL = config.privateApiBase || config.public.apiBase
+ if (!opts.baseURL) {
+ // Use privateApiBase only on server side, fallback to public.apiBase on client
+ opts.baseURL = (import.meta.server && config.privateApiBase) || config.public.apiBase
+ }
return {
async onResponseError({ response }) {
- const authStore = useAuthStore()
-
const { status } = response
if (status === 401) {
- if (authStore.check) {
- console.log("Logging out due to 401")
- authStore.logout()
- useAppStore().isUnauthorizedError = true
- useAppStore().quickLoginModal = true
- }
+ // Always handle 401 errors with token expiry flow
+ // This covers both cases: token expired AND no token present
+ const { handleTokenExpiry } = useAuthFlow()
+ await handleTokenExpiry()
} else if (status === 420) {
// If invalid domain, redirect to main domain
console.warn("Invalid response from back-end - redirecting to main domain")
diff --git a/client/composables/useSubdomainRedirect.js b/client/composables/useSubdomainRedirect.js
new file mode 100644
index 000000000..874cb6049
--- /dev/null
+++ b/client/composables/useSubdomainRedirect.js
@@ -0,0 +1,69 @@
+import { sendRedirect } from 'h3'
+
+/**
+ * Composable for handling subdomain redirects
+ * Used to redirect users to a configured URL when accessing certain pages
+ *
+ * @returns {Object} - Object with redirect functions
+ */
+export const useSubdomainRedirect = () => {
+ /**
+ * Check if subdomain redirect is enabled and configured
+ * @returns {boolean} - Whether redirect should happen
+ */
+ const shouldRedirect = () => {
+ if (!useFeatureFlag('self_hosted')) return false
+
+ const redirectUrl = useRuntimeConfig().public.rootRedirectUrl
+ return redirectUrl && /^https?:\/\//.test(redirectUrl)
+ }
+
+ /**
+ * Get the configured redirect URL
+ * @returns {string|null} - The redirect URL or null if not configured
+ */
+ const getRedirectUrl = () => {
+ if (!shouldRedirect()) return null
+ return useRuntimeConfig().public.rootRedirectUrl
+ }
+
+ /**
+ * Perform SSR redirect if possible, otherwise client-side redirect
+ * @param {Object} options - Options for the redirect
+ * @param {boolean} options.skipIfIframe - Skip redirect if in iframe (default: true)
+ * @returns {Promise<void>} - Promise that resolves when redirect is complete
+ */
+ const performRedirect = async (options = {}) => {
+ const { skipIfIframe = true } = options
+
+ if (!shouldRedirect()) return
+
+ const redirectUrl = getRedirectUrl()
+ if (!redirectUrl) return
+
+ // Skip redirect if in iframe and option is enabled
+ if (skipIfIframe && import.meta.client && useIsIframe().value) {
+ return
+ }
+
+ // Server-side redirect (SSR)
+ if (import.meta.server) {
+ const event = useRequestEvent()
+ if (event) {
+ await sendRedirect(event, redirectUrl, 301)
+ return
+ }
+ }
+
+ // Client-side redirect fallback
+ if (import.meta.client) {
+ await navigateTo(redirectUrl, { external: true })
+ }
+ }
+
+ return {
+ shouldRedirect,
+ getRedirectUrl,
+ performRedirect
+ }
+}
\ No newline at end of file
diff --git a/client/css/app.css b/client/css/app.css
new file mode 100644
index 000000000..5573f7681
--- /dev/null
+++ b/client/css/app.css
@@ -0,0 +1,382 @@
+@import "tailwindcss";
+@import "@nuxt/ui";
+@import "./fonts.css";
+
+@custom-variant dark (&:where(.dark, .dark *));
+@custom-variant ltr-only (&:where(:not([dir="rtl"] *)));
+
+/* Explicitly scan form-themes.js file */
+@source "./lib/forms/themes/form-themes.js";
+
+/* Safelist utilities using v4 @source inline() syntax with brace expansion */
+@source inline("bg-{blue,gray,red,yellow,green,purple}-{50,{100..900..100},950}");
+@source inline("border-{green,red,blue,yellow,purple}-500");
+@source inline("{hover:,}bg-neutral-50");
+@source inline("dark:hover:bg-notion-dark-light");
+@source inline("grid-cols-{1,2,3,4,5,6}");
+
+@theme {
+ --color-notion-dark: #191919;
+ --color-notion-dark-light: #2e2e2e;
+
+ --color-notion-input-background: #f7f6f3;
+ --color-notion-input-background-dark: #272b2c;
+ --color-notion-input-help: #37352f99;
+ --color-notion-input-help-dark: #fff9;
+ --color-notion-input-border: rgba(15, 15, 15, 0.1);
+ --color-notion-input-border-dark: rgba(255, 255, 255, 0.1);
+
+ --color-light-gray: #f8fafc;
+
+ /* Form color variable */
+ --bg-form-color: var(--color-blue-500);
+ --form-color: var(--color-blue-500);
+
+ /* Create color utility for form color (enables ring-form, bg-form, etc.) */
+ --color-form: var(--form-color, --bg-form-color);
+
+ /* Custom animations */
+ --animate-bounce-slow: bounce-slow 3s ease-in-out infinite;
+ --animate-infinite-scroll: infinite-scroll 80s linear infinite;
+ --animate-text: text 5s ease infinite;
+
+ /* Custom keyframes */
+ @keyframes bounce-slow {
+ 0%,
+ 20% {
+ transform: translateY(0);
+ }
+ 8% {
+ transform: translateY(-25%);
+ }
+ 16% {
+ transform: translateY(+10%);
+ }
+ }
+
+ @keyframes infinite-scroll {
+ from {
+ transform: translateX(0);
+ }
+ to {
+ transform: translateX(-100%);
+ }
+ }
+
+ @keyframes text {
+ 0%,
+ 100% {
+ background-size: 200% 200%;
+ background-position: left center;
+ }
+ 50% {
+ background-size: 200% 200%;
+ background-position: right center;
+ }
+ }
+
+ /* Custom sizes */
+ --font-size-xxs: 0.5rem;
+ --max-height-42: 10.5rem;
+ --min-height-6: 1.5rem;
+ --min-height-8: 2rem;
+ --max-width-15: 15rem;
+ --max-width-10: 10rem;
+ --max-width-8: 2rem;
+ --translate-5-5: 1.4rem;
+
+ /* Transition properties */
+ --transition-duration-40: 40ms;
+ --transition-property-height: height;
+ --transition-property-width: width;
+ --transition-property-max-width: max-width;
+ --transition-property-spacing: margin, padding;
+ --border-radius-custom-lg: 10px;
+}
+
+@layer utilities {
+ /* Custom form color utility */
+ .form-color {
+ color: rgb(from var(--form-color, var(--bg-form-color)));
+ }
+
+ /* Animation utilities */
+ .animate-bounce-slow {
+ animation: var(--animate-bounce-slow);
+ }
+ .animate-infinite-scroll {
+ animation: var(--animate-infinite-scroll);
+ }
+ .animate-text {
+ animation: var(--animate-text);
+ }
+
+ /* Custom shadow */
+ .shadow-custom {
+ box-shadow: 0px 25px 75px 0px #5353531a;
+ }
+ .drop-shadow-white {
+ filter: drop-shadow(0 0px 10px rgba(255, 255, 255, 0.5));
+ }
+ .drop-shadow-blue {
+ filter: drop-shadow(0 0px 15px rgba(59, 130, 246, 0.8));
+ }
+
+ /* Custom gradient backgrounds */
+ .bg-gradient-core {
+ background-image: linear-gradient(
+ 251deg,
+ #3b9cf6 0%,
+ #3b82f6 48%,
+ #3b82f6 100%
+ );
+ }
+ .bg-gradient-blue {
+ background-image: linear-gradient(
+ 270deg,
+ #3b9cf6 0%,
+ #3b82f6 48%,
+ #3b82f6 100%
+ );
+ }
+ .bg-custom-gradient {
+ background-image: linear-gradient(
+ 90deg,
+ #3b82f6 0.24%,
+ #60a5fa 100.24%
+ );
+ }
+}
+
+@layer base {
+ *,
+ ::after,
+ ::before,
+ ::backdrop,
+ ::file-selector-button {
+ border-color: var(--color-neutral-200, currentColor);
+ }
+
+ button:not(:disabled),
+ [role="button"]:not(:disabled) {
+ cursor: pointer;
+ }
+
+ /* Global dark mode border override - low specificity, can be overridden */
+ :where(.dark) *,
+ :where(.dark) ::after,
+ :where(.dark) ::before,
+ :where(.dark) ::backdrop,
+ :where(.dark) ::file-selector-button {
+ border-color: var(--color-neutral-600);
+ }
+
+ #app {
+ font-family: Inter, sans-serif !important;
+ min-height: 100vh;
+ color: var(--color-neutral-800);
+ }
+
+ :where(.dark) #app {
+ color: white;
+ }
+
+ p,
+ div {
+ text-align: inherit;
+ }
+
+ h1,
+ h2,
+ h3,
+ h4,
+ h5,
+ h6 {
+ color: var(--color-neutral-900);
+ text-align: inherit;
+ }
+
+ :where(.dark) h1,
+ :where(.dark) h2,
+ :where(.dark) h3,
+ :where(.dark) h4,
+ :where(.dark) h5,
+ :where(.dark) h6 {
+ color: white;
+ }
+
+ h1 {
+ font-size: var(--text-2xl);
+ font-weight: 800;
+ }
+
+ @media (min-width: 640px) {
+ h1 {
+ font-size: var(--text-3xl);
+ }
+ }
+
+ h2 {
+ font-size: var(--text-2xl);
+ font-weight: 800;
+ }
+
+ a {
+ color: var(--color-blue-500);
+ }
+}
+
+/* Default overrides with low specificity - can be easily overridden */
+@layer components {
+ :where(.bg-white) {
+ background-color: white;
+ }
+
+ :where(.dark .bg-white) {
+ background-color: var(--color-notion-dark);
+ }
+
+ :where(.bg-neutral-50) {
+ background-color: var(--color-neutral-50);
+ }
+
+ :where(.dark .bg-neutral-50) {
+ background-color: var(--color-notion-dark-light);
+ }
+}
+
+/* Hide feedback buttons in some cases */
+.fb-feedback-widget-feedback-button-container {
+ display: none !important;
+}
+
+@media (min-width: 768px) {
+ .fb-feedback-widget-feedback-button-container {
+ display: block !important;
+ }
+}
+
+.public-page .fb-feedback-widget-feedback-button-container {
+ display: none !important;
+}
+
+/* Actual CSS */
+body.dark * {
+ @apply border-neutral-600;
+}
+
+#app {
+ font-family: Inter, sans-serif !important;
+ @apply min-h-screen;
+}
+
+@layer base {
+ p,
+ div,
+ span,
+ ol,
+ ul,
+ li {
+ @apply text-inherit;
+ }
+
+ h1,
+ h2,
+ h3,
+ h4,
+ h5,
+ h6 {
+ @apply text-neutral-900 dark:text-white text-inherit;
+ }
+
+ h1 {
+ @apply text-2xl sm:text-3xl font-extrabold;
+ }
+
+ h2 {
+ @apply text-2xl font-extrabold;
+ }
+
+ a {
+ @apply text-blue-500;
+ }
+
+ /* Field help styles */
+ .field-help p,
+ .field-help ol,
+ .field-help ul,
+ .field-help li {
+ color: var(--color-neutral-400);
+ }
+
+ :where(.dark) .field-help p,
+ :where(.dark) .field-help ol,
+ :where(.dark) .field-help ul,
+ :where(.dark) .field-help li {
+ color: var(--color-neutral-500);
+ }
+
+ .field-help ol {
+ list-style-type: decimal;
+ list-style-position: inside;
+ }
+
+ .field-help ul {
+ list-style-type: disc;
+ list-style-position: inside;
+ }
+
+ /* Logic query builder */
+ .query-builder-rule {
+ background-color: var(--color-neutral-100);
+ max-width: 100%;
+ padding-left: 0.75rem;
+ padding-right: 0.75rem;
+ padding-top: 0.5rem;
+ padding-bottom: 0.5rem;
+ }
+
+ .query-builder-group__group-children {
+ margin-left: 0;
+ }
+
+ .query-builder-child__delete-child {
+ right: 0.75rem;
+ }
+
+ /* Gradient text utility */
+ .gradient-text {
+ background: linear-gradient(90deg, #3b82f6 0.24%, #60a5fa 100.24%);
+ -webkit-background-clip: text;
+ -webkit-text-fill-color: transparent;
+ background-clip: text;
+ text-fill-color: transparent;
+ }
+}
+
+:root {
+ --ui-border: var(--ui-color-neutral-300);
+ --ui-border-muted: var(--ui-color-neutral-300);
+ --ui-border-accented: var(--ui-color-neutral-300);
+}
+
+/* Why NoteForms */
+.gradient-text {
+ background: linear-gradient(90deg, #3b82f6 0.24%, #60a5fa 100.24%);
+ -webkit-background-clip: text;
+ -webkit-text-fill-color: transparent;
+ background-clip: text;
+ text-fill-color: transparent;
+}
+
+/* Global mention styles for consistency across components */
+.rich-editor span[mention],
+.rich-editor span[mention="true"],
+.mention-input span[mention],
+.mention-input span[mention="true"] {
+ @apply inline-flex items-center align-baseline leading-tight text-sm relative bg-blue-100 text-blue-800 border border-blue-200 rounded-md px-1 py-0.5 mx-0.5 max-w-[200px] whitespace-nowrap overflow-hidden truncate;
+}
+
+.crisp-client {
+ pointer-events: auto;
+}
diff --git a/client/css/fonts.css b/client/css/fonts.css
new file mode 100644
index 000000000..4db33ba2c
--- /dev/null
+++ b/client/css/fonts.css
@@ -0,0 +1,34 @@
+@font-face {
+ font-family: "Inter-Variable";
+ src: url("/fonts/inter/Inter-VariableFont_opsz,wght.ttf") format("truetype");
+ font-weight: 100 900;
+ font-display: swap;
+ font-style: normal;
+}
+
+@font-face {
+ font-family: "Inter-Variable";
+ src: url("/fonts/inter/Inter-Italic-VariableFont_opsz,wght.ttf")
+ format("truetype");
+ font-weight: 100 900;
+ font-display: swap;
+ font-style: italic;
+}
+
+/* Add Inter alias */
+@font-face {
+ font-family: "Inter";
+ src: url("/fonts/inter/Inter-VariableFont_opsz,wght.ttf") format("truetype");
+ font-weight: 100 900;
+ font-display: swap;
+ font-style: normal;
+}
+
+@font-face {
+ font-family: "Inter";
+ src: url("/fonts/inter/Inter-Italic-VariableFont_opsz,wght.ttf")
+ format("truetype");
+ font-weight: 100 900;
+ font-display: swap;
+ font-style: italic;
+}
diff --git a/client/error.vue b/client/error.vue
index fa2cce8ea..e4c258a2d 100644
--- a/client/error.vue
+++ b/client/error.vue
@@ -9,14 +9,14 @@
class="w-56 mb-5"
>
- <h1 class="mb-6 font-semibold text-3xl text-gray-900">
+ <h1 class="mb-6 font-semibold text-3xl text-neutral-900">
Whoops, something went wrong ({{ error.statusCode || '404' }})
</h1>
<div class="links">
<NuxtLink
:to="{ name: 'index' }"
- class="hover:underline text-gray-700"
+ class="hover:underline text-neutral-700"
>
Go Home
</NuxtLink>
@@ -37,8 +37,6 @@ useOpnSeoMeta({
const props = defineProps({
error: { type: Object, default: null }
})
-const authStore = useAuthStore()
-
if (props.error?.statusCode === 500) {
// Track in Sentry 500 errors
@@ -48,7 +46,7 @@ if (props.error?.statusCode === 500) {
captureException(exception, {
message: props.error?.message ?? props.error?.statusMessage,
type: '500_error',
- user_id: authStore.user?.id
+ user_id: useAuth().user().data.value?.id
})
}
</script>
diff --git a/client/layouts/basic.vue b/client/layouts/basic.vue
deleted file mode 100644
index 1a0ce72f8..000000000
--- a/client/layouts/basic.vue
+++ /dev/null
@@ -1,24 +0,0 @@
-<template>
- <div class="basic-layout flex items-center justify-center m-0">
- <slot />
- </div>
-</template>
-
-<style lang="scss">
-.basic-layout {
- color: #636b6f;
- height: 100vh;
- font-weight: 100;
- position: relative;
-
- .links > a {
- color: #636b6f;
- padding: 0 25px;
- font-size: 12px;
- font-weight: 600;
- letter-spacing: 0.1rem;
- text-decoration: none;
- text-transform: uppercase;
- }
-}
-</style>
diff --git a/client/layouts/dashboard.vue b/client/layouts/dashboard.vue
new file mode 100644
index 000000000..887450486
--- /dev/null
+++ b/client/layouts/dashboard.vue
@@ -0,0 +1,24 @@
+<template>
+ <div class="dashboard-layout min-h-screen bg-neutral-50">
+ <!-- Sidebar -->
+ <AppSidebar />
+
+ <!-- Main content area -->
+ <main class="sm:pl-58">
+ <!-- Content wrapper with proper spacing -->
+ <div class="min-h-screen bg-white">
+ <slot />
+ </div>
+ </main>
+ </div>
+</template>
+
+<script setup>
+import AppSidebar from "~/components/layouts/AppSidebar.vue"
+</script>
+
+<style scoped>
+.dashboard-layout {
+ /* Ensure proper layout structure */
+}
+</style>
\ No newline at end of file
diff --git a/client/layouts/empty.vue b/client/layouts/empty.vue
new file mode 100644
index 000000000..bebb74f36
--- /dev/null
+++ b/client/layouts/empty.vue
@@ -0,0 +1,5 @@
+<template>
+ <div class="min-h-screen flex flex-col">
+ <slot class="flex-grow" />
+ </div>
+</template>
diff --git a/client/lib/file-uploads.js b/client/lib/file-uploads.js
index 4d924ccce..4140d70be 100644
--- a/client/lib/file-uploads.js
+++ b/client/lib/file-uploads.js
@@ -1,10 +1,9 @@
+import { uploadsApi } from "~/api"
+
async function storeLocalFile(file) {
let formData = new FormData()
formData.append("file", file)
- const response = await opnFetch("/upload-file", {
- method: "POST",
- body: formData,
- })
+ const response = await uploadsApi.uploadFile(formData)
response.extension = file.name.split(".").pop()
return response
}
@@ -13,20 +12,16 @@ export const storeFile = async (file, options = {}) => {
if (useFeatureFlag('storage.local'))
return storeLocalFile(file, options)
- const response = await opnFetch(
- options.signedStorageUrl || "vapor/signed-storage-url",
- {
- method: "POST",
- body: options.data,
- bucket: options.bucket || "",
- content_type: options.contentType || file.type,
- expires: options.expires || "",
- visibility: options.visibility || "",
- baseURL: options.baseURL || null,
- headers: options.headers || {},
- ...options.options,
- },
- )
+ const response = await uploadsApi.getSignedStorageUrl({
+ ...options.data,
+ bucket: options.bucket || "",
+ content_type: options.contentType || file.type,
+ expires: options.expires || "",
+ visibility: options.visibility || "",
+ baseURL: options.baseURL || null,
+ headers: options.headers || {},
+ ...options.options,
+ })
// Upload to S3
await useFetch(response.url, {
diff --git a/client/lib/forms/FormModeStrategy.js b/client/lib/forms/FormModeStrategy.js
index 0b987a3e5..dc2868b05 100644
--- a/client/lib/forms/FormModeStrategy.js
+++ b/client/lib/forms/FormModeStrategy.js
@@ -31,13 +31,19 @@ export function createFormModeStrategy(mode) {
showHiddenFields: false,
enableDisabledFields: false,
showFormCleanings: true,
- showFontLink: false
+ showFontLink: false,
+ showBranding: true
},
// Admin behaviors
admin: {
allowDragging: false,
showAdminControls: false,
+ },
+
+ // Submission behaviors
+ submission: {
+ enablePartialSubmissions: true
}
}
@@ -60,9 +66,12 @@ export function createFormModeStrategy(mode) {
strategy.display.showHiddenFields = false
strategy.display.showFormCleanings = false
strategy.display.showFontLink = true
+ strategy.display.showBranding = false
strategy.admin.allowDragging = true
strategy.admin.showAdminControls = true
+
+ strategy.submission.enablePartialSubmissions = false
break
case FormMode.PREFILL:
@@ -73,18 +82,21 @@ export function createFormModeStrategy(mode) {
strategy.display.showHiddenFields = true
strategy.display.enableDisabledFields = true
+ strategy.display.showBranding = false
break
case FormMode.EDIT:
// Editing submission - same validation as LIVE mode, but show hidden fields
// This ensures edit mode behaves like live mode for validation
strategy.display.showHiddenFields = true
+ strategy.submission.enablePartialSubmissions = false
break
case FormMode.TEST:
// Test mode - validate on submit but don't submit, and don't validate on next page
strategy.validation.performActualSubmission = false
strategy.validation.validateOnNextPage = false
+ strategy.submission.enablePartialSubmissions = false
break
}
diff --git a/client/lib/forms/composables/useFormInitialization.js b/client/lib/forms/composables/useFormInitialization.js
index 532e0632b..452a08818 100644
--- a/client/lib/forms/composables/useFormInitialization.js
+++ b/client/lib/forms/composables/useFormInitialization.js
@@ -1,5 +1,5 @@
import { toValue } from 'vue'
-import { opnFetch } from '~/composables/useOpnApi.js'
+import { formsApi } from '~/api'
import clonedeep from 'clone-deep'
/**
@@ -215,7 +215,7 @@ export function useFormInitialization(formConfig, form, pendingSubmission) {
}
// Use the correct route format: /forms/{slug}/submissions/{submission_id}
- return opnFetch(`/forms/${slug}/submissions/${submissionIdValue}`)
+ return formsApi.submissions.get(slug, submissionIdValue)
.then(submissionData => {
if (submissionData.data) {
resetAndFill({
diff --git a/client/lib/forms/composables/useFormManager.js b/client/lib/forms/composables/useFormManager.js
index 21200c2de..c486fdc51 100644
--- a/client/lib/forms/composables/useFormManager.js
+++ b/client/lib/forms/composables/useFormManager.js
@@ -96,8 +96,8 @@ export function useFormManager(initialFormConfig, initialMode = FormMode.LIVE, o
timer.reset()
timer.start()
- // Start partial submission sync if enabled
- if (import.meta.client && config.value.enable_partial_submissions) {
+ // Start partial submission sync if enabled in both config and strategy
+ if (import.meta.client && config.value.enable_partial_submissions && strategy.value.submission.enablePartialSubmissions) {
partialSubmissionService.startSync()
}
@@ -172,7 +172,7 @@ export function useFormManager(initialFormConfig, initialMode = FormMode.LIVE, o
try {
// Stop partial submission sync during submission if enabled
- if (!import.meta.server && toValue(config).enable_partial_submissions) {
+ if (!import.meta.server && toValue(config).enable_partial_submissions && strategy.value.submission.enablePartialSubmissions) {
partialSubmissionService.stopSync() // This will sync immediately before stopping
}
@@ -201,7 +201,7 @@ export function useFormManager(initialFormConfig, initialMode = FormMode.LIVE, o
// 3. Get submission hash from partialSubmission if enabled
let submissionHash = null
- if (!import.meta.server && toValue(config).enable_partial_submissions) {
+ if (!import.meta.server && toValue(config).enable_partial_submissions && strategy.value.submission.enablePartialSubmissions) {
submissionHash = partialSubmissionService.getSubmissionHash()
}
@@ -268,7 +268,7 @@ export function useFormManager(initialFormConfig, initialMode = FormMode.LIVE, o
} catch (error) {
// Restart partial submission sync if there was an error and it's enabled
- if (!import.meta.server && toValue(config).enable_partial_submissions) {
+ if (!import.meta.server && toValue(config).enable_partial_submissions && strategy.value.submission.enablePartialSubmissions) {
partialSubmissionService.startSync()
}
@@ -294,7 +294,7 @@ export function useFormManager(initialFormConfig, initialMode = FormMode.LIVE, o
timer.start() // Restart timer
// Restart partial submission if enabled
- if (!import.meta.server && toValue(config).enable_partial_submissions) {
+ if (!import.meta.server && toValue(config).enable_partial_submissions && strategy.value.submission.enablePartialSubmissions) {
partialSubmissionService.stopSync() // This will sync immediately before stopping
partialSubmissionService.startSync() // Start fresh sync
}
@@ -303,7 +303,7 @@ export function useFormManager(initialFormConfig, initialMode = FormMode.LIVE, o
// Clean up when component using the manager is unmounted
if (import.meta.client) {
onBeforeUnmount(() => {
- if (toValue(config).enable_partial_submissions) {
+ if (toValue(config).enable_partial_submissions && strategy.value.submission.enablePartialSubmissions) {
partialSubmissionService.stopSync()
}
})
diff --git a/client/lib/forms/composables/useFormPayment.js b/client/lib/forms/composables/useFormPayment.js
index d250235ce..fca2d908e 100644
--- a/client/lib/forms/composables/useFormPayment.js
+++ b/client/lib/forms/composables/useFormPayment.js
@@ -1,6 +1,6 @@
import { toValue, ref } from 'vue'
-import { createStripeElements } from '~/composables/useStripeElements'
-import { opnFetch } from '~/composables/useOpnApi.js'
+import { createStripeElements } from '~/composables/components/stripe/useStripeElements'
+import { formsApi } from '~/api'
// Assume Stripe is loaded globally or via another mechanism if needed client-side
// For server-side/Nuxt API routes, import Stripe library properly.
@@ -65,14 +65,8 @@ export function useFormPayment(formConfig, form) {
return { success: false, error: 'Invalid form configuration' }
}
- // Construct the URL (no query params needed for POST)
- const url = `/forms/${formSlug}/stripe-connect/payment-intent`
-
- // Use opnFetch with POST method and an empty body
- const response = await opnFetch(url, {
- method: 'POST',
- body: {}
- })
+ // Use formsApi for the payment intent creation
+ const response = await formsApi.stripe.createPaymentIntent(formSlug)
// Handle response structure with type and intent fields
if (response?.type === 'success' && response?.intent?.secret) {
diff --git a/client/lib/forms/composables/useFormStructure.js b/client/lib/forms/composables/useFormStructure.js
index 7bb6bea54..8617d0b97 100644
--- a/client/lib/forms/composables/useFormStructure.js
+++ b/client/lib/forms/composables/useFormStructure.js
@@ -310,9 +310,10 @@ export function useFormStructure(formConfig, managerState, formData) {
* @param {Number|null} selectedFieldIndex - The index of the currently selected field in form.properties.
* @param {Number} currentPageIndex - The current page index.
* @param {Number|null} [explicitIndex=null] - An explicitly provided insert index.
+ * @param {boolean} [insertOnSamePage=false] - If true, ensures insertion happens on the current page, even before a page break.
* @returns {Number} The calculated index for insertion.
*/
- const determineInsertIndex = (selectedFieldIndex, currentPageIndex, explicitIndex = null) => {
+ const determineInsertIndex = (selectedFieldIndex, currentPageIndex, explicitIndex = null, insertOnSamePage = false) => {
if (explicitIndex !== null && typeof explicitIndex === 'number') {
return explicitIndex
}
@@ -336,6 +337,15 @@ export function useFormStructure(formConfig, managerState, formData) {
}
const currentBoundary = boundaries[pageIdx]
+ const endOfPageIdx = currentBoundary.end
+
+ if (insertOnSamePage) {
+ const lastField = properties[endOfPageIdx]
+ if (lastField?.type === 'nf-page-break' && !isFieldHidden(lastField)) {
+ return endOfPageIdx // Insert before the page break
+ }
+ }
+
// Insert at the end of the current page (index after the last field of that page)
return currentBoundary.end + 1
}
diff --git a/client/lib/forms/themes/form-themes.js b/client/lib/forms/themes/form-themes.js
index af4291051..5dda662b1 100644
--- a/client/lib/forms/themes/form-themes.js
+++ b/client/lib/forms/themes/form-themes.js
@@ -11,7 +11,7 @@
},
label: 'text-gray-700 dark:text-gray-300 font-semibold',
input:
- 'flex-1 appearance-none border border-gray-300 dark:border-gray-600 w-full bg-white text-gray-700 dark:bg-notion-dark-light dark:text-gray-300 dark:placeholder-gray-500 placeholder-gray-400 shadow-sm focus:outline-none focus:ring-2 focus:border-transparent focus:ring-opacity-100',
+ 'flex-1 appearance-none border border-gray-300 dark:border-gray-600 w-full bg-white text-gray-700 dark:bg-notion-dark-light dark:text-gray-300 dark:placeholder-gray-500 placeholder-gray-400 shadow-xs focus:outline-hidden focus:ring-2 focus:ring-form/100 focus:border-transparent',
help: 'text-gray-500',
spacing: {
horizontal: {
@@ -37,29 +37,29 @@
}
},
ScaleInput: {
- button: 'cursor-pointer text-gray-700 inline-block border-gray-300 flex-grow dark:bg-notion-dark-light dark:text-gray-300 text-center',
+ button: 'cursor-pointer text-gray-700 inline-block border-gray-300 grow dark:bg-notion-dark-light dark:text-gray-300 text-center',
unselectedButton: 'bg-white border'
},
SliderInput: {
stepLabel: 'text-gray-700 dark:text-gray-300 text-center text-xs'
},
Button: {
- body: 'transition ease-in duration-200 text-center font-semibold shadow-md focus:outline-none focus:ring-2 focus:ring-offset-2 filter hover:brightness-90'
+ body: 'transition ease-in duration-200 text-center font-semibold shadow-md focus:outline-hidden focus:ring-2 focus:ring-offset-2 hover:brightness-90'
},
CodeInput: {
input: 'overflow-hidden'
},
RichTextAreaInput: {
input:
- 'flex-1 appearance-none border border-gray-300 dark:border-gray-600 w-full bg-white text-gray-700 dark:bg-notion-dark-light dark:text-gray-300 dark:placeholder-gray-500 placeholder-gray-400 shadow-sm text-base focus:outline-none focus:ring-1 focus:ring-opacity-100 focus:border-transparent focus:ring-2'
+ 'flex-1 appearance-none border border-gray-300 dark:border-gray-600 w-full bg-white text-gray-700 dark:bg-notion-dark-light dark:text-gray-300 dark:placeholder-gray-500 placeholder-gray-400 shadow-xs text-base focus:outline-hidden focus:ring-1 focus:ring-form/100 focus:border-transparent focus:ring-2'
},
SelectInput: {
input:
- 'relative w-full flex-1 appearance-none border border-gray-300 dark:border-gray-600 w-full text-gray-700 dark:text-gray-300 dark:placeholder-gray-600 shadow-sm text-base focus:outline-none focus:ring-2 focus:border-transparent',
+ 'relative w-full flex-1 appearance-none border border-gray-300 dark:border-gray-600 w-full text-gray-700 dark:text-gray-300 dark:placeholder-gray-600 shadow-xs text-base focus:outline-hidden focus:ring-2 focus:border-transparent',
background: 'bg-white dark:bg-notion-dark-light',
chevronGradient: 'bg-gradient-to-r from-transparent to-white dark:to-notion-dark-light',
dropdown: 'border border-gray-300 dark:border-gray-600',
- option: 'rounded',
+ option: 'rounded-xs',
minHeight: {
sm: 'min-h-[20px]',
md: 'min-h-[24px]',
@@ -73,9 +73,9 @@
lg: 'w-[120px]'
},
flag: {
- sm: '!-mt-[14px]',
- md: '!-mt-[9px] rounded',
- lg: '!-mt-[9px] rounded'
+ sm: '-mt-[14px]!',
+ md: '-mt-[9px]! rounded-xs',
+ lg: '-mt-[9px]! rounded-xs'
},
flagSize: {
sm: 'small',
@@ -99,11 +99,11 @@
},
DateInput: {
input:
- 'flex-1 appearance-none border border-gray-300 dark:border-gray-600 w-full bg-white text-gray-700 dark:bg-notion-dark-light dark:text-gray-300 dark:placeholder-gray-500 placeholder-gray-400 shadow-sm text-base focus:outline-none focus:ring-2 focus:border-transparent focus:ring-opacity-100'
+ 'flex-1 appearance-none border border-gray-300 dark:border-gray-600 w-full bg-white text-gray-700 dark:bg-notion-dark-light dark:text-gray-300 dark:placeholder-gray-500 placeholder-gray-400 shadow-xs text-base focus:outline-hidden focus:ring-2 focus:ring-form/100 focus:border-transparent'
},
PaymentInput: {
cardContainer: 'transition-all duration-200',
- focusRing: 'ring-2 ring-primary-500 border-transparent ring-opacity-100'
+ focusRing: 'ring-2 ring-form/100 border-transparent'
},
CheckboxInput:{
size: {
@@ -149,7 +149,7 @@
dark: 'bg-notion-dark-light'
},
uploadedFile:
- 'border border-gray-300 dark:border-gray-600 bg-white dark:bg-notion-dark-light rounded-lg shadow-sm max-w-[10rem]'
+ 'border border-gray-300 dark:border-gray-600 bg-white dark:bg-notion-dark-light rounded-lg shadow-xs max-w-10'
},
SignatureInput: {
minHeight: {
@@ -159,7 +159,7 @@
},
},
MatrixInput: {
- table: 'bg-white dark:bg-notion-dark-light shadow-sm',
+ table: 'bg-white dark:bg-notion-dark-light shadow-xs',
cell: 'border-gray-300 dark:border-gray-600',
cellHover: 'hover:bg-gray-50 dark:hover:bg-gray-900'
}
@@ -173,7 +173,7 @@
},
label: 'text-gray-700 dark:text-gray-300 font-medium',
input:
- 'flex-1 appearance-none border border-gray-300 dark:border-gray-600 w-full bg-white text-gray-700 dark:bg-notion-dark-light dark:text-gray-300 dark:placeholder-gray-500 placeholder-gray-400 focus:outline-none focus:ring-2 focus:border-transparent focus:ring-opacity-100',
+ 'flex-1 appearance-none border border-gray-300 dark:border-gray-600 w-full bg-white text-gray-700 dark:bg-notion-dark-light dark:text-gray-300 dark:placeholder-gray-500 placeholder-gray-400 focus:outline-hidden focus:ring-2 focus:ring-form/100 focus:border-transparent',
help: 'text-gray-500',
spacing: {
horizontal: {
@@ -206,22 +206,22 @@
stepLabel: 'text-gray-700 dark:text-gray-300 text-center text-xs'
},
Button: {
- body: 'transition ease-in duration-200 text-center font-semibold focus:outline-none focus:ring-2 focus:ring-offset-2 filter hover:brightness-90'
+ body: 'transition ease-in duration-200 text-center font-semibold focus:outline-hidden focus:ring-2 focus:ring-offset-2 hover:brightness-90'
},
CodeInput: {
input: 'overflow-hidden'
},
RichTextAreaInput: {
input:
- 'flex-1 appearance-none border border-gray-300 dark:border-gray-600 w-full bg-white text-gray-700 dark:bg-notion-dark-light dark:text-gray-300 dark:placeholder-gray-500 placeholder-gray-400 text-base focus:outline-none focus:ring-1 focus:ring-opacity-100 focus:border-transparent focus:ring-2'
+ 'flex-1 appearance-none border border-gray-300 dark:border-gray-600 w-full bg-white text-gray-700 dark:bg-notion-dark-light dark:text-gray-300 dark:placeholder-gray-500 placeholder-gray-400 text-base focus:outline-hidden focus:ring-1 focus:ring-form/100 focus:border-transparent focus:ring-2'
},
SelectInput: {
input:
- 'relative w-full flex-1 appearance-none border border-gray-300 dark:border-gray-600 w-full text-gray-700 dark:text-gray-300 dark:placeholder-gray-600 text-base focus:outline-none focus:ring-2 focus:border-transparent',
+ 'relative w-full flex-1 appearance-none border border-gray-300 dark:border-gray-600 w-full text-gray-700 dark:text-gray-300 dark:placeholder-gray-600 text-base focus:outline-hidden focus:ring-2 focus:border-transparent',
background: 'bg-white dark:bg-notion-dark-light',
chevronGradient: 'bg-gradient-to-r from-transparent to-white dark:to-notion-dark-light',
dropdown: 'border border-gray-300 dark:border-gray-600',
- option: 'rounded',
+ option: 'rounded-xs',
minHeight: {
sm: 'min-h-[20px]',
md: 'min-h-[24px]',
@@ -235,9 +235,9 @@
lg: 'w-[120px]'
},
flag: {
- sm: '!-mt-[14px]',
- md: '!-mt-[9px] rounded',
- lg: '!-mt-[9px] rounded'
+ sm: '-mt-[14px]!',
+ md: '-mt-[9px]! rounded-xs',
+ lg: '-mt-[9px]! rounded-xs'
},
flagSize: {
sm: 'small',
@@ -260,11 +260,11 @@
}
},
DateInput: {
- input: 'flex-1 appearance-none border border-gray-300 dark:border-gray-600 w-full bg-white text-gray-700 dark:bg-notion-dark-light dark:text-gray-300 dark:placeholder-gray-500 placeholder-gray-400 text-base focus:outline-none focus:ring-2 focus:border-transparent focus:ring-opacity-100'
+ input: 'flex-1 appearance-none border border-gray-300 dark:border-gray-600 w-full bg-white text-gray-700 dark:bg-notion-dark-light dark:text-gray-300 placeholder-gray-400 text-base focus:outline-hidden focus:ring-2 focus:ring-form/100 focus:border-transparent'
},
PaymentInput: {
cardContainer: 'transition-all duration-200',
- focusRing: 'ring-2 ring-primary-500 border-transparent ring-opacity-100'
+ focusRing: 'ring-2 ring-form/100 border-transparent'
},
CheckboxInput:{
size: {
@@ -305,7 +305,7 @@
dark: 'bg-notion-dark-light'
},
uploadedFile:
- 'border border-gray-300 dark:border-gray-600 bg-white dark:bg-notion-dark-light shadow-sm max-w-[10rem]'
+ 'border border-gray-300 dark:border-gray-600 bg-white dark:bg-notion-dark-light shadow-xs max-w-10'
},
SignatureInput: {
minHeight: {
@@ -329,7 +329,7 @@
},
label: 'text-gray-900 dark:text-gray-100 mb-1 block mt-4',
input:
- 'rounded border border-notion-input-border dark:border-notion-input-borderDark flex-1 appearance-none w-full bg-notion-input-background dark:bg-notion-dark-light text-gray-900 dark:text-gray-100 dark:placeholder-gray-500 placeholder-gray-400 focus:outline-none focus:ring-2 focus:ring-opacity-40 focus:border-transparent',
+ 'rounded-xs border border-notion-input-border dark:border-notion-input-borderDark flex-1 appearance-none w-full bg-notion-input-background dark:bg-notion-dark-light text-gray-900 dark:text-gray-100 dark:placeholder-gray-500 placeholder-gray-400 focus:outline-hidden focus:ring-2 focus:ring-form/40 focus:border-transparent',
help: 'text-gray-500',
spacing: {
horizontal: {
@@ -350,34 +350,34 @@
},
borderRadius: {
none: 'rounded-none',
- small: 'rounded',
+ small: 'rounded-xs',
full: 'rounded-[20px]'
}
},
ScaleInput: {
- button: 'border border-notion-input-border dark:border-notion-input-borderDark flex-1 appearance-none w-full bg-notion-input-background dark:bg-notion-dark-light text-gray-900 dark:text-gray-100 text-center focus:outline-none focus:ring-2 focus:ring-opacity-40 focus:border-transparent',
+ button: 'border border-notion-input-border dark:border-notion-input-borderDark flex-1 appearance-none w-full bg-notion-input-background dark:bg-notion-dark-light text-gray-900 dark:text-gray-100 text-center focus:outline-hidden focus:ring-2 focus:ring-form/40 focus:border-transparent',
unselectedButton: 'bg-notion-input-background dark:bg-notion-dark-light'
},
SliderInput: {
stepLabel: 'text-gray-700 dark:text-gray-300 text-center text-xs'
},
Button: {
- body: 'transition ease-in duration-200 text-center font-semibold border border-notion-input-border dark:border-notion-input-borderDark focus:outline-none focus:ring-2 focus:ring-opacity-40 focus:border-transparent filter hover:brightness-90'
+ body: 'transition ease-in duration-200 text-center font-semibold border border-notion-input-border dark:border-notion-input-borderDark focus:outline-hidden focus:ring-2 focus:ring-form/40 focus:border-transparent hover:brightness-90'
},
CodeInput: {
- input: 'border border-notion-input-border dark:border-notion-input-borderDark focus:outline-none focus:ring-2 focus:ring-opacity-40 focus:border-transparent overflow-hidden'
+ input: 'border border-notion-input-border dark:border-notion-input-borderDark focus:outline-hidden focus:ring-2 focus:ring-form/40 focus:border-transparent overflow-hidden'
},
RichTextAreaInput: {
input:
- 'flex-1 appearance-none border border-notion-input-border dark:border-notion-input-borderDark w-full bg-notion-input-background dark:bg-notion-dark-light text-gray-900 dark:text-gray-100 dark:placeholder-gray-500 placeholder-gray-400 text-base focus:outline-none focus:ring-2 focus:ring-opacity-40 focus:border-transparent'
+ 'flex-1 appearance-none border border-notion-input-border dark:border-notion-input-borderDark w-full bg-notion-input-background dark:bg-notion-dark-light text-gray-900 dark:text-gray-100 dark:placeholder-gray-500 placeholder-gray-400 text-base focus:outline-hidden focus:ring-2 focus:ring-form/40 focus:border-transparent'
},
SelectInput: {
input:
- 'relative w-full border border-notion-input-border dark:border-notion-input-borderDark flex-1 appearance-none w-full text-gray-900 dark:text-gray-100 placeholder-gray-400 dark:placeholder-gray-500 text-base focus:outline-none focus:ring-2 focus:ring-opacity-40 focus:border-transparent',
+ 'relative w-full border border-notion-input-border dark:border-notion-input-borderDark flex-1 appearance-none w-full text-gray-900 dark:text-gray-100 placeholder-gray-400 dark:placeholder-gray-500 text-base focus:outline-hidden focus:ring-2 focus:ring-form/40 focus:border-transparent',
background: 'bg-notion-input-background dark:bg-notion-dark-light',
chevronGradient: 'bg-gradient-to-r from-transparent to-notion-input-background dark:to-notion-dark-light',
dropdown: 'border border-notion-input-border dark:border-notion-input-borderDark',
- option: 'rounded',
+ option: 'rounded-xs',
minHeight: {
sm: 'min-h-[20px]',
md: 'min-h-[24px]',
@@ -391,9 +391,9 @@
lg: 'w-[120px]'
},
flag: {
- sm: '!-mt-[14px]',
- md: '!-mt-[9px] rounded',
- lg: '!-mt-[9px] rounded'
+ sm: '-mt-[14px]!',
+ md: '-mt-[9px]! rounded-xs',
+ lg: '-mt-[9px]! rounded-xs'
},
flagSize: {
sm: 'small',
@@ -416,11 +416,11 @@
}
},
DateInput: {
- input: 'border border-notion-input-border dark:border-notion-input-borderDark flex-1 appearance-none w-full bg-notion-input-background dark:bg-notion-dark-light text-gray-900 dark:text-gray-100 placeholder-gray-400 text-base focus:outline-none focus:ring-2 focus:ring-opacity-40 focus:border-transparent'
+ input: 'border border-notion-input-border dark:border-notion-input-borderDark flex-1 appearance-none w-full bg-notion-input-background dark:bg-notion-dark-light text-gray-900 dark:text-gray-100 placeholder-gray-400 text-base focus:outline-hidden focus:ring-2 focus:ring-form/40 focus:border-transparent'
},
PaymentInput: {
cardContainer: 'transition-all duration-200',
- focusRing: 'ring-2 ring-primary-500 border-transparent ring-opacity-40'
+ focusRing: 'ring-2 ring-form/40 border-transparent'
},
CheckboxInput:{
size: {
@@ -455,7 +455,7 @@
},
fileInput: {
input:
- 'p-4 rounded border border-dashed border-notion-input-border dark:border-notion-input-borderDark bg-notion-input-background dark:bg-notion-dark-light focus:outline-none focus:ring-2 focus:ring-opacity-40 focus:border-transparent',
+ 'p-4 rounded-xs border border-dashed border-notion-input-border dark:border-notion-input-borderDark bg-notion-input-background dark:bg-notion-dark-light focus:outline-hidden focus:ring-2 focus:ring-form/40 focus:border-transparent',
minHeight: {
sm: 'min-h-28',
md: 'min-h-40',
@@ -466,7 +466,7 @@
dark: 'bg-notion-dark-light'
},
uploadedFile:
- 'border border-notion-input-border dark:border-notion-input-borderDark bg-white dark:bg-notion-dark-light rounded max-w-[10rem] focus:outline-none focus:ring-2 focus:ring-opacity-40 focus:border-transparent'
+ 'border border-notion-input-border dark:border-notion-input-borderDark bg-white dark:bg-notion-dark-light rounded-xs max-w-10 focus:outline-hidden focus:ring-2 focus:ring-form/40 focus:border-transparent'
},
SignatureInput: {
minHeight: {
diff --git a/client/lib/utils.js b/client/lib/utils.js
index 47f9a2139..1e171c26f 100644
--- a/client/lib/utils.js
+++ b/client/lib/utils.js
@@ -120,4 +120,26 @@ export const mentionAsText = (content) => {
return `${text}`
}
).replace(/<[^>]*>/g, '')
+}
+
+export function formatNumber(num) {
+ if (num >= 1000000) {
+ return (num / 1000000).toFixed(1).replace(/\.0$/, '') + 'm'
+ }
+ if (num >= 1000) {
+ return (num / 1000).toFixed(1).replace(/\.0$/, '') + 'k'
+ }
+ return num
+}
+
+export function formatNumberWithCommas(num) {
+ if (typeof num !== 'number') {
+ return num
+ }
+ return num.toLocaleString()
+}
+
+export function cleanQuotes(str) {
+ if (!str) return ''
+ return str.replace(/^"|"$/g, '')
}
\ No newline at end of file
diff --git a/client/middleware/01.check-auth.global.js b/client/middleware/01.check-auth.global.js
index 2959bef88..6bee5fe5d 100644
--- a/client/middleware/01.check-auth.global.js
+++ b/client/middleware/01.check-auth.global.js
@@ -1,25 +1,44 @@
-import { fetchAllWorkspaces } from "~/stores/workspaces.js"
+import { useQueryClient } from '@tanstack/vue-query'
+import { initServiceClients } from '~/composables/useAuthFlow'
export default defineNuxtRouteMiddleware(async () => {
const authStore = useAuthStore()
-
- // Get tokens from cookies
- const tokenValue = useCookie("token").value
- const adminTokenValue = useCookie("admin_token").value
-
- // Initialize the store with the tokens
- authStore.initStore(tokenValue, adminTokenValue)
+ const queryClient = useQueryClient()
- if (authStore.token && !authStore.user) {
- const workspaceStore = useWorkspacesStore()
+ // Initialize tokens from cookies first
+ authStore.initStore(
+ useCookie('token').value,
+ useCookie('admin_token').value,
+ )
- // Load user data and workspaces
- const [userDataResponse, workspacesResponse] = await Promise.all([
- useOpnApi("user"),
- fetchAllWorkspaces(),
- ])
- authStore.setUser(userDataResponse.data.value)
- workspaceStore.save(workspacesResponse.data.value)
+ // If no token, nothing to do
+ if (!authStore.token) {
+ return
+ }
+
+ // Check for already cached user data (from SSR or previous fetch)
+ let userData = queryClient.getQueryData(['user'])
+
+ // Fetch user & workspaces only if not cached yet
+ if (!userData) {
+ try {
+ const userQuery = useAuth().user()
+ const workspacesQuery = useWorkspaces().list()
+ await Promise.all([userQuery.suspense(), workspacesQuery.suspense()])
+
+ userData = queryClient.getQueryData(['user'])
+ } catch (error) {
+ // On 401, clear auth state
+ if (error?.status === 401) {
+ authStore.clearToken()
+ queryClient.clear()
+ }
+ return
+ }
+ }
+
+ // Initialize service clients on client side (no-op on server)
+ if (userData) {
+ initServiceClients(userData)
}
- authStore.initServiceClients()
})
diff --git a/client/middleware/admin.js b/client/middleware/admin.js
index c16902def..f0bc04494 100644
--- a/client/middleware/admin.js
+++ b/client/middleware/admin.js
@@ -1,6 +1,9 @@
export default defineNuxtRouteMiddleware(() => {
- const authStore = useAuthStore()
- if (authStore.check && !authStore.user?.admin) {
- return navigateTo({ name: "home" })
+ const { isAuthenticated } = useIsAuthenticated()
+ const { user } = useAuth()
+ const { data: userData } = user()
+
+ if (isAuthenticated.value && !userData.value?.admin) {
+ throw createError({ statusCode: 403, statusMessage: 'Forbidden' })
}
})
diff --git a/client/middleware/auth.js b/client/middleware/auth.js
index 8dfca935b..65d9debc0 100644
--- a/client/middleware/auth.js
+++ b/client/middleware/auth.js
@@ -1,7 +1,7 @@
export default defineNuxtRouteMiddleware((to) => {
- const authStore = useAuthStore()
+ const { isAuthenticated } = useIsAuthenticated()
- if (!authStore.check) {
+ if (!isAuthenticated.value) {
useCookie("intended_url").value = to.path
return navigateTo({ name: "login" })
}
diff --git a/client/middleware/guest.js b/client/middleware/guest.js
index 25c456e7e..8540546c1 100644
--- a/client/middleware/guest.js
+++ b/client/middleware/guest.js
@@ -1,6 +1,6 @@
export default defineNuxtRouteMiddleware(() => {
- const authStore = useAuthStore()
- if (authStore.check) {
+ const { isAuthenticated } = useIsAuthenticated()
+ if (isAuthenticated.value) {
return navigateTo({ name: "home" })
}
})
diff --git a/client/middleware/moderator.js b/client/middleware/moderator.js
index 6d7a87c66..d54597754 100644
--- a/client/middleware/moderator.js
+++ b/client/middleware/moderator.js
@@ -1,6 +1,9 @@
export default defineNuxtRouteMiddleware(() => {
- const authStore = useAuthStore()
- if (authStore.check && !authStore.user?.moderator) {
- return navigateTo({ name: "home" })
+ const { isAuthenticated } = useIsAuthenticated()
+ const { user } = useAuth()
+ const { data: userData } = user()
+
+ if (isAuthenticated.value && !userData.value?.moderator) {
+ throw createError({ statusCode: 403, statusMessage: 'Forbidden' })
}
})
diff --git a/client/middleware/root-redirect.js b/client/middleware/root-redirect.js
index 606e09c84..db79938b8 100644
--- a/client/middleware/root-redirect.js
+++ b/client/middleware/root-redirect.js
@@ -1,21 +1,7 @@
-import { sendRedirect } from 'h3'
-
-export default defineNuxtRouteMiddleware(() => {
- if (!useFeatureFlag('self_hosted')) return
- const redirectUrl = useRuntimeConfig().public.rootRedirectUrl
-
- // Only run if env var is set and is a valid URL
- if (!redirectUrl || !/^https?:\/\//.test(redirectUrl)) return
-
- // Server-side: use h3's sendRedirect
- if (import.meta.server) {
-
- const event = useRequestEvent()
- if (event) {
- return sendRedirect(event, redirectUrl, 301)
- }
- }
+export default defineNuxtRouteMiddleware(async () => {
+ const { performRedirect } = useSubdomainRedirect()
- // Client-side handling
- return navigateTo(redirectUrl, { external: true })
+ // Perform redirect with iframe check disabled for root pages
+ // (root pages should always redirect regardless of iframe context)
+ await performRedirect({ skipIfIframe: false })
})
\ No newline at end of file
diff --git a/client/middleware/self-hosted-credentials.js b/client/middleware/self-hosted-credentials.js
index d7d6265b7..62f40348d 100644
--- a/client/middleware/self-hosted-credentials.js
+++ b/client/middleware/self-hosted-credentials.js
@@ -1,9 +1,11 @@
export default defineNuxtRouteMiddleware(async () => {
- const authStore = useAuthStore()
+ const { isAuthenticated } = useIsAuthenticated()
+ const { user } = useAuth()
+ const { data: userData } = user()
if (useFeatureFlag('self_hosted')) {
- if (authStore.check && authStore.user?.email === '[email protected]') {
- return navigateTo({ name: "update-credentials" })
+ if (isAuthenticated.value && userData.value?.email === '[email protected]') {
+ throw createError({ statusCode: 403, statusMessage: 'Please update your credentials' })
}
}
})
\ No newline at end of file
diff --git a/client/middleware/subscribed.js b/client/middleware/subscribed.js
index 77e45d0eb..85937a161 100644
--- a/client/middleware/subscribed.js
+++ b/client/middleware/subscribed.js
@@ -1,7 +1,9 @@
export default defineNuxtRouteMiddleware(() => {
- const authStore = useAuthStore()
+ const { isAuthenticated } = useIsAuthenticated()
+ const { user } = useAuth()
+ const { data: userData } = user()
- if (authStore.check && !authStore.user?.is_subscribed) {
- return navigateTo({ name: "pricing" })
+ if (isAuthenticated.value && !userData.value?.is_subscribed) {
+ throw createError({ statusCode: 403, statusMessage: 'Subscription required' })
}
})
diff --git a/client/nuxt.config.ts b/client/nuxt.config.ts
index a17164e92..44e96cf20 100644
--- a/client/nuxt.config.ts
+++ b/client/nuxt.config.ts
@@ -5,7 +5,7 @@ import sitemap from "./sitemap"
export default defineNuxtConfig({
loglevel: process.env.NUXT_LOG_LEVEL || 'info',
devtools: {enabled: true},
- css: ['~/scss/app.scss'],
+ css: ['~/css/app.css'],
modules: [
'@pinia/nuxt',
@@ -17,7 +17,7 @@ export default defineNuxtConfig({
'@nuxtjs/i18n',
'@nuxt/icon',
'@sentry/nuxt/module',
- ...(process.env.NUXT_PUBLIC_GTM_CODE ? ['@zadigetvoltaire/nuxt-gtm'] : []),
+ '@zadigetvoltaire/nuxt-gtm',
],
build: {
@@ -81,42 +81,43 @@ export default defineNuxtConfig({
id: process.env.NUXT_PUBLIC_GOOGLE_ANALYTICS_CODE,
},
+ ui: {
+ theme: {
+ colors: [
+ 'primary',
+ 'secondary',
+ 'success',
+ 'error',
+ 'warning',
+ 'info',
+ 'neutral',
+ 'form'
+ ]
+ }
+ },
+
components: [
{
- path: '~/components/forms',
+ path: '~/components/forms/core',
pathPrefix: false,
global: true,
},
{
- path: '~/components/global',
+ path: '~/components/forms/heavy',
pathPrefix: false,
+ global: false,
},
{
- path: '~/components/forms',
+ path: '~/components/global',
pathPrefix: false,
- global: true
},
{
path: '~/components/pages',
pathPrefix: false,
},
- {
- path: '~/components/open/integrations',
- pathPrefix: false,
- global: true,
- },
- {
- path: '~/components/settings',
- pathPrefix: false,
- global: true,
- },
'~/components',
],
- tailwindcss: {
- cssPath: '~/scss/app.scss'
- },
-
colorMode: {
preference: 'light',
fallback: 'light',
diff --git a/client/package-lock.json b/client/package-lock.json
index 24a974e4c..f84fc6367 100644
--- a/client/package-lock.json
+++ b/client/package-lock.json
@@ -9,18 +9,23 @@
"dependencies": {
"@codemirror/lang-html": "^6.4.9",
"@iconify-json/material-symbols": "^1.2.4",
- "@nuxt/ui": "^2.19.2",
+ "@nuxt/ui": "^3.2.0",
"@pinia/nuxt": "^0.11.0",
"@popperjs/core": "^2.11.8",
"@sentry/nuxt": "^9.8.0",
"@sentry/vite-plugin": "^3.2.2",
"@sentry/vue": "^9.8.0",
"@stripe/stripe-js": "^5.5.0",
+ "@tailwindcss/postcss": "^4.1.10",
+ "@tanstack/query-devtools": "^5.81.2",
+ "@tanstack/vue-query": "^5.81.5",
+ "@tanstack/vue-query-devtools": "^5.81.5",
"@vueuse/components": "^11.2.0",
"@vueuse/core": "^13.1.0",
"@vueuse/integrations": "^11.2.0",
"@vueuse/motion": "^2.2.6",
"@vueuse/nuxt": "^11.2.0",
+ "@vueuse/router": "^13.4.0",
"@zadigetvoltaire/nuxt-gtm": "^0.0.13",
"@zxing/library": "^0.21.3",
"amplitude-js": "^8.21.9",
@@ -41,6 +46,7 @@
"query-builder-vue-3": "^1.0.1",
"quill": "^2.0.2",
"tailwind-merge": "^2.5.4",
+ "tailwindcss": "^4.1.10",
"tinymotion": "^0.2.0",
"v-calendar": "3.0.1",
"vue-chartjs": "^5.3.2",
@@ -56,6 +62,7 @@
},
"devDependencies": {
"@iconify-json/clarity": "^1.2.1",
+ "@iconify-json/heroicons": "^1.2.2",
"@iconify-json/ic": "^1.2.1",
"@iconify-json/octicon": "^1.2.1",
"@iconify-json/tabler": "^1.2.1",
@@ -70,7 +77,7 @@
"eslint-plugin-vue": "^10.1.0",
"nuxt": "^3.17.1",
"nuxt-utm": "^0.2.2",
- "postcss": "^8.4.47",
+ "postcss": "^8.5.6",
"prettier": "^3.3.3",
"sass": "^1.80.2",
"vue": "^3.5.13",
@@ -186,30 +193,30 @@
}
},
"node_modules/@babel/compat-data": {
- "version": "7.27.2",
- "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.27.2.tgz",
- "integrity": "sha512-TUtMJYRPyUb/9aU8f3K0mjmjf6M9N5Woshn2CS6nqJSeJtTtQcpLUXjGt9vbF8ZGff0El99sWkLgzwW3VXnxZQ==",
+ "version": "7.28.0",
+ "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.28.0.tgz",
+ "integrity": "sha512-60X7qkglvrap8mn1lh2ebxXdZYtUcpd7gsmy9kLaBJ4i/WdY8PqTSdxyA8qraikqKQK5C1KRBKXqznrVapyNaw==",
"license": "MIT",
"engines": {
"node": ">=6.9.0"
}
},
"node_modules/@babel/core": {
- "version": "7.27.1",
- "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.27.1.tgz",
- "integrity": "sha512-IaaGWsQqfsQWVLqMn9OB92MNN7zukfVA4s7KKAI0KfrrDsZ0yhi5uV4baBuLuN7n3vsZpwP8asPPcVwApxvjBQ==",
+ "version": "7.28.0",
+ "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.28.0.tgz",
+ "integrity": "sha512-UlLAnTPrFdNGoFtbSXwcGFQBtQZJCNjaN6hQNP3UPvuNXT1i82N26KL3dZeIpNalWywr9IuQuncaAfUaS1g6sQ==",
"license": "MIT",
"dependencies": {
"@ampproject/remapping": "^2.2.0",
"@babel/code-frame": "^7.27.1",
- "@babel/generator": "^7.27.1",
- "@babel/helper-compilation-targets": "^7.27.1",
- "@babel/helper-module-transforms": "^7.27.1",
- "@babel/helpers": "^7.27.1",
- "@babel/parser": "^7.27.1",
- "@babel/template": "^7.27.1",
- "@babel/traverse": "^7.27.1",
- "@babel/types": "^7.27.1",
+ "@babel/generator": "^7.28.0",
+ "@babel/helper-compilation-targets": "^7.27.2",
+ "@babel/helper-module-transforms": "^7.27.3",
+ "@babel/helpers": "^7.27.6",
+ "@babel/parser": "^7.28.0",
+ "@babel/template": "^7.27.2",
+ "@babel/traverse": "^7.28.0",
+ "@babel/types": "^7.28.0",
"convert-source-map": "^2.0.0",
"debug": "^4.1.0",
"gensync": "^1.0.0-beta.2",
@@ -234,15 +241,15 @@
}
},
"node_modules/@babel/generator": {
- "version": "7.27.1",
- "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.27.1.tgz",
- "integrity": "sha512-UnJfnIpc/+JO0/+KRVQNGU+y5taA5vCbwN8+azkX6beii/ZF+enZJSOKo11ZSzGJjlNfJHfQtmQT8H+9TXPG2w==",
+ "version": "7.28.0",
+ "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.28.0.tgz",
+ "integrity": "sha512-lJjzvrbEeWrhB4P3QBsH7tey117PjLZnDbLiQEKjQ/fNJTjuq4HSqgFA+UNSwZT8D7dxxbnuSBMsa1lrWzKlQg==",
"license": "MIT",
"dependencies": {
- "@babel/parser": "^7.27.1",
- "@babel/types": "^7.27.1",
- "@jridgewell/gen-mapping": "^0.3.5",
- "@jridgewell/trace-mapping": "^0.3.25",
+ "@babel/parser": "^7.28.0",
+ "@babel/types": "^7.28.0",
+ "@jridgewell/gen-mapping": "^0.3.12",
+ "@jridgewell/trace-mapping": "^0.3.28",
"jsesc": "^3.0.2"
},
"engines": {
@@ -250,12 +257,12 @@
}
},
"node_modules/@babel/helper-annotate-as-pure": {
- "version": "7.27.1",
- "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.27.1.tgz",
- "integrity": "sha512-WnuuDILl9oOBbKnb4L+DyODx7iC47XfzmNCpTttFsSp6hTG7XZxu60+4IO+2/hPfcGOoKbFiwoI/+zwARbNQow==",
+ "version": "7.27.3",
+ "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.27.3.tgz",
+ "integrity": "sha512-fXSwMQqitTGeHLBC08Eq5yXz2m37E4pJX1qAU1+2cNedz/ifv/bVXft90VeSav5nFO61EcNgwr0aJxbyPaWBPg==",
"license": "MIT",
"dependencies": {
- "@babel/types": "^7.27.1"
+ "@babel/types": "^7.27.3"
},
"engines": {
"node": ">=6.9.0"
@@ -316,6 +323,15 @@
"semver": "bin/semver.js"
}
},
+ "node_modules/@babel/helper-globals": {
+ "version": "7.28.0",
+ "resolved": "https://registry.npmjs.org/@babel/helper-globals/-/helper-globals-7.28.0.tgz",
+ "integrity": "sha512-+W6cISkXFa1jXsDEdYA8HeevQT/FULhxzR99pxphltZcVaugps53THCeiWA8SguxxpSp3gKPiuYfSWopkLQ4hw==",
+ "license": "MIT",
+ "engines": {
+ "node": ">=6.9.0"
+ }
+ },
"node_modules/@babel/helper-member-expression-to-functions": {
"version": "7.27.1",
"resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.27.1.tgz",
@@ -343,14 +359,14 @@
}
},
"node_modules/@babel/helper-module-transforms": {
- "version": "7.27.1",
- "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.27.1.tgz",
- "integrity": "sha512-9yHn519/8KvTU5BjTVEEeIM3w9/2yXNKoD82JifINImhpKkARMJKPP59kLo+BafpdN5zgNeIcS4jsGDmd3l58g==",
+ "version": "7.27.3",
+ "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.27.3.tgz",
+ "integrity": "sha512-dSOvYwvyLsWBeIRyOeHXp5vPj5l1I011r52FM1+r1jCERv+aFXYk4whgQccYEGYxK2H3ZAIA8nuPkQ0HaUo3qg==",
"license": "MIT",
"dependencies": {
"@babel/helper-module-imports": "^7.27.1",
"@babel/helper-validator-identifier": "^7.27.1",
- "@babel/traverse": "^7.27.1"
+ "@babel/traverse": "^7.27.3"
},
"engines": {
"node": ">=6.9.0"
@@ -438,25 +454,25 @@
}
},
"node_modules/@babel/helpers": {
- "version": "7.27.1",
- "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.27.1.tgz",
- "integrity": "sha512-FCvFTm0sWV8Fxhpp2McP5/W53GPllQ9QeQ7SiqGWjMf/LVG07lFa5+pgK05IRhVwtvafT22KF+ZSnM9I545CvQ==",
+ "version": "7.27.6",
+ "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.27.6.tgz",
+ "integrity": "sha512-muE8Tt8M22638HU31A3CgfSUciwz1fhATfoVai05aPXGor//CdWDCbnlY1yvBPo07njuVOCNGCSp/GTt12lIug==",
"license": "MIT",
"dependencies": {
- "@babel/template": "^7.27.1",
- "@babel/types": "^7.27.1"
+ "@babel/template": "^7.27.2",
+ "@babel/types": "^7.27.6"
},
"engines": {
"node": ">=6.9.0"
}
},
"node_modules/@babel/parser": {
- "version": "7.27.2",
- "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.27.2.tgz",
- "integrity": "sha512-QYLs8299NA7WM/bZAdp+CviYYkVoYXlDW2rzliy3chxd1PQjej7JORuMJDJXJUb9g0TT+B99EwaVLKmX+sPXWw==",
+ "version": "7.28.0",
+ "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.28.0.tgz",
+ "integrity": "sha512-jVZGvOxOuNSsuQuLRTh13nU0AogFlw32w/MT+LV6D3sP5WdbW61E77RnkbaO2dUvmPAYrBDJXGn5gGS6tH4j8g==",
"license": "MIT",
"dependencies": {
- "@babel/types": "^7.27.1"
+ "@babel/types": "^7.28.0"
},
"bin": {
"parser": "bin/babel-parser.js"
@@ -496,12 +512,12 @@
}
},
"node_modules/@babel/plugin-transform-typescript": {
- "version": "7.27.1",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.27.1.tgz",
- "integrity": "sha512-Q5sT5+O4QUebHdbwKedFBEwRLb02zJ7r4A5Gg2hUoLuU3FjdMcyqcywqUrLCaDsFCxzokf7u9kuy7qz51YUuAg==",
+ "version": "7.28.0",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.28.0.tgz",
+ "integrity": "sha512-4AEiDEBPIZvLQaWlc9liCavE0xRM0dNca41WtBeM3jgFptfUOSG9z0uteLhq6+3rq+WB6jIvUwKDTpXEHPJ2Vg==",
"license": "MIT",
"dependencies": {
- "@babel/helper-annotate-as-pure": "^7.27.1",
+ "@babel/helper-annotate-as-pure": "^7.27.3",
"@babel/helper-create-class-features-plugin": "^7.27.1",
"@babel/helper-plugin-utils": "^7.27.1",
"@babel/helper-skip-transparent-expression-wrappers": "^7.27.1",
@@ -515,9 +531,9 @@
}
},
"node_modules/@babel/runtime": {
- "version": "7.27.1",
- "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.27.1.tgz",
- "integrity": "sha512-1x3D2xEk2fRo3PAhwQwu5UubzgiVWSXTBfWpVd2Mx2AzRqJuDJCsgaDVZ7HB5iGzDW1Hl1sWN2mFyKjmR9uAog==",
+ "version": "7.27.6",
+ "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.27.6.tgz",
+ "integrity": "sha512-vbavdySgbTTrmFE+EsiqUTzlOr5bzlnJtUv9PynGCAKvfQqjIXbvFdumPM/GxMDfyuGMJaJAU6TO4zc1Jf1i8Q==",
"license": "MIT",
"engines": {
"node": ">=6.9.0"
@@ -538,36 +554,27 @@
}
},
"node_modules/@babel/traverse": {
- "version": "7.27.1",
- "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.27.1.tgz",
- "integrity": "sha512-ZCYtZciz1IWJB4U61UPu4KEaqyfj+r5T1Q5mqPo+IBpcG9kHv30Z0aD8LXPgC1trYa6rK0orRyAhqUgk4MjmEg==",
+ "version": "7.28.0",
+ "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.28.0.tgz",
+ "integrity": "sha512-mGe7UK5wWyh0bKRfupsUchrQGqvDbZDbKJw+kcRGSmdHVYrv+ltd0pnpDTVpiTqnaBru9iEvA8pz8W46v0Amwg==",
"license": "MIT",
"dependencies": {
"@babel/code-frame": "^7.27.1",
- "@babel/generator": "^7.27.1",
- "@babel/parser": "^7.27.1",
- "@babel/template": "^7.27.1",
- "@babel/types": "^7.27.1",
- "debug": "^4.3.1",
- "globals": "^11.1.0"
+ "@babel/generator": "^7.28.0",
+ "@babel/helper-globals": "^7.28.0",
+ "@babel/parser": "^7.28.0",
+ "@babel/template": "^7.27.2",
+ "@babel/types": "^7.28.0",
+ "debug": "^4.3.1"
},
"engines": {
"node": ">=6.9.0"
}
},
- "node_modules/@babel/traverse/node_modules/globals": {
- "version": "11.12.0",
- "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
- "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
- "license": "MIT",
- "engines": {
- "node": ">=4"
- }
- },
"node_modules/@babel/types": {
- "version": "7.27.1",
- "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.27.1.tgz",
- "integrity": "sha512-+EzkxvLNfiUeKMgy/3luqfsCWFRXLb7U6wNQTk60tovuckwB15B191tJWvpp4HjiQWdJkCxO3Wbvc6jlk3Xb2Q==",
+ "version": "7.28.1",
+ "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.28.1.tgz",
+ "integrity": "sha512-x0LvFTekgSX+83TI28Y9wYPUfzrnl2aT5+5QLnO6v7mSJYtEEevuDRN0F0uSHRk1G1IWZC43o00Y0xDDrpBGPQ==",
"license": "MIT",
"dependencies": {
"@babel/helper-string-parser": "^7.27.1",
@@ -577,10 +584,27 @@
"node": ">=6.9.0"
}
},
+ "node_modules/@capsizecss/metrics": {
+ "version": "3.5.0",
+ "resolved": "https://registry.npmjs.org/@capsizecss/metrics/-/metrics-3.5.0.tgz",
+ "integrity": "sha512-Ju2I/Qn3c1OaU8FgeW4Tc22D4C9NwyVfKzNmzst59bvxBjPoLYNZMqFYn+HvCtn4MpXwiaDtCE8fNuQLpdi9yA==",
+ "license": "MIT"
+ },
+ "node_modules/@capsizecss/unpack": {
+ "version": "2.4.0",
+ "resolved": "https://registry.npmjs.org/@capsizecss/unpack/-/unpack-2.4.0.tgz",
+ "integrity": "sha512-GrSU71meACqcmIUxPYOJvGKF0yryjN/L1aCuE9DViCTJI7bfkjgYDPD1zbNDcINJwSSP6UaBZY9GAbYDO7re0Q==",
+ "license": "MIT",
+ "dependencies": {
+ "blob-to-buffer": "^1.2.8",
+ "cross-fetch": "^3.0.4",
+ "fontkit": "^2.0.2"
+ }
+ },
"node_modules/@clack/core": {
- "version": "0.4.2",
- "resolved": "https://registry.npmjs.org/@clack/core/-/core-0.4.2.tgz",
- "integrity": "sha512-NYQfcEy8MWIxrT5Fj8nIVchfRFA26yYKJcvBS7WlUIlw2OmQOY9DhGGXMovyI5J5PpxrCPGkgUi207EBrjpBvg==",
+ "version": "0.5.0",
+ "resolved": "https://registry.npmjs.org/@clack/core/-/core-0.5.0.tgz",
+ "integrity": "sha512-p3y0FIOwaYRUPRcMO7+dlmLh8PSRcrjuTndsiA0WAFbWES0mLZlrjVoBRZ9DzkPFJZG6KGkJmoEAY0ZcVWTkow==",
"dev": true,
"license": "MIT",
"dependencies": {
@@ -589,13 +613,13 @@
}
},
"node_modules/@clack/prompts": {
- "version": "0.10.1",
- "resolved": "https://registry.npmjs.org/@clack/prompts/-/prompts-0.10.1.tgz",
- "integrity": "sha512-Q0T02vx8ZM9XSv9/Yde0jTmmBQufZhPJfYAg2XrrrxWWaZgq1rr8nU8Hv710BQ1dhoP8rtY7YUdpGej2Qza/cw==",
+ "version": "0.11.0",
+ "resolved": "https://registry.npmjs.org/@clack/prompts/-/prompts-0.11.0.tgz",
+ "integrity": "sha512-pMN5FcrEw9hUkZA4f+zLlzivQSeQf5dRGJjSUbvVYDLvpKCdQx5OaknvKzgbtXOizhP+SJJJjqEbOe55uKKfAw==",
"dev": true,
"license": "MIT",
"dependencies": {
- "@clack/core": "0.4.2",
+ "@clack/core": "0.5.0",
"picocolors": "^1.0.0",
"sisteransi": "^1.0.5"
}
@@ -679,9 +703,9 @@
}
},
"node_modules/@codemirror/lang-javascript": {
- "version": "6.2.3",
- "resolved": "https://registry.npmjs.org/@codemirror/lang-javascript/-/lang-javascript-6.2.3.tgz",
- "integrity": "sha512-8PR3vIWg7pSu7ur8A07pGiYHgy3hHj+mRYRCSG8q+mPIrl0F02rgpGv+DsQTHRTc30rydOsf5PZ7yjKFg2Ackw==",
+ "version": "6.2.4",
+ "resolved": "https://registry.npmjs.org/@codemirror/lang-javascript/-/lang-javascript-6.2.4.tgz",
+ "integrity": "sha512-0WVmhp1QOqZ4Rt6GlVGwKJN3KW7Xh4H2q8ZZNGZaP6lRdxXJzmjm4FqvmOojVj6khWJHIb9sp7U/72W7xQgqAA==",
"license": "MIT",
"dependencies": {
"@codemirror/autocomplete": "^6.0.0",
@@ -694,9 +718,9 @@
}
},
"node_modules/@codemirror/language": {
- "version": "6.11.0",
- "resolved": "https://registry.npmjs.org/@codemirror/language/-/language-6.11.0.tgz",
- "integrity": "sha512-A7+f++LodNNc1wGgoRDTt78cOwWm9KVezApgjOMp1W4hM0898nsqBXwF+sbePE7ZRcjN7Sa1Z5m2oN27XkmEjQ==",
+ "version": "6.11.2",
+ "resolved": "https://registry.npmjs.org/@codemirror/language/-/language-6.11.2.tgz",
+ "integrity": "sha512-p44TsNArL4IVXDTbapUmEkAlvWs2CFQbcfc0ymDsis1kH2wh0gcY96AS29c/vp2d0y2Tquk1EDSaawpzilUiAw==",
"license": "MIT",
"dependencies": {
"@codemirror/state": "^6.0.0",
@@ -719,9 +743,9 @@
}
},
"node_modules/@codemirror/search": {
- "version": "6.5.10",
- "resolved": "https://registry.npmjs.org/@codemirror/search/-/search-6.5.10.tgz",
- "integrity": "sha512-RMdPdmsrUf53pb2VwflKGHEe1XVM07hI7vV2ntgw1dmqhimpatSJKva4VA9h4TLUDOD4EIF02201oZurpnEFsg==",
+ "version": "6.5.11",
+ "resolved": "https://registry.npmjs.org/@codemirror/search/-/search-6.5.11.tgz",
+ "integrity": "sha512-KmWepDE6jUdL6n8cAAqIpRmLPBZ5ZKnicE8oGU/s3QrAVID+0VhLFrzUucVKHG5035/BSykhExDL/Xm7dHthiA==",
"license": "MIT",
"dependencies": {
"@codemirror/state": "^6.0.0",
@@ -739,12 +763,13 @@
}
},
"node_modules/@codemirror/view": {
- "version": "6.36.7",
- "resolved": "https://registry.npmjs.org/@codemirror/view/-/view-6.36.7.tgz",
- "integrity": "sha512-kCWGW/chWGPgZqfZ36Um9Iz0X2IVpmCjg1P/qY6B6a2ecXtWRRAigmpJ6YgUQ5lTWXMyyVdfmpzhLZmsZQMbtg==",
+ "version": "6.38.1",
+ "resolved": "https://registry.npmjs.org/@codemirror/view/-/view-6.38.1.tgz",
+ "integrity": "sha512-RmTOkE7hRU3OVREqFVITWHz6ocgBjv08GoePscAakgVQfciA3SGCEk7mb9IzwW61cKKmlTpHXG6DUE5Ubx+MGQ==",
"license": "MIT",
"dependencies": {
"@codemirror/state": "^6.5.0",
+ "crelt": "^1.0.6",
"style-mod": "^4.1.0",
"w3c-keyname": "^2.2.4"
}
@@ -770,33 +795,33 @@
}
},
"node_modules/@dependents/detective-less": {
- "version": "4.1.0",
- "resolved": "https://registry.npmjs.org/@dependents/detective-less/-/detective-less-4.1.0.tgz",
- "integrity": "sha512-KrkT6qO5NxqNfy68sBl6CTSoJ4SNDIS5iQArkibhlbGU4LaDukZ3q2HIkh8aUKDio6o4itU4xDR7t82Y2eP1Bg==",
+ "version": "5.0.1",
+ "resolved": "https://registry.npmjs.org/@dependents/detective-less/-/detective-less-5.0.1.tgz",
+ "integrity": "sha512-Y6+WUMsTFWE5jb20IFP4YGa5IrGY/+a/FbOSjDF/wz9gepU2hwCYSXRHP/vPwBvwcY3SVMASt4yXxbXNXigmZQ==",
"license": "MIT",
"dependencies": {
"gonzales-pe": "^4.3.0",
- "node-source-walk": "^6.0.1"
+ "node-source-walk": "^7.0.1"
},
"engines": {
- "node": ">=14"
+ "node": ">=18"
}
},
"node_modules/@emnapi/core": {
- "version": "1.4.3",
- "resolved": "https://registry.npmjs.org/@emnapi/core/-/core-1.4.3.tgz",
- "integrity": "sha512-4m62DuCE07lw01soJwPiBGC0nAww0Q+RY70VZ+n49yDIO13yyinhbWCeNnaob0lakDtWQzSdtNWzJeOJt2ma+g==",
+ "version": "1.4.4",
+ "resolved": "https://registry.npmjs.org/@emnapi/core/-/core-1.4.4.tgz",
+ "integrity": "sha512-A9CnAbC6ARNMKcIcrQwq6HeHCjpcBZ5wSx4U01WXCqEKlrzB9F9315WDNHkrs2xbx7YjjSxbUYxuN6EQzpcY2g==",
"license": "MIT",
"optional": true,
"dependencies": {
- "@emnapi/wasi-threads": "1.0.2",
+ "@emnapi/wasi-threads": "1.0.3",
"tslib": "^2.4.0"
}
},
"node_modules/@emnapi/runtime": {
- "version": "1.4.3",
- "resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-1.4.3.tgz",
- "integrity": "sha512-pBPWdu6MLKROBX05wSNKcNb++m5Er+KQ9QkB+WVM+pW2Kx9hoSrVTnu3BdkI5eBLZoKu/J6mW/B6i6bJB2ytXQ==",
+ "version": "1.4.4",
+ "resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-1.4.4.tgz",
+ "integrity": "sha512-hHyapA4A3gPaDCNfiqyZUStTMqIkKRshqPIuDOXv1hcBnD4U3l8cP0T1HMCfGRxQ6V64TGCcoswChANyOAwbQg==",
"license": "MIT",
"optional": true,
"dependencies": {
@@ -804,9 +829,9 @@
}
},
"node_modules/@emnapi/wasi-threads": {
- "version": "1.0.2",
- "resolved": "https://registry.npmjs.org/@emnapi/wasi-threads/-/wasi-threads-1.0.2.tgz",
- "integrity": "sha512-5n3nTJblwRi8LlXkJ9eBzu+kZR8Yxcc7ubakyQTFzPMtIhFpUBRbsnc2Dv88IZDIbCDlBiWrknhB4Lsz7mg6BA==",
+ "version": "1.0.3",
+ "resolved": "https://registry.npmjs.org/@emnapi/wasi-threads/-/wasi-threads-1.0.3.tgz",
+ "integrity": "sha512-8K5IFFsQqF9wQNJptGbS6FNKgUTsSRYnTqNCG1vPP8jFdjSv18n2mQfJpkt2Oibo9iBEzcDnDxNwKTzC7svlJw==",
"license": "MIT",
"optional": true,
"dependencies": {
@@ -814,18 +839,20 @@
}
},
"node_modules/@es-joy/jsdoccomment": {
- "version": "0.49.0",
- "resolved": "https://registry.npmjs.org/@es-joy/jsdoccomment/-/jsdoccomment-0.49.0.tgz",
- "integrity": "sha512-xjZTSFgECpb9Ohuk5yMX5RhUEbfeQcuOp8IF60e+wyzWEF0M5xeSgqsfLtvPEX8BIyOX9saZqzuGPmZ8oWc+5Q==",
+ "version": "0.52.0",
+ "resolved": "https://registry.npmjs.org/@es-joy/jsdoccomment/-/jsdoccomment-0.52.0.tgz",
+ "integrity": "sha512-BXuN7BII+8AyNtn57euU2Yxo9yA/KUDNzrpXyi3pfqKmBhhysR6ZWOebFh3vyPoqA3/j1SOvGgucElMGwlXing==",
"dev": true,
"license": "MIT",
"dependencies": {
+ "@types/estree": "^1.0.8",
+ "@typescript-eslint/types": "^8.34.1",
"comment-parser": "1.4.1",
"esquery": "^1.6.0",
"jsdoc-type-pratt-parser": "~4.1.0"
},
"engines": {
- "node": ">=16"
+ "node": ">=20.11.0"
}
},
"node_modules/@esbuild/aix-ppc64": {
@@ -1101,9 +1128,9 @@
}
},
"node_modules/@esbuild/netbsd-arm64": {
- "version": "0.25.4",
- "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.25.4.tgz",
- "integrity": "sha512-vUnkBYxZW4hL/ie91hSqaSNjulOnYXE1VSLusnvHg2u3jewJBz3YzB9+oCw8DABeVqZGg94t9tyZFoHma8gWZQ==",
+ "version": "0.25.5",
+ "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.25.5.tgz",
+ "integrity": "sha512-pwHtMP9viAy1oHPvgxtOv+OkduK5ugofNTVDilIzBLpoWAM16r7b/mxBvfpuQDpRQFMfuVr5aLcn4yveGvBZvw==",
"cpu": [
"arm64"
],
@@ -1164,6 +1191,22 @@
"node": ">=18"
}
},
+ "node_modules/@esbuild/openharmony-arm64": {
+ "version": "0.25.6",
+ "resolved": "https://registry.npmjs.org/@esbuild/openharmony-arm64/-/openharmony-arm64-0.25.6.tgz",
+ "integrity": "sha512-+SqBcAWoB1fYKmpWoQP4pGtx+pUUC//RNYhFdbcSA16617cchuryuhOCRpPsjCblKukAckWsV+aQ3UKT/RMPcA==",
+ "cpu": [
+ "arm64"
+ ],
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "openharmony"
+ ],
+ "engines": {
+ "node": ">=18"
+ }
+ },
"node_modules/@esbuild/sunos-x64": {
"version": "0.23.1",
"resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.23.1.tgz",
@@ -1258,16 +1301,16 @@
}
},
"node_modules/@eslint/compat": {
- "version": "1.2.9",
- "resolved": "https://registry.npmjs.org/@eslint/compat/-/compat-1.2.9.tgz",
- "integrity": "sha512-gCdSY54n7k+driCadyMNv8JSPzYLeDVM/ikZRtvtROBpRdFSkS8W9A82MqsaY7lZuwL0wiapgD0NT1xT0hyJsA==",
+ "version": "1.3.1",
+ "resolved": "https://registry.npmjs.org/@eslint/compat/-/compat-1.3.1.tgz",
+ "integrity": "sha512-k8MHony59I5EPic6EQTCNOuPoVBnoYXkP+20xvwFjN7t0qI3ImyvyBgg+hIVPwC8JaxVjjUZld+cLfBLFDLucg==",
"dev": true,
"license": "Apache-2.0",
"engines": {
"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
},
"peerDependencies": {
- "eslint": "^9.10.0"
+ "eslint": "^8.40 || 9"
},
"peerDependenciesMeta": {
"eslint": {
@@ -1276,9 +1319,9 @@
}
},
"node_modules/@eslint/config-array": {
- "version": "0.20.0",
- "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.20.0.tgz",
- "integrity": "sha512-fxlS1kkIjx8+vy2SjuCB94q3htSNrufYTXubwiBFeaQHbH6Ipi43gFJq2zCMt6PHhImH3Xmr0NksKDvchWlpQQ==",
+ "version": "0.21.0",
+ "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.21.0.tgz",
+ "integrity": "sha512-ENIdc4iLu0d93HeYirvKmrzshzofPw6VkZRKQGe9Nv46ZnWUzcF1xV01dcvEg/1wXUR61OmmlSfyeyO7EvjLxQ==",
"devOptional": true,
"license": "Apache-2.0",
"dependencies": {
@@ -1291,9 +1334,9 @@
}
},
"node_modules/@eslint/config-array/node_modules/brace-expansion": {
- "version": "1.1.11",
- "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
- "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+ "version": "1.1.12",
+ "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz",
+ "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==",
"devOptional": true,
"license": "MIT",
"dependencies": {
@@ -1315,9 +1358,9 @@
}
},
"node_modules/@eslint/config-helpers": {
- "version": "0.2.2",
- "resolved": "https://registry.npmjs.org/@eslint/config-helpers/-/config-helpers-0.2.2.tgz",
- "integrity": "sha512-+GPzk8PlG0sPpzdU5ZvIRMPidzAnZDl/s9L+y13iodqvb8leL53bTannOrQ/Im7UkpsmFU5Ily5U60LWixnmLg==",
+ "version": "0.3.0",
+ "resolved": "https://registry.npmjs.org/@eslint/config-helpers/-/config-helpers-0.3.0.tgz",
+ "integrity": "sha512-ViuymvFmcJi04qdZeDc2whTHryouGcDlaxPqarTD0ZE10ISpxGUVZGZDx4w01upyIynL3iu6IXH2bS1NhclQMw==",
"devOptional": true,
"license": "Apache-2.0",
"engines": {
@@ -1325,9 +1368,9 @@
}
},
"node_modules/@eslint/core": {
- "version": "0.13.0",
- "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.13.0.tgz",
- "integrity": "sha512-yfkgDw1KR66rkT5A8ci4irzDysN7FRpq3ttJolR88OqQikAWqwA8j5VZyas+vjyBNFIJ7MfybJ9plMILI2UrCw==",
+ "version": "0.15.1",
+ "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.15.1.tgz",
+ "integrity": "sha512-bkOp+iumZCCbt1K1CmWf0R9pM5yKpDv+ZXtvSyQpudrI9kuFLp+bM2WOPXImuD/ceQuaa8f5pj93Y7zyECIGNA==",
"devOptional": true,
"license": "Apache-2.0",
"dependencies": {
@@ -1362,9 +1405,9 @@
}
},
"node_modules/@eslint/eslintrc/node_modules/brace-expansion": {
- "version": "1.1.11",
- "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
- "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+ "version": "1.1.12",
+ "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz",
+ "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==",
"devOptional": true,
"license": "MIT",
"dependencies": {
@@ -1409,13 +1452,16 @@
}
},
"node_modules/@eslint/js": {
- "version": "9.26.0",
- "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.26.0.tgz",
- "integrity": "sha512-I9XlJawFdSMvWjDt6wksMCrgns5ggLNfFwFvnShsleWruvXM514Qxk8V246efTw+eo9JABvVz+u3q2RiAowKxQ==",
+ "version": "9.31.0",
+ "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.31.0.tgz",
+ "integrity": "sha512-LOm5OVt7D4qiKCqoiPbA7LWmI+tbw1VbTUowBcUMgQSuM6poJufkFkYDcQpo5KfgD39TnNySV26QjOh7VFpSyw==",
"devOptional": true,
"license": "MIT",
"engines": {
"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+ },
+ "funding": {
+ "url": "https://eslint.org/donate"
}
},
"node_modules/@eslint/object-schema": {
@@ -1429,13 +1475,13 @@
}
},
"node_modules/@eslint/plugin-kit": {
- "version": "0.2.8",
- "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.2.8.tgz",
- "integrity": "sha512-ZAoA40rNMPwSm+AeHpCq8STiNAwzWLJuP8Xv4CHIc9wv/PSuExjMrmjfYNj682vW0OOiZ1HKxzvjQr9XZIisQA==",
+ "version": "0.3.3",
+ "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.3.3.tgz",
+ "integrity": "sha512-1+WqvgNMhmlAambTvT3KPtCl/Ibr68VldY2XY40SL1CE0ZXiakFR/cbTspaF5HsnpDMvcYYoJHfl4980NBjGag==",
"devOptional": true,
"license": "Apache-2.0",
"dependencies": {
- "@eslint/core": "^0.13.0",
+ "@eslint/core": "^0.15.1",
"levn": "^0.4.1"
},
"engines": {
@@ -1448,6 +1494,68 @@
"integrity": "sha512-5DGmA8FTdB2XbDeEwc/5ZXBl6UbBAyBOOLlPuBnZ/N1SwdH9Ii+cOX3tBROlDgcTXxjOYnLMVoKk9+FXAw0CJw==",
"license": "MIT"
},
+ "node_modules/@floating-ui/core": {
+ "version": "1.7.2",
+ "resolved": "https://registry.npmjs.org/@floating-ui/core/-/core-1.7.2.tgz",
+ "integrity": "sha512-wNB5ooIKHQc+Kui96jE/n69rHFWAVoxn5CAzL1Xdd8FG03cgY3MLO+GF9U3W737fYDSgPWA6MReKhBQBop6Pcw==",
+ "license": "MIT",
+ "dependencies": {
+ "@floating-ui/utils": "^0.2.10"
+ }
+ },
+ "node_modules/@floating-ui/dom": {
+ "version": "1.7.2",
+ "resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.7.2.tgz",
+ "integrity": "sha512-7cfaOQuCS27HD7DX+6ib2OrnW+b4ZBwDNnCcT0uTyidcmyWb03FnQqJybDBoCnpdxwBSfA94UAYlRCt7mV+TbA==",
+ "license": "MIT",
+ "dependencies": {
+ "@floating-ui/core": "^1.7.2",
+ "@floating-ui/utils": "^0.2.10"
+ }
+ },
+ "node_modules/@floating-ui/utils": {
+ "version": "0.2.10",
+ "resolved": "https://registry.npmjs.org/@floating-ui/utils/-/utils-0.2.10.tgz",
+ "integrity": "sha512-aGTxbpbg8/b5JfU1HXSrbH3wXZuLPJcNEcZQFMxLs3oSzgtVu6nFPkbbGGUvBcUjKV2YyB9Wxxabo+HEH9tcRQ==",
+ "license": "MIT"
+ },
+ "node_modules/@floating-ui/vue": {
+ "version": "1.1.7",
+ "resolved": "https://registry.npmjs.org/@floating-ui/vue/-/vue-1.1.7.tgz",
+ "integrity": "sha512-idmAtbAIigGXN2SI5gItiXYBYtNfDTP9yIiObxgu13dgtG7ARCHlNfnR29GxP4LI4o13oiwsJ8wVgghj1lNqcw==",
+ "license": "MIT",
+ "dependencies": {
+ "@floating-ui/dom": "^1.7.2",
+ "@floating-ui/utils": "^0.2.10",
+ "vue-demi": ">=0.13.0"
+ }
+ },
+ "node_modules/@floating-ui/vue/node_modules/vue-demi": {
+ "version": "0.14.10",
+ "resolved": "https://registry.npmjs.org/vue-demi/-/vue-demi-0.14.10.tgz",
+ "integrity": "sha512-nMZBOwuzabUO0nLgIcc6rycZEebF6eeUfaiQx9+WSk8e29IbLvPU9feI6tqW4kTo3hvoYAJkMh8n8D0fuISphg==",
+ "hasInstallScript": true,
+ "license": "MIT",
+ "bin": {
+ "vue-demi-fix": "bin/vue-demi-fix.js",
+ "vue-demi-switch": "bin/vue-demi-switch.js"
+ },
+ "engines": {
+ "node": ">=12"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/antfu"
+ },
+ "peerDependencies": {
+ "@vue/composition-api": "^1.0.0-rc.1",
+ "vue": "^3.0.0-0 || ^2.6.0"
+ },
+ "peerDependenciesMeta": {
+ "@vue/composition-api": {
+ "optional": true
+ }
+ }
+ },
"node_modules/@gtm-support/core": {
"version": "2.3.1",
"resolved": "https://registry.npmjs.org/@gtm-support/core/-/core-2.3.1.tgz",
@@ -1474,33 +1582,6 @@
}
}
},
- "node_modules/@headlessui/tailwindcss": {
- "version": "0.2.2",
- "resolved": "https://registry.npmjs.org/@headlessui/tailwindcss/-/tailwindcss-0.2.2.tgz",
- "integrity": "sha512-xNe42KjdyA4kfUKLLPGzME9zkH7Q3rOZ5huFihWNWOQFxnItxPB3/67yBI8/qBfY8nwBRx5GHn4VprsoluVMGw==",
- "license": "MIT",
- "engines": {
- "node": ">=10"
- },
- "peerDependencies": {
- "tailwindcss": "^3.0 || ^4.0"
- }
- },
- "node_modules/@headlessui/vue": {
- "version": "1.7.23",
- "resolved": "https://registry.npmjs.org/@headlessui/vue/-/vue-1.7.23.tgz",
- "integrity": "sha512-JzdCNqurrtuu0YW6QaDtR2PIYCKPUWq28csDyMvN4zmGccmE7lz40Is6hc3LA4HFeCI7sekZ/PQMTNmn9I/4Wg==",
- "license": "MIT",
- "dependencies": {
- "@tanstack/vue-virtual": "^3.0.0-beta.60"
- },
- "engines": {
- "node": ">=10"
- },
- "peerDependencies": {
- "vue": "^3.2.0"
- }
- },
"node_modules/@humanfs/core": {
"version": "0.19.1",
"resolved": "https://registry.npmjs.org/@humanfs/core/-/core-0.19.1.tgz",
@@ -1554,9 +1635,9 @@
}
},
"node_modules/@humanwhocodes/retry": {
- "version": "0.4.2",
- "resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.4.2.tgz",
- "integrity": "sha512-xeO57FpIu4p1Ri3Jq/EXq4ClRm86dVF2z/+kvFnyqVYRavTZmaFaUBbWCOuuTh0o/g7DSsk6kc2vrS4Vl5oPOQ==",
+ "version": "0.4.3",
+ "resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.4.3.tgz",
+ "integrity": "sha512-bV0Tgo9K4hfPCek+aMAn81RppFKv2ySDQeMoSZuvTASywNTnVJCArCZE2FWqpvIatKu7VMRLWlR1EazvVhDyhQ==",
"devOptional": true,
"license": "Apache-2.0",
"engines": {
@@ -1581,6 +1662,7 @@
"version": "1.2.2",
"resolved": "https://registry.npmjs.org/@iconify-json/heroicons/-/heroicons-1.2.2.tgz",
"integrity": "sha512-qoW4pXr5kTTL6juEjgTs83OJIwpePu7q1tdtKVEdj+i0zyyVHgg/dd9grsXJQnpTpBt6/VwNjrXBvFjRsKPENg==",
+ "dev": true,
"license": "MIT",
"dependencies": {
"@iconify/types": "*"
@@ -1597,18 +1679,18 @@
}
},
"node_modules/@iconify-json/material-symbols": {
- "version": "1.2.20",
- "resolved": "https://registry.npmjs.org/@iconify-json/material-symbols/-/material-symbols-1.2.20.tgz",
- "integrity": "sha512-+KqOT+3fD+LC2FbWiV8gd4+JLMiVUtmqrjzpKN1ji7rfMQTwvYJ94RT0WQlmL+vfDNJ5MTRe3rBzzJyvIH/aSg==",
+ "version": "1.2.29",
+ "resolved": "https://registry.npmjs.org/@iconify-json/material-symbols/-/material-symbols-1.2.29.tgz",
+ "integrity": "sha512-UUSrsl0gHF0GjAB9eZOpXrj7/v55ayMzo3QnMwUqP/FSfSkITKLR7CsBmUIFS8eEj8eRTfBNWA1yiIJR6UOdWg==",
"license": "Apache-2.0",
"dependencies": {
"@iconify/types": "*"
}
},
"node_modules/@iconify-json/octicon": {
- "version": "1.2.5",
- "resolved": "https://registry.npmjs.org/@iconify-json/octicon/-/octicon-1.2.5.tgz",
- "integrity": "sha512-FVFjjmAC1R1Feis9k+COO3WvL3yumk0E7RxNvOEGT9K8CDp05k3Qg2lLlynBzZrSfuT1DhReJUUXFAj60ZHkpA==",
+ "version": "1.2.7",
+ "resolved": "https://registry.npmjs.org/@iconify-json/octicon/-/octicon-1.2.7.tgz",
+ "integrity": "sha512-o1WcVH2Uus6PlMOZkBOpmWywAoHDJBsHx/3cH/D/FZPB1OLNG7N9o+xI67iqlc7/5vKMeW22jI/1iSgdEYdfBw==",
"dev": true,
"license": "MIT",
"dependencies": {
@@ -1616,18 +1698,19 @@
}
},
"node_modules/@iconify-json/tabler": {
- "version": "1.2.18",
- "resolved": "https://registry.npmjs.org/@iconify-json/tabler/-/tabler-1.2.18.tgz",
- "integrity": "sha512-W+8qiJhJpb4dmBw3P7JSM9QhGsFG8GIS3BJWAmrJ/92rzK6NPGUOPfGmswoO+/MuPzQV96ColY9lcUktUKv0pg==",
+ "version": "1.2.19",
+ "resolved": "https://registry.npmjs.org/@iconify-json/tabler/-/tabler-1.2.19.tgz",
+ "integrity": "sha512-JDeQTQxHD8KE12pAbPVHX1WFVOPq8D0XfRb/LwYHwGwYE0HP9OIjJ//TKxS1Gt++RirYu6Xsx+Jm5LA5KbykoA==",
"dev": true,
+ "license": "MIT",
"dependencies": {
"@iconify/types": "*"
}
},
"node_modules/@iconify/collections": {
- "version": "1.0.546",
- "resolved": "https://registry.npmjs.org/@iconify/collections/-/collections-1.0.546.tgz",
- "integrity": "sha512-ftDzfvN+9lX0zNeKrgunE2HmWGfek7hKJJC6R16pc/JU7Wv0uibJ6MS2cRlmrjUFvtl0Kl2c2wbZZGRgFmKvTg==",
+ "version": "1.0.569",
+ "resolved": "https://registry.npmjs.org/@iconify/collections/-/collections-1.0.569.tgz",
+ "integrity": "sha512-PclOVcAlvv55Fv5kRJmxk/KMoFLNBMLh0q9LDMlonIPJMUu958VsNw7F7CVurfyEbCf/54i7eF+q6LHqJxeQvg==",
"license": "MIT",
"dependencies": {
"@iconify/types": "*"
@@ -1668,9 +1751,9 @@
}
},
"node_modules/@iconify/vue": {
- "version": "4.3.0",
- "resolved": "https://registry.npmjs.org/@iconify/vue/-/vue-4.3.0.tgz",
- "integrity": "sha512-Xq0h6zMrHBbrW8jXJ9fISi+x8oDQllg5hTDkDuxnWiskJ63rpJu9CvJshj8VniHVTbsxCg9fVoPAaNp3RQI5OQ==",
+ "version": "5.0.0",
+ "resolved": "https://registry.npmjs.org/@iconify/vue/-/vue-5.0.0.tgz",
+ "integrity": "sha512-C+KuEWIF5nSBrobFJhT//JS87OZ++QDORB6f2q2Wm6fl2mueSTpFBeBsveK0KW9hWiZ4mNiPjsh6Zs4jjdROSg==",
"license": "MIT",
"dependencies": {
"@iconify/types": "^2.0.0"
@@ -1682,6 +1765,24 @@
"vue": ">=3"
}
},
+ "node_modules/@internationalized/date": {
+ "version": "3.8.2",
+ "resolved": "https://registry.npmjs.org/@internationalized/date/-/date-3.8.2.tgz",
+ "integrity": "sha512-/wENk7CbvLbkUvX1tu0mwq49CVkkWpkXubGel6birjRPyo6uQ4nQpnq5xZu823zRCwwn82zgHrvgF1vZyvmVgA==",
+ "license": "Apache-2.0",
+ "dependencies": {
+ "@swc/helpers": "^0.5.0"
+ }
+ },
+ "node_modules/@internationalized/number": {
+ "version": "3.6.3",
+ "resolved": "https://registry.npmjs.org/@internationalized/number/-/number-3.6.3.tgz",
+ "integrity": "sha512-p+Zh1sb6EfrfVaS86jlHGQ9HA66fJhV9x5LiE5vCbZtXEHAuhcmUZUdZ4WrFpUBfNalr2OkAJI5AcKEQF+Lebw==",
+ "license": "Apache-2.0",
+ "dependencies": {
+ "@swc/helpers": "^0.5.0"
+ }
+ },
"node_modules/@intlify/bundle-utils": {
"version": "10.0.1",
"resolved": "https://registry.npmjs.org/@intlify/bundle-utils/-/bundle-utils-10.0.1.tgz",
@@ -1712,13 +1813,13 @@
}
},
"node_modules/@intlify/bundle-utils/node_modules/@intlify/message-compiler": {
- "version": "11.1.3",
- "resolved": "https://registry.npmjs.org/@intlify/message-compiler/-/message-compiler-11.1.3.tgz",
- "integrity": "sha512-7rbqqpo2f5+tIcwZTAG/Ooy9C8NDVwfDkvSeDPWUPQW+Dyzfw2o9H103N5lKBxO7wxX9dgCDjQ8Umz73uYw3hw==",
+ "version": "11.1.9",
+ "resolved": "https://registry.npmjs.org/@intlify/message-compiler/-/message-compiler-11.1.9.tgz",
+ "integrity": "sha512-84SNs3Ikjg0rD1bOuchzb3iK1vR2/8nxrkyccIl5DjFTeMzE/Fxv6X+A7RN5ZXjEWelc1p5D4kHA6HEOhlKL5Q==",
"dev": true,
"license": "MIT",
"dependencies": {
- "@intlify/shared": "11.1.3",
+ "@intlify/shared": "11.1.9",
"source-map-js": "^1.0.2"
},
"engines": {
@@ -1729,9 +1830,9 @@
}
},
"node_modules/@intlify/bundle-utils/node_modules/@intlify/shared": {
- "version": "11.1.3",
- "resolved": "https://registry.npmjs.org/@intlify/shared/-/shared-11.1.3.tgz",
- "integrity": "sha512-pTFBgqa/99JRA2H1qfyqv97MKWJrYngXBA/I0elZcYxvJgcCw3mApAoPW3mJ7vx3j+Ti0FyKUFZ4hWxdjKaxvA==",
+ "version": "11.1.9",
+ "resolved": "https://registry.npmjs.org/@intlify/shared/-/shared-11.1.9.tgz",
+ "integrity": "sha512-H/83xgU1l8ox+qG305p6ucmoy93qyjIPnvxGWRA7YdOoHe1tIiW9IlEu4lTdsOR7cfP1ecrwyflQSqXdXBacXA==",
"dev": true,
"license": "MIT",
"engines": {
@@ -1871,9 +1972,9 @@
}
},
"node_modules/@intlify/unplugin-vue-i18n/node_modules/@intlify/shared": {
- "version": "11.1.3",
- "resolved": "https://registry.npmjs.org/@intlify/shared/-/shared-11.1.3.tgz",
- "integrity": "sha512-pTFBgqa/99JRA2H1qfyqv97MKWJrYngXBA/I0elZcYxvJgcCw3mApAoPW3mJ7vx3j+Ti0FyKUFZ4hWxdjKaxvA==",
+ "version": "11.1.9",
+ "resolved": "https://registry.npmjs.org/@intlify/shared/-/shared-11.1.9.tgz",
+ "integrity": "sha512-H/83xgU1l8ox+qG305p6ucmoy93qyjIPnvxGWRA7YdOoHe1tIiW9IlEu4lTdsOR7cfP1ecrwyflQSqXdXBacXA==",
"dev": true,
"license": "MIT",
"engines": {
@@ -2065,17 +2166,13 @@
}
},
"node_modules/@jridgewell/gen-mapping": {
- "version": "0.3.8",
- "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.8.tgz",
- "integrity": "sha512-imAbBGkb+ebQyxKgzv5Hu2nmROxoDOXHh80evxdoXNOrvAnVx7zimzc1Oo5h9RlfV4vPXaE2iM5pOFbvOCClWA==",
+ "version": "0.3.12",
+ "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.12.tgz",
+ "integrity": "sha512-OuLGC46TjB5BbN1dH8JULVVZY4WTdkF7tV9Ys6wLL1rubZnCMstOhNHueU5bLCrnRuDhKPDM4g6sw4Bel5Gzqg==",
"license": "MIT",
"dependencies": {
- "@jridgewell/set-array": "^1.2.1",
- "@jridgewell/sourcemap-codec": "^1.4.10",
+ "@jridgewell/sourcemap-codec": "^1.5.0",
"@jridgewell/trace-mapping": "^0.3.24"
- },
- "engines": {
- "node": ">=6.0.0"
}
},
"node_modules/@jridgewell/resolve-uri": {
@@ -2087,19 +2184,10 @@
"node": ">=6.0.0"
}
},
- "node_modules/@jridgewell/set-array": {
- "version": "1.2.1",
- "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.2.1.tgz",
- "integrity": "sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==",
- "license": "MIT",
- "engines": {
- "node": ">=6.0.0"
- }
- },
"node_modules/@jridgewell/source-map": {
- "version": "0.3.6",
- "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.6.tgz",
- "integrity": "sha512-1ZJTZebgqllO79ue2bm3rIGud/bOe0pP5BjSRCRxxYkEZS8STV7zN84UBbiYu7jy+eCKSnVIUgoWWE/tt+shMQ==",
+ "version": "0.3.10",
+ "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.10.tgz",
+ "integrity": "sha512-0pPkgz9dY+bijgistcTTJ5mR+ocqRXLuhXHYdzoMmmoJ2C9S46RCm2GMUbatPEUK9Yjy26IrAy8D/M00lLkv+Q==",
"license": "MIT",
"dependencies": {
"@jridgewell/gen-mapping": "^0.3.5",
@@ -2107,43 +2195,21 @@
}
},
"node_modules/@jridgewell/sourcemap-codec": {
- "version": "1.5.0",
- "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz",
- "integrity": "sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==",
+ "version": "1.5.4",
+ "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.4.tgz",
+ "integrity": "sha512-VT2+G1VQs/9oz078bLrYbecdZKs912zQlkelYpuf+SXF+QvZDYJlbx/LSx+meSAwdDFnF8FVXW92AVjjkVmgFw==",
"license": "MIT"
},
"node_modules/@jridgewell/trace-mapping": {
- "version": "0.3.25",
- "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz",
- "integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==",
+ "version": "0.3.29",
+ "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.29.tgz",
+ "integrity": "sha512-uw6guiW/gcAGPDhLmd77/6lW8QLeiV5RUTsAX46Db6oLhGaVj4lhnPwb184s1bkc8kdVg/+h988dro8GRDpmYQ==",
"license": "MIT",
"dependencies": {
"@jridgewell/resolve-uri": "^3.1.0",
"@jridgewell/sourcemap-codec": "^1.4.14"
}
},
- "node_modules/@koa/router": {
- "version": "12.0.2",
- "resolved": "https://registry.npmjs.org/@koa/router/-/router-12.0.2.tgz",
- "integrity": "sha512-sYcHglGKTxGF+hQ6x67xDfkE9o+NhVlRHBqq6gLywaMc6CojK/5vFZByphdonKinYlMLkEkacm+HEse9HzwgTA==",
- "license": "MIT",
- "dependencies": {
- "debug": "^4.3.4",
- "http-errors": "^2.0.0",
- "koa-compose": "^4.1.0",
- "methods": "^1.1.2",
- "path-to-regexp": "^6.3.0"
- },
- "engines": {
- "node": ">= 12"
- }
- },
- "node_modules/@koa/router/node_modules/path-to-regexp": {
- "version": "6.3.0",
- "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-6.3.0.tgz",
- "integrity": "sha512-Yhpw4T9C6hPpgPeA28us07OJeqZ5EzQTkbfwuhsUg0c237RomFoETJgmp2sa3F/41gfLE6G5cqcYwznmeEeOlQ==",
- "license": "MIT"
- },
"node_modules/@kurkle/color": {
"version": "0.3.4",
"resolved": "https://registry.npmjs.org/@kurkle/color/-/color-0.3.4.tgz",
@@ -2172,14 +2238,14 @@
"license": "MIT"
},
"node_modules/@lezer/css": {
- "version": "1.1.11",
- "resolved": "https://registry.npmjs.org/@lezer/css/-/css-1.1.11.tgz",
- "integrity": "sha512-FuAnusbLBl1SEAtfN8NdShxYJiESKw9LAFysfea1T96jD3ydBn12oYjaSG1a04BQRIUd93/0D8e5CV1cUMkmQg==",
+ "version": "1.3.0",
+ "resolved": "https://registry.npmjs.org/@lezer/css/-/css-1.3.0.tgz",
+ "integrity": "sha512-pBL7hup88KbI7hXnZV3PQsn43DHy6TWyzuyk2AO9UyoXcDltvIdqWKE1dLL/45JVZ+YZkHe1WVHqO6wugZZWcw==",
"license": "MIT",
"dependencies": {
"@lezer/common": "^1.2.0",
"@lezer/highlight": "^1.0.0",
- "@lezer/lr": "^1.0.0"
+ "@lezer/lr": "^1.3.0"
}
},
"node_modules/@lezer/highlight": {
@@ -2244,23 +2310,14 @@
}
},
"node_modules/@mapbox/node-pre-gyp/node_modules/agent-base": {
- "version": "7.1.3",
- "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.3.tgz",
- "integrity": "sha512-jRR5wdylq8CkOe6hei19GGZnxM6rBGwFl3Bg0YItGDimvjGtAvdZk4Pu6Cl4u4Igsws4a1fd1Vq3ezrhn4KmFw==",
+ "version": "7.1.4",
+ "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.4.tgz",
+ "integrity": "sha512-MnA+YT8fwfJPgBx3m60MNqakm30XOkyIoH1y6huTQvC0PwZG7ki8NacLBcrPbNoo8vEZy7Jpuk7+jMO+CUovTQ==",
"license": "MIT",
"engines": {
"node": ">= 14"
}
},
- "node_modules/@mapbox/node-pre-gyp/node_modules/detect-libc": {
- "version": "2.0.4",
- "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.4.tgz",
- "integrity": "sha512-3UDv+G9CsCKO1WKMGw9fwq/SWJYbI0c5Y7LU1AXYoDdbhE2AHQ6N6Nb34sG8Fj7T5APy8qXDCKuuIHd1BR0tVA==",
- "license": "Apache-2.0",
- "engines": {
- "node": ">=8"
- }
- },
"node_modules/@mapbox/node-pre-gyp/node_modules/https-proxy-agent": {
"version": "7.0.6",
"resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.6.tgz",
@@ -2294,38 +2351,16 @@
"rollup": "^1.20.0 || ^2.0.0 || ^3.0.0 || ^4.0.0"
}
},
- "node_modules/@modelcontextprotocol/sdk": {
- "version": "1.11.0",
- "resolved": "https://registry.npmjs.org/@modelcontextprotocol/sdk/-/sdk-1.11.0.tgz",
- "integrity": "sha512-k/1pb70eD638anoi0e8wUGAlbMJXyvdV4p62Ko+EZ7eBe1xMx8Uhak1R5DgfoofsK5IBBnRwsYGTaLZl+6/+RQ==",
- "devOptional": true,
- "license": "MIT",
- "dependencies": {
- "content-type": "^1.0.5",
- "cors": "^2.8.5",
- "cross-spawn": "^7.0.3",
- "eventsource": "^3.0.2",
- "express": "^5.0.1",
- "express-rate-limit": "^7.5.0",
- "pkce-challenge": "^5.0.0",
- "raw-body": "^3.0.0",
- "zod": "^3.23.8",
- "zod-to-json-schema": "^3.24.1"
- },
- "engines": {
- "node": ">=18"
- }
- },
"node_modules/@napi-rs/wasm-runtime": {
- "version": "0.2.9",
- "resolved": "https://registry.npmjs.org/@napi-rs/wasm-runtime/-/wasm-runtime-0.2.9.tgz",
- "integrity": "sha512-OKRBiajrrxB9ATokgEQoG87Z25c67pCpYcCwmXYX8PBftC9pBfN18gnm/fh1wurSLEKIAt+QRFLFCQISrb66Jg==",
+ "version": "0.2.12",
+ "resolved": "https://registry.npmjs.org/@napi-rs/wasm-runtime/-/wasm-runtime-0.2.12.tgz",
+ "integrity": "sha512-ZVWUcfwY4E/yPitQJl481FjFo3K22D6qF0DuFH6Y/nbnE11GY5uguDxZMGXPQ8WQ0128MXQD7TnfHyK4oWoIJQ==",
"license": "MIT",
"optional": true,
"dependencies": {
- "@emnapi/core": "^1.4.0",
- "@emnapi/runtime": "^1.4.0",
- "@tybys/wasm-util": "^0.9.0"
+ "@emnapi/core": "^1.4.3",
+ "@emnapi/runtime": "^1.4.3",
+ "@tybys/wasm-util": "^0.10.0"
}
},
"node_modules/@netlify/binary-info": {
@@ -2335,20 +2370,22 @@
"license": "Apache 2"
},
"node_modules/@netlify/blobs": {
- "version": "8.2.0",
- "resolved": "https://registry.npmjs.org/@netlify/blobs/-/blobs-8.2.0.tgz",
- "integrity": "sha512-9djLZHBKsoKk8XCgwWSEPK9QnT8qqxEQGuYh48gFIcNLvpBKkLnHbDZuyUxmNemCfDz7h0HnMXgSPnnUVgARhg==",
+ "version": "9.1.2",
+ "resolved": "https://registry.npmjs.org/@netlify/blobs/-/blobs-9.1.2.tgz",
+ "integrity": "sha512-7dMjExSH4zj4ShvLem49mE3mf0K171Tx2pV4WDWhJbRUWW3SJIR2qntz0LvUGS97N5HO1SmnzrgWUhEXCsApiw==",
"license": "MIT",
- "optional": true,
- "peer": true,
+ "dependencies": {
+ "@netlify/dev-utils": "2.2.0",
+ "@netlify/runtime-utils": "1.3.1"
+ },
"engines": {
"node": "^14.16.0 || >=16.0.0"
}
},
"node_modules/@netlify/dev-utils": {
- "version": "2.1.0",
- "resolved": "https://registry.npmjs.org/@netlify/dev-utils/-/dev-utils-2.1.0.tgz",
- "integrity": "sha512-GZ3cVSkipJ+shHQ0yudqqgH5/PW8g98Ou8CckLDKDVi7FREnaWQocJIomfxk0cPWqkg9Iq3DLLV9LOoioCOlAg==",
+ "version": "2.2.0",
+ "resolved": "https://registry.npmjs.org/@netlify/dev-utils/-/dev-utils-2.2.0.tgz",
+ "integrity": "sha512-5XUvZuffe3KetyhbWwd4n2ktd7wraocCYw10tlM+/u/95iAz29GjNiuNxbCD1T6Bn1MyGc4QLVNKOWhzJkVFAw==",
"license": "MIT",
"dependencies": {
"@whatwg-node/server": "^0.9.60",
@@ -2358,7 +2395,7 @@
"env-paths": "^3.0.0",
"find-up": "7.0.0",
"lodash.debounce": "^4.0.8",
- "netlify": "^13.3.4",
+ "netlify": "^13.3.5",
"parse-gitignore": "^2.0.0",
"uuid": "^11.1.0",
"write-file-atomic": "^6.0.0"
@@ -2463,15 +2500,15 @@
}
},
"node_modules/@netlify/functions": {
- "version": "3.1.5",
- "resolved": "https://registry.npmjs.org/@netlify/functions/-/functions-3.1.5.tgz",
- "integrity": "sha512-HQtKIY+O1gJf+UFk9nHm62ai9fYxF9F4Aaq8zJdMfPhZaSsslS/PH8rEE51bkLi3u63GM8LdaxU1JyCKmT4mGg==",
+ "version": "3.1.10",
+ "resolved": "https://registry.npmjs.org/@netlify/functions/-/functions-3.1.10.tgz",
+ "integrity": "sha512-sI93kcJ2cUoMgDRPnrEm0lZhuiDVDqM6ngS/UbHTApIH3+eg3yZM5p/0SDFQQq9Bad0/srFmgBmTdXushzY5kg==",
"license": "MIT",
"dependencies": {
- "@netlify/blobs": "^9.0.1",
- "@netlify/dev-utils": "2.1.0",
- "@netlify/serverless-functions-api": "1.38.0",
- "@netlify/zip-it-and-ship-it": "^10.0.7",
+ "@netlify/blobs": "9.1.2",
+ "@netlify/dev-utils": "2.2.0",
+ "@netlify/serverless-functions-api": "1.41.2",
+ "@netlify/zip-it-and-ship-it": "^12.1.0",
"cron-parser": "^4.9.0",
"decache": "^4.6.2",
"extract-zip": "^2.0.1",
@@ -2485,19 +2522,6 @@
"node": ">=14.0.0"
}
},
- "node_modules/@netlify/functions/node_modules/@netlify/blobs": {
- "version": "9.0.1",
- "resolved": "https://registry.npmjs.org/@netlify/blobs/-/blobs-9.0.1.tgz",
- "integrity": "sha512-l2d7KCAvekDpIBMQjUuOpOgolhMWt9Bll7G/KH/zmW/3gFlTB2mD5/2ghSjCTxLGJzdjbch7/5EBt8UPSDlD3A==",
- "license": "MIT",
- "dependencies": {
- "@netlify/dev-utils": "2.1.0",
- "@netlify/runtime-utils": "1.2.0"
- },
- "engines": {
- "node": "^14.16.0 || >=16.0.0"
- }
- },
"node_modules/@netlify/functions/node_modules/is-stream": {
"version": "4.0.1",
"resolved": "https://registry.npmjs.org/is-stream/-/is-stream-4.0.1.tgz",
@@ -2520,44 +2544,43 @@
}
},
"node_modules/@netlify/runtime-utils": {
- "version": "1.2.0",
- "resolved": "https://registry.npmjs.org/@netlify/runtime-utils/-/runtime-utils-1.2.0.tgz",
- "integrity": "sha512-iTWkuINC7O8AqthMzbF9/OAnz3ubVPn8ycSD5ZO7vtnlaQiYu/L8mZ7Nez1eZu4WxWgpNBwS79YgAK6x0RBWUQ==",
+ "version": "1.3.1",
+ "resolved": "https://registry.npmjs.org/@netlify/runtime-utils/-/runtime-utils-1.3.1.tgz",
+ "integrity": "sha512-7/vIJlMYrPJPlEW84V2yeRuG3QBu66dmlv9neTmZ5nXzwylhBEOhy11ai+34A8mHCSZI4mKns25w3HM9kaDdJg==",
"license": "MIT",
"engines": {
"node": ">=16.0.0"
}
},
"node_modules/@netlify/serverless-functions-api": {
- "version": "1.38.0",
- "resolved": "https://registry.npmjs.org/@netlify/serverless-functions-api/-/serverless-functions-api-1.38.0.tgz",
- "integrity": "sha512-AuTzLH4BlQxPViwdEP9WcW/9NjqmjzaPHxOd9fyaMZUOkAgF0iauio9PF9QylAtgyodhLd6mGuASESZZiJcXaw==",
+ "version": "1.41.2",
+ "resolved": "https://registry.npmjs.org/@netlify/serverless-functions-api/-/serverless-functions-api-1.41.2.tgz",
+ "integrity": "sha512-pfCkH50JV06SGMNsNPjn8t17hOcId4fA881HeYQgMBOrewjsw4csaYgHEnCxCEu24Y5x75E2ULbFpqm9CvRCqw==",
"license": "MIT",
"engines": {
"node": ">=18.0.0"
}
},
"node_modules/@netlify/zip-it-and-ship-it": {
- "version": "10.0.7",
- "resolved": "https://registry.npmjs.org/@netlify/zip-it-and-ship-it/-/zip-it-and-ship-it-10.0.7.tgz",
- "integrity": "sha512-h7VUDyY6ePD8JA1tM0m8zbWDp03UOmBlPdqgl9/aK1fSVYcoo0qhXmp1Z1n+viKkNkmvBx4KvOLScUJEXPeRnA==",
+ "version": "12.2.1",
+ "resolved": "https://registry.npmjs.org/@netlify/zip-it-and-ship-it/-/zip-it-and-ship-it-12.2.1.tgz",
+ "integrity": "sha512-zAr+8Tg80y/sUbhdUkZsq4Uy1IMzkSB6H/sKRMrDQ2NJx4uPgf5X5jMdg9g2FljNcxzpfJwc1Gg4OXQrjD0Z4A==",
"license": "MIT",
"dependencies": {
"@babel/parser": "^7.22.5",
- "@babel/types": "7.26.10",
+ "@babel/types": "7.28.0",
"@netlify/binary-info": "^1.0.0",
- "@netlify/serverless-functions-api": "^1.38.0",
- "@vercel/nft": "0.27.7",
- "archiver": "^5.3.1",
+ "@netlify/serverless-functions-api": "^2.1.3",
+ "@vercel/nft": "0.29.4",
+ "archiver": "^7.0.0",
"common-path-prefix": "^3.0.0",
- "cp-file": "^10.0.0",
+ "copy-file": "^11.0.0",
"es-module-lexer": "^1.0.0",
- "esbuild": "0.19.11",
- "execa": "^7.0.0",
- "fast-glob": "^3.3.2",
- "filter-obj": "^5.0.0",
- "find-up": "^6.0.0",
- "glob": "^8.0.3",
+ "esbuild": "0.25.5",
+ "execa": "^8.0.0",
+ "fast-glob": "^3.3.3",
+ "filter-obj": "^6.0.0",
+ "find-up": "^7.0.0",
"is-builtin-module": "^3.1.0",
"is-path-inside": "^4.0.0",
"junk": "^4.0.0",
@@ -2567,7 +2590,7 @@
"normalize-path": "^3.0.0",
"p-map": "^7.0.0",
"path-exists": "^5.0.0",
- "precinct": "^11.0.0",
+ "precinct": "^12.0.0",
"require-package-name": "^2.0.1",
"resolve": "^2.0.0-next.1",
"semver": "^7.3.8",
@@ -2582,26 +2605,26 @@
"zip-it-and-ship-it": "bin.js"
},
"engines": {
- "node": "^14.18.0 || >=16.0.0"
+ "node": ">=18.14.0"
}
},
"node_modules/@netlify/zip-it-and-ship-it/node_modules/@babel/types": {
- "version": "7.26.10",
- "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.26.10.tgz",
- "integrity": "sha512-emqcG3vHrpxUKTrxcblR36dcrcoRDvKmnL/dCL6ZsHaShW80qxCAcNhzQZrpeM765VzEos+xOi4s+r4IXzTwdQ==",
+ "version": "7.28.0",
+ "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.28.0.tgz",
+ "integrity": "sha512-jYnje+JyZG5YThjHiF28oT4SIZLnYOcSBb6+SDaFIyzDVSkXQmQQYclJ2R+YxcdmK0AX6x1E5OQNtuh3jHDrUg==",
"license": "MIT",
"dependencies": {
- "@babel/helper-string-parser": "^7.25.9",
- "@babel/helper-validator-identifier": "^7.25.9"
+ "@babel/helper-string-parser": "^7.27.1",
+ "@babel/helper-validator-identifier": "^7.27.1"
},
"engines": {
"node": ">=6.9.0"
}
},
"node_modules/@netlify/zip-it-and-ship-it/node_modules/@esbuild/aix-ppc64": {
- "version": "0.19.11",
- "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.19.11.tgz",
- "integrity": "sha512-FnzU0LyE3ySQk7UntJO4+qIiQgI7KoODnZg5xzXIrFJlKd2P2gwHsHY4927xj9y5PJmJSzULiUCWmv7iWnNa7g==",
+ "version": "0.25.5",
+ "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.25.5.tgz",
+ "integrity": "sha512-9o3TMmpmftaCMepOdA5k/yDw8SfInyzWWTjYTFCX3kPSDJMROQTb8jg+h9Cnwnmm1vOzvxN7gIfB5V2ewpjtGA==",
"cpu": [
"ppc64"
],
@@ -2611,13 +2634,13 @@
"aix"
],
"engines": {
- "node": ">=12"
+ "node": ">=18"
}
},
"node_modules/@netlify/zip-it-and-ship-it/node_modules/@esbuild/android-arm": {
- "version": "0.19.11",
- "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.19.11.tgz",
- "integrity": "sha512-5OVapq0ClabvKvQ58Bws8+wkLCV+Rxg7tUVbo9xu034Nm536QTII4YzhaFriQ7rMrorfnFKUsArD2lqKbFY4vw==",
+ "version": "0.25.5",
+ "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.25.5.tgz",
+ "integrity": "sha512-AdJKSPeEHgi7/ZhuIPtcQKr5RQdo6OO2IL87JkianiMYMPbCtot9fxPbrMiBADOWWm3T2si9stAiVsGbTQFkbA==",
"cpu": [
"arm"
],
@@ -2627,13 +2650,13 @@
"android"
],
"engines": {
- "node": ">=12"
+ "node": ">=18"
}
},
"node_modules/@netlify/zip-it-and-ship-it/node_modules/@esbuild/android-arm64": {
- "version": "0.19.11",
- "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.19.11.tgz",
- "integrity": "sha512-aiu7K/5JnLj//KOnOfEZ0D90obUkRzDMyqd/wNAUQ34m4YUPVhRZpnqKV9uqDGxT7cToSDnIHsGooyIczu9T+Q==",
+ "version": "0.25.5",
+ "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.25.5.tgz",
+ "integrity": "sha512-VGzGhj4lJO+TVGV1v8ntCZWJktV7SGCs3Pn1GRWI1SBFtRALoomm8k5E9Pmwg3HOAal2VDc2F9+PM/rEY6oIDg==",
"cpu": [
"arm64"
],
@@ -2643,13 +2666,13 @@
"android"
],
"engines": {
- "node": ">=12"
+ "node": ">=18"
}
},
"node_modules/@netlify/zip-it-and-ship-it/node_modules/@esbuild/android-x64": {
- "version": "0.19.11",
- "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.19.11.tgz",
- "integrity": "sha512-eccxjlfGw43WYoY9QgB82SgGgDbibcqyDTlk3l3C0jOVHKxrjdc9CTwDUQd0vkvYg5um0OH+GpxYvp39r+IPOg==",
+ "version": "0.25.5",
+ "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.25.5.tgz",
+ "integrity": "sha512-D2GyJT1kjvO//drbRT3Hib9XPwQeWd9vZoBJn+bu/lVsOZ13cqNdDeqIF/xQ5/VmWvMduP6AmXvylO/PIc2isw==",
"cpu": [
"x64"
],
@@ -2659,13 +2682,13 @@
"android"
],
"engines": {
- "node": ">=12"
+ "node": ">=18"
}
},
"node_modules/@netlify/zip-it-and-ship-it/node_modules/@esbuild/darwin-arm64": {
- "version": "0.19.11",
- "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.19.11.tgz",
- "integrity": "sha512-ETp87DRWuSt9KdDVkqSoKoLFHYTrkyz2+65fj9nfXsaV3bMhTCjtQfw3y+um88vGRKRiF7erPrh/ZuIdLUIVxQ==",
+ "version": "0.25.5",
+ "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.25.5.tgz",
+ "integrity": "sha512-GtaBgammVvdF7aPIgH2jxMDdivezgFu6iKpmT+48+F8Hhg5J/sfnDieg0aeG/jfSvkYQU2/pceFPDKlqZzwnfQ==",
"cpu": [
"arm64"
],
@@ -2675,13 +2698,13 @@
"darwin"
],
"engines": {
- "node": ">=12"
+ "node": ">=18"
}
},
"node_modules/@netlify/zip-it-and-ship-it/node_modules/@esbuild/darwin-x64": {
- "version": "0.19.11",
- "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.19.11.tgz",
- "integrity": "sha512-fkFUiS6IUK9WYUO/+22omwetaSNl5/A8giXvQlcinLIjVkxwTLSktbF5f/kJMftM2MJp9+fXqZ5ezS7+SALp4g==",
+ "version": "0.25.5",
+ "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.25.5.tgz",
+ "integrity": "sha512-1iT4FVL0dJ76/q1wd7XDsXrSW+oLoquptvh4CLR4kITDtqi2e/xwXwdCVH8hVHU43wgJdsq7Gxuzcs6Iq/7bxQ==",
"cpu": [
"x64"
],
@@ -2691,13 +2714,13 @@
"darwin"
],
"engines": {
- "node": ">=12"
+ "node": ">=18"
}
},
"node_modules/@netlify/zip-it-and-ship-it/node_modules/@esbuild/freebsd-arm64": {
- "version": "0.19.11",
- "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.19.11.tgz",
- "integrity": "sha512-lhoSp5K6bxKRNdXUtHoNc5HhbXVCS8V0iZmDvyWvYq9S5WSfTIHU2UGjcGt7UeS6iEYp9eeymIl5mJBn0yiuxA==",
+ "version": "0.25.5",
+ "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.25.5.tgz",
+ "integrity": "sha512-nk4tGP3JThz4La38Uy/gzyXtpkPW8zSAmoUhK9xKKXdBCzKODMc2adkB2+8om9BDYugz+uGV7sLmpTYzvmz6Sw==",
"cpu": [
"arm64"
],
@@ -2707,13 +2730,13 @@
"freebsd"
],
"engines": {
- "node": ">=12"
+ "node": ">=18"
}
},
"node_modules/@netlify/zip-it-and-ship-it/node_modules/@esbuild/freebsd-x64": {
- "version": "0.19.11",
- "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.19.11.tgz",
- "integrity": "sha512-JkUqn44AffGXitVI6/AbQdoYAq0TEullFdqcMY/PCUZ36xJ9ZJRtQabzMA+Vi7r78+25ZIBosLTOKnUXBSi1Kw==",
+ "version": "0.25.5",
+ "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.25.5.tgz",
+ "integrity": "sha512-PrikaNjiXdR2laW6OIjlbeuCPrPaAl0IwPIaRv+SMV8CiM8i2LqVUHFC1+8eORgWyY7yhQY+2U2fA55mBzReaw==",
"cpu": [
"x64"
],
@@ -2723,13 +2746,13 @@
"freebsd"
],
"engines": {
- "node": ">=12"
+ "node": ">=18"
}
},
"node_modules/@netlify/zip-it-and-ship-it/node_modules/@esbuild/linux-arm": {
- "version": "0.19.11",
- "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.19.11.tgz",
- "integrity": "sha512-3CRkr9+vCV2XJbjwgzjPtO8T0SZUmRZla+UL1jw+XqHZPkPgZiyWvbDvl9rqAN8Zl7qJF0O/9ycMtjU67HN9/Q==",
+ "version": "0.25.5",
+ "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.25.5.tgz",
+ "integrity": "sha512-cPzojwW2okgh7ZlRpcBEtsX7WBuqbLrNXqLU89GxWbNt6uIg78ET82qifUy3W6OVww6ZWobWub5oqZOVtwolfw==",
"cpu": [
"arm"
],
@@ -2739,13 +2762,13 @@
"linux"
],
"engines": {
- "node": ">=12"
+ "node": ">=18"
}
},
"node_modules/@netlify/zip-it-and-ship-it/node_modules/@esbuild/linux-arm64": {
- "version": "0.19.11",
- "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.19.11.tgz",
- "integrity": "sha512-LneLg3ypEeveBSMuoa0kwMpCGmpu8XQUh+mL8XXwoYZ6Be2qBnVtcDI5azSvh7vioMDhoJFZzp9GWp9IWpYoUg==",
+ "version": "0.25.5",
+ "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.25.5.tgz",
+ "integrity": "sha512-Z9kfb1v6ZlGbWj8EJk9T6czVEjjq2ntSYLY2cw6pAZl4oKtfgQuS4HOq41M/BcoLPzrUbNd+R4BXFyH//nHxVg==",
"cpu": [
"arm64"
],
@@ -2755,13 +2778,13 @@
"linux"
],
"engines": {
- "node": ">=12"
+ "node": ">=18"
}
},
"node_modules/@netlify/zip-it-and-ship-it/node_modules/@esbuild/linux-ia32": {
- "version": "0.19.11",
- "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.19.11.tgz",
- "integrity": "sha512-caHy++CsD8Bgq2V5CodbJjFPEiDPq8JJmBdeyZ8GWVQMjRD0sU548nNdwPNvKjVpamYYVL40AORekgfIubwHoA==",
+ "version": "0.25.5",
+ "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.25.5.tgz",
+ "integrity": "sha512-sQ7l00M8bSv36GLV95BVAdhJ2QsIbCuCjh/uYrWiMQSUuV+LpXwIqhgJDcvMTj+VsQmqAHL2yYaasENvJ7CDKA==",
"cpu": [
"ia32"
],
@@ -2771,13 +2794,13 @@
"linux"
],
"engines": {
- "node": ">=12"
+ "node": ">=18"
}
},
"node_modules/@netlify/zip-it-and-ship-it/node_modules/@esbuild/linux-loong64": {
- "version": "0.19.11",
- "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.19.11.tgz",
- "integrity": "sha512-ppZSSLVpPrwHccvC6nQVZaSHlFsvCQyjnvirnVjbKSHuE5N24Yl8F3UwYUUR1UEPaFObGD2tSvVKbvR+uT1Nrg==",
+ "version": "0.25.5",
+ "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.25.5.tgz",
+ "integrity": "sha512-0ur7ae16hDUC4OL5iEnDb0tZHDxYmuQyhKhsPBV8f99f6Z9KQM02g33f93rNH5A30agMS46u2HP6qTdEt6Q1kg==",
"cpu": [
"loong64"
],
@@ -2787,13 +2810,13 @@
"linux"
],
"engines": {
- "node": ">=12"
+ "node": ">=18"
}
},
"node_modules/@netlify/zip-it-and-ship-it/node_modules/@esbuild/linux-mips64el": {
- "version": "0.19.11",
- "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.19.11.tgz",
- "integrity": "sha512-B5x9j0OgjG+v1dF2DkH34lr+7Gmv0kzX6/V0afF41FkPMMqaQ77pH7CrhWeR22aEeHKaeZVtZ6yFwlxOKPVFyg==",
+ "version": "0.25.5",
+ "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.25.5.tgz",
+ "integrity": "sha512-kB/66P1OsHO5zLz0i6X0RxlQ+3cu0mkxS3TKFvkb5lin6uwZ/ttOkP3Z8lfR9mJOBk14ZwZ9182SIIWFGNmqmg==",
"cpu": [
"mips64el"
],
@@ -2803,13 +2826,13 @@
"linux"
],
"engines": {
- "node": ">=12"
+ "node": ">=18"
}
},
"node_modules/@netlify/zip-it-and-ship-it/node_modules/@esbuild/linux-ppc64": {
- "version": "0.19.11",
- "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.19.11.tgz",
- "integrity": "sha512-MHrZYLeCG8vXblMetWyttkdVRjQlQUb/oMgBNurVEnhj4YWOr4G5lmBfZjHYQHHN0g6yDmCAQRR8MUHldvvRDA==",
+ "version": "0.25.5",
+ "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.25.5.tgz",
+ "integrity": "sha512-UZCmJ7r9X2fe2D6jBmkLBMQetXPXIsZjQJCjgwpVDz+YMcS6oFR27alkgGv3Oqkv07bxdvw7fyB71/olceJhkQ==",
"cpu": [
"ppc64"
],
@@ -2819,13 +2842,13 @@
"linux"
],
"engines": {
- "node": ">=12"
+ "node": ">=18"
}
},
"node_modules/@netlify/zip-it-and-ship-it/node_modules/@esbuild/linux-riscv64": {
- "version": "0.19.11",
- "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.19.11.tgz",
- "integrity": "sha512-f3DY++t94uVg141dozDu4CCUkYW+09rWtaWfnb3bqe4w5NqmZd6nPVBm+qbz7WaHZCoqXqHz5p6CM6qv3qnSSQ==",
+ "version": "0.25.5",
+ "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.25.5.tgz",
+ "integrity": "sha512-kTxwu4mLyeOlsVIFPfQo+fQJAV9mh24xL+y+Bm6ej067sYANjyEw1dNHmvoqxJUCMnkBdKpvOn0Ahql6+4VyeA==",
"cpu": [
"riscv64"
],
@@ -2835,13 +2858,13 @@
"linux"
],
"engines": {
- "node": ">=12"
+ "node": ">=18"
}
},
"node_modules/@netlify/zip-it-and-ship-it/node_modules/@esbuild/linux-s390x": {
- "version": "0.19.11",
- "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.19.11.tgz",
- "integrity": "sha512-A5xdUoyWJHMMlcSMcPGVLzYzpcY8QP1RtYzX5/bS4dvjBGVxdhuiYyFwp7z74ocV7WDc0n1harxmpq2ePOjI0Q==",
+ "version": "0.25.5",
+ "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.25.5.tgz",
+ "integrity": "sha512-K2dSKTKfmdh78uJ3NcWFiqyRrimfdinS5ErLSn3vluHNeHVnBAFWC8a4X5N+7FgVE1EjXS1QDZbpqZBjfrqMTQ==",
"cpu": [
"s390x"
],
@@ -2851,13 +2874,13 @@
"linux"
],
"engines": {
- "node": ">=12"
+ "node": ">=18"
}
},
"node_modules/@netlify/zip-it-and-ship-it/node_modules/@esbuild/linux-x64": {
- "version": "0.19.11",
- "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.19.11.tgz",
- "integrity": "sha512-grbyMlVCvJSfxFQUndw5mCtWs5LO1gUlwP4CDi4iJBbVpZcqLVT29FxgGuBJGSzyOxotFG4LoO5X+M1350zmPA==",
+ "version": "0.25.5",
+ "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.25.5.tgz",
+ "integrity": "sha512-uhj8N2obKTE6pSZ+aMUbqq+1nXxNjZIIjCjGLfsWvVpy7gKCOL6rsY1MhRh9zLtUtAI7vpgLMK6DxjO8Qm9lJw==",
"cpu": [
"x64"
],
@@ -2867,13 +2890,13 @@
"linux"
],
"engines": {
- "node": ">=12"
+ "node": ">=18"
}
},
"node_modules/@netlify/zip-it-and-ship-it/node_modules/@esbuild/netbsd-x64": {
- "version": "0.19.11",
- "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.19.11.tgz",
- "integrity": "sha512-13jvrQZJc3P230OhU8xgwUnDeuC/9egsjTkXN49b3GcS5BKvJqZn86aGM8W9pd14Kd+u7HuFBMVtrNGhh6fHEQ==",
+ "version": "0.25.5",
+ "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.25.5.tgz",
+ "integrity": "sha512-WOb5fKrvVTRMfWFNCroYWWklbnXH0Q5rZppjq0vQIdlsQKuw6mdSihwSo4RV/YdQ5UCKKvBy7/0ZZYLBZKIbwQ==",
"cpu": [
"x64"
],
@@ -2883,15 +2906,15 @@
"netbsd"
],
"engines": {
- "node": ">=12"
+ "node": ">=18"
}
},
- "node_modules/@netlify/zip-it-and-ship-it/node_modules/@esbuild/openbsd-x64": {
- "version": "0.19.11",
- "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.19.11.tgz",
- "integrity": "sha512-ysyOGZuTp6SNKPE11INDUeFVVQFrhcNDVUgSQVDzqsqX38DjhPEPATpid04LCoUr2WXhQTEZ8ct/EgJCUDpyNw==",
+ "node_modules/@netlify/zip-it-and-ship-it/node_modules/@esbuild/openbsd-arm64": {
+ "version": "0.25.5",
+ "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.25.5.tgz",
+ "integrity": "sha512-7A208+uQKgTxHd0G0uqZO8UjK2R0DDb4fDmERtARjSHWxqMTye4Erz4zZafx7Di9Cv+lNHYuncAkiGFySoD+Mw==",
"cpu": [
- "x64"
+ "arm64"
],
"license": "MIT",
"optional": true,
@@ -2899,13 +2922,29 @@
"openbsd"
],
"engines": {
- "node": ">=12"
+ "node": ">=18"
+ }
+ },
+ "node_modules/@netlify/zip-it-and-ship-it/node_modules/@esbuild/openbsd-x64": {
+ "version": "0.25.5",
+ "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.25.5.tgz",
+ "integrity": "sha512-G4hE405ErTWraiZ8UiSoesH8DaCsMm0Cay4fsFWOOUcz8b8rC6uCvnagr+gnioEjWn0wC+o1/TAHt+It+MpIMg==",
+ "cpu": [
+ "x64"
+ ],
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "openbsd"
+ ],
+ "engines": {
+ "node": ">=18"
}
},
"node_modules/@netlify/zip-it-and-ship-it/node_modules/@esbuild/sunos-x64": {
- "version": "0.19.11",
- "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.19.11.tgz",
- "integrity": "sha512-Hf+Sad9nVwvtxy4DXCZQqLpgmRTQqyFyhT3bZ4F2XlJCjxGmRFF0Shwn9rzhOYRB61w9VMXUkxlBy56dk9JJiQ==",
+ "version": "0.25.5",
+ "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.25.5.tgz",
+ "integrity": "sha512-l+azKShMy7FxzY0Rj4RCt5VD/q8mG/e+mDivgspo+yL8zW7qEwctQ6YqKX34DTEleFAvCIUviCFX1SDZRSyMQA==",
"cpu": [
"x64"
],
@@ -2915,13 +2954,13 @@
"sunos"
],
"engines": {
- "node": ">=12"
+ "node": ">=18"
}
},
"node_modules/@netlify/zip-it-and-ship-it/node_modules/@esbuild/win32-arm64": {
- "version": "0.19.11",
- "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.19.11.tgz",
- "integrity": "sha512-0P58Sbi0LctOMOQbpEOvOL44Ne0sqbS0XWHMvvrg6NE5jQ1xguCSSw9jQeUk2lfrXYsKDdOe6K+oZiwKPilYPQ==",
+ "version": "0.25.5",
+ "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.25.5.tgz",
+ "integrity": "sha512-O2S7SNZzdcFG7eFKgvwUEZ2VG9D/sn/eIiz8XRZ1Q/DO5a3s76Xv0mdBzVM5j5R639lXQmPmSo0iRpHqUUrsxw==",
"cpu": [
"arm64"
],
@@ -2931,13 +2970,13 @@
"win32"
],
"engines": {
- "node": ">=12"
+ "node": ">=18"
}
},
"node_modules/@netlify/zip-it-and-ship-it/node_modules/@esbuild/win32-ia32": {
- "version": "0.19.11",
- "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.19.11.tgz",
- "integrity": "sha512-6YOrWS+sDJDmshdBIQU+Uoyh7pQKrdykdefC1avn76ss5c+RN6gut3LZA4E2cH5xUEp5/cA0+YxRaVtRAb0xBg==",
+ "version": "0.25.5",
+ "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.25.5.tgz",
+ "integrity": "sha512-onOJ02pqs9h1iMJ1PQphR+VZv8qBMQ77Klcsqv9CNW2w6yLqoURLcgERAIurY6QE63bbLuqgP9ATqajFLK5AMQ==",
"cpu": [
"ia32"
],
@@ -2947,13 +2986,13 @@
"win32"
],
"engines": {
- "node": ">=12"
+ "node": ">=18"
}
},
"node_modules/@netlify/zip-it-and-ship-it/node_modules/@esbuild/win32-x64": {
- "version": "0.19.11",
- "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.19.11.tgz",
- "integrity": "sha512-vfkhltrjCAb603XaFhqhAF4LGDi2M4OrCRrFusyQ+iTLQ/o60QQXxc9cZC/FFpihBI9N1Grn6SMKVJ4KP7Fuiw==",
+ "version": "0.25.5",
+ "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.25.5.tgz",
+ "integrity": "sha512-TXv6YnJ8ZMVdX+SXWVBo/0p8LTcrUYngpWjvm91TMjjBQii7Oz11Lw5lbDV5Y0TzuhSJHwiH4hEtC1I42mMS0g==",
"cpu": [
"x64"
],
@@ -2963,113 +3002,16 @@
"win32"
],
"engines": {
- "node": ">=12"
- }
- },
- "node_modules/@netlify/zip-it-and-ship-it/node_modules/archiver": {
- "version": "5.3.2",
- "resolved": "https://registry.npmjs.org/archiver/-/archiver-5.3.2.tgz",
- "integrity": "sha512-+25nxyyznAXF7Nef3y0EbBeqmGZgeN/BxHX29Rs39djAfaFalmQ89SE6CWyDCHzGL0yt/ycBtNOmGTW0FyGWNw==",
- "license": "MIT",
- "dependencies": {
- "archiver-utils": "^2.1.0",
- "async": "^3.2.4",
- "buffer-crc32": "^0.2.1",
- "readable-stream": "^3.6.0",
- "readdir-glob": "^1.1.2",
- "tar-stream": "^2.2.0",
- "zip-stream": "^4.1.0"
- },
- "engines": {
- "node": ">= 10"
- }
- },
- "node_modules/@netlify/zip-it-and-ship-it/node_modules/archiver-utils": {
- "version": "2.1.0",
- "resolved": "https://registry.npmjs.org/archiver-utils/-/archiver-utils-2.1.0.tgz",
- "integrity": "sha512-bEL/yUb/fNNiNTuUz979Z0Yg5L+LzLxGJz8x79lYmR54fmTIb6ob/hNQgkQnIUDWIFjZVQwl9Xs356I6BAMHfw==",
- "license": "MIT",
- "dependencies": {
- "glob": "^7.1.4",
- "graceful-fs": "^4.2.0",
- "lazystream": "^1.0.0",
- "lodash.defaults": "^4.2.0",
- "lodash.difference": "^4.5.0",
- "lodash.flatten": "^4.4.0",
- "lodash.isplainobject": "^4.0.6",
- "lodash.union": "^4.6.0",
- "normalize-path": "^3.0.0",
- "readable-stream": "^2.0.0"
- },
- "engines": {
- "node": ">= 6"
- }
- },
- "node_modules/@netlify/zip-it-and-ship-it/node_modules/archiver-utils/node_modules/brace-expansion": {
- "version": "1.1.11",
- "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
- "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
- "license": "MIT",
- "dependencies": {
- "balanced-match": "^1.0.0",
- "concat-map": "0.0.1"
- }
- },
- "node_modules/@netlify/zip-it-and-ship-it/node_modules/archiver-utils/node_modules/glob": {
- "version": "7.2.3",
- "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
- "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
- "deprecated": "Glob versions prior to v9 are no longer supported",
- "license": "ISC",
- "dependencies": {
- "fs.realpath": "^1.0.0",
- "inflight": "^1.0.4",
- "inherits": "2",
- "minimatch": "^3.1.1",
- "once": "^1.3.0",
- "path-is-absolute": "^1.0.0"
- },
- "engines": {
- "node": "*"
- },
- "funding": {
- "url": "https://github.com/sponsors/isaacs"
- }
- },
- "node_modules/@netlify/zip-it-and-ship-it/node_modules/archiver-utils/node_modules/minimatch": {
- "version": "3.1.2",
- "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
- "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
- "license": "ISC",
- "dependencies": {
- "brace-expansion": "^1.1.7"
- },
- "engines": {
- "node": "*"
- }
- },
- "node_modules/@netlify/zip-it-and-ship-it/node_modules/archiver-utils/node_modules/readable-stream": {
- "version": "2.3.8",
- "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
- "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
- "license": "MIT",
- "dependencies": {
- "core-util-is": "~1.0.0",
- "inherits": "~2.0.3",
- "isarray": "~1.0.0",
- "process-nextick-args": "~2.0.0",
- "safe-buffer": "~5.1.1",
- "string_decoder": "~1.1.1",
- "util-deprecate": "~1.0.1"
+ "node": ">=18"
}
},
- "node_modules/@netlify/zip-it-and-ship-it/node_modules/buffer-crc32": {
- "version": "0.2.13",
- "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
- "integrity": "sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==",
+ "node_modules/@netlify/zip-it-and-ship-it/node_modules/@netlify/serverless-functions-api": {
+ "version": "2.1.3",
+ "resolved": "https://registry.npmjs.org/@netlify/serverless-functions-api/-/serverless-functions-api-2.1.3.tgz",
+ "integrity": "sha512-bNlN/hpND8xFQzpjyKxm6vJayD+bPBlOvs4lWihE7WULrphuH1UuFsoVE5386bNNGH8Rs1IH01AFsl7ALQgOlQ==",
"license": "MIT",
"engines": {
- "node": "*"
+ "node": ">=18.0.0"
}
},
"node_modules/@netlify/zip-it-and-ship-it/node_modules/builtin-modules": {
@@ -3084,164 +3026,63 @@
"url": "https://github.com/sponsors/sindresorhus"
}
},
- "node_modules/@netlify/zip-it-and-ship-it/node_modules/compress-commons": {
- "version": "4.1.2",
- "resolved": "https://registry.npmjs.org/compress-commons/-/compress-commons-4.1.2.tgz",
- "integrity": "sha512-D3uMHtGc/fcO1Gt1/L7i1e33VOvD4A9hfQLP+6ewd+BvG/gQ84Yh4oftEhAdjSMgBgwGL+jsppT7JYNpo6MHHg==",
- "license": "MIT",
- "dependencies": {
- "buffer-crc32": "^0.2.13",
- "crc32-stream": "^4.0.2",
- "normalize-path": "^3.0.0",
- "readable-stream": "^3.6.0"
- },
- "engines": {
- "node": ">= 10"
- }
- },
- "node_modules/@netlify/zip-it-and-ship-it/node_modules/crc32-stream": {
- "version": "4.0.3",
- "resolved": "https://registry.npmjs.org/crc32-stream/-/crc32-stream-4.0.3.tgz",
- "integrity": "sha512-NT7w2JVU7DFroFdYkeq8cywxrgjPHWkdX1wjpRQXPX5Asews3tA+Ght6lddQO5Mkumffp3X7GEqku3epj2toIw==",
- "license": "MIT",
- "dependencies": {
- "crc-32": "^1.2.0",
- "readable-stream": "^3.4.0"
- },
- "engines": {
- "node": ">= 10"
- }
- },
"node_modules/@netlify/zip-it-and-ship-it/node_modules/esbuild": {
- "version": "0.19.11",
- "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.19.11.tgz",
- "integrity": "sha512-HJ96Hev2hX/6i5cDVwcqiJBBtuo9+FeIJOtZ9W1kA5M6AMJRHUZlpYZ1/SbEwtO0ioNAW8rUooVpC/WehY2SfA==",
+ "version": "0.25.5",
+ "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.25.5.tgz",
+ "integrity": "sha512-P8OtKZRv/5J5hhz0cUAdu/cLuPIKXpQl1R9pZtvmHWQvrAUVd0UNIPT4IB4W3rNOqVO0rlqHmCIbSwxh/c9yUQ==",
"hasInstallScript": true,
"license": "MIT",
"bin": {
"esbuild": "bin/esbuild"
},
"engines": {
- "node": ">=12"
+ "node": ">=18"
},
"optionalDependencies": {
- "@esbuild/aix-ppc64": "0.19.11",
- "@esbuild/android-arm": "0.19.11",
- "@esbuild/android-arm64": "0.19.11",
- "@esbuild/android-x64": "0.19.11",
- "@esbuild/darwin-arm64": "0.19.11",
- "@esbuild/darwin-x64": "0.19.11",
- "@esbuild/freebsd-arm64": "0.19.11",
- "@esbuild/freebsd-x64": "0.19.11",
- "@esbuild/linux-arm": "0.19.11",
- "@esbuild/linux-arm64": "0.19.11",
- "@esbuild/linux-ia32": "0.19.11",
- "@esbuild/linux-loong64": "0.19.11",
- "@esbuild/linux-mips64el": "0.19.11",
- "@esbuild/linux-ppc64": "0.19.11",
- "@esbuild/linux-riscv64": "0.19.11",
- "@esbuild/linux-s390x": "0.19.11",
- "@esbuild/linux-x64": "0.19.11",
- "@esbuild/netbsd-x64": "0.19.11",
- "@esbuild/openbsd-x64": "0.19.11",
- "@esbuild/sunos-x64": "0.19.11",
- "@esbuild/win32-arm64": "0.19.11",
- "@esbuild/win32-ia32": "0.19.11",
- "@esbuild/win32-x64": "0.19.11"
- }
- },
- "node_modules/@netlify/zip-it-and-ship-it/node_modules/execa": {
- "version": "7.2.0",
- "resolved": "https://registry.npmjs.org/execa/-/execa-7.2.0.tgz",
- "integrity": "sha512-UduyVP7TLB5IcAQl+OzLyLcS/l32W/GLg+AhHJ+ow40FOk2U3SAllPwR44v4vmdFwIWqpdwxxpQbF1n5ta9seA==",
- "license": "MIT",
- "dependencies": {
- "cross-spawn": "^7.0.3",
- "get-stream": "^6.0.1",
- "human-signals": "^4.3.0",
- "is-stream": "^3.0.0",
- "merge-stream": "^2.0.0",
- "npm-run-path": "^5.1.0",
- "onetime": "^6.0.0",
- "signal-exit": "^3.0.7",
- "strip-final-newline": "^3.0.0"
- },
- "engines": {
- "node": "^14.18.0 || ^16.14.0 || >=18.0.0"
- },
- "funding": {
- "url": "https://github.com/sindresorhus/execa?sponsor=1"
+ "@esbuild/aix-ppc64": "0.25.5",
+ "@esbuild/android-arm": "0.25.5",
+ "@esbuild/android-arm64": "0.25.5",
+ "@esbuild/android-x64": "0.25.5",
+ "@esbuild/darwin-arm64": "0.25.5",
+ "@esbuild/darwin-x64": "0.25.5",
+ "@esbuild/freebsd-arm64": "0.25.5",
+ "@esbuild/freebsd-x64": "0.25.5",
+ "@esbuild/linux-arm": "0.25.5",
+ "@esbuild/linux-arm64": "0.25.5",
+ "@esbuild/linux-ia32": "0.25.5",
+ "@esbuild/linux-loong64": "0.25.5",
+ "@esbuild/linux-mips64el": "0.25.5",
+ "@esbuild/linux-ppc64": "0.25.5",
+ "@esbuild/linux-riscv64": "0.25.5",
+ "@esbuild/linux-s390x": "0.25.5",
+ "@esbuild/linux-x64": "0.25.5",
+ "@esbuild/netbsd-arm64": "0.25.5",
+ "@esbuild/netbsd-x64": "0.25.5",
+ "@esbuild/openbsd-arm64": "0.25.5",
+ "@esbuild/openbsd-x64": "0.25.5",
+ "@esbuild/sunos-x64": "0.25.5",
+ "@esbuild/win32-arm64": "0.25.5",
+ "@esbuild/win32-ia32": "0.25.5",
+ "@esbuild/win32-x64": "0.25.5"
}
},
"node_modules/@netlify/zip-it-and-ship-it/node_modules/find-up": {
- "version": "6.3.0",
- "resolved": "https://registry.npmjs.org/find-up/-/find-up-6.3.0.tgz",
- "integrity": "sha512-v2ZsoEuVHYy8ZIlYqwPe/39Cy+cFDzp4dXPaxNvkEuouymu+2Jbz0PxpKarJHYJTmv2HWT3O382qY8l4jMWthw==",
+ "version": "7.0.0",
+ "resolved": "https://registry.npmjs.org/find-up/-/find-up-7.0.0.tgz",
+ "integrity": "sha512-YyZM99iHrqLKjmt4LJDj58KI+fYyufRLBSYcqycxf//KpBk9FoewoGX0450m9nB44qrZnovzC2oeP5hUibxc/g==",
"license": "MIT",
"dependencies": {
- "locate-path": "^7.1.0",
- "path-exists": "^5.0.0"
- },
- "engines": {
- "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+ "locate-path": "^7.2.0",
+ "path-exists": "^5.0.0",
+ "unicorn-magic": "^0.1.0"
},
- "funding": {
- "url": "https://github.com/sponsors/sindresorhus"
- }
- },
- "node_modules/@netlify/zip-it-and-ship-it/node_modules/get-stream": {
- "version": "6.0.1",
- "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
- "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
- "license": "MIT",
"engines": {
- "node": ">=10"
+ "node": ">=18"
},
"funding": {
"url": "https://github.com/sponsors/sindresorhus"
}
},
- "node_modules/@netlify/zip-it-and-ship-it/node_modules/glob": {
- "version": "8.1.0",
- "resolved": "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz",
- "integrity": "sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==",
- "deprecated": "Glob versions prior to v9 are no longer supported",
- "license": "ISC",
- "dependencies": {
- "fs.realpath": "^1.0.0",
- "inflight": "^1.0.4",
- "inherits": "2",
- "minimatch": "^5.0.1",
- "once": "^1.3.0"
- },
- "engines": {
- "node": ">=12"
- },
- "funding": {
- "url": "https://github.com/sponsors/isaacs"
- }
- },
- "node_modules/@netlify/zip-it-and-ship-it/node_modules/glob/node_modules/minimatch": {
- "version": "5.1.6",
- "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz",
- "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==",
- "license": "ISC",
- "dependencies": {
- "brace-expansion": "^2.0.1"
- },
- "engines": {
- "node": ">=10"
- }
- },
- "node_modules/@netlify/zip-it-and-ship-it/node_modules/human-signals": {
- "version": "4.3.1",
- "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-4.3.1.tgz",
- "integrity": "sha512-nZXjEF2nbo7lIw3mgYjItAfgQXog3OjJogSbKa2CQIIvSGWcKgeJnQlNXip6NglNzYH45nSRiEVimMvYL8DDqQ==",
- "license": "Apache-2.0",
- "engines": {
- "node": ">=14.18.0"
- }
- },
"node_modules/@netlify/zip-it-and-ship-it/node_modules/is-builtin-module": {
"version": "3.2.1",
"resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-3.2.1.tgz",
@@ -3311,72 +3152,16 @@
"node": "^12.20.0 || ^14.13.1 || >=16.0.0"
}
},
- "node_modules/@netlify/zip-it-and-ship-it/node_modules/readable-stream": {
- "version": "3.6.2",
- "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
- "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
+ "node_modules/@netlify/zip-it-and-ship-it/node_modules/unicorn-magic": {
+ "version": "0.1.0",
+ "resolved": "https://registry.npmjs.org/unicorn-magic/-/unicorn-magic-0.1.0.tgz",
+ "integrity": "sha512-lRfVq8fE8gz6QMBuDM6a+LO3IAzTi05H6gCVaUpir2E1Rwpo4ZUog45KpNXKC/Mn3Yb9UDuHumeFTo9iV/D9FQ==",
"license": "MIT",
- "dependencies": {
- "inherits": "^2.0.3",
- "string_decoder": "^1.1.1",
- "util-deprecate": "^1.0.1"
- },
"engines": {
- "node": ">= 6"
- }
- },
- "node_modules/@netlify/zip-it-and-ship-it/node_modules/resolve": {
- "version": "2.0.0-next.5",
- "resolved": "https://registry.npmjs.org/resolve/-/resolve-2.0.0-next.5.tgz",
- "integrity": "sha512-U7WjGVG9sH8tvjW5SmGbQuui75FiyjAX72HX15DwBBwF9dNiQZRQAg9nnPhYy+TUnE0+VcrttuvNI8oSxZcocA==",
- "license": "MIT",
- "dependencies": {
- "is-core-module": "^2.13.0",
- "path-parse": "^1.0.7",
- "supports-preserve-symlinks-flag": "^1.0.0"
- },
- "bin": {
- "resolve": "bin/resolve"
+ "node": ">=18"
},
"funding": {
- "url": "https://github.com/sponsors/ljharb"
- }
- },
- "node_modules/@netlify/zip-it-and-ship-it/node_modules/safe-buffer": {
- "version": "5.1.2",
- "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
- "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
- "license": "MIT"
- },
- "node_modules/@netlify/zip-it-and-ship-it/node_modules/signal-exit": {
- "version": "3.0.7",
- "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
- "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==",
- "license": "ISC"
- },
- "node_modules/@netlify/zip-it-and-ship-it/node_modules/string_decoder": {
- "version": "1.1.1",
- "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
- "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
- "license": "MIT",
- "dependencies": {
- "safe-buffer": "~5.1.0"
- }
- },
- "node_modules/@netlify/zip-it-and-ship-it/node_modules/tar-stream": {
- "version": "2.2.0",
- "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz",
- "integrity": "sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==",
- "license": "MIT",
- "dependencies": {
- "bl": "^4.0.3",
- "end-of-stream": "^1.4.1",
- "fs-constants": "^1.0.0",
- "inherits": "^2.0.3",
- "readable-stream": "^3.1.1"
- },
- "engines": {
- "node": ">=6"
+ "url": "https://github.com/sponsors/sindresorhus"
}
},
"node_modules/@netlify/zip-it-and-ship-it/node_modules/yocto-queue": {
@@ -3391,101 +3176,23 @@
"url": "https://github.com/sponsors/sindresorhus"
}
},
- "node_modules/@netlify/zip-it-and-ship-it/node_modules/zip-stream": {
- "version": "4.1.1",
- "resolved": "https://registry.npmjs.org/zip-stream/-/zip-stream-4.1.1.tgz",
- "integrity": "sha512-9qv4rlDiopXg4E69k+vMHjNN63YFMe9sZMrdlvKnCjlCRWeCBswPPMPUfx+ipsAWq1LXHe70RcbaHdJJpS6hyQ==",
+ "node_modules/@nodelib/fs.scandir": {
+ "version": "2.1.5",
+ "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
+ "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
"license": "MIT",
"dependencies": {
- "archiver-utils": "^3.0.4",
- "compress-commons": "^4.1.2",
- "readable-stream": "^3.6.0"
+ "@nodelib/fs.stat": "2.0.5",
+ "run-parallel": "^1.1.9"
},
"engines": {
- "node": ">= 10"
+ "node": ">= 8"
}
},
- "node_modules/@netlify/zip-it-and-ship-it/node_modules/zip-stream/node_modules/archiver-utils": {
- "version": "3.0.4",
- "resolved": "https://registry.npmjs.org/archiver-utils/-/archiver-utils-3.0.4.tgz",
- "integrity": "sha512-KVgf4XQVrTjhyWmx6cte4RxonPLR9onExufI1jhvw/MQ4BB6IsZD5gT8Lq+u/+pRkWna/6JoHpiQioaqFP5Rzw==",
- "license": "MIT",
- "dependencies": {
- "glob": "^7.2.3",
- "graceful-fs": "^4.2.0",
- "lazystream": "^1.0.0",
- "lodash.defaults": "^4.2.0",
- "lodash.difference": "^4.5.0",
- "lodash.flatten": "^4.4.0",
- "lodash.isplainobject": "^4.0.6",
- "lodash.union": "^4.6.0",
- "normalize-path": "^3.0.0",
- "readable-stream": "^3.6.0"
- },
- "engines": {
- "node": ">= 10"
- }
- },
- "node_modules/@netlify/zip-it-and-ship-it/node_modules/zip-stream/node_modules/brace-expansion": {
- "version": "1.1.11",
- "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
- "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
- "license": "MIT",
- "dependencies": {
- "balanced-match": "^1.0.0",
- "concat-map": "0.0.1"
- }
- },
- "node_modules/@netlify/zip-it-and-ship-it/node_modules/zip-stream/node_modules/glob": {
- "version": "7.2.3",
- "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
- "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
- "deprecated": "Glob versions prior to v9 are no longer supported",
- "license": "ISC",
- "dependencies": {
- "fs.realpath": "^1.0.0",
- "inflight": "^1.0.4",
- "inherits": "2",
- "minimatch": "^3.1.1",
- "once": "^1.3.0",
- "path-is-absolute": "^1.0.0"
- },
- "engines": {
- "node": "*"
- },
- "funding": {
- "url": "https://github.com/sponsors/isaacs"
- }
- },
- "node_modules/@netlify/zip-it-and-ship-it/node_modules/zip-stream/node_modules/minimatch": {
- "version": "3.1.2",
- "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
- "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
- "license": "ISC",
- "dependencies": {
- "brace-expansion": "^1.1.7"
- },
- "engines": {
- "node": "*"
- }
- },
- "node_modules/@nodelib/fs.scandir": {
- "version": "2.1.5",
- "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
- "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
- "license": "MIT",
- "dependencies": {
- "@nodelib/fs.stat": "2.0.5",
- "run-parallel": "^1.1.9"
- },
- "engines": {
- "node": ">= 8"
- }
- },
- "node_modules/@nodelib/fs.stat": {
- "version": "2.0.5",
- "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
- "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
+ "node_modules/@nodelib/fs.stat": {
+ "version": "2.0.5",
+ "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
+ "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
"license": "MIT",
"engines": {
"node": ">= 8"
@@ -3505,20 +3212,21 @@
}
},
"node_modules/@nuxt/cli": {
- "version": "3.25.0",
- "resolved": "https://registry.npmjs.org/@nuxt/cli/-/cli-3.25.0.tgz",
- "integrity": "sha512-PZ8q+a/VY3zp6C8AvYb8zg0nhd3RmzSxegUuz6tTgBjvNdrK8IMA9gbiA3HT2TIJQ+qfKG62PXJXFggDYNvBEA==",
+ "version": "3.26.1",
+ "resolved": "https://registry.npmjs.org/@nuxt/cli/-/cli-3.26.1.tgz",
+ "integrity": "sha512-7LofkhcwhDaxjREMnMDjbMHsi0H73M8iYHp7gFV/91UkO5O06WUTlNxna3ymyRMjl6XKVUsOeMpa82B/I26zcw==",
"license": "MIT",
"dependencies": {
- "c12": "^3.0.3",
- "chokidar": "^4.0.3",
+ "c12": "^3.1.0",
"citty": "^0.1.6",
"clipboardy": "^4.0.0",
+ "confbox": "^0.2.2",
"consola": "^3.4.2",
"defu": "^6.1.4",
+ "exsolve": "^1.0.7",
"fuse.js": "^7.1.0",
"giget": "^2.0.0",
- "h3": "^1.15.1",
+ "h3": "^1.15.3",
"httpxy": "^0.1.7",
"jiti": "^2.4.2",
"listhen": "^1.9.0",
@@ -3527,13 +3235,13 @@
"ohash": "^2.0.11",
"pathe": "^2.0.3",
"perfect-debounce": "^1.0.0",
- "pkg-types": "^2.1.0",
+ "pkg-types": "^2.2.0",
"scule": "^1.3.0",
- "semver": "^7.7.1",
+ "semver": "^7.7.2",
"std-env": "^3.9.0",
"tinyexec": "^1.0.1",
"ufo": "^1.6.1",
- "youch": "^4.1.0-beta.7"
+ "youch": "^4.1.0-beta.10"
},
"bin": {
"nuxi": "bin/nuxi.mjs",
@@ -3552,22 +3260,22 @@
"license": "MIT"
},
"node_modules/@nuxt/devtools": {
- "version": "2.4.0",
- "resolved": "https://registry.npmjs.org/@nuxt/devtools/-/devtools-2.4.0.tgz",
- "integrity": "sha512-iXjLoLeWfMa2qWWKRG3z6DKlKVLmbIa3zl7Y8X83BF83m7RW1xVXu6S4tVlLaTi+5tzeKIFlXHo+RO/tJVA72A==",
+ "version": "2.6.2",
+ "resolved": "https://registry.npmjs.org/@nuxt/devtools/-/devtools-2.6.2.tgz",
+ "integrity": "sha512-pqcSDPv1I+8fxa6FvhAxVrfcN/sXYLOBe9scTLbRQOVLTO0pHzryayho678qNKiwWGgj/rcjEDr6IZCgwqOCfA==",
"license": "MIT",
"dependencies": {
- "@nuxt/devtools-kit": "2.4.0",
- "@nuxt/devtools-wizard": "2.4.0",
- "@nuxt/kit": "^3.16.2",
- "@vue/devtools-core": "^7.7.2",
- "@vue/devtools-kit": "^7.7.2",
- "birpc": "^2.3.0",
+ "@nuxt/devtools-kit": "2.6.2",
+ "@nuxt/devtools-wizard": "2.6.2",
+ "@nuxt/kit": "^3.17.6",
+ "@vue/devtools-core": "^7.7.7",
+ "@vue/devtools-kit": "^7.7.7",
+ "birpc": "^2.4.0",
"consola": "^3.4.2",
"destr": "^2.0.5",
"error-stack-parser-es": "^1.0.5",
"execa": "^8.0.1",
- "fast-npm-meta": "^0.4.2",
+ "fast-npm-meta": "^0.4.4",
"get-port-please": "^3.1.2",
"hookable": "^5.5.3",
"image-meta": "^0.2.1",
@@ -3579,16 +3287,16 @@
"ohash": "^2.0.11",
"pathe": "^2.0.3",
"perfect-debounce": "^1.0.0",
- "pkg-types": "^2.1.0",
- "semver": "^7.7.1",
- "simple-git": "^3.27.0",
+ "pkg-types": "^2.2.0",
+ "semver": "^7.7.2",
+ "simple-git": "^3.28.0",
"sirv": "^3.0.1",
"structured-clone-es": "^1.0.0",
- "tinyglobby": "^0.2.12",
- "vite-plugin-inspect": "^11.0.0",
- "vite-plugin-vue-tracer": "^0.1.3",
+ "tinyglobby": "^0.2.14",
+ "vite-plugin-inspect": "^11.3.0",
+ "vite-plugin-vue-tracer": "^1.0.0",
"which": "^5.0.0",
- "ws": "^8.18.1"
+ "ws": "^8.18.3"
},
"bin": {
"devtools": "cli.mjs"
@@ -3598,13 +3306,12 @@
}
},
"node_modules/@nuxt/devtools-kit": {
- "version": "2.4.0",
- "resolved": "https://registry.npmjs.org/@nuxt/devtools-kit/-/devtools-kit-2.4.0.tgz",
- "integrity": "sha512-GdxdxEDN1f6uxJOPooYQTLC6X1QUe5kRs83A0PVH/uD0sqoXCjpKHOw+H0vdhkHOwOIsVIsbL+TdaF4k++p9TA==",
+ "version": "2.6.2",
+ "resolved": "https://registry.npmjs.org/@nuxt/devtools-kit/-/devtools-kit-2.6.2.tgz",
+ "integrity": "sha512-esErdMQ0u3wXXogKQ3IE2m0fxv52w6CzPsfsXF4o5ZVrUQrQaH58ygupDAQTYdlGTgtqmEA6KkHTGG5cM6yxeg==",
"license": "MIT",
"dependencies": {
- "@nuxt/kit": "^3.16.2",
- "@nuxt/schema": "^3.16.2",
+ "@nuxt/kit": "^3.17.6",
"execa": "^8.0.1"
},
"peerDependencies": {
@@ -3612,19 +3319,19 @@
}
},
"node_modules/@nuxt/devtools-wizard": {
- "version": "2.4.0",
- "resolved": "https://registry.npmjs.org/@nuxt/devtools-wizard/-/devtools-wizard-2.4.0.tgz",
- "integrity": "sha512-3/5S2zpl79rE1b/lh8M/2lDNsYiYIXXHZmCwsYPuFJA6DilLQo/VY44oq6cY0Q1up32HYB3h1Te/q3ELbsb+ag==",
+ "version": "2.6.2",
+ "resolved": "https://registry.npmjs.org/@nuxt/devtools-wizard/-/devtools-wizard-2.6.2.tgz",
+ "integrity": "sha512-s1eYYKi2eZu2ZUPQrf22C0SceWs5/C3c3uow/DVunD304Um/Tj062xM9E4p1B9L8yjaq8t0Gtyu/YvZdo/reyg==",
"license": "MIT",
"dependencies": {
"consola": "^3.4.2",
- "diff": "^7.0.0",
+ "diff": "^8.0.2",
"execa": "^8.0.1",
"magicast": "^0.3.5",
"pathe": "^2.0.3",
- "pkg-types": "^2.1.0",
+ "pkg-types": "^2.2.0",
"prompts": "^2.4.2",
- "semver": "^7.7.1"
+ "semver": "^7.7.2"
},
"bin": {
"devtools-wizard": "cli.mjs"
@@ -3655,405 +3362,160 @@
}
},
"node_modules/@nuxt/eslint-config": {
- "version": "1.3.0",
- "resolved": "https://registry.npmjs.org/@nuxt/eslint-config/-/eslint-config-1.3.0.tgz",
- "integrity": "sha512-m0ebtmjyAiPVctBn+YijVst3WA2tQ6s/YJT4Dr33bTiSVvl+sFapxvAV+YOTyS4WECCBtjTAct61gamjbiahPg==",
+ "version": "1.5.2",
+ "resolved": "https://registry.npmjs.org/@nuxt/eslint-config/-/eslint-config-1.5.2.tgz",
+ "integrity": "sha512-oHAwVi11Chsnsi3RPsQa9lrIdrNeqlIJLMLD0tqigSXePsgN4zObTZfHL9zcnqBlOw7sD0k8RUbitzIk7dNEqA==",
"dev": true,
"license": "MIT",
"dependencies": {
- "@antfu/install-pkg": "^1.0.0",
- "@clack/prompts": "^0.10.0",
- "@eslint/js": "^9.23.0",
- "@nuxt/eslint-plugin": "1.3.0",
- "@stylistic/eslint-plugin": "^4.2.0",
- "@typescript-eslint/eslint-plugin": "^8.28.0",
- "@typescript-eslint/parser": "^8.28.0",
+ "@antfu/install-pkg": "^1.1.0",
+ "@clack/prompts": "^0.11.0",
+ "@eslint/js": "^9.30.1",
+ "@nuxt/eslint-plugin": "1.5.2",
+ "@stylistic/eslint-plugin": "^5.1.0",
+ "@typescript-eslint/eslint-plugin": "^8.35.1",
+ "@typescript-eslint/parser": "^8.35.1",
"eslint-config-flat-gitignore": "^2.1.0",
- "eslint-flat-config-utils": "^2.0.1",
+ "eslint-flat-config-utils": "^2.1.0",
"eslint-merge-processors": "^2.0.0",
- "eslint-plugin-import-x": "^4.9.4",
- "eslint-plugin-jsdoc": "^50.6.9",
- "eslint-plugin-regexp": "^2.7.0",
- "eslint-plugin-unicorn": "^58.0.0",
- "eslint-plugin-vue": "^10.0.0",
+ "eslint-plugin-import-lite": "^0.3.0",
+ "eslint-plugin-jsdoc": "^51.3.3",
+ "eslint-plugin-regexp": "^2.9.0",
+ "eslint-plugin-unicorn": "^59.0.1",
+ "eslint-plugin-vue": "^10.3.0",
"eslint-processor-vue-blocks": "^2.0.0",
- "globals": "^16.0.0",
+ "globals": "^16.3.0",
"local-pkg": "^1.1.1",
"pathe": "^2.0.3",
- "vue-eslint-parser": "^10.1.1"
+ "vue-eslint-parser": "^10.2.0"
},
"peerDependencies": {
"eslint": "^9.0.0",
- "eslint-plugin-format": "*"
+ "eslint-plugin-format": "*",
+ "eslint-plugin-import-x": "*"
},
"peerDependenciesMeta": {
"eslint-plugin-format": {
"optional": true
+ },
+ "eslint-plugin-import-x": {
+ "optional": true
}
}
},
"node_modules/@nuxt/eslint-plugin": {
- "version": "1.3.0",
- "resolved": "https://registry.npmjs.org/@nuxt/eslint-plugin/-/eslint-plugin-1.3.0.tgz",
- "integrity": "sha512-XrBSM81/nqMg4t4/iI2ZzSWlqz6v2IHmgQHobVuRASFI4b4fPRMoAl46CEGoDs8TgK7RBOJ1BziJ64c7Icos0g==",
+ "version": "1.5.2",
+ "resolved": "https://registry.npmjs.org/@nuxt/eslint-plugin/-/eslint-plugin-1.5.2.tgz",
+ "integrity": "sha512-tTejIcjd2eAlQjcT8CXA/200rAHZp24NjutEzAvvYoBOhkOdHZhGrBCxwkq0KVnct6jCnzmyscEOESd4o8VNsQ==",
"dev": true,
"license": "MIT",
"dependencies": {
- "@typescript-eslint/types": "^8.28.0",
- "@typescript-eslint/utils": "^8.28.0"
+ "@typescript-eslint/types": "^8.35.1",
+ "@typescript-eslint/utils": "^8.35.1"
},
"peerDependencies": {
"eslint": "^9.0.0"
}
},
- "node_modules/@nuxt/icon": {
- "version": "1.12.0",
- "resolved": "https://registry.npmjs.org/@nuxt/icon/-/icon-1.12.0.tgz",
- "integrity": "sha512-aAEq4NQzRXmfR6ajLvA8tuD/5pxaOg/3VzIKqQS68R3D2fGD1pAitTrJAm4A3RX2TnrRMSoYoNw34IyVE5w1dg==",
- "license": "MIT",
- "dependencies": {
- "@iconify/collections": "^1.0.536",
- "@iconify/types": "^2.0.0",
- "@iconify/utils": "^2.3.0",
- "@iconify/vue": "^4.3.0",
- "@nuxt/devtools-kit": "^2.3.2",
- "@nuxt/kit": "^3.16.2",
- "consola": "^3.4.2",
- "local-pkg": "^1.1.1",
- "mlly": "^1.7.4",
- "ohash": "^2.0.11",
- "pathe": "^2.0.3",
- "picomatch": "^4.0.2",
- "std-env": "^3.9.0",
- "tinyglobby": "^0.2.12"
- }
- },
- "node_modules/@nuxt/kit": {
- "version": "3.17.2",
- "resolved": "https://registry.npmjs.org/@nuxt/kit/-/kit-3.17.2.tgz",
- "integrity": "sha512-Mz2Ni8iUwty5LBs3LepUL43rI2xXbuAz3Cqq37L9frOD2QI2tQUtasYaSoKk6U7nvYzuW2z/2b3YOLkMNi/k2w==",
+ "node_modules/@nuxt/fonts": {
+ "version": "0.11.4",
+ "resolved": "https://registry.npmjs.org/@nuxt/fonts/-/fonts-0.11.4.tgz",
+ "integrity": "sha512-GbLavsC+9FejVwY+KU4/wonJsKhcwOZx/eo4EuV57C4osnF/AtEmev8xqI0DNlebMEhEGZbu1MGwDDDYbeR7Bw==",
"license": "MIT",
"dependencies": {
- "c12": "^3.0.3",
+ "@nuxt/devtools-kit": "^2.4.0",
+ "@nuxt/kit": "^3.17.3",
"consola": "^3.4.2",
+ "css-tree": "^3.1.0",
"defu": "^6.1.4",
- "destr": "^2.0.5",
- "errx": "^0.1.0",
- "exsolve": "^1.0.5",
- "ignore": "^7.0.4",
+ "esbuild": "^0.25.4",
+ "fontaine": "^0.6.0",
+ "h3": "^1.15.3",
"jiti": "^2.4.2",
- "klona": "^2.0.6",
- "knitwork": "^1.2.0",
- "mlly": "^1.7.4",
+ "magic-regexp": "^0.10.0",
+ "magic-string": "^0.30.17",
+ "node-fetch-native": "^1.6.6",
"ohash": "^2.0.11",
"pathe": "^2.0.3",
- "pkg-types": "^2.1.0",
- "scule": "^1.3.0",
- "semver": "^7.7.1",
- "std-env": "^3.9.0",
+ "sirv": "^3.0.1",
"tinyglobby": "^0.2.13",
"ufo": "^1.6.1",
- "unctx": "^2.4.1",
- "unimport": "^5.0.1",
- "untyped": "^2.0.0"
- },
+ "unifont": "^0.4.1",
+ "unplugin": "^2.3.3",
+ "unstorage": "^1.16.0"
+ }
+ },
+ "node_modules/@nuxt/fonts/node_modules/@esbuild/aix-ppc64": {
+ "version": "0.25.6",
+ "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.25.6.tgz",
+ "integrity": "sha512-ShbM/3XxwuxjFiuVBHA+d3j5dyac0aEVVq1oluIDf71hUw0aRF59dV/efUsIwFnR6m8JNM2FjZOzmaZ8yG61kw==",
+ "cpu": [
+ "ppc64"
+ ],
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "aix"
+ ],
"engines": {
- "node": ">=18.12.0"
+ "node": ">=18"
}
},
- "node_modules/@nuxt/schema": {
- "version": "3.17.2",
- "resolved": "https://registry.npmjs.org/@nuxt/schema/-/schema-3.17.2.tgz",
- "integrity": "sha512-DzmvgqcfIoCkNKXrBU6wpGckIXSxHHU+7OTlE68qNq6y0lVYnUA0Akrn0I8j+n/vFdQTIpJXiRD4dAgcomsBAg==",
+ "node_modules/@nuxt/fonts/node_modules/@esbuild/android-arm": {
+ "version": "0.25.6",
+ "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.25.6.tgz",
+ "integrity": "sha512-S8ToEOVfg++AU/bHwdksHNnyLyVM+eMVAOf6yRKFitnwnbwwPNqKr3srzFRe7nzV69RQKb5DgchIX5pt3L53xg==",
+ "cpu": [
+ "arm"
+ ],
"license": "MIT",
- "dependencies": {
- "@vue/shared": "^3.5.13",
- "consola": "^3.4.2",
- "defu": "^6.1.4",
- "pathe": "^2.0.3",
- "std-env": "^3.9.0"
- },
+ "optional": true,
+ "os": [
+ "android"
+ ],
"engines": {
- "node": "^14.18.0 || >=16.10.0"
+ "node": ">=18"
}
},
- "node_modules/@nuxt/telemetry": {
- "version": "2.6.6",
- "resolved": "https://registry.npmjs.org/@nuxt/telemetry/-/telemetry-2.6.6.tgz",
- "integrity": "sha512-Zh4HJLjzvm3Cq9w6sfzIFyH9ozK5ePYVfCUzzUQNiZojFsI2k1QkSBrVI9BGc6ArKXj/O6rkI6w7qQ+ouL8Cag==",
+ "node_modules/@nuxt/fonts/node_modules/@esbuild/android-arm64": {
+ "version": "0.25.6",
+ "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.25.6.tgz",
+ "integrity": "sha512-hd5zdUarsK6strW+3Wxi5qWws+rJhCCbMiC9QZyzoxfk5uHRIE8T287giQxzVpEvCwuJ9Qjg6bEjcRJcgfLqoA==",
+ "cpu": [
+ "arm64"
+ ],
"license": "MIT",
- "dependencies": {
- "@nuxt/kit": "^3.15.4",
- "citty": "^0.1.6",
- "consola": "^3.4.2",
- "destr": "^2.0.3",
- "dotenv": "^16.4.7",
- "git-url-parse": "^16.0.1",
- "is-docker": "^3.0.0",
- "ofetch": "^1.4.1",
- "package-manager-detector": "^1.1.0",
- "pathe": "^2.0.3",
- "rc9": "^2.1.2",
- "std-env": "^3.8.1"
- },
- "bin": {
- "nuxt-telemetry": "bin/nuxt-telemetry.mjs"
- },
+ "optional": true,
+ "os": [
+ "android"
+ ],
"engines": {
- "node": ">=18.12.0"
+ "node": ">=18"
}
},
- "node_modules/@nuxt/ui": {
- "version": "2.22.0",
- "resolved": "https://registry.npmjs.org/@nuxt/ui/-/ui-2.22.0.tgz",
- "integrity": "sha512-TT8IP/5aaCqLltLbq0rulLaKtJXcMbv91mrfUz4j7IGNWZm/SLz74CZx0pHO3/Ha4jrDbwbSFrkrKv0ewfDvnw==",
+ "node_modules/@nuxt/fonts/node_modules/@esbuild/android-x64": {
+ "version": "0.25.6",
+ "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.25.6.tgz",
+ "integrity": "sha512-0Z7KpHSr3VBIO9A/1wcT3NTy7EB4oNC4upJ5ye3R7taCc2GUdeynSLArnon5G8scPwaU866d3H4BCrE5xLW25A==",
+ "cpu": [
+ "x64"
+ ],
"license": "MIT",
- "dependencies": {
- "@headlessui/tailwindcss": "^0.2.2",
- "@headlessui/vue": "^1.7.23",
- "@iconify-json/heroicons": "^1.2.2",
- "@nuxt/icon": "^1.12.0",
- "@nuxt/kit": "^3.16.2",
- "@nuxtjs/color-mode": "^3.5.2",
- "@nuxtjs/tailwindcss": "^6.13.2",
- "@popperjs/core": "^2.11.8",
- "@standard-schema/spec": "^1.0.0",
- "@tailwindcss/aspect-ratio": "^0.4.2",
- "@tailwindcss/container-queries": "^0.1.1",
- "@tailwindcss/forms": "^0.5.10",
- "@tailwindcss/typography": "^0.5.16",
- "@vueuse/core": "^13.1.0",
- "@vueuse/integrations": "^13.1.0",
- "@vueuse/math": "^13.1.0",
- "defu": "^6.1.4",
- "fuse.js": "^7.1.0",
- "ohash": "^2.0.11",
- "pathe": "^2.0.3",
- "scule": "^1.3.0",
- "tailwind-merge": "^2.6.0",
- "tailwindcss": "^3.4.17"
- },
- "peerDependencies": {
- "joi": "^17.13.0",
- "superstruct": "^2.0.0",
- "valibot": "^1.0.0",
- "yup": "^1.6.0",
- "zod": "^3.24.0"
- },
- "peerDependenciesMeta": {
- "joi": {
- "optional": true
- },
- "superstruct": {
- "optional": true
- },
- "valibot": {
- "optional": true
- },
- "yup": {
- "optional": true
- },
- "zod": {
- "optional": true
- }
+ "optional": true,
+ "os": [
+ "android"
+ ],
+ "engines": {
+ "node": ">=18"
}
},
- "node_modules/@nuxt/ui/node_modules/@vueuse/integrations": {
- "version": "13.1.0",
- "resolved": "https://registry.npmjs.org/@vueuse/integrations/-/integrations-13.1.0.tgz",
- "integrity": "sha512-wJ6aANdUs4SOpVabChQK+uLIwxRTUAEmn1DJnflGG7Wq6yaipiRmp6as/Md201FjJnquQt8MecIPbFv8HSBeDA==",
- "license": "MIT",
- "dependencies": {
- "@vueuse/core": "13.1.0",
- "@vueuse/shared": "13.1.0"
- },
- "funding": {
- "url": "https://github.com/sponsors/antfu"
- },
- "peerDependencies": {
- "async-validator": "^4",
- "axios": "^1",
- "change-case": "^5",
- "drauu": "^0.4",
- "focus-trap": "^7",
- "fuse.js": "^7",
- "idb-keyval": "^6",
- "jwt-decode": "^4",
- "nprogress": "^0.2",
- "qrcode": "^1.5",
- "sortablejs": "^1",
- "universal-cookie": "^7",
- "vue": "^3.5.0"
- },
- "peerDependenciesMeta": {
- "async-validator": {
- "optional": true
- },
- "axios": {
- "optional": true
- },
- "change-case": {
- "optional": true
- },
- "drauu": {
- "optional": true
- },
- "focus-trap": {
- "optional": true
- },
- "fuse.js": {
- "optional": true
- },
- "idb-keyval": {
- "optional": true
- },
- "jwt-decode": {
- "optional": true
- },
- "nprogress": {
- "optional": true
- },
- "qrcode": {
- "optional": true
- },
- "sortablejs": {
- "optional": true
- },
- "universal-cookie": {
- "optional": true
- }
- }
- },
- "node_modules/@nuxt/ui/node_modules/@vueuse/shared": {
- "version": "13.1.0",
- "resolved": "https://registry.npmjs.org/@vueuse/shared/-/shared-13.1.0.tgz",
- "integrity": "sha512-IVS/qRRjhPTZ6C2/AM3jieqXACGwFZwWTdw5sNTSKk2m/ZpkuuN+ri+WCVUP8TqaKwJYt/KuMwmXspMAw8E6ew==",
- "license": "MIT",
- "funding": {
- "url": "https://github.com/sponsors/antfu"
- },
- "peerDependencies": {
- "vue": "^3.5.0"
- }
- },
- "node_modules/@nuxt/vite-builder": {
- "version": "3.17.2",
- "resolved": "https://registry.npmjs.org/@nuxt/vite-builder/-/vite-builder-3.17.2.tgz",
- "integrity": "sha512-TfKuh7MPjIhlObLNcoNTRk6/s3L6b6Z7hPuJcnrAeh/a9JGH6fmRsKztW5D5mFEN3H3K6viXche8q2ftQEk7CQ==",
- "license": "MIT",
- "dependencies": {
- "@nuxt/kit": "3.17.2",
- "@rollup/plugin-replace": "^6.0.2",
- "@vitejs/plugin-vue": "^5.2.3",
- "@vitejs/plugin-vue-jsx": "^4.1.2",
- "autoprefixer": "^10.4.21",
- "consola": "^3.4.2",
- "cssnano": "^7.0.6",
- "defu": "^6.1.4",
- "esbuild": "^0.25.3",
- "escape-string-regexp": "^5.0.0",
- "exsolve": "^1.0.5",
- "externality": "^1.0.2",
- "get-port-please": "^3.1.2",
- "h3": "^1.15.3",
- "jiti": "^2.4.2",
- "knitwork": "^1.2.0",
- "magic-string": "^0.30.17",
- "mlly": "^1.7.4",
- "mocked-exports": "^0.1.1",
- "ohash": "^2.0.11",
- "pathe": "^2.0.3",
- "perfect-debounce": "^1.0.0",
- "pkg-types": "^2.1.0",
- "postcss": "^8.5.3",
- "rollup-plugin-visualizer": "^5.14.0",
- "std-env": "^3.9.0",
- "ufo": "^1.6.1",
- "unenv": "^2.0.0-rc.15",
- "unplugin": "^2.3.2",
- "vite": "^6.3.4",
- "vite-node": "^3.1.2",
- "vite-plugin-checker": "^0.9.2",
- "vue-bundle-renderer": "^2.1.1"
- },
- "engines": {
- "node": "^18.12.0 || ^20.9.0 || >=22.0.0"
- },
- "peerDependencies": {
- "vue": "^3.3.4"
- }
- },
- "node_modules/@nuxt/vite-builder/node_modules/@esbuild/aix-ppc64": {
- "version": "0.25.4",
- "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.25.4.tgz",
- "integrity": "sha512-1VCICWypeQKhVbE9oW/sJaAmjLxhVqacdkvPLEjwlttjfwENRSClS8EjBz0KzRyFSCPDIkuXW34Je/vk7zdB7Q==",
- "cpu": [
- "ppc64"
- ],
- "license": "MIT",
- "optional": true,
- "os": [
- "aix"
- ],
- "engines": {
- "node": ">=18"
- }
- },
- "node_modules/@nuxt/vite-builder/node_modules/@esbuild/android-arm": {
- "version": "0.25.4",
- "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.25.4.tgz",
- "integrity": "sha512-QNdQEps7DfFwE3hXiU4BZeOV68HHzYwGd0Nthhd3uCkkEKK7/R6MTgM0P7H7FAs5pU/DIWsviMmEGxEoxIZ+ZQ==",
- "cpu": [
- "arm"
- ],
- "license": "MIT",
- "optional": true,
- "os": [
- "android"
- ],
- "engines": {
- "node": ">=18"
- }
- },
- "node_modules/@nuxt/vite-builder/node_modules/@esbuild/android-arm64": {
- "version": "0.25.4",
- "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.25.4.tgz",
- "integrity": "sha512-bBy69pgfhMGtCnwpC/x5QhfxAz/cBgQ9enbtwjf6V9lnPI/hMyT9iWpR1arm0l3kttTr4L0KSLpKmLp/ilKS9A==",
- "cpu": [
- "arm64"
- ],
- "license": "MIT",
- "optional": true,
- "os": [
- "android"
- ],
- "engines": {
- "node": ">=18"
- }
- },
- "node_modules/@nuxt/vite-builder/node_modules/@esbuild/android-x64": {
- "version": "0.25.4",
- "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.25.4.tgz",
- "integrity": "sha512-TVhdVtQIFuVpIIR282btcGC2oGQoSfZfmBdTip2anCaVYcqWlZXGcdcKIUklfX2wj0JklNYgz39OBqh2cqXvcQ==",
- "cpu": [
- "x64"
- ],
- "license": "MIT",
- "optional": true,
- "os": [
- "android"
- ],
- "engines": {
- "node": ">=18"
- }
- },
- "node_modules/@nuxt/vite-builder/node_modules/@esbuild/darwin-arm64": {
- "version": "0.25.4",
- "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.25.4.tgz",
- "integrity": "sha512-Y1giCfM4nlHDWEfSckMzeWNdQS31BQGs9/rouw6Ub91tkK79aIMTH3q9xHvzH8d0wDru5Ci0kWB8b3up/nl16g==",
- "cpu": [
- "arm64"
- ],
+ "node_modules/@nuxt/fonts/node_modules/@esbuild/darwin-arm64": {
+ "version": "0.25.6",
+ "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.25.6.tgz",
+ "integrity": "sha512-FFCssz3XBavjxcFxKsGy2DYK5VSvJqa6y5HXljKzhRZ87LvEi13brPrf/wdyl/BbpbMKJNOr1Sd0jtW4Ge1pAA==",
+ "cpu": [
+ "arm64"
+ ],
"license": "MIT",
"optional": true,
"os": [
@@ -4063,10 +3525,10 @@
"node": ">=18"
}
},
- "node_modules/@nuxt/vite-builder/node_modules/@esbuild/darwin-x64": {
- "version": "0.25.4",
- "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.25.4.tgz",
- "integrity": "sha512-CJsry8ZGM5VFVeyUYB3cdKpd/H69PYez4eJh1W/t38vzutdjEjtP7hB6eLKBoOdxcAlCtEYHzQ/PJ/oU9I4u0A==",
+ "node_modules/@nuxt/fonts/node_modules/@esbuild/darwin-x64": {
+ "version": "0.25.6",
+ "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.25.6.tgz",
+ "integrity": "sha512-GfXs5kry/TkGM2vKqK2oyiLFygJRqKVhawu3+DOCk7OxLy/6jYkWXhlHwOoTb0WqGnWGAS7sooxbZowy+pK9Yg==",
"cpu": [
"x64"
],
@@ -4079,10 +3541,10 @@
"node": ">=18"
}
},
- "node_modules/@nuxt/vite-builder/node_modules/@esbuild/freebsd-arm64": {
- "version": "0.25.4",
- "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.25.4.tgz",
- "integrity": "sha512-yYq+39NlTRzU2XmoPW4l5Ifpl9fqSk0nAJYM/V/WUGPEFfek1epLHJIkTQM6bBs1swApjO5nWgvr843g6TjxuQ==",
+ "node_modules/@nuxt/fonts/node_modules/@esbuild/freebsd-arm64": {
+ "version": "0.25.6",
+ "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.25.6.tgz",
+ "integrity": "sha512-aoLF2c3OvDn2XDTRvn8hN6DRzVVpDlj2B/F66clWd/FHLiHaG3aVZjxQX2DYphA5y/evbdGvC6Us13tvyt4pWg==",
"cpu": [
"arm64"
],
@@ -4095,10 +3557,10 @@
"node": ">=18"
}
},
- "node_modules/@nuxt/vite-builder/node_modules/@esbuild/freebsd-x64": {
- "version": "0.25.4",
- "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.25.4.tgz",
- "integrity": "sha512-0FgvOJ6UUMflsHSPLzdfDnnBBVoCDtBTVyn/MrWloUNvq/5SFmh13l3dvgRPkDihRxb77Y17MbqbCAa2strMQQ==",
+ "node_modules/@nuxt/fonts/node_modules/@esbuild/freebsd-x64": {
+ "version": "0.25.6",
+ "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.25.6.tgz",
+ "integrity": "sha512-2SkqTjTSo2dYi/jzFbU9Plt1vk0+nNg8YC8rOXXea+iA3hfNJWebKYPs3xnOUf9+ZWhKAaxnQNUf2X9LOpeiMQ==",
"cpu": [
"x64"
],
@@ -4111,10 +3573,10 @@
"node": ">=18"
}
},
- "node_modules/@nuxt/vite-builder/node_modules/@esbuild/linux-arm": {
- "version": "0.25.4",
- "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.25.4.tgz",
- "integrity": "sha512-kro4c0P85GMfFYqW4TWOpvmF8rFShbWGnrLqlzp4X1TNWjRY3JMYUfDCtOxPKOIY8B0WC8HN51hGP4I4hz4AaQ==",
+ "node_modules/@nuxt/fonts/node_modules/@esbuild/linux-arm": {
+ "version": "0.25.6",
+ "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.25.6.tgz",
+ "integrity": "sha512-SZHQlzvqv4Du5PrKE2faN0qlbsaW/3QQfUUc6yO2EjFcA83xnwm91UbEEVx4ApZ9Z5oG8Bxz4qPE+HFwtVcfyw==",
"cpu": [
"arm"
],
@@ -4127,10 +3589,10 @@
"node": ">=18"
}
},
- "node_modules/@nuxt/vite-builder/node_modules/@esbuild/linux-arm64": {
- "version": "0.25.4",
- "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.25.4.tgz",
- "integrity": "sha512-+89UsQTfXdmjIvZS6nUnOOLoXnkUTB9hR5QAeLrQdzOSWZvNSAXAtcRDHWtqAUtAmv7ZM1WPOOeSxDzzzMogiQ==",
+ "node_modules/@nuxt/fonts/node_modules/@esbuild/linux-arm64": {
+ "version": "0.25.6",
+ "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.25.6.tgz",
+ "integrity": "sha512-b967hU0gqKd9Drsh/UuAm21Khpoh6mPBSgz8mKRq4P5mVK8bpA+hQzmm/ZwGVULSNBzKdZPQBRT3+WuVavcWsQ==",
"cpu": [
"arm64"
],
@@ -4143,10 +3605,10 @@
"node": ">=18"
}
},
- "node_modules/@nuxt/vite-builder/node_modules/@esbuild/linux-ia32": {
- "version": "0.25.4",
- "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.25.4.tgz",
- "integrity": "sha512-yTEjoapy8UP3rv8dB0ip3AfMpRbyhSN3+hY8mo/i4QXFeDxmiYbEKp3ZRjBKcOP862Ua4b1PDfwlvbuwY7hIGQ==",
+ "node_modules/@nuxt/fonts/node_modules/@esbuild/linux-ia32": {
+ "version": "0.25.6",
+ "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.25.6.tgz",
+ "integrity": "sha512-aHWdQ2AAltRkLPOsKdi3xv0mZ8fUGPdlKEjIEhxCPm5yKEThcUjHpWB1idN74lfXGnZ5SULQSgtr5Qos5B0bPw==",
"cpu": [
"ia32"
],
@@ -4159,10 +3621,10 @@
"node": ">=18"
}
},
- "node_modules/@nuxt/vite-builder/node_modules/@esbuild/linux-loong64": {
- "version": "0.25.4",
- "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.25.4.tgz",
- "integrity": "sha512-NeqqYkrcGzFwi6CGRGNMOjWGGSYOpqwCjS9fvaUlX5s3zwOtn1qwg1s2iE2svBe4Q/YOG1q6875lcAoQK/F4VA==",
+ "node_modules/@nuxt/fonts/node_modules/@esbuild/linux-loong64": {
+ "version": "0.25.6",
+ "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.25.6.tgz",
+ "integrity": "sha512-VgKCsHdXRSQ7E1+QXGdRPlQ/e08bN6WMQb27/TMfV+vPjjTImuT9PmLXupRlC90S1JeNNW5lzkAEO/McKeJ2yg==",
"cpu": [
"loong64"
],
@@ -4175,10 +3637,10 @@
"node": ">=18"
}
},
- "node_modules/@nuxt/vite-builder/node_modules/@esbuild/linux-mips64el": {
- "version": "0.25.4",
- "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.25.4.tgz",
- "integrity": "sha512-IcvTlF9dtLrfL/M8WgNI/qJYBENP3ekgsHbYUIzEzq5XJzzVEV/fXY9WFPfEEXmu3ck2qJP8LG/p3Q8f7Zc2Xg==",
+ "node_modules/@nuxt/fonts/node_modules/@esbuild/linux-mips64el": {
+ "version": "0.25.6",
+ "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.25.6.tgz",
+ "integrity": "sha512-WViNlpivRKT9/py3kCmkHnn44GkGXVdXfdc4drNmRl15zVQ2+D2uFwdlGh6IuK5AAnGTo2qPB1Djppj+t78rzw==",
"cpu": [
"mips64el"
],
@@ -4191,10 +3653,10 @@
"node": ">=18"
}
},
- "node_modules/@nuxt/vite-builder/node_modules/@esbuild/linux-ppc64": {
- "version": "0.25.4",
- "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.25.4.tgz",
- "integrity": "sha512-HOy0aLTJTVtoTeGZh4HSXaO6M95qu4k5lJcH4gxv56iaycfz1S8GO/5Jh6X4Y1YiI0h7cRyLi+HixMR+88swag==",
+ "node_modules/@nuxt/fonts/node_modules/@esbuild/linux-ppc64": {
+ "version": "0.25.6",
+ "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.25.6.tgz",
+ "integrity": "sha512-wyYKZ9NTdmAMb5730I38lBqVu6cKl4ZfYXIs31Baf8aoOtB4xSGi3THmDYt4BTFHk7/EcVixkOV2uZfwU3Q2Jw==",
"cpu": [
"ppc64"
],
@@ -4207,10 +3669,10 @@
"node": ">=18"
}
},
- "node_modules/@nuxt/vite-builder/node_modules/@esbuild/linux-riscv64": {
- "version": "0.25.4",
- "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.25.4.tgz",
- "integrity": "sha512-i8JUDAufpz9jOzo4yIShCTcXzS07vEgWzyX3NH2G7LEFVgrLEhjwL3ajFE4fZI3I4ZgiM7JH3GQ7ReObROvSUA==",
+ "node_modules/@nuxt/fonts/node_modules/@esbuild/linux-riscv64": {
+ "version": "0.25.6",
+ "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.25.6.tgz",
+ "integrity": "sha512-KZh7bAGGcrinEj4qzilJ4hqTY3Dg2U82c8bv+e1xqNqZCrCyc+TL9AUEn5WGKDzm3CfC5RODE/qc96OcbIe33w==",
"cpu": [
"riscv64"
],
@@ -4223,10 +3685,10 @@
"node": ">=18"
}
},
- "node_modules/@nuxt/vite-builder/node_modules/@esbuild/linux-s390x": {
- "version": "0.25.4",
- "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.25.4.tgz",
- "integrity": "sha512-jFnu+6UbLlzIjPQpWCNh5QtrcNfMLjgIavnwPQAfoGx4q17ocOU9MsQ2QVvFxwQoWpZT8DvTLooTvmOQXkO51g==",
+ "node_modules/@nuxt/fonts/node_modules/@esbuild/linux-s390x": {
+ "version": "0.25.6",
+ "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.25.6.tgz",
+ "integrity": "sha512-9N1LsTwAuE9oj6lHMyyAM+ucxGiVnEqUdp4v7IaMmrwb06ZTEVCIs3oPPplVsnjPfyjmxwHxHMF8b6vzUVAUGw==",
"cpu": [
"s390x"
],
@@ -4239,10 +3701,10 @@
"node": ">=18"
}
},
- "node_modules/@nuxt/vite-builder/node_modules/@esbuild/linux-x64": {
- "version": "0.25.4",
- "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.25.4.tgz",
- "integrity": "sha512-6e0cvXwzOnVWJHq+mskP8DNSrKBr1bULBvnFLpc1KY+d+irZSgZ02TGse5FsafKS5jg2e4pbvK6TPXaF/A6+CA==",
+ "node_modules/@nuxt/fonts/node_modules/@esbuild/linux-x64": {
+ "version": "0.25.6",
+ "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.25.6.tgz",
+ "integrity": "sha512-A6bJB41b4lKFWRKNrWoP2LHsjVzNiaurf7wyj/XtFNTsnPuxwEBWHLty+ZE0dWBKuSK1fvKgrKaNjBS7qbFKig==",
"cpu": [
"x64"
],
@@ -4255,10 +3717,26 @@
"node": ">=18"
}
},
- "node_modules/@nuxt/vite-builder/node_modules/@esbuild/netbsd-x64": {
- "version": "0.25.4",
- "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.25.4.tgz",
- "integrity": "sha512-XAg8pIQn5CzhOB8odIcAm42QsOfa98SBeKUdo4xa8OvX8LbMZqEtgeWE9P/Wxt7MlG2QqvjGths+nq48TrUiKw==",
+ "node_modules/@nuxt/fonts/node_modules/@esbuild/netbsd-arm64": {
+ "version": "0.25.6",
+ "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.25.6.tgz",
+ "integrity": "sha512-IjA+DcwoVpjEvyxZddDqBY+uJ2Snc6duLpjmkXm/v4xuS3H+3FkLZlDm9ZsAbF9rsfP3zeA0/ArNDORZgrxR/Q==",
+ "cpu": [
+ "arm64"
+ ],
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "netbsd"
+ ],
+ "engines": {
+ "node": ">=18"
+ }
+ },
+ "node_modules/@nuxt/fonts/node_modules/@esbuild/netbsd-x64": {
+ "version": "0.25.6",
+ "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.25.6.tgz",
+ "integrity": "sha512-dUXuZr5WenIDlMHdMkvDc1FAu4xdWixTCRgP7RQLBOkkGgwuuzaGSYcOpW4jFxzpzL1ejb8yF620UxAqnBrR9g==",
"cpu": [
"x64"
],
@@ -4271,10 +3749,10 @@
"node": ">=18"
}
},
- "node_modules/@nuxt/vite-builder/node_modules/@esbuild/openbsd-arm64": {
- "version": "0.25.4",
- "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.25.4.tgz",
- "integrity": "sha512-Ct2WcFEANlFDtp1nVAXSNBPDxyU+j7+tId//iHXU2f/lN5AmO4zLyhDcpR5Cz1r08mVxzt3Jpyt4PmXQ1O6+7A==",
+ "node_modules/@nuxt/fonts/node_modules/@esbuild/openbsd-arm64": {
+ "version": "0.25.6",
+ "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.25.6.tgz",
+ "integrity": "sha512-l8ZCvXP0tbTJ3iaqdNf3pjaOSd5ex/e6/omLIQCVBLmHTlfXW3zAxQ4fnDmPLOB1x9xrcSi/xtCWFwCZRIaEwg==",
"cpu": [
"arm64"
],
@@ -4287,10 +3765,10 @@
"node": ">=18"
}
},
- "node_modules/@nuxt/vite-builder/node_modules/@esbuild/openbsd-x64": {
- "version": "0.25.4",
- "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.25.4.tgz",
- "integrity": "sha512-xAGGhyOQ9Otm1Xu8NT1ifGLnA6M3sJxZ6ixylb+vIUVzvvd6GOALpwQrYrtlPouMqd/vSbgehz6HaVk4+7Afhw==",
+ "node_modules/@nuxt/fonts/node_modules/@esbuild/openbsd-x64": {
+ "version": "0.25.6",
+ "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.25.6.tgz",
+ "integrity": "sha512-hKrmDa0aOFOr71KQ/19JC7az1P0GWtCN1t2ahYAf4O007DHZt/dW8ym5+CUdJhQ/qkZmI1HAF8KkJbEFtCL7gw==",
"cpu": [
"x64"
],
@@ -4303,10 +3781,10 @@
"node": ">=18"
}
},
- "node_modules/@nuxt/vite-builder/node_modules/@esbuild/sunos-x64": {
- "version": "0.25.4",
- "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.25.4.tgz",
- "integrity": "sha512-Mw+tzy4pp6wZEK0+Lwr76pWLjrtjmJyUB23tHKqEDP74R3q95luY/bXqXZeYl4NYlvwOqoRKlInQialgCKy67Q==",
+ "node_modules/@nuxt/fonts/node_modules/@esbuild/sunos-x64": {
+ "version": "0.25.6",
+ "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.25.6.tgz",
+ "integrity": "sha512-dyCGxv1/Br7MiSC42qinGL8KkG4kX0pEsdb0+TKhmJZgCUDBGmyo1/ArCjNGiOLiIAgdbWgmWgib4HoCi5t7kA==",
"cpu": [
"x64"
],
@@ -4319,10 +3797,10 @@
"node": ">=18"
}
},
- "node_modules/@nuxt/vite-builder/node_modules/@esbuild/win32-arm64": {
- "version": "0.25.4",
- "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.25.4.tgz",
- "integrity": "sha512-AVUP428VQTSddguz9dO9ngb+E5aScyg7nOeJDrF1HPYu555gmza3bDGMPhmVXL8svDSoqPCsCPjb265yG/kLKQ==",
+ "node_modules/@nuxt/fonts/node_modules/@esbuild/win32-arm64": {
+ "version": "0.25.6",
+ "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.25.6.tgz",
+ "integrity": "sha512-42QOgcZeZOvXfsCBJF5Afw73t4veOId//XD3i+/9gSkhSV6Gk3VPlWncctI+JcOyERv85FUo7RxuxGy+z8A43Q==",
"cpu": [
"arm64"
],
@@ -4335,10 +3813,10 @@
"node": ">=18"
}
},
- "node_modules/@nuxt/vite-builder/node_modules/@esbuild/win32-ia32": {
- "version": "0.25.4",
- "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.25.4.tgz",
- "integrity": "sha512-i1sW+1i+oWvQzSgfRcxxG2k4I9n3O9NRqy8U+uugaT2Dy7kLO9Y7wI72haOahxceMX8hZAzgGou1FhndRldxRg==",
+ "node_modules/@nuxt/fonts/node_modules/@esbuild/win32-ia32": {
+ "version": "0.25.6",
+ "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.25.6.tgz",
+ "integrity": "sha512-4AWhgXmDuYN7rJI6ORB+uU9DHLq/erBbuMoAuB4VWJTu5KtCgcKYPynF0YI1VkBNuEfjNlLrFr9KZPJzrtLkrQ==",
"cpu": [
"ia32"
],
@@ -4351,10 +3829,10 @@
"node": ">=18"
}
},
- "node_modules/@nuxt/vite-builder/node_modules/@esbuild/win32-x64": {
- "version": "0.25.4",
- "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.25.4.tgz",
- "integrity": "sha512-nOT2vZNw6hJ+z43oP1SPea/G/6AbN6X+bGNhNuq8NtRHy4wsMhw765IKLNmnjek7GvjWBYQ8Q5VBoYTFg9y1UQ==",
+ "node_modules/@nuxt/fonts/node_modules/@esbuild/win32-x64": {
+ "version": "0.25.6",
+ "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.25.6.tgz",
+ "integrity": "sha512-NgJPHHbEpLQgDH2MjQu90pzW/5vvXIZ7KOnPyNBm92A6WgZ/7b6fJyUBjoumLqeOQQGqY2QjQxRo97ah4Sj0cA==",
"cpu": [
"x64"
],
@@ -4367,10 +3845,10 @@
"node": ">=18"
}
},
- "node_modules/@nuxt/vite-builder/node_modules/esbuild": {
- "version": "0.25.4",
- "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.25.4.tgz",
- "integrity": "sha512-8pgjLUcUjcgDg+2Q4NYXnPbo/vncAY4UmyaCm0jZevERqCHZIaWwdJHkf8XQtu4AxSKCdvrUbT0XUr1IdZzI8Q==",
+ "node_modules/@nuxt/fonts/node_modules/esbuild": {
+ "version": "0.25.6",
+ "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.25.6.tgz",
+ "integrity": "sha512-GVuzuUwtdsghE3ocJ9Bs8PNoF13HNQ5TXbEi2AhvVb8xU1Iwt9Fos9FEamfoee+u/TOsn7GUWc04lz46n2bbTg==",
"hasInstallScript": true,
"license": "MIT",
"bin": {
@@ -4380,151 +3858,365 @@
"node": ">=18"
},
"optionalDependencies": {
- "@esbuild/aix-ppc64": "0.25.4",
- "@esbuild/android-arm": "0.25.4",
- "@esbuild/android-arm64": "0.25.4",
- "@esbuild/android-x64": "0.25.4",
- "@esbuild/darwin-arm64": "0.25.4",
- "@esbuild/darwin-x64": "0.25.4",
- "@esbuild/freebsd-arm64": "0.25.4",
- "@esbuild/freebsd-x64": "0.25.4",
- "@esbuild/linux-arm": "0.25.4",
- "@esbuild/linux-arm64": "0.25.4",
- "@esbuild/linux-ia32": "0.25.4",
- "@esbuild/linux-loong64": "0.25.4",
- "@esbuild/linux-mips64el": "0.25.4",
- "@esbuild/linux-ppc64": "0.25.4",
- "@esbuild/linux-riscv64": "0.25.4",
- "@esbuild/linux-s390x": "0.25.4",
- "@esbuild/linux-x64": "0.25.4",
- "@esbuild/netbsd-arm64": "0.25.4",
- "@esbuild/netbsd-x64": "0.25.4",
- "@esbuild/openbsd-arm64": "0.25.4",
- "@esbuild/openbsd-x64": "0.25.4",
- "@esbuild/sunos-x64": "0.25.4",
- "@esbuild/win32-arm64": "0.25.4",
- "@esbuild/win32-ia32": "0.25.4",
- "@esbuild/win32-x64": "0.25.4"
- }
- },
- "node_modules/@nuxt/vite-builder/node_modules/escape-string-regexp": {
- "version": "5.0.0",
- "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-5.0.0.tgz",
- "integrity": "sha512-/veY75JbMK4j1yjvuUxuVsiS/hr/4iHs9FTT6cgTexxdE0Ly/glccBAkloH/DofkjRbZU3bnoj38mOmhkZ0lHw==",
- "license": "MIT",
- "engines": {
- "node": ">=12"
- },
- "funding": {
- "url": "https://github.com/sponsors/sindresorhus"
- }
- },
- "node_modules/@nuxtjs/color-mode": {
- "version": "3.5.2",
- "resolved": "https://registry.npmjs.org/@nuxtjs/color-mode/-/color-mode-3.5.2.tgz",
- "integrity": "sha512-cC6RfgZh3guHBMLLjrBB2Uti5eUoGM9KyauOaYS9ETmxNWBMTvpgjvSiSJp1OFljIXPIqVTJ3xtJpSNZiO3ZaA==",
- "license": "MIT",
- "dependencies": {
- "@nuxt/kit": "^3.13.2",
- "pathe": "^1.1.2",
- "pkg-types": "^1.2.1",
- "semver": "^7.6.3"
+ "@esbuild/aix-ppc64": "0.25.6",
+ "@esbuild/android-arm": "0.25.6",
+ "@esbuild/android-arm64": "0.25.6",
+ "@esbuild/android-x64": "0.25.6",
+ "@esbuild/darwin-arm64": "0.25.6",
+ "@esbuild/darwin-x64": "0.25.6",
+ "@esbuild/freebsd-arm64": "0.25.6",
+ "@esbuild/freebsd-x64": "0.25.6",
+ "@esbuild/linux-arm": "0.25.6",
+ "@esbuild/linux-arm64": "0.25.6",
+ "@esbuild/linux-ia32": "0.25.6",
+ "@esbuild/linux-loong64": "0.25.6",
+ "@esbuild/linux-mips64el": "0.25.6",
+ "@esbuild/linux-ppc64": "0.25.6",
+ "@esbuild/linux-riscv64": "0.25.6",
+ "@esbuild/linux-s390x": "0.25.6",
+ "@esbuild/linux-x64": "0.25.6",
+ "@esbuild/netbsd-arm64": "0.25.6",
+ "@esbuild/netbsd-x64": "0.25.6",
+ "@esbuild/openbsd-arm64": "0.25.6",
+ "@esbuild/openbsd-x64": "0.25.6",
+ "@esbuild/openharmony-arm64": "0.25.6",
+ "@esbuild/sunos-x64": "0.25.6",
+ "@esbuild/win32-arm64": "0.25.6",
+ "@esbuild/win32-ia32": "0.25.6",
+ "@esbuild/win32-x64": "0.25.6"
}
},
- "node_modules/@nuxtjs/color-mode/node_modules/confbox": {
- "version": "0.1.8",
- "resolved": "https://registry.npmjs.org/confbox/-/confbox-0.1.8.tgz",
- "integrity": "sha512-RMtmw0iFkeR4YV+fUOSucriAQNb9g8zFR52MWCtl+cCZOFRNL6zeB395vPzFhEjjn4fMxXudmELnl/KF/WrK6w==",
- "license": "MIT"
- },
- "node_modules/@nuxtjs/color-mode/node_modules/pathe": {
- "version": "1.1.2",
- "resolved": "https://registry.npmjs.org/pathe/-/pathe-1.1.2.tgz",
- "integrity": "sha512-whLdWMYL2TwI08hn8/ZqAbrVemu0LNaNNJZX73O6qaIdCTfXutsLhMkjdENX0qhsQ9uIimo4/aQOmXkoon2nDQ==",
- "license": "MIT"
- },
- "node_modules/@nuxtjs/color-mode/node_modules/pkg-types": {
- "version": "1.3.1",
- "resolved": "https://registry.npmjs.org/pkg-types/-/pkg-types-1.3.1.tgz",
- "integrity": "sha512-/Jm5M4RvtBFVkKWRu2BLUTNP8/M2a+UwuAX+ae4770q1qVGtfjG+WTCupoZixokjmHiry8uI+dlY8KXYV5HVVQ==",
+ "node_modules/@nuxt/icon": {
+ "version": "1.15.0",
+ "resolved": "https://registry.npmjs.org/@nuxt/icon/-/icon-1.15.0.tgz",
+ "integrity": "sha512-kA0rxqr1B601zNJNcOXera8CyYcxUCEcT7dXEC7rwAz71PRCN5emf7G656eKEQgtqrD4JSj6NQqWDgrmFcf/GQ==",
"license": "MIT",
"dependencies": {
- "confbox": "^0.1.8",
+ "@iconify/collections": "^1.0.563",
+ "@iconify/types": "^2.0.0",
+ "@iconify/utils": "^2.3.0",
+ "@iconify/vue": "^5.0.0",
+ "@nuxt/devtools-kit": "^2.5.0",
+ "@nuxt/kit": "^3.17.5",
+ "consola": "^3.4.2",
+ "local-pkg": "^1.1.1",
"mlly": "^1.7.4",
- "pathe": "^2.0.1"
+ "ohash": "^2.0.11",
+ "pathe": "^2.0.3",
+ "picomatch": "^4.0.2",
+ "std-env": "^3.9.0",
+ "tinyglobby": "^0.2.14"
}
},
- "node_modules/@nuxtjs/color-mode/node_modules/pkg-types/node_modules/pathe": {
- "version": "2.0.3",
- "resolved": "https://registry.npmjs.org/pathe/-/pathe-2.0.3.tgz",
- "integrity": "sha512-WUjGcAqP1gQacoQe+OBJsFA7Ld4DyXuUIjZ5cc75cLHvJ7dtNsTugphxIADwspS+AraAUePCKrSVtPLFj/F88w==",
- "license": "MIT"
- },
- "node_modules/@nuxtjs/i18n": {
- "version": "9.5.4",
- "resolved": "https://registry.npmjs.org/@nuxtjs/i18n/-/i18n-9.5.4.tgz",
- "integrity": "sha512-HSCC6bLvkI74AOJ/Hsa8+52uy92Bzpu/lVOKYJZIR/HV4TtV48fgKLPRlL8RmCXx/AmKBtrPsLfhAAIj9RBAKQ==",
- "dev": true,
+ "node_modules/@nuxt/kit": {
+ "version": "3.17.7",
+ "resolved": "https://registry.npmjs.org/@nuxt/kit/-/kit-3.17.7.tgz",
+ "integrity": "sha512-JLno3ur7Pix2o/StxIMlEHRkMawA6h7uzjZBDgxdeKXRWTYY8ID9YekSkN4PBlEFGXBfCBOcPd5+YqcyBUAMkw==",
"license": "MIT",
"dependencies": {
- "@intlify/h3": "^0.6.1",
- "@intlify/shared": "^10.0.7",
- "@intlify/unplugin-vue-i18n": "^6.0.8",
- "@intlify/utils": "^0.13.0",
- "@miyaneee/rollup-plugin-json5": "^1.2.0",
- "@nuxt/kit": "^3.16.2",
- "@oxc-parser/wasm": "^0.60.0",
- "@rollup/plugin-yaml": "^4.1.2",
- "@vue/compiler-sfc": "^3.5.13",
- "debug": "^4.4.0",
+ "c12": "^3.0.4",
+ "consola": "^3.4.2",
"defu": "^6.1.4",
- "esbuild": "^0.25.1",
- "estree-walker": "^3.0.3",
- "h3": "^1.15.1",
+ "destr": "^2.0.5",
+ "errx": "^0.1.0",
+ "exsolve": "^1.0.7",
+ "ignore": "^7.0.5",
+ "jiti": "^2.4.2",
+ "klona": "^2.0.6",
"knitwork": "^1.2.0",
- "magic-string": "^0.30.17",
"mlly": "^1.7.4",
- "oxc-parser": "^0.61.2",
+ "ohash": "^2.0.11",
"pathe": "^2.0.3",
- "typescript": "^5.6.2",
- "ufo": "^1.5.4",
- "unplugin": "^2.2.2",
- "unplugin-vue-router": "^0.12.0",
- "vue-i18n": "^10.0.7",
- "vue-router": "^4.5.0"
+ "pkg-types": "^2.2.0",
+ "scule": "^1.3.0",
+ "semver": "^7.7.2",
+ "std-env": "^3.9.0",
+ "tinyglobby": "^0.2.14",
+ "ufo": "^1.6.1",
+ "unctx": "^2.4.1",
+ "unimport": "^5.1.0",
+ "untyped": "^2.0.0"
},
"engines": {
"node": ">=18.12.0"
- },
- "funding": {
- "url": "https://github.com/sponsors/bobbiegoede"
}
},
- "node_modules/@nuxtjs/i18n/node_modules/@esbuild/aix-ppc64": {
- "version": "0.25.4",
- "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.25.4.tgz",
- "integrity": "sha512-1VCICWypeQKhVbE9oW/sJaAmjLxhVqacdkvPLEjwlttjfwENRSClS8EjBz0KzRyFSCPDIkuXW34Je/vk7zdB7Q==",
- "cpu": [
- "ppc64"
- ],
- "dev": true,
+ "node_modules/@nuxt/schema": {
+ "version": "3.17.7",
+ "resolved": "https://registry.npmjs.org/@nuxt/schema/-/schema-3.17.7.tgz",
+ "integrity": "sha512-c22IE/ECvjUScFyOJH/0VnSf5izDLmwkrCRlZKNhHzcNZUBFe5mCE5BM28QSVRSLGcC/mqg5POyNjf2tRwf+/w==",
"license": "MIT",
- "optional": true,
- "os": [
- "aix"
- ],
+ "dependencies": {
+ "@vue/shared": "^3.5.17",
+ "consola": "^3.4.2",
+ "defu": "^6.1.4",
+ "pathe": "^2.0.3",
+ "std-env": "^3.9.0"
+ },
+ "engines": {
+ "node": "^14.18.0 || >=16.10.0"
+ }
+ },
+ "node_modules/@nuxt/telemetry": {
+ "version": "2.6.6",
+ "resolved": "https://registry.npmjs.org/@nuxt/telemetry/-/telemetry-2.6.6.tgz",
+ "integrity": "sha512-Zh4HJLjzvm3Cq9w6sfzIFyH9ozK5ePYVfCUzzUQNiZojFsI2k1QkSBrVI9BGc6ArKXj/O6rkI6w7qQ+ouL8Cag==",
+ "license": "MIT",
+ "dependencies": {
+ "@nuxt/kit": "^3.15.4",
+ "citty": "^0.1.6",
+ "consola": "^3.4.2",
+ "destr": "^2.0.3",
+ "dotenv": "^16.4.7",
+ "git-url-parse": "^16.0.1",
+ "is-docker": "^3.0.0",
+ "ofetch": "^1.4.1",
+ "package-manager-detector": "^1.1.0",
+ "pathe": "^2.0.3",
+ "rc9": "^2.1.2",
+ "std-env": "^3.8.1"
+ },
+ "bin": {
+ "nuxt-telemetry": "bin/nuxt-telemetry.mjs"
+ },
+ "engines": {
+ "node": ">=18.12.0"
+ }
+ },
+ "node_modules/@nuxt/ui": {
+ "version": "3.2.0",
+ "resolved": "https://registry.npmjs.org/@nuxt/ui/-/ui-3.2.0.tgz",
+ "integrity": "sha512-4xK3MM6DZwrPzptDWakKKLa7iS6eVAilxs0YZy6HTEiDsoCuq2JQWJKI0hniNQdY8pcH6AjpkQDx8NJlqBvp/Q==",
+ "license": "MIT",
+ "dependencies": {
+ "@iconify/vue": "^5.0.0",
+ "@internationalized/date": "^3.8.2",
+ "@internationalized/number": "^3.6.3",
+ "@nuxt/fonts": "^0.11.4",
+ "@nuxt/icon": "^1.14.0",
+ "@nuxt/kit": "^3.17.5",
+ "@nuxt/schema": "^3.17.5",
+ "@nuxtjs/color-mode": "^3.5.2",
+ "@standard-schema/spec": "^1.0.0",
+ "@tailwindcss/postcss": "^4.1.10",
+ "@tailwindcss/vite": "^4.1.10",
+ "@tanstack/vue-table": "^8.21.3",
+ "@unhead/vue": "^2.0.10",
+ "@vueuse/core": "^13.4.0",
+ "@vueuse/integrations": "^13.4.0",
+ "colortranslator": "^5.0.0",
+ "consola": "^3.4.2",
+ "defu": "^6.1.4",
+ "embla-carousel-auto-height": "^8.6.0",
+ "embla-carousel-auto-scroll": "^8.6.0",
+ "embla-carousel-autoplay": "^8.6.0",
+ "embla-carousel-class-names": "^8.6.0",
+ "embla-carousel-fade": "^8.6.0",
+ "embla-carousel-vue": "^8.6.0",
+ "embla-carousel-wheel-gestures": "^8.0.2",
+ "fuse.js": "^7.1.0",
+ "hookable": "^5.5.3",
+ "knitwork": "^1.2.0",
+ "magic-string": "^0.30.17",
+ "mlly": "^1.7.4",
+ "ohash": "^2.0.11",
+ "pathe": "^2.0.3",
+ "reka-ui": "2.3.1",
+ "scule": "^1.3.0",
+ "tailwind-variants": "^1.0.0",
+ "tailwindcss": "^4.1.10",
+ "tinyglobby": "^0.2.14",
+ "unplugin": "^2.3.5",
+ "unplugin-auto-import": "^19.3.0",
+ "unplugin-vue-components": "^28.7.0",
+ "vaul-vue": "0.4.1",
+ "vue-component-type-helpers": "^2.2.10"
+ },
+ "bin": {
+ "nuxt-ui": "cli/index.mjs"
+ },
+ "peerDependencies": {
+ "@inertiajs/vue3": "^2.0.7",
+ "joi": "^17.13.0",
+ "superstruct": "^2.0.0",
+ "typescript": "^5.6.3",
+ "valibot": "^1.0.0",
+ "vue-router": "^4.5.0",
+ "yup": "^1.6.0",
+ "zod": "^3.24.0"
+ },
+ "peerDependenciesMeta": {
+ "@inertiajs/vue3": {
+ "optional": true
+ },
+ "joi": {
+ "optional": true
+ },
+ "superstruct": {
+ "optional": true
+ },
+ "valibot": {
+ "optional": true
+ },
+ "vue-router": {
+ "optional": true
+ },
+ "yup": {
+ "optional": true
+ },
+ "zod": {
+ "optional": true
+ }
+ }
+ },
+ "node_modules/@nuxt/ui/node_modules/@vueuse/integrations": {
+ "version": "13.5.0",
+ "resolved": "https://registry.npmjs.org/@vueuse/integrations/-/integrations-13.5.0.tgz",
+ "integrity": "sha512-7RACJySnlpl0MkSzxbtadioNGSX4TL5/Wl2cUy4nDq/XkeHwPYvVM880HJUSiap/FXhVEup9VKTM9y/n5UspAw==",
+ "license": "MIT",
+ "dependencies": {
+ "@vueuse/core": "13.5.0",
+ "@vueuse/shared": "13.5.0"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/antfu"
+ },
+ "peerDependencies": {
+ "async-validator": "^4",
+ "axios": "^1",
+ "change-case": "^5",
+ "drauu": "^0.4",
+ "focus-trap": "^7",
+ "fuse.js": "^7",
+ "idb-keyval": "^6",
+ "jwt-decode": "^4",
+ "nprogress": "^0.2",
+ "qrcode": "^1.5",
+ "sortablejs": "^1",
+ "universal-cookie": "^7 || ^8",
+ "vue": "^3.5.0"
+ },
+ "peerDependenciesMeta": {
+ "async-validator": {
+ "optional": true
+ },
+ "axios": {
+ "optional": true
+ },
+ "change-case": {
+ "optional": true
+ },
+ "drauu": {
+ "optional": true
+ },
+ "focus-trap": {
+ "optional": true
+ },
+ "fuse.js": {
+ "optional": true
+ },
+ "idb-keyval": {
+ "optional": true
+ },
+ "jwt-decode": {
+ "optional": true
+ },
+ "nprogress": {
+ "optional": true
+ },
+ "qrcode": {
+ "optional": true
+ },
+ "sortablejs": {
+ "optional": true
+ },
+ "universal-cookie": {
+ "optional": true
+ }
+ }
+ },
+ "node_modules/@nuxt/ui/node_modules/@vueuse/shared": {
+ "version": "13.5.0",
+ "resolved": "https://registry.npmjs.org/@vueuse/shared/-/shared-13.5.0.tgz",
+ "integrity": "sha512-K7GrQIxJ/ANtucxIXbQlUHdB0TPA8c+q5i+zbrjxuhJCnJ9GtBg75sBSnvmLSxHKPg2Yo8w62PWksl9kwH0Q8g==",
+ "license": "MIT",
+ "funding": {
+ "url": "https://github.com/sponsors/antfu"
+ },
+ "peerDependencies": {
+ "vue": "^3.5.0"
+ }
+ },
+ "node_modules/@nuxt/vite-builder": {
+ "version": "3.17.5",
+ "resolved": "https://registry.npmjs.org/@nuxt/vite-builder/-/vite-builder-3.17.5.tgz",
+ "integrity": "sha512-SKlm73FuuPj1ZdVJ1JQfUed/lO5l7iJMbM+9K+CMXnifu7vV2ITaSxu8uZ/ice1FeLYwOZKEsjnJXB0QpqDArQ==",
+ "license": "MIT",
+ "dependencies": {
+ "@nuxt/kit": "3.17.5",
+ "@rollup/plugin-replace": "^6.0.2",
+ "@vitejs/plugin-vue": "^5.2.4",
+ "@vitejs/plugin-vue-jsx": "^4.2.0",
+ "autoprefixer": "^10.4.21",
+ "consola": "^3.4.2",
+ "cssnano": "^7.0.7",
+ "defu": "^6.1.4",
+ "esbuild": "^0.25.5",
+ "escape-string-regexp": "^5.0.0",
+ "exsolve": "^1.0.5",
+ "externality": "^1.0.2",
+ "get-port-please": "^3.1.2",
+ "h3": "^1.15.3",
+ "jiti": "^2.4.2",
+ "knitwork": "^1.2.0",
+ "magic-string": "^0.30.17",
+ "mlly": "^1.7.4",
+ "mocked-exports": "^0.1.1",
+ "ohash": "^2.0.11",
+ "pathe": "^2.0.3",
+ "perfect-debounce": "^1.0.0",
+ "pkg-types": "^2.1.0",
+ "postcss": "^8.5.4",
+ "rollup-plugin-visualizer": "^6.0.1",
+ "std-env": "^3.9.0",
+ "ufo": "^1.6.1",
+ "unenv": "^2.0.0-rc.17",
+ "unplugin": "^2.3.5",
+ "vite": "^6.3.5",
+ "vite-node": "^3.2.0",
+ "vite-plugin-checker": "^0.9.3",
+ "vue-bundle-renderer": "^2.1.1"
+ },
+ "engines": {
+ "node": "^18.12.0 || ^20.9.0 || >=22.0.0"
+ },
+ "peerDependencies": {
+ "vue": "^3.3.4"
+ }
+ },
+ "node_modules/@nuxt/vite-builder/node_modules/@esbuild/aix-ppc64": {
+ "version": "0.25.6",
+ "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.25.6.tgz",
+ "integrity": "sha512-ShbM/3XxwuxjFiuVBHA+d3j5dyac0aEVVq1oluIDf71hUw0aRF59dV/efUsIwFnR6m8JNM2FjZOzmaZ8yG61kw==",
+ "cpu": [
+ "ppc64"
+ ],
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "aix"
+ ],
"engines": {
"node": ">=18"
}
},
- "node_modules/@nuxtjs/i18n/node_modules/@esbuild/android-arm": {
- "version": "0.25.4",
- "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.25.4.tgz",
- "integrity": "sha512-QNdQEps7DfFwE3hXiU4BZeOV68HHzYwGd0Nthhd3uCkkEKK7/R6MTgM0P7H7FAs5pU/DIWsviMmEGxEoxIZ+ZQ==",
+ "node_modules/@nuxt/vite-builder/node_modules/@esbuild/android-arm": {
+ "version": "0.25.6",
+ "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.25.6.tgz",
+ "integrity": "sha512-S8ToEOVfg++AU/bHwdksHNnyLyVM+eMVAOf6yRKFitnwnbwwPNqKr3srzFRe7nzV69RQKb5DgchIX5pt3L53xg==",
"cpu": [
"arm"
],
- "dev": true,
"license": "MIT",
"optional": true,
"os": [
@@ -4534,14 +4226,13 @@
"node": ">=18"
}
},
- "node_modules/@nuxtjs/i18n/node_modules/@esbuild/android-arm64": {
- "version": "0.25.4",
- "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.25.4.tgz",
- "integrity": "sha512-bBy69pgfhMGtCnwpC/x5QhfxAz/cBgQ9enbtwjf6V9lnPI/hMyT9iWpR1arm0l3kttTr4L0KSLpKmLp/ilKS9A==",
+ "node_modules/@nuxt/vite-builder/node_modules/@esbuild/android-arm64": {
+ "version": "0.25.6",
+ "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.25.6.tgz",
+ "integrity": "sha512-hd5zdUarsK6strW+3Wxi5qWws+rJhCCbMiC9QZyzoxfk5uHRIE8T287giQxzVpEvCwuJ9Qjg6bEjcRJcgfLqoA==",
"cpu": [
"arm64"
],
- "dev": true,
"license": "MIT",
"optional": true,
"os": [
@@ -4551,14 +4242,13 @@
"node": ">=18"
}
},
- "node_modules/@nuxtjs/i18n/node_modules/@esbuild/android-x64": {
- "version": "0.25.4",
- "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.25.4.tgz",
- "integrity": "sha512-TVhdVtQIFuVpIIR282btcGC2oGQoSfZfmBdTip2anCaVYcqWlZXGcdcKIUklfX2wj0JklNYgz39OBqh2cqXvcQ==",
+ "node_modules/@nuxt/vite-builder/node_modules/@esbuild/android-x64": {
+ "version": "0.25.6",
+ "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.25.6.tgz",
+ "integrity": "sha512-0Z7KpHSr3VBIO9A/1wcT3NTy7EB4oNC4upJ5ye3R7taCc2GUdeynSLArnon5G8scPwaU866d3H4BCrE5xLW25A==",
"cpu": [
"x64"
],
- "dev": true,
"license": "MIT",
"optional": true,
"os": [
@@ -4568,14 +4258,13 @@
"node": ">=18"
}
},
- "node_modules/@nuxtjs/i18n/node_modules/@esbuild/darwin-arm64": {
- "version": "0.25.4",
- "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.25.4.tgz",
- "integrity": "sha512-Y1giCfM4nlHDWEfSckMzeWNdQS31BQGs9/rouw6Ub91tkK79aIMTH3q9xHvzH8d0wDru5Ci0kWB8b3up/nl16g==",
+ "node_modules/@nuxt/vite-builder/node_modules/@esbuild/darwin-arm64": {
+ "version": "0.25.6",
+ "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.25.6.tgz",
+ "integrity": "sha512-FFCssz3XBavjxcFxKsGy2DYK5VSvJqa6y5HXljKzhRZ87LvEi13brPrf/wdyl/BbpbMKJNOr1Sd0jtW4Ge1pAA==",
"cpu": [
"arm64"
],
- "dev": true,
"license": "MIT",
"optional": true,
"os": [
@@ -4585,14 +4274,13 @@
"node": ">=18"
}
},
- "node_modules/@nuxtjs/i18n/node_modules/@esbuild/darwin-x64": {
- "version": "0.25.4",
- "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.25.4.tgz",
- "integrity": "sha512-CJsry8ZGM5VFVeyUYB3cdKpd/H69PYez4eJh1W/t38vzutdjEjtP7hB6eLKBoOdxcAlCtEYHzQ/PJ/oU9I4u0A==",
+ "node_modules/@nuxt/vite-builder/node_modules/@esbuild/darwin-x64": {
+ "version": "0.25.6",
+ "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.25.6.tgz",
+ "integrity": "sha512-GfXs5kry/TkGM2vKqK2oyiLFygJRqKVhawu3+DOCk7OxLy/6jYkWXhlHwOoTb0WqGnWGAS7sooxbZowy+pK9Yg==",
"cpu": [
"x64"
],
- "dev": true,
"license": "MIT",
"optional": true,
"os": [
@@ -4602,14 +4290,13 @@
"node": ">=18"
}
},
- "node_modules/@nuxtjs/i18n/node_modules/@esbuild/freebsd-arm64": {
- "version": "0.25.4",
- "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.25.4.tgz",
- "integrity": "sha512-yYq+39NlTRzU2XmoPW4l5Ifpl9fqSk0nAJYM/V/WUGPEFfek1epLHJIkTQM6bBs1swApjO5nWgvr843g6TjxuQ==",
+ "node_modules/@nuxt/vite-builder/node_modules/@esbuild/freebsd-arm64": {
+ "version": "0.25.6",
+ "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.25.6.tgz",
+ "integrity": "sha512-aoLF2c3OvDn2XDTRvn8hN6DRzVVpDlj2B/F66clWd/FHLiHaG3aVZjxQX2DYphA5y/evbdGvC6Us13tvyt4pWg==",
"cpu": [
"arm64"
],
- "dev": true,
"license": "MIT",
"optional": true,
"os": [
@@ -4619,14 +4306,13 @@
"node": ">=18"
}
},
- "node_modules/@nuxtjs/i18n/node_modules/@esbuild/freebsd-x64": {
- "version": "0.25.4",
- "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.25.4.tgz",
- "integrity": "sha512-0FgvOJ6UUMflsHSPLzdfDnnBBVoCDtBTVyn/MrWloUNvq/5SFmh13l3dvgRPkDihRxb77Y17MbqbCAa2strMQQ==",
+ "node_modules/@nuxt/vite-builder/node_modules/@esbuild/freebsd-x64": {
+ "version": "0.25.6",
+ "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.25.6.tgz",
+ "integrity": "sha512-2SkqTjTSo2dYi/jzFbU9Plt1vk0+nNg8YC8rOXXea+iA3hfNJWebKYPs3xnOUf9+ZWhKAaxnQNUf2X9LOpeiMQ==",
"cpu": [
"x64"
],
- "dev": true,
"license": "MIT",
"optional": true,
"os": [
@@ -4636,14 +4322,13 @@
"node": ">=18"
}
},
- "node_modules/@nuxtjs/i18n/node_modules/@esbuild/linux-arm": {
- "version": "0.25.4",
- "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.25.4.tgz",
- "integrity": "sha512-kro4c0P85GMfFYqW4TWOpvmF8rFShbWGnrLqlzp4X1TNWjRY3JMYUfDCtOxPKOIY8B0WC8HN51hGP4I4hz4AaQ==",
+ "node_modules/@nuxt/vite-builder/node_modules/@esbuild/linux-arm": {
+ "version": "0.25.6",
+ "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.25.6.tgz",
+ "integrity": "sha512-SZHQlzvqv4Du5PrKE2faN0qlbsaW/3QQfUUc6yO2EjFcA83xnwm91UbEEVx4ApZ9Z5oG8Bxz4qPE+HFwtVcfyw==",
"cpu": [
"arm"
],
- "dev": true,
"license": "MIT",
"optional": true,
"os": [
@@ -4653,14 +4338,13 @@
"node": ">=18"
}
},
- "node_modules/@nuxtjs/i18n/node_modules/@esbuild/linux-arm64": {
- "version": "0.25.4",
- "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.25.4.tgz",
- "integrity": "sha512-+89UsQTfXdmjIvZS6nUnOOLoXnkUTB9hR5QAeLrQdzOSWZvNSAXAtcRDHWtqAUtAmv7ZM1WPOOeSxDzzzMogiQ==",
+ "node_modules/@nuxt/vite-builder/node_modules/@esbuild/linux-arm64": {
+ "version": "0.25.6",
+ "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.25.6.tgz",
+ "integrity": "sha512-b967hU0gqKd9Drsh/UuAm21Khpoh6mPBSgz8mKRq4P5mVK8bpA+hQzmm/ZwGVULSNBzKdZPQBRT3+WuVavcWsQ==",
"cpu": [
"arm64"
],
- "dev": true,
"license": "MIT",
"optional": true,
"os": [
@@ -4670,14 +4354,13 @@
"node": ">=18"
}
},
- "node_modules/@nuxtjs/i18n/node_modules/@esbuild/linux-ia32": {
- "version": "0.25.4",
- "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.25.4.tgz",
- "integrity": "sha512-yTEjoapy8UP3rv8dB0ip3AfMpRbyhSN3+hY8mo/i4QXFeDxmiYbEKp3ZRjBKcOP862Ua4b1PDfwlvbuwY7hIGQ==",
+ "node_modules/@nuxt/vite-builder/node_modules/@esbuild/linux-ia32": {
+ "version": "0.25.6",
+ "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.25.6.tgz",
+ "integrity": "sha512-aHWdQ2AAltRkLPOsKdi3xv0mZ8fUGPdlKEjIEhxCPm5yKEThcUjHpWB1idN74lfXGnZ5SULQSgtr5Qos5B0bPw==",
"cpu": [
"ia32"
],
- "dev": true,
"license": "MIT",
"optional": true,
"os": [
@@ -4687,14 +4370,13 @@
"node": ">=18"
}
},
- "node_modules/@nuxtjs/i18n/node_modules/@esbuild/linux-loong64": {
- "version": "0.25.4",
- "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.25.4.tgz",
- "integrity": "sha512-NeqqYkrcGzFwi6CGRGNMOjWGGSYOpqwCjS9fvaUlX5s3zwOtn1qwg1s2iE2svBe4Q/YOG1q6875lcAoQK/F4VA==",
+ "node_modules/@nuxt/vite-builder/node_modules/@esbuild/linux-loong64": {
+ "version": "0.25.6",
+ "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.25.6.tgz",
+ "integrity": "sha512-VgKCsHdXRSQ7E1+QXGdRPlQ/e08bN6WMQb27/TMfV+vPjjTImuT9PmLXupRlC90S1JeNNW5lzkAEO/McKeJ2yg==",
"cpu": [
"loong64"
],
- "dev": true,
"license": "MIT",
"optional": true,
"os": [
@@ -4704,14 +4386,13 @@
"node": ">=18"
}
},
- "node_modules/@nuxtjs/i18n/node_modules/@esbuild/linux-mips64el": {
- "version": "0.25.4",
- "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.25.4.tgz",
- "integrity": "sha512-IcvTlF9dtLrfL/M8WgNI/qJYBENP3ekgsHbYUIzEzq5XJzzVEV/fXY9WFPfEEXmu3ck2qJP8LG/p3Q8f7Zc2Xg==",
+ "node_modules/@nuxt/vite-builder/node_modules/@esbuild/linux-mips64el": {
+ "version": "0.25.6",
+ "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.25.6.tgz",
+ "integrity": "sha512-WViNlpivRKT9/py3kCmkHnn44GkGXVdXfdc4drNmRl15zVQ2+D2uFwdlGh6IuK5AAnGTo2qPB1Djppj+t78rzw==",
"cpu": [
"mips64el"
],
- "dev": true,
"license": "MIT",
"optional": true,
"os": [
@@ -4721,14 +4402,13 @@
"node": ">=18"
}
},
- "node_modules/@nuxtjs/i18n/node_modules/@esbuild/linux-ppc64": {
- "version": "0.25.4",
- "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.25.4.tgz",
- "integrity": "sha512-HOy0aLTJTVtoTeGZh4HSXaO6M95qu4k5lJcH4gxv56iaycfz1S8GO/5Jh6X4Y1YiI0h7cRyLi+HixMR+88swag==",
+ "node_modules/@nuxt/vite-builder/node_modules/@esbuild/linux-ppc64": {
+ "version": "0.25.6",
+ "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.25.6.tgz",
+ "integrity": "sha512-wyYKZ9NTdmAMb5730I38lBqVu6cKl4ZfYXIs31Baf8aoOtB4xSGi3THmDYt4BTFHk7/EcVixkOV2uZfwU3Q2Jw==",
"cpu": [
"ppc64"
],
- "dev": true,
"license": "MIT",
"optional": true,
"os": [
@@ -4738,14 +4418,13 @@
"node": ">=18"
}
},
- "node_modules/@nuxtjs/i18n/node_modules/@esbuild/linux-riscv64": {
- "version": "0.25.4",
- "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.25.4.tgz",
- "integrity": "sha512-i8JUDAufpz9jOzo4yIShCTcXzS07vEgWzyX3NH2G7LEFVgrLEhjwL3ajFE4fZI3I4ZgiM7JH3GQ7ReObROvSUA==",
+ "node_modules/@nuxt/vite-builder/node_modules/@esbuild/linux-riscv64": {
+ "version": "0.25.6",
+ "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.25.6.tgz",
+ "integrity": "sha512-KZh7bAGGcrinEj4qzilJ4hqTY3Dg2U82c8bv+e1xqNqZCrCyc+TL9AUEn5WGKDzm3CfC5RODE/qc96OcbIe33w==",
"cpu": [
"riscv64"
],
- "dev": true,
"license": "MIT",
"optional": true,
"os": [
@@ -4755,14 +4434,13 @@
"node": ">=18"
}
},
- "node_modules/@nuxtjs/i18n/node_modules/@esbuild/linux-s390x": {
- "version": "0.25.4",
- "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.25.4.tgz",
- "integrity": "sha512-jFnu+6UbLlzIjPQpWCNh5QtrcNfMLjgIavnwPQAfoGx4q17ocOU9MsQ2QVvFxwQoWpZT8DvTLooTvmOQXkO51g==",
+ "node_modules/@nuxt/vite-builder/node_modules/@esbuild/linux-s390x": {
+ "version": "0.25.6",
+ "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.25.6.tgz",
+ "integrity": "sha512-9N1LsTwAuE9oj6lHMyyAM+ucxGiVnEqUdp4v7IaMmrwb06ZTEVCIs3oPPplVsnjPfyjmxwHxHMF8b6vzUVAUGw==",
"cpu": [
"s390x"
],
- "dev": true,
"license": "MIT",
"optional": true,
"os": [
@@ -4772,14 +4450,13 @@
"node": ">=18"
}
},
- "node_modules/@nuxtjs/i18n/node_modules/@esbuild/linux-x64": {
- "version": "0.25.4",
- "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.25.4.tgz",
- "integrity": "sha512-6e0cvXwzOnVWJHq+mskP8DNSrKBr1bULBvnFLpc1KY+d+irZSgZ02TGse5FsafKS5jg2e4pbvK6TPXaF/A6+CA==",
+ "node_modules/@nuxt/vite-builder/node_modules/@esbuild/linux-x64": {
+ "version": "0.25.6",
+ "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.25.6.tgz",
+ "integrity": "sha512-A6bJB41b4lKFWRKNrWoP2LHsjVzNiaurf7wyj/XtFNTsnPuxwEBWHLty+ZE0dWBKuSK1fvKgrKaNjBS7qbFKig==",
"cpu": [
"x64"
],
- "dev": true,
"license": "MIT",
"optional": true,
"os": [
@@ -4789,14 +4466,13 @@
"node": ">=18"
}
},
- "node_modules/@nuxtjs/i18n/node_modules/@esbuild/netbsd-x64": {
- "version": "0.25.4",
- "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.25.4.tgz",
- "integrity": "sha512-XAg8pIQn5CzhOB8odIcAm42QsOfa98SBeKUdo4xa8OvX8LbMZqEtgeWE9P/Wxt7MlG2QqvjGths+nq48TrUiKw==",
+ "node_modules/@nuxt/vite-builder/node_modules/@esbuild/netbsd-arm64": {
+ "version": "0.25.6",
+ "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.25.6.tgz",
+ "integrity": "sha512-IjA+DcwoVpjEvyxZddDqBY+uJ2Snc6duLpjmkXm/v4xuS3H+3FkLZlDm9ZsAbF9rsfP3zeA0/ArNDORZgrxR/Q==",
"cpu": [
- "x64"
+ "arm64"
],
- "dev": true,
"license": "MIT",
"optional": true,
"os": [
@@ -4806,27 +4482,629 @@
"node": ">=18"
}
},
- "node_modules/@nuxtjs/i18n/node_modules/@esbuild/openbsd-arm64": {
- "version": "0.25.4",
- "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.25.4.tgz",
- "integrity": "sha512-Ct2WcFEANlFDtp1nVAXSNBPDxyU+j7+tId//iHXU2f/lN5AmO4zLyhDcpR5Cz1r08mVxzt3Jpyt4PmXQ1O6+7A==",
+ "node_modules/@nuxt/vite-builder/node_modules/@esbuild/netbsd-x64": {
+ "version": "0.25.6",
+ "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.25.6.tgz",
+ "integrity": "sha512-dUXuZr5WenIDlMHdMkvDc1FAu4xdWixTCRgP7RQLBOkkGgwuuzaGSYcOpW4jFxzpzL1ejb8yF620UxAqnBrR9g==",
"cpu": [
- "arm64"
+ "x64"
],
- "dev": true,
"license": "MIT",
"optional": true,
"os": [
- "openbsd"
+ "netbsd"
],
"engines": {
"node": ">=18"
}
},
- "node_modules/@nuxtjs/i18n/node_modules/@esbuild/openbsd-x64": {
- "version": "0.25.4",
- "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.25.4.tgz",
- "integrity": "sha512-xAGGhyOQ9Otm1Xu8NT1ifGLnA6M3sJxZ6ixylb+vIUVzvvd6GOALpwQrYrtlPouMqd/vSbgehz6HaVk4+7Afhw==",
+ "node_modules/@nuxt/vite-builder/node_modules/@esbuild/openbsd-arm64": {
+ "version": "0.25.6",
+ "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.25.6.tgz",
+ "integrity": "sha512-l8ZCvXP0tbTJ3iaqdNf3pjaOSd5ex/e6/omLIQCVBLmHTlfXW3zAxQ4fnDmPLOB1x9xrcSi/xtCWFwCZRIaEwg==",
+ "cpu": [
+ "arm64"
+ ],
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "openbsd"
+ ],
+ "engines": {
+ "node": ">=18"
+ }
+ },
+ "node_modules/@nuxt/vite-builder/node_modules/@esbuild/openbsd-x64": {
+ "version": "0.25.6",
+ "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.25.6.tgz",
+ "integrity": "sha512-hKrmDa0aOFOr71KQ/19JC7az1P0GWtCN1t2ahYAf4O007DHZt/dW8ym5+CUdJhQ/qkZmI1HAF8KkJbEFtCL7gw==",
+ "cpu": [
+ "x64"
+ ],
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "openbsd"
+ ],
+ "engines": {
+ "node": ">=18"
+ }
+ },
+ "node_modules/@nuxt/vite-builder/node_modules/@esbuild/sunos-x64": {
+ "version": "0.25.6",
+ "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.25.6.tgz",
+ "integrity": "sha512-dyCGxv1/Br7MiSC42qinGL8KkG4kX0pEsdb0+TKhmJZgCUDBGmyo1/ArCjNGiOLiIAgdbWgmWgib4HoCi5t7kA==",
+ "cpu": [
+ "x64"
+ ],
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "sunos"
+ ],
+ "engines": {
+ "node": ">=18"
+ }
+ },
+ "node_modules/@nuxt/vite-builder/node_modules/@esbuild/win32-arm64": {
+ "version": "0.25.6",
+ "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.25.6.tgz",
+ "integrity": "sha512-42QOgcZeZOvXfsCBJF5Afw73t4veOId//XD3i+/9gSkhSV6Gk3VPlWncctI+JcOyERv85FUo7RxuxGy+z8A43Q==",
+ "cpu": [
+ "arm64"
+ ],
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "win32"
+ ],
+ "engines": {
+ "node": ">=18"
+ }
+ },
+ "node_modules/@nuxt/vite-builder/node_modules/@esbuild/win32-ia32": {
+ "version": "0.25.6",
+ "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.25.6.tgz",
+ "integrity": "sha512-4AWhgXmDuYN7rJI6ORB+uU9DHLq/erBbuMoAuB4VWJTu5KtCgcKYPynF0YI1VkBNuEfjNlLrFr9KZPJzrtLkrQ==",
+ "cpu": [
+ "ia32"
+ ],
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "win32"
+ ],
+ "engines": {
+ "node": ">=18"
+ }
+ },
+ "node_modules/@nuxt/vite-builder/node_modules/@esbuild/win32-x64": {
+ "version": "0.25.6",
+ "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.25.6.tgz",
+ "integrity": "sha512-NgJPHHbEpLQgDH2MjQu90pzW/5vvXIZ7KOnPyNBm92A6WgZ/7b6fJyUBjoumLqeOQQGqY2QjQxRo97ah4Sj0cA==",
+ "cpu": [
+ "x64"
+ ],
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "win32"
+ ],
+ "engines": {
+ "node": ">=18"
+ }
+ },
+ "node_modules/@nuxt/vite-builder/node_modules/@nuxt/kit": {
+ "version": "3.17.5",
+ "resolved": "https://registry.npmjs.org/@nuxt/kit/-/kit-3.17.5.tgz",
+ "integrity": "sha512-NdCepmA+S/SzgcaL3oYUeSlXGYO6BXGr9K/m1D0t0O9rApF8CSq/QQ+ja5KYaYMO1kZAEWH4s2XVcE3uPrrAVg==",
+ "license": "MIT",
+ "dependencies": {
+ "c12": "^3.0.4",
+ "consola": "^3.4.2",
+ "defu": "^6.1.4",
+ "destr": "^2.0.5",
+ "errx": "^0.1.0",
+ "exsolve": "^1.0.5",
+ "ignore": "^7.0.5",
+ "jiti": "^2.4.2",
+ "klona": "^2.0.6",
+ "knitwork": "^1.2.0",
+ "mlly": "^1.7.4",
+ "ohash": "^2.0.11",
+ "pathe": "^2.0.3",
+ "pkg-types": "^2.1.0",
+ "scule": "^1.3.0",
+ "semver": "^7.7.2",
+ "std-env": "^3.9.0",
+ "tinyglobby": "^0.2.14",
+ "ufo": "^1.6.1",
+ "unctx": "^2.4.1",
+ "unimport": "^5.0.1",
+ "untyped": "^2.0.0"
+ },
+ "engines": {
+ "node": ">=18.12.0"
+ }
+ },
+ "node_modules/@nuxt/vite-builder/node_modules/esbuild": {
+ "version": "0.25.6",
+ "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.25.6.tgz",
+ "integrity": "sha512-GVuzuUwtdsghE3ocJ9Bs8PNoF13HNQ5TXbEi2AhvVb8xU1Iwt9Fos9FEamfoee+u/TOsn7GUWc04lz46n2bbTg==",
+ "hasInstallScript": true,
+ "license": "MIT",
+ "bin": {
+ "esbuild": "bin/esbuild"
+ },
+ "engines": {
+ "node": ">=18"
+ },
+ "optionalDependencies": {
+ "@esbuild/aix-ppc64": "0.25.6",
+ "@esbuild/android-arm": "0.25.6",
+ "@esbuild/android-arm64": "0.25.6",
+ "@esbuild/android-x64": "0.25.6",
+ "@esbuild/darwin-arm64": "0.25.6",
+ "@esbuild/darwin-x64": "0.25.6",
+ "@esbuild/freebsd-arm64": "0.25.6",
+ "@esbuild/freebsd-x64": "0.25.6",
+ "@esbuild/linux-arm": "0.25.6",
+ "@esbuild/linux-arm64": "0.25.6",
+ "@esbuild/linux-ia32": "0.25.6",
+ "@esbuild/linux-loong64": "0.25.6",
+ "@esbuild/linux-mips64el": "0.25.6",
+ "@esbuild/linux-ppc64": "0.25.6",
+ "@esbuild/linux-riscv64": "0.25.6",
+ "@esbuild/linux-s390x": "0.25.6",
+ "@esbuild/linux-x64": "0.25.6",
+ "@esbuild/netbsd-arm64": "0.25.6",
+ "@esbuild/netbsd-x64": "0.25.6",
+ "@esbuild/openbsd-arm64": "0.25.6",
+ "@esbuild/openbsd-x64": "0.25.6",
+ "@esbuild/openharmony-arm64": "0.25.6",
+ "@esbuild/sunos-x64": "0.25.6",
+ "@esbuild/win32-arm64": "0.25.6",
+ "@esbuild/win32-ia32": "0.25.6",
+ "@esbuild/win32-x64": "0.25.6"
+ }
+ },
+ "node_modules/@nuxt/vite-builder/node_modules/escape-string-regexp": {
+ "version": "5.0.0",
+ "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-5.0.0.tgz",
+ "integrity": "sha512-/veY75JbMK4j1yjvuUxuVsiS/hr/4iHs9FTT6cgTexxdE0Ly/glccBAkloH/DofkjRbZU3bnoj38mOmhkZ0lHw==",
+ "license": "MIT",
+ "engines": {
+ "node": ">=12"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
+ },
+ "node_modules/@nuxtjs/color-mode": {
+ "version": "3.5.2",
+ "resolved": "https://registry.npmjs.org/@nuxtjs/color-mode/-/color-mode-3.5.2.tgz",
+ "integrity": "sha512-cC6RfgZh3guHBMLLjrBB2Uti5eUoGM9KyauOaYS9ETmxNWBMTvpgjvSiSJp1OFljIXPIqVTJ3xtJpSNZiO3ZaA==",
+ "license": "MIT",
+ "dependencies": {
+ "@nuxt/kit": "^3.13.2",
+ "pathe": "^1.1.2",
+ "pkg-types": "^1.2.1",
+ "semver": "^7.6.3"
+ }
+ },
+ "node_modules/@nuxtjs/color-mode/node_modules/confbox": {
+ "version": "0.1.8",
+ "resolved": "https://registry.npmjs.org/confbox/-/confbox-0.1.8.tgz",
+ "integrity": "sha512-RMtmw0iFkeR4YV+fUOSucriAQNb9g8zFR52MWCtl+cCZOFRNL6zeB395vPzFhEjjn4fMxXudmELnl/KF/WrK6w==",
+ "license": "MIT"
+ },
+ "node_modules/@nuxtjs/color-mode/node_modules/pathe": {
+ "version": "1.1.2",
+ "resolved": "https://registry.npmjs.org/pathe/-/pathe-1.1.2.tgz",
+ "integrity": "sha512-whLdWMYL2TwI08hn8/ZqAbrVemu0LNaNNJZX73O6qaIdCTfXutsLhMkjdENX0qhsQ9uIimo4/aQOmXkoon2nDQ==",
+ "license": "MIT"
+ },
+ "node_modules/@nuxtjs/color-mode/node_modules/pkg-types": {
+ "version": "1.3.1",
+ "resolved": "https://registry.npmjs.org/pkg-types/-/pkg-types-1.3.1.tgz",
+ "integrity": "sha512-/Jm5M4RvtBFVkKWRu2BLUTNP8/M2a+UwuAX+ae4770q1qVGtfjG+WTCupoZixokjmHiry8uI+dlY8KXYV5HVVQ==",
+ "license": "MIT",
+ "dependencies": {
+ "confbox": "^0.1.8",
+ "mlly": "^1.7.4",
+ "pathe": "^2.0.1"
+ }
+ },
+ "node_modules/@nuxtjs/color-mode/node_modules/pkg-types/node_modules/pathe": {
+ "version": "2.0.3",
+ "resolved": "https://registry.npmjs.org/pathe/-/pathe-2.0.3.tgz",
+ "integrity": "sha512-WUjGcAqP1gQacoQe+OBJsFA7Ld4DyXuUIjZ5cc75cLHvJ7dtNsTugphxIADwspS+AraAUePCKrSVtPLFj/F88w==",
+ "license": "MIT"
+ },
+ "node_modules/@nuxtjs/i18n": {
+ "version": "9.5.6",
+ "resolved": "https://registry.npmjs.org/@nuxtjs/i18n/-/i18n-9.5.6.tgz",
+ "integrity": "sha512-PhrQtJT6Di9uoslL5BTrBFqntFlfCaUKlO3T9ORJwmWFdowPqQeFjQ9OjVbKA6TNWr3kQhDqLbIcGlhbuG1USQ==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "@intlify/h3": "^0.6.1",
+ "@intlify/shared": "^10.0.7",
+ "@intlify/unplugin-vue-i18n": "^6.0.8",
+ "@intlify/utils": "^0.13.0",
+ "@miyaneee/rollup-plugin-json5": "^1.2.0",
+ "@nuxt/kit": "^3.17.2",
+ "@oxc-parser/wasm": "^0.60.0",
+ "@rollup/plugin-yaml": "^4.1.2",
+ "@vue/compiler-sfc": "^3.5.13",
+ "debug": "^4.4.0",
+ "defu": "^6.1.4",
+ "esbuild": "^0.25.1",
+ "estree-walker": "^3.0.3",
+ "h3": "^1.15.1",
+ "knitwork": "^1.2.0",
+ "magic-string": "^0.30.17",
+ "mlly": "^1.7.4",
+ "oxc-parser": "^0.70.0",
+ "pathe": "^2.0.3",
+ "typescript": "^5.6.2",
+ "ufo": "^1.5.4",
+ "unplugin": "^2.2.2",
+ "unplugin-vue-router": "^0.12.0",
+ "vue-i18n": "^10.0.7",
+ "vue-router": "^4.5.1"
+ },
+ "engines": {
+ "node": ">=18.12.0"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/bobbiegoede"
+ }
+ },
+ "node_modules/@nuxtjs/i18n/node_modules/@esbuild/aix-ppc64": {
+ "version": "0.25.6",
+ "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.25.6.tgz",
+ "integrity": "sha512-ShbM/3XxwuxjFiuVBHA+d3j5dyac0aEVVq1oluIDf71hUw0aRF59dV/efUsIwFnR6m8JNM2FjZOzmaZ8yG61kw==",
+ "cpu": [
+ "ppc64"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "aix"
+ ],
+ "engines": {
+ "node": ">=18"
+ }
+ },
+ "node_modules/@nuxtjs/i18n/node_modules/@esbuild/android-arm": {
+ "version": "0.25.6",
+ "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.25.6.tgz",
+ "integrity": "sha512-S8ToEOVfg++AU/bHwdksHNnyLyVM+eMVAOf6yRKFitnwnbwwPNqKr3srzFRe7nzV69RQKb5DgchIX5pt3L53xg==",
+ "cpu": [
+ "arm"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "android"
+ ],
+ "engines": {
+ "node": ">=18"
+ }
+ },
+ "node_modules/@nuxtjs/i18n/node_modules/@esbuild/android-arm64": {
+ "version": "0.25.6",
+ "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.25.6.tgz",
+ "integrity": "sha512-hd5zdUarsK6strW+3Wxi5qWws+rJhCCbMiC9QZyzoxfk5uHRIE8T287giQxzVpEvCwuJ9Qjg6bEjcRJcgfLqoA==",
+ "cpu": [
+ "arm64"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "android"
+ ],
+ "engines": {
+ "node": ">=18"
+ }
+ },
+ "node_modules/@nuxtjs/i18n/node_modules/@esbuild/android-x64": {
+ "version": "0.25.6",
+ "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.25.6.tgz",
+ "integrity": "sha512-0Z7KpHSr3VBIO9A/1wcT3NTy7EB4oNC4upJ5ye3R7taCc2GUdeynSLArnon5G8scPwaU866d3H4BCrE5xLW25A==",
+ "cpu": [
+ "x64"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "android"
+ ],
+ "engines": {
+ "node": ">=18"
+ }
+ },
+ "node_modules/@nuxtjs/i18n/node_modules/@esbuild/darwin-arm64": {
+ "version": "0.25.6",
+ "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.25.6.tgz",
+ "integrity": "sha512-FFCssz3XBavjxcFxKsGy2DYK5VSvJqa6y5HXljKzhRZ87LvEi13brPrf/wdyl/BbpbMKJNOr1Sd0jtW4Ge1pAA==",
+ "cpu": [
+ "arm64"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "darwin"
+ ],
+ "engines": {
+ "node": ">=18"
+ }
+ },
+ "node_modules/@nuxtjs/i18n/node_modules/@esbuild/darwin-x64": {
+ "version": "0.25.6",
+ "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.25.6.tgz",
+ "integrity": "sha512-GfXs5kry/TkGM2vKqK2oyiLFygJRqKVhawu3+DOCk7OxLy/6jYkWXhlHwOoTb0WqGnWGAS7sooxbZowy+pK9Yg==",
+ "cpu": [
+ "x64"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "darwin"
+ ],
+ "engines": {
+ "node": ">=18"
+ }
+ },
+ "node_modules/@nuxtjs/i18n/node_modules/@esbuild/freebsd-arm64": {
+ "version": "0.25.6",
+ "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.25.6.tgz",
+ "integrity": "sha512-aoLF2c3OvDn2XDTRvn8hN6DRzVVpDlj2B/F66clWd/FHLiHaG3aVZjxQX2DYphA5y/evbdGvC6Us13tvyt4pWg==",
+ "cpu": [
+ "arm64"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "freebsd"
+ ],
+ "engines": {
+ "node": ">=18"
+ }
+ },
+ "node_modules/@nuxtjs/i18n/node_modules/@esbuild/freebsd-x64": {
+ "version": "0.25.6",
+ "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.25.6.tgz",
+ "integrity": "sha512-2SkqTjTSo2dYi/jzFbU9Plt1vk0+nNg8YC8rOXXea+iA3hfNJWebKYPs3xnOUf9+ZWhKAaxnQNUf2X9LOpeiMQ==",
+ "cpu": [
+ "x64"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "freebsd"
+ ],
+ "engines": {
+ "node": ">=18"
+ }
+ },
+ "node_modules/@nuxtjs/i18n/node_modules/@esbuild/linux-arm": {
+ "version": "0.25.6",
+ "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.25.6.tgz",
+ "integrity": "sha512-SZHQlzvqv4Du5PrKE2faN0qlbsaW/3QQfUUc6yO2EjFcA83xnwm91UbEEVx4ApZ9Z5oG8Bxz4qPE+HFwtVcfyw==",
+ "cpu": [
+ "arm"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "linux"
+ ],
+ "engines": {
+ "node": ">=18"
+ }
+ },
+ "node_modules/@nuxtjs/i18n/node_modules/@esbuild/linux-arm64": {
+ "version": "0.25.6",
+ "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.25.6.tgz",
+ "integrity": "sha512-b967hU0gqKd9Drsh/UuAm21Khpoh6mPBSgz8mKRq4P5mVK8bpA+hQzmm/ZwGVULSNBzKdZPQBRT3+WuVavcWsQ==",
+ "cpu": [
+ "arm64"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "linux"
+ ],
+ "engines": {
+ "node": ">=18"
+ }
+ },
+ "node_modules/@nuxtjs/i18n/node_modules/@esbuild/linux-ia32": {
+ "version": "0.25.6",
+ "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.25.6.tgz",
+ "integrity": "sha512-aHWdQ2AAltRkLPOsKdi3xv0mZ8fUGPdlKEjIEhxCPm5yKEThcUjHpWB1idN74lfXGnZ5SULQSgtr5Qos5B0bPw==",
+ "cpu": [
+ "ia32"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "linux"
+ ],
+ "engines": {
+ "node": ">=18"
+ }
+ },
+ "node_modules/@nuxtjs/i18n/node_modules/@esbuild/linux-loong64": {
+ "version": "0.25.6",
+ "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.25.6.tgz",
+ "integrity": "sha512-VgKCsHdXRSQ7E1+QXGdRPlQ/e08bN6WMQb27/TMfV+vPjjTImuT9PmLXupRlC90S1JeNNW5lzkAEO/McKeJ2yg==",
+ "cpu": [
+ "loong64"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "linux"
+ ],
+ "engines": {
+ "node": ">=18"
+ }
+ },
+ "node_modules/@nuxtjs/i18n/node_modules/@esbuild/linux-mips64el": {
+ "version": "0.25.6",
+ "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.25.6.tgz",
+ "integrity": "sha512-WViNlpivRKT9/py3kCmkHnn44GkGXVdXfdc4drNmRl15zVQ2+D2uFwdlGh6IuK5AAnGTo2qPB1Djppj+t78rzw==",
+ "cpu": [
+ "mips64el"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "linux"
+ ],
+ "engines": {
+ "node": ">=18"
+ }
+ },
+ "node_modules/@nuxtjs/i18n/node_modules/@esbuild/linux-ppc64": {
+ "version": "0.25.6",
+ "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.25.6.tgz",
+ "integrity": "sha512-wyYKZ9NTdmAMb5730I38lBqVu6cKl4ZfYXIs31Baf8aoOtB4xSGi3THmDYt4BTFHk7/EcVixkOV2uZfwU3Q2Jw==",
+ "cpu": [
+ "ppc64"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "linux"
+ ],
+ "engines": {
+ "node": ">=18"
+ }
+ },
+ "node_modules/@nuxtjs/i18n/node_modules/@esbuild/linux-riscv64": {
+ "version": "0.25.6",
+ "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.25.6.tgz",
+ "integrity": "sha512-KZh7bAGGcrinEj4qzilJ4hqTY3Dg2U82c8bv+e1xqNqZCrCyc+TL9AUEn5WGKDzm3CfC5RODE/qc96OcbIe33w==",
+ "cpu": [
+ "riscv64"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "linux"
+ ],
+ "engines": {
+ "node": ">=18"
+ }
+ },
+ "node_modules/@nuxtjs/i18n/node_modules/@esbuild/linux-s390x": {
+ "version": "0.25.6",
+ "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.25.6.tgz",
+ "integrity": "sha512-9N1LsTwAuE9oj6lHMyyAM+ucxGiVnEqUdp4v7IaMmrwb06ZTEVCIs3oPPplVsnjPfyjmxwHxHMF8b6vzUVAUGw==",
+ "cpu": [
+ "s390x"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "linux"
+ ],
+ "engines": {
+ "node": ">=18"
+ }
+ },
+ "node_modules/@nuxtjs/i18n/node_modules/@esbuild/linux-x64": {
+ "version": "0.25.6",
+ "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.25.6.tgz",
+ "integrity": "sha512-A6bJB41b4lKFWRKNrWoP2LHsjVzNiaurf7wyj/XtFNTsnPuxwEBWHLty+ZE0dWBKuSK1fvKgrKaNjBS7qbFKig==",
+ "cpu": [
+ "x64"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "linux"
+ ],
+ "engines": {
+ "node": ">=18"
+ }
+ },
+ "node_modules/@nuxtjs/i18n/node_modules/@esbuild/netbsd-arm64": {
+ "version": "0.25.6",
+ "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.25.6.tgz",
+ "integrity": "sha512-IjA+DcwoVpjEvyxZddDqBY+uJ2Snc6duLpjmkXm/v4xuS3H+3FkLZlDm9ZsAbF9rsfP3zeA0/ArNDORZgrxR/Q==",
+ "cpu": [
+ "arm64"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "netbsd"
+ ],
+ "engines": {
+ "node": ">=18"
+ }
+ },
+ "node_modules/@nuxtjs/i18n/node_modules/@esbuild/netbsd-x64": {
+ "version": "0.25.6",
+ "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.25.6.tgz",
+ "integrity": "sha512-dUXuZr5WenIDlMHdMkvDc1FAu4xdWixTCRgP7RQLBOkkGgwuuzaGSYcOpW4jFxzpzL1ejb8yF620UxAqnBrR9g==",
+ "cpu": [
+ "x64"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "netbsd"
+ ],
+ "engines": {
+ "node": ">=18"
+ }
+ },
+ "node_modules/@nuxtjs/i18n/node_modules/@esbuild/openbsd-arm64": {
+ "version": "0.25.6",
+ "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.25.6.tgz",
+ "integrity": "sha512-l8ZCvXP0tbTJ3iaqdNf3pjaOSd5ex/e6/omLIQCVBLmHTlfXW3zAxQ4fnDmPLOB1x9xrcSi/xtCWFwCZRIaEwg==",
+ "cpu": [
+ "arm64"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "openbsd"
+ ],
+ "engines": {
+ "node": ">=18"
+ }
+ },
+ "node_modules/@nuxtjs/i18n/node_modules/@esbuild/openbsd-x64": {
+ "version": "0.25.6",
+ "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.25.6.tgz",
+ "integrity": "sha512-hKrmDa0aOFOr71KQ/19JC7az1P0GWtCN1t2ahYAf4O007DHZt/dW8ym5+CUdJhQ/qkZmI1HAF8KkJbEFtCL7gw==",
"cpu": [
"x64"
],
@@ -4841,9 +5119,9 @@
}
},
"node_modules/@nuxtjs/i18n/node_modules/@esbuild/sunos-x64": {
- "version": "0.25.4",
- "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.25.4.tgz",
- "integrity": "sha512-Mw+tzy4pp6wZEK0+Lwr76pWLjrtjmJyUB23tHKqEDP74R3q95luY/bXqXZeYl4NYlvwOqoRKlInQialgCKy67Q==",
+ "version": "0.25.6",
+ "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.25.6.tgz",
+ "integrity": "sha512-dyCGxv1/Br7MiSC42qinGL8KkG4kX0pEsdb0+TKhmJZgCUDBGmyo1/ArCjNGiOLiIAgdbWgmWgib4HoCi5t7kA==",
"cpu": [
"x64"
],
@@ -4858,9 +5136,9 @@
}
},
"node_modules/@nuxtjs/i18n/node_modules/@esbuild/win32-arm64": {
- "version": "0.25.4",
- "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.25.4.tgz",
- "integrity": "sha512-AVUP428VQTSddguz9dO9ngb+E5aScyg7nOeJDrF1HPYu555gmza3bDGMPhmVXL8svDSoqPCsCPjb265yG/kLKQ==",
+ "version": "0.25.6",
+ "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.25.6.tgz",
+ "integrity": "sha512-42QOgcZeZOvXfsCBJF5Afw73t4veOId//XD3i+/9gSkhSV6Gk3VPlWncctI+JcOyERv85FUo7RxuxGy+z8A43Q==",
"cpu": [
"arm64"
],
@@ -4875,9 +5153,9 @@
}
},
"node_modules/@nuxtjs/i18n/node_modules/@esbuild/win32-ia32": {
- "version": "0.25.4",
- "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.25.4.tgz",
- "integrity": "sha512-i1sW+1i+oWvQzSgfRcxxG2k4I9n3O9NRqy8U+uugaT2Dy7kLO9Y7wI72haOahxceMX8hZAzgGou1FhndRldxRg==",
+ "version": "0.25.6",
+ "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.25.6.tgz",
+ "integrity": "sha512-4AWhgXmDuYN7rJI6ORB+uU9DHLq/erBbuMoAuB4VWJTu5KtCgcKYPynF0YI1VkBNuEfjNlLrFr9KZPJzrtLkrQ==",
"cpu": [
"ia32"
],
@@ -4892,9 +5170,9 @@
}
},
"node_modules/@nuxtjs/i18n/node_modules/@esbuild/win32-x64": {
- "version": "0.25.4",
- "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.25.4.tgz",
- "integrity": "sha512-nOT2vZNw6hJ+z43oP1SPea/G/6AbN6X+bGNhNuq8NtRHy4wsMhw765IKLNmnjek7GvjWBYQ8Q5VBoYTFg9y1UQ==",
+ "version": "0.25.6",
+ "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.25.6.tgz",
+ "integrity": "sha512-NgJPHHbEpLQgDH2MjQu90pzW/5vvXIZ7KOnPyNBm92A6WgZ/7b6fJyUBjoumLqeOQQGqY2QjQxRo97ah4Sj0cA==",
"cpu": [
"x64"
],
@@ -4909,9 +5187,9 @@
}
},
"node_modules/@nuxtjs/i18n/node_modules/esbuild": {
- "version": "0.25.4",
- "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.25.4.tgz",
- "integrity": "sha512-8pgjLUcUjcgDg+2Q4NYXnPbo/vncAY4UmyaCm0jZevERqCHZIaWwdJHkf8XQtu4AxSKCdvrUbT0XUr1IdZzI8Q==",
+ "version": "0.25.6",
+ "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.25.6.tgz",
+ "integrity": "sha512-GVuzuUwtdsghE3ocJ9Bs8PNoF13HNQ5TXbEi2AhvVb8xU1Iwt9Fos9FEamfoee+u/TOsn7GUWc04lz46n2bbTg==",
"dev": true,
"hasInstallScript": true,
"license": "MIT",
@@ -4922,53 +5200,57 @@
"node": ">=18"
},
"optionalDependencies": {
- "@esbuild/aix-ppc64": "0.25.4",
- "@esbuild/android-arm": "0.25.4",
- "@esbuild/android-arm64": "0.25.4",
- "@esbuild/android-x64": "0.25.4",
- "@esbuild/darwin-arm64": "0.25.4",
- "@esbuild/darwin-x64": "0.25.4",
- "@esbuild/freebsd-arm64": "0.25.4",
- "@esbuild/freebsd-x64": "0.25.4",
- "@esbuild/linux-arm": "0.25.4",
- "@esbuild/linux-arm64": "0.25.4",
- "@esbuild/linux-ia32": "0.25.4",
- "@esbuild/linux-loong64": "0.25.4",
- "@esbuild/linux-mips64el": "0.25.4",
- "@esbuild/linux-ppc64": "0.25.4",
- "@esbuild/linux-riscv64": "0.25.4",
- "@esbuild/linux-s390x": "0.25.4",
- "@esbuild/linux-x64": "0.25.4",
- "@esbuild/netbsd-arm64": "0.25.4",
- "@esbuild/netbsd-x64": "0.25.4",
- "@esbuild/openbsd-arm64": "0.25.4",
- "@esbuild/openbsd-x64": "0.25.4",
- "@esbuild/sunos-x64": "0.25.4",
- "@esbuild/win32-arm64": "0.25.4",
- "@esbuild/win32-ia32": "0.25.4",
- "@esbuild/win32-x64": "0.25.4"
+ "@esbuild/aix-ppc64": "0.25.6",
+ "@esbuild/android-arm": "0.25.6",
+ "@esbuild/android-arm64": "0.25.6",
+ "@esbuild/android-x64": "0.25.6",
+ "@esbuild/darwin-arm64": "0.25.6",
+ "@esbuild/darwin-x64": "0.25.6",
+ "@esbuild/freebsd-arm64": "0.25.6",
+ "@esbuild/freebsd-x64": "0.25.6",
+ "@esbuild/linux-arm": "0.25.6",
+ "@esbuild/linux-arm64": "0.25.6",
+ "@esbuild/linux-ia32": "0.25.6",
+ "@esbuild/linux-loong64": "0.25.6",
+ "@esbuild/linux-mips64el": "0.25.6",
+ "@esbuild/linux-ppc64": "0.25.6",
+ "@esbuild/linux-riscv64": "0.25.6",
+ "@esbuild/linux-s390x": "0.25.6",
+ "@esbuild/linux-x64": "0.25.6",
+ "@esbuild/netbsd-arm64": "0.25.6",
+ "@esbuild/netbsd-x64": "0.25.6",
+ "@esbuild/openbsd-arm64": "0.25.6",
+ "@esbuild/openbsd-x64": "0.25.6",
+ "@esbuild/openharmony-arm64": "0.25.6",
+ "@esbuild/sunos-x64": "0.25.6",
+ "@esbuild/win32-arm64": "0.25.6",
+ "@esbuild/win32-ia32": "0.25.6",
+ "@esbuild/win32-x64": "0.25.6"
}
},
"node_modules/@nuxtjs/sitemap": {
- "version": "7.2.10",
- "resolved": "https://registry.npmjs.org/@nuxtjs/sitemap/-/sitemap-7.2.10.tgz",
- "integrity": "sha512-7w1Ys2XIE/QVTJn5dbt2p/hrmDoGO9Ay1S3o6LI5M/MDRzKPvnXi5ByRUcc7Sfa3LUpLad5/w4IOQ4lyxhq9Hw==",
+ "version": "7.4.3",
+ "resolved": "https://registry.npmjs.org/@nuxtjs/sitemap/-/sitemap-7.4.3.tgz",
+ "integrity": "sha512-edJ0bVuKS87PefTnKVMqcEwSZbur0yLg2eCKU2kjNDI1jC9tOnCHwXMHQficiKPXZolzqmlK7+U23Tv95OzVbg==",
"dev": true,
"license": "MIT",
"dependencies": {
- "@nuxt/devtools-kit": "^2.3.2",
- "@nuxt/kit": "^3.16.2",
+ "@nuxt/devtools-kit": "^2.5.0",
+ "@nuxt/kit": "^3.17.5",
"chalk": "^5.4.1",
"defu": "^6.1.4",
+ "fast-xml-parser": "^5.2.5",
"h3-compression": "^0.3.2",
- "nuxt-site-config": "^3.1.9",
+ "nuxt-site-config": "^3.2.2",
"ofetch": "^1.4.1",
"pathe": "^2.0.3",
- "pkg-types": "^2.1.0",
+ "pkg-types": "^2.1.1",
"radix3": "^1.1.2",
- "semver": "^7.7.1",
+ "semver": "^7.7.2",
"sirv": "^3.0.1",
- "ufo": "^1.5.4"
+ "std-env": "^3.9.0",
+ "ufo": "^1.6.1",
+ "ultrahtml": "^1.6.0"
},
"engines": {
"node": ">=18.0.0"
@@ -4977,30 +5259,6 @@
"url": "https://github.com/sponsors/harlan-zw"
}
},
- "node_modules/@nuxtjs/tailwindcss": {
- "version": "6.14.0",
- "resolved": "https://registry.npmjs.org/@nuxtjs/tailwindcss/-/tailwindcss-6.14.0.tgz",
- "integrity": "sha512-30RyDK++LrUVRgc2A85MktGWIZoRQgeQKjE4CjjD64OXNozyl+4ScHnnYgqVToMM6Ch2ZG2W4wV2J0EN6F0zkQ==",
- "license": "MIT",
- "dependencies": {
- "@nuxt/kit": "^3.16.0",
- "autoprefixer": "^10.4.20",
- "c12": "^3.0.2",
- "consola": "^3.4.0",
- "defu": "^6.1.4",
- "h3": "^1.15.1",
- "klona": "^2.0.6",
- "ohash": "^2.0.11",
- "pathe": "^2.0.3",
- "pkg-types": "^2.1.0",
- "postcss": "^8.5.3",
- "postcss-nesting": "^13.0.1",
- "tailwind-config-viewer": "^2.0.4",
- "tailwindcss": "~3.4.17",
- "ufo": "^1.5.4",
- "unctx": "^2.4.1"
- }
- },
"node_modules/@opentelemetry/api": {
"version": "1.9.0",
"resolved": "https://registry.npmjs.org/@opentelemetry/api/-/api-1.9.0.tgz",
@@ -5145,23 +5403,6 @@
"@opentelemetry/api": "^1.3.0"
}
},
- "node_modules/@opentelemetry/instrumentation-fastify": {
- "version": "0.44.2",
- "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-fastify/-/instrumentation-fastify-0.44.2.tgz",
- "integrity": "sha512-arSp97Y4D2NWogoXRb8CzFK3W2ooVdvqRRtQDljFt9uC3zI6OuShgey6CVFC0JxT1iGjkAr1r4PDz23mWrFULQ==",
- "license": "Apache-2.0",
- "dependencies": {
- "@opentelemetry/core": "^1.8.0",
- "@opentelemetry/instrumentation": "^0.57.1",
- "@opentelemetry/semantic-conventions": "^1.27.0"
- },
- "engines": {
- "node": ">=14"
- },
- "peerDependencies": {
- "@opentelemetry/api": "^1.3.0"
- }
- },
"node_modules/@opentelemetry/instrumentation-fs": {
"version": "0.19.1",
"resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-fs/-/instrumentation-fs-0.19.1.tgz",
@@ -5532,9 +5773,9 @@
}
},
"node_modules/@opentelemetry/semantic-conventions": {
- "version": "1.32.0",
- "resolved": "https://registry.npmjs.org/@opentelemetry/semantic-conventions/-/semantic-conventions-1.32.0.tgz",
- "integrity": "sha512-s0OpmpQFSfMrmedAn9Lhg4KWJELHCU6uU9dtIJ28N8UGhf9Y55im5X8fEzwhwDwiSqN+ZPSNrDJF7ivf/AuRPQ==",
+ "version": "1.36.0",
+ "resolved": "https://registry.npmjs.org/@opentelemetry/semantic-conventions/-/semantic-conventions-1.36.0.tgz",
+ "integrity": "sha512-TtxJSRD8Ohxp6bKkhrm27JRHAxPczQA7idtcTOMYI+wQRRrfgqxHv1cFbCApcSnNjtXkmzFozn6jQtFrOmbjPQ==",
"license": "Apache-2.0",
"engines": {
"node": ">=14"
@@ -5555,12 +5796,29 @@
"@opentelemetry/api": "^1.1.0"
}
},
- "node_modules/@oxc-parser/binding-darwin-arm64": {
- "version": "0.61.2",
- "resolved": "https://registry.npmjs.org/@oxc-parser/binding-darwin-arm64/-/binding-darwin-arm64-0.61.2.tgz",
- "integrity": "sha512-xpDuwawMDCHg3plbSjpMbrhNTzO1AlvvHqsUOTE3WDmv5K7fFD72f3Pl+SxPJ4D/IhMdskec1B5ZfZHM1iAFmQ==",
+ "node_modules/@oxc-parser/binding-darwin-arm64": {
+ "version": "0.70.0",
+ "resolved": "https://registry.npmjs.org/@oxc-parser/binding-darwin-arm64/-/binding-darwin-arm64-0.70.0.tgz",
+ "integrity": "sha512-pIi7L9PnsBctS/ruW6JQVSYRJkh76PblBN46uQxpBfVsM57c1s4HGZlmGysQWbdmQTFDZW+SmH3u0JpmDLF0+A==",
+ "cpu": [
+ "arm64"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "darwin"
+ ],
+ "engines": {
+ "node": ">=14.0.0"
+ }
+ },
+ "node_modules/@oxc-parser/binding-darwin-x64": {
+ "version": "0.70.0",
+ "resolved": "https://registry.npmjs.org/@oxc-parser/binding-darwin-x64/-/binding-darwin-x64-0.70.0.tgz",
+ "integrity": "sha512-EbKqtOHzZR56ZFC5HHg6XrYneFAJmpLC1Z6FSgbI061Ley1atAViQg7S6Agm9wAcPpns+BeFJqXEBx/y3MKa2w==",
"cpu": [
- "arm64"
+ "x64"
],
"dev": true,
"license": "MIT",
@@ -5572,10 +5830,10 @@
"node": ">=14.0.0"
}
},
- "node_modules/@oxc-parser/binding-darwin-x64": {
- "version": "0.61.2",
- "resolved": "https://registry.npmjs.org/@oxc-parser/binding-darwin-x64/-/binding-darwin-x64-0.61.2.tgz",
- "integrity": "sha512-1zjghOALDDhg5mPJgQfoud/bLOxD3M9n8l2LxXK4NngxGh3xXq1K7vAs2dzDnwZI6FaStrrBMDJSocT2hggiLg==",
+ "node_modules/@oxc-parser/binding-freebsd-x64": {
+ "version": "0.70.0",
+ "resolved": "https://registry.npmjs.org/@oxc-parser/binding-freebsd-x64/-/binding-freebsd-x64-0.70.0.tgz",
+ "integrity": "sha512-MVUaOMEUVE8q3nsWtEo589h++V5wAdqTbCRa9WY4Yuyxska4xcuJQk/kDNCx+n92saS7Luk+b20O9+VCI03c+A==",
"cpu": [
"x64"
],
@@ -5583,16 +5841,33 @@
"license": "MIT",
"optional": true,
"os": [
- "darwin"
+ "freebsd"
],
"engines": {
"node": ">=14.0.0"
}
},
"node_modules/@oxc-parser/binding-linux-arm-gnueabihf": {
- "version": "0.61.2",
- "resolved": "https://registry.npmjs.org/@oxc-parser/binding-linux-arm-gnueabihf/-/binding-linux-arm-gnueabihf-0.61.2.tgz",
- "integrity": "sha512-OppSdOE7BAHfx/hNbsS4tf+CPCEWEXeEB/4tJKcv6qysZKsTD6XXWUzn2F7KR7TFNSzA0hPjnZyezjFgo+xvcQ==",
+ "version": "0.70.0",
+ "resolved": "https://registry.npmjs.org/@oxc-parser/binding-linux-arm-gnueabihf/-/binding-linux-arm-gnueabihf-0.70.0.tgz",
+ "integrity": "sha512-8N4JTYTgKiRHlMUDAdzKs6iEC57a8ex408VgKoLD/Fl+Un79qOti3S9sotdnWSdH/BsDQeO5NW+PKaqFBTw+hA==",
+ "cpu": [
+ "arm"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "linux"
+ ],
+ "engines": {
+ "node": ">=14.0.0"
+ }
+ },
+ "node_modules/@oxc-parser/binding-linux-arm-musleabihf": {
+ "version": "0.70.0",
+ "resolved": "https://registry.npmjs.org/@oxc-parser/binding-linux-arm-musleabihf/-/binding-linux-arm-musleabihf-0.70.0.tgz",
+ "integrity": "sha512-Bsu+YvtgWuSfSDJTHMF5APZBOtvddR0GiHyrL0yaXDwaYvAL/E7XcoSK2GdmKTpw+J8nk5IlejEXlQliPo52pQ==",
"cpu": [
"arm"
],
@@ -5607,9 +5882,9 @@
}
},
"node_modules/@oxc-parser/binding-linux-arm64-gnu": {
- "version": "0.61.2",
- "resolved": "https://registry.npmjs.org/@oxc-parser/binding-linux-arm64-gnu/-/binding-linux-arm64-gnu-0.61.2.tgz",
- "integrity": "sha512-CqhKWDvVr4rZpi8Evh/K7FKwn9UnPhF0F0ivF+CsFCMOaS5egalmFRRybQk1QuwGq1XjTA3D8puqvlF0p82+ew==",
+ "version": "0.70.0",
+ "resolved": "https://registry.npmjs.org/@oxc-parser/binding-linux-arm64-gnu/-/binding-linux-arm64-gnu-0.70.0.tgz",
+ "integrity": "sha512-tDzHWKexJPHR+qSiuAFoZ1v8EgCd4ggBNbjJHkcIHsoYKnsKaT1+uE9xfW9UhI1mhv2lo1JJ9n9og2yDTGxSeA==",
"cpu": [
"arm64"
],
@@ -5624,9 +5899,9 @@
}
},
"node_modules/@oxc-parser/binding-linux-arm64-musl": {
- "version": "0.61.2",
- "resolved": "https://registry.npmjs.org/@oxc-parser/binding-linux-arm64-musl/-/binding-linux-arm64-musl-0.61.2.tgz",
- "integrity": "sha512-wLtzWy6EyMf7F83pcJhanolaQ7xnwnVAj2wjdJ52qgX4oQjqZZUo6Rk/LE2iY8Aq/R2Bx2yREFeIC4R1kjtB0A==",
+ "version": "0.70.0",
+ "resolved": "https://registry.npmjs.org/@oxc-parser/binding-linux-arm64-musl/-/binding-linux-arm64-musl-0.70.0.tgz",
+ "integrity": "sha512-BJ+N25UWmHU624558ojSTnht3uFL00jV1c8qk1hnKf4cl6+ovFcoktRWAWSBlgLEP8tLlu8qgIhz875tMj2PkQ==",
"cpu": [
"arm64"
],
@@ -5640,10 +5915,44 @@
"node": ">=14.0.0"
}
},
+ "node_modules/@oxc-parser/binding-linux-riscv64-gnu": {
+ "version": "0.70.0",
+ "resolved": "https://registry.npmjs.org/@oxc-parser/binding-linux-riscv64-gnu/-/binding-linux-riscv64-gnu-0.70.0.tgz",
+ "integrity": "sha512-nxu22nVuPA2xy1cxvBC0D5mVl0myqStOw3XBkVkDViNL01iPyuEFJd5VsM0GqsgrXvF95H/jrbMd+XWnto924g==",
+ "cpu": [
+ "riscv64"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "linux"
+ ],
+ "engines": {
+ "node": ">=14.0.0"
+ }
+ },
+ "node_modules/@oxc-parser/binding-linux-s390x-gnu": {
+ "version": "0.70.0",
+ "resolved": "https://registry.npmjs.org/@oxc-parser/binding-linux-s390x-gnu/-/binding-linux-s390x-gnu-0.70.0.tgz",
+ "integrity": "sha512-AQ6Xj97lYRxHZl94cZIHJxT5M1qkeEi+vQe+e7M2lAtjcURl8cwhZmWKSv4rt4BQRVfO3ys0bY8AgIh4eFJiqw==",
+ "cpu": [
+ "s390x"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "linux"
+ ],
+ "engines": {
+ "node": ">=14.0.0"
+ }
+ },
"node_modules/@oxc-parser/binding-linux-x64-gnu": {
- "version": "0.61.2",
- "resolved": "https://registry.npmjs.org/@oxc-parser/binding-linux-x64-gnu/-/binding-linux-x64-gnu-0.61.2.tgz",
- "integrity": "sha512-aJ+g/pDcOeqfB2bVZkUjHlCBL8H7lsgkuYVGKKLYxN/oLjrt2Jf/BVu6fL3NxmSSaFmtHKowDgoRAjiKwxQWEQ==",
+ "version": "0.70.0",
+ "resolved": "https://registry.npmjs.org/@oxc-parser/binding-linux-x64-gnu/-/binding-linux-x64-gnu-0.70.0.tgz",
+ "integrity": "sha512-RIxaVsIxtG90CoX6/Okij8itaMrJp4SEJm1pSL0pz3hGo0yur3Il9M1mmGvOpW+avY8uHdwXIvf2qMnnTKZuoQ==",
"cpu": [
"x64"
],
@@ -5658,9 +5967,9 @@
}
},
"node_modules/@oxc-parser/binding-linux-x64-musl": {
- "version": "0.61.2",
- "resolved": "https://registry.npmjs.org/@oxc-parser/binding-linux-x64-musl/-/binding-linux-x64-musl-0.61.2.tgz",
- "integrity": "sha512-PosnNyxTqCiMTgva5w695p3ooCcFU8tU+c+JnGgkBgD8pKTbV6fwn8dc4GlcgyyLaM1rD+zi/s+4ooTVML8iIA==",
+ "version": "0.70.0",
+ "resolved": "https://registry.npmjs.org/@oxc-parser/binding-linux-x64-musl/-/binding-linux-x64-musl-0.70.0.tgz",
+ "integrity": "sha512-B3S0G4TlZ+WLdQq4mSQtt2ZW0MAkKWc8dla17tZY86kcXvvCWwACvj7I27Z/nSlb7uJOdRZS9/r6Gw0uAARNVQ==",
"cpu": [
"x64"
],
@@ -5675,9 +5984,9 @@
}
},
"node_modules/@oxc-parser/binding-wasm32-wasi": {
- "version": "0.61.2",
- "resolved": "https://registry.npmjs.org/@oxc-parser/binding-wasm32-wasi/-/binding-wasm32-wasi-0.61.2.tgz",
- "integrity": "sha512-zOxdLDItMXeB1GdVCtOOW+aC+Ra6C4E1ivT4rbhaaVe70RsCRa2fGmNC0divvgfQsL2eGBkCuB4d4N9DjfhK4Q==",
+ "version": "0.70.0",
+ "resolved": "https://registry.npmjs.org/@oxc-parser/binding-wasm32-wasi/-/binding-wasm32-wasi-0.70.0.tgz",
+ "integrity": "sha512-QN8yxH7eHXTqed8Oo7ZUzOWn6hixXa8EVINLy21eLU9isoifSPKMswSmCXHxsM2L5rIIvzoaKfghGOru1mMQbw==",
"cpu": [
"wasm32"
],
@@ -5685,16 +5994,16 @@
"license": "MIT",
"optional": true,
"dependencies": {
- "@napi-rs/wasm-runtime": "^0.2.7"
+ "@napi-rs/wasm-runtime": "^0.2.9"
},
"engines": {
"node": ">=14.0.0"
}
},
"node_modules/@oxc-parser/binding-win32-arm64-msvc": {
- "version": "0.61.2",
- "resolved": "https://registry.npmjs.org/@oxc-parser/binding-win32-arm64-msvc/-/binding-win32-arm64-msvc-0.61.2.tgz",
- "integrity": "sha512-E7VMrb4XF748hyzIax2KV7TEfi27SfXoi/BH5guiBicSef/31qwHRdKCh708lmIYmbeEJ9D0wO/25K6dvTl8QQ==",
+ "version": "0.70.0",
+ "resolved": "https://registry.npmjs.org/@oxc-parser/binding-win32-arm64-msvc/-/binding-win32-arm64-msvc-0.70.0.tgz",
+ "integrity": "sha512-6k8/s78g0GQKqrxk4F0wYj32NBF9oSP6089e6BeuIRQ9l+Zh0cuI6unJeLzXNszxmlqq84xmf/tmP3MSDG43Uw==",
"cpu": [
"arm64"
],
@@ -5709,9 +6018,9 @@
}
},
"node_modules/@oxc-parser/binding-win32-x64-msvc": {
- "version": "0.61.2",
- "resolved": "https://registry.npmjs.org/@oxc-parser/binding-win32-x64-msvc/-/binding-win32-x64-msvc-0.61.2.tgz",
- "integrity": "sha512-GtRVVz4DGF94MzlJ7xCIpITu6WKYdTqWc2cqMaJEzYDC8EsHjNkfbGhmawhyodFFuTfWqPAjJecIvvAnfMLpxw==",
+ "version": "0.70.0",
+ "resolved": "https://registry.npmjs.org/@oxc-parser/binding-win32-x64-msvc/-/binding-win32-x64-msvc-0.70.0.tgz",
+ "integrity": "sha512-nd9o1QtEvupaJZ3Wn7PfsuC00n31NNRQZ5+Mui6Q0ZyDzp+obqPUSbSt7xh9Dy0c5zgtYMk8WY4n/VBJY2VvTQ==",
"cpu": [
"x64"
],
@@ -6070,10 +6379,22 @@
"url": "https://opencollective.com/parcel"
}
},
+ "node_modules/@parcel/watcher/node_modules/detect-libc": {
+ "version": "1.0.3",
+ "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz",
+ "integrity": "sha512-pGjwhsmsp4kL2RTz08wcOlGN83otlqHeD/Z5T8GXZB+/YcpQ/dgo+lbU8ZsGxV0HIvqqxo9l7mqYwyYMD9bKDg==",
+ "license": "Apache-2.0",
+ "bin": {
+ "detect-libc": "bin/detect-libc.js"
+ },
+ "engines": {
+ "node": ">=0.10"
+ }
+ },
"node_modules/@pinia/nuxt": {
- "version": "0.11.0",
- "resolved": "https://registry.npmjs.org/@pinia/nuxt/-/nuxt-0.11.0.tgz",
- "integrity": "sha512-QGFlUAkeVAhPCTXacrtNP4ti24sGEleVzmxcTALY9IkS6U5OUox7vmNL1pkqBeW39oSNq/UC5m40ofDEPHB1fg==",
+ "version": "0.11.1",
+ "resolved": "https://registry.npmjs.org/@pinia/nuxt/-/nuxt-0.11.1.tgz",
+ "integrity": "sha512-tCD8ioWhhIHKwm8Y9VvyhBAV/kK4W5uGBIYbI5iM4N1t7duOqK6ECBUavrMxMolELayqqMLb9+evegrh3S7s2A==",
"license": "MIT",
"dependencies": {
"@nuxt/kit": "^3.9.0"
@@ -6082,7 +6403,7 @@
"url": "https://github.com/sponsors/posva"
},
"peerDependencies": {
- "pinia": "^3.0.2"
+ "pinia": "^3.0.3"
}
},
"node_modules/@pkgjs/parseargs": {
@@ -6096,9 +6417,9 @@
}
},
"node_modules/@pkgr/core": {
- "version": "0.2.4",
- "resolved": "https://registry.npmjs.org/@pkgr/core/-/core-0.2.4.tgz",
- "integrity": "sha512-ROFF39F6ZrnzSUEmQQZUar0Jt4xVoP9WnDRdWwF4NNcXs3xBTLgBUDoOwW141y1jP+S8nahIbdxbFC7IShw9Iw==",
+ "version": "0.2.7",
+ "resolved": "https://registry.npmjs.org/@pkgr/core/-/core-0.2.7.tgz",
+ "integrity": "sha512-YLT9Zo3oNPJoBjBc4q8G2mjU4tqIbf5CEOORbUUr48dCD9q3umJ3IPlVqOqDakPfd2HuwccBaqlGhN4Gmr5OWg==",
"dev": true,
"license": "MIT",
"engines": {
@@ -6125,15 +6446,12 @@
}
},
"node_modules/@poppinss/colors": {
- "version": "4.1.4",
- "resolved": "https://registry.npmjs.org/@poppinss/colors/-/colors-4.1.4.tgz",
- "integrity": "sha512-FA+nTU8p6OcSH4tLDY5JilGYr1bVWHpNmcLr7xmMEdbWmKHa+3QZ+DqefrXKmdjO/brHTnQZo20lLSjaO7ydog==",
+ "version": "4.1.5",
+ "resolved": "https://registry.npmjs.org/@poppinss/colors/-/colors-4.1.5.tgz",
+ "integrity": "sha512-FvdDqtcRCtz6hThExcFOgW0cWX+xwSMWcRuQe5ZEb2m7cVQOAVZOIMt+/v9RxGiD9/OY16qJBXK4CVKWAPalBw==",
"license": "MIT",
"dependencies": {
"kleur": "^4.1.5"
- },
- "engines": {
- "node": ">=18.16.0"
}
},
"node_modules/@poppinss/colors/node_modules/kleur": {
@@ -6146,29 +6464,26 @@
}
},
"node_modules/@poppinss/dumper": {
- "version": "0.6.3",
- "resolved": "https://registry.npmjs.org/@poppinss/dumper/-/dumper-0.6.3.tgz",
- "integrity": "sha512-iombbn8ckOixMtuV1p3f8jN6vqhXefNjJttoPaJDMeIk/yIGhkkL3OrHkEjE9SRsgoAx1vBUU2GtgggjvA5hCA==",
+ "version": "0.6.4",
+ "resolved": "https://registry.npmjs.org/@poppinss/dumper/-/dumper-0.6.4.tgz",
+ "integrity": "sha512-iG0TIdqv8xJ3Lt9O8DrPRxw1MRLjNpoqiSGU03P/wNLP/s0ra0udPJ1J2Tx5M0J3H/cVyEgpbn8xUKRY9j59kQ==",
"license": "MIT",
"dependencies": {
- "@poppinss/colors": "^4.1.4",
- "@sindresorhus/is": "^7.0.1",
+ "@poppinss/colors": "^4.1.5",
+ "@sindresorhus/is": "^7.0.2",
"supports-color": "^10.0.0"
}
},
"node_modules/@poppinss/exception": {
- "version": "1.2.1",
- "resolved": "https://registry.npmjs.org/@poppinss/exception/-/exception-1.2.1.tgz",
- "integrity": "sha512-aQypoot0HPSJa6gDPEPTntc1GT6QINrSbgRlRhadGW2WaYqUK3tK4Bw9SBMZXhmxd3GeAlZjVcODHgiu+THY7A==",
- "license": "MIT",
- "engines": {
- "node": ">=18"
- }
+ "version": "1.2.2",
+ "resolved": "https://registry.npmjs.org/@poppinss/exception/-/exception-1.2.2.tgz",
+ "integrity": "sha512-m7bpKCD4QMlFCjA/nKTs23fuvoVFoA83brRKmObCUNmi/9tVu8Ve3w4YQAnJu4q3Tjf5fr685HYIC/IA2zHRSg==",
+ "license": "MIT"
},
"node_modules/@prisma/instrumentation": {
- "version": "6.6.0",
- "resolved": "https://registry.npmjs.org/@prisma/instrumentation/-/instrumentation-6.6.0.tgz",
- "integrity": "sha512-M/a6njz3hbf2oucwdbjNKrSMLuyMCwgDrmTtkF1pm4Nm7CU45J/Hd6lauF2CDACTUYzu3ymcV7P0ZAhIoj6WRw==",
+ "version": "6.11.1",
+ "resolved": "https://registry.npmjs.org/@prisma/instrumentation/-/instrumentation-6.11.1.tgz",
+ "integrity": "sha512-mrZOev24EDhnefmnZX7WVVT7v+r9LttPRqf54ONvj6re4XMF7wFTpK2tLJi4XHB7fFp/6xhYbgRel8YV7gQiyA==",
"license": "Apache-2.0",
"dependencies": {
"@opentelemetry/instrumentation": "^0.52.0 || ^0.53.0 || ^0.54.0 || ^0.55.0 || ^0.56.0 || ^0.57.0"
@@ -6177,6 +6492,12 @@
"@opentelemetry/api": "^1.8"
}
},
+ "node_modules/@rolldown/pluginutils": {
+ "version": "1.0.0-beta.27",
+ "resolved": "https://registry.npmjs.org/@rolldown/pluginutils/-/pluginutils-1.0.0-beta.27.tgz",
+ "integrity": "sha512-+d0F4MKMCbeVUJwG96uQ4SgAznZNSq93I3V+9NHA4OpvqG8mRCpGdKmK8l/dl02h2CCDHwW2FqilnTyDcAnqjA==",
+ "license": "MIT"
+ },
"node_modules/@rollup/plugin-alias": {
"version": "5.1.1",
"resolved": "https://registry.npmjs.org/@rollup/plugin-alias/-/plugin-alias-5.1.1.tgz",
@@ -6195,9 +6516,9 @@
}
},
"node_modules/@rollup/plugin-commonjs": {
- "version": "28.0.3",
- "resolved": "https://registry.npmjs.org/@rollup/plugin-commonjs/-/plugin-commonjs-28.0.3.tgz",
- "integrity": "sha512-pyltgilam1QPdn+Zd9gaCfOLcnjMEJ9gV+bTw6/r73INdvzf1ah9zLIJBm+kW7R6IUFIQ1YO+VqZtYxZNWFPEQ==",
+ "version": "28.0.6",
+ "resolved": "https://registry.npmjs.org/@rollup/plugin-commonjs/-/plugin-commonjs-28.0.6.tgz",
+ "integrity": "sha512-XSQB1K7FUU5QP+3lOQmVCE3I0FcbbNvmNT4VJSj93iUjayaARrTQeoRdiYQoftAJBLrR9t2agwAd3ekaTgHNlw==",
"license": "MIT",
"dependencies": {
"@rollup/pluginutils": "^5.0.1",
@@ -6298,6 +6619,26 @@
}
}
},
+ "node_modules/@rollup/plugin-node-resolve/node_modules/resolve": {
+ "version": "1.22.10",
+ "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.10.tgz",
+ "integrity": "sha512-NPRy+/ncIMeDlTAsuqwKIiferiawhefFJtkNSW0qZJEqMEb+qBt/77B/jGeeek+F0uOeN05CDa6HXbbIgtVX4w==",
+ "license": "MIT",
+ "dependencies": {
+ "is-core-module": "^2.16.0",
+ "path-parse": "^1.0.7",
+ "supports-preserve-symlinks-flag": "^1.0.0"
+ },
+ "bin": {
+ "resolve": "bin/resolve"
+ },
+ "engines": {
+ "node": ">= 0.4"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
+ }
+ },
"node_modules/@rollup/plugin-replace": {
"version": "6.0.2",
"resolved": "https://registry.npmjs.org/@rollup/plugin-replace/-/plugin-replace-6.0.2.tgz",
@@ -6365,9 +6706,9 @@
}
},
"node_modules/@rollup/pluginutils": {
- "version": "5.1.4",
- "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-5.1.4.tgz",
- "integrity": "sha512-USm05zrsFxYLPdWWq+K3STlWiT/3ELn3RcV5hJMghpeAIhxfsUIg6mt12CBJBInWMV4VneoV7SfGv8xIwo2qNQ==",
+ "version": "5.2.0",
+ "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-5.2.0.tgz",
+ "integrity": "sha512-qWJ2ZTbmumwiLFomfzTyt5Kng4hwPi9rwCYN4SHb6eaRU1KNO4ccxINHr/VhH4GgPlt1XfSTLX2LBTme8ne4Zw==",
"license": "MIT",
"dependencies": {
"@types/estree": "^1.0.0",
@@ -6393,9 +6734,9 @@
"license": "MIT"
},
"node_modules/@rollup/rollup-android-arm-eabi": {
- "version": "4.40.2",
- "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.40.2.tgz",
- "integrity": "sha512-JkdNEq+DFxZfUwxvB58tHMHBHVgX23ew41g1OQinthJ+ryhdRk67O31S7sYw8u2lTjHUPFxwar07BBt1KHp/hg==",
+ "version": "4.45.1",
+ "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.45.1.tgz",
+ "integrity": "sha512-NEySIFvMY0ZQO+utJkgoMiCAjMrGvnbDLHvcmlA33UXJpYBCvlBEbMMtV837uCkS+plG2umfhn0T5mMAxGrlRA==",
"cpu": [
"arm"
],
@@ -6406,9 +6747,9 @@
]
},
"node_modules/@rollup/rollup-android-arm64": {
- "version": "4.40.2",
- "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.40.2.tgz",
- "integrity": "sha512-13unNoZ8NzUmnndhPTkWPWbX3vtHodYmy+I9kuLxN+F+l+x3LdVF7UCu8TWVMt1POHLh6oDHhnOA04n8oJZhBw==",
+ "version": "4.45.1",
+ "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.45.1.tgz",
+ "integrity": "sha512-ujQ+sMXJkg4LRJaYreaVx7Z/VMgBBd89wGS4qMrdtfUFZ+TSY5Rs9asgjitLwzeIbhwdEhyj29zhst3L1lKsRQ==",
"cpu": [
"arm64"
],
@@ -6419,9 +6760,9 @@
]
},
"node_modules/@rollup/rollup-darwin-arm64": {
- "version": "4.40.2",
- "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.40.2.tgz",
- "integrity": "sha512-Gzf1Hn2Aoe8VZzevHostPX23U7N5+4D36WJNHK88NZHCJr7aVMG4fadqkIf72eqVPGjGc0HJHNuUaUcxiR+N/w==",
+ "version": "4.45.1",
+ "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.45.1.tgz",
+ "integrity": "sha512-FSncqHvqTm3lC6Y13xncsdOYfxGSLnP+73k815EfNmpewPs+EyM49haPS105Rh4aF5mJKywk9X0ogzLXZzN9lA==",
"cpu": [
"arm64"
],
@@ -6432,9 +6773,9 @@
]
},
"node_modules/@rollup/rollup-darwin-x64": {
- "version": "4.40.2",
- "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.40.2.tgz",
- "integrity": "sha512-47N4hxa01a4x6XnJoskMKTS8XZ0CZMd8YTbINbi+w03A2w4j1RTlnGHOz/P0+Bg1LaVL6ufZyNprSg+fW5nYQQ==",
+ "version": "4.45.1",
+ "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.45.1.tgz",
+ "integrity": "sha512-2/vVn/husP5XI7Fsf/RlhDaQJ7x9zjvC81anIVbr4b/f0xtSmXQTFcGIQ/B1cXIYM6h2nAhJkdMHTnD7OtQ9Og==",
"cpu": [
"x64"
],
@@ -6445,9 +6786,9 @@
]
},
"node_modules/@rollup/rollup-freebsd-arm64": {
- "version": "4.40.2",
- "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.40.2.tgz",
- "integrity": "sha512-8t6aL4MD+rXSHHZUR1z19+9OFJ2rl1wGKvckN47XFRVO+QL/dUSpKA2SLRo4vMg7ELA8pzGpC+W9OEd1Z/ZqoQ==",
+ "version": "4.45.1",
+ "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.45.1.tgz",
+ "integrity": "sha512-4g1kaDxQItZsrkVTdYQ0bxu4ZIQ32cotoQbmsAnW1jAE4XCMbcBPDirX5fyUzdhVCKgPcrwWuucI8yrVRBw2+g==",
"cpu": [
"arm64"
],
@@ -6458,9 +6799,9 @@
]
},
"node_modules/@rollup/rollup-freebsd-x64": {
- "version": "4.40.2",
- "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.40.2.tgz",
- "integrity": "sha512-C+AyHBzfpsOEYRFjztcYUFsH4S7UsE9cDtHCtma5BK8+ydOZYgMmWg1d/4KBytQspJCld8ZIujFMAdKG1xyr4Q==",
+ "version": "4.45.1",
+ "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.45.1.tgz",
+ "integrity": "sha512-L/6JsfiL74i3uK1Ti2ZFSNsp5NMiM4/kbbGEcOCps99aZx3g8SJMO1/9Y0n/qKlWZfn6sScf98lEOUe2mBvW9A==",
"cpu": [
"x64"
],
@@ -6471,9 +6812,9 @@
]
},
"node_modules/@rollup/rollup-linux-arm-gnueabihf": {
- "version": "4.40.2",
- "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.40.2.tgz",
- "integrity": "sha512-de6TFZYIvJwRNjmW3+gaXiZ2DaWL5D5yGmSYzkdzjBDS3W+B9JQ48oZEsmMvemqjtAFzE16DIBLqd6IQQRuG9Q==",
+ "version": "4.45.1",
+ "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.45.1.tgz",
+ "integrity": "sha512-RkdOTu2jK7brlu+ZwjMIZfdV2sSYHK2qR08FUWcIoqJC2eywHbXr0L8T/pONFwkGukQqERDheaGTeedG+rra6Q==",
"cpu": [
"arm"
],
@@ -6484,9 +6825,9 @@
]
},
"node_modules/@rollup/rollup-linux-arm-musleabihf": {
- "version": "4.40.2",
- "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.40.2.tgz",
- "integrity": "sha512-urjaEZubdIkacKc930hUDOfQPysezKla/O9qV+O89enqsqUmQm8Xj8O/vh0gHg4LYfv7Y7UsE3QjzLQzDYN1qg==",
+ "version": "4.45.1",
+ "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.45.1.tgz",
+ "integrity": "sha512-3kJ8pgfBt6CIIr1o+HQA7OZ9mp/zDk3ctekGl9qn/pRBgrRgfwiffaUmqioUGN9hv0OHv2gxmvdKOkARCtRb8Q==",
"cpu": [
"arm"
],
@@ -6497,9 +6838,9 @@
]
},
"node_modules/@rollup/rollup-linux-arm64-gnu": {
- "version": "4.40.2",
- "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.40.2.tgz",
- "integrity": "sha512-KlE8IC0HFOC33taNt1zR8qNlBYHj31qGT1UqWqtvR/+NuCVhfufAq9fxO8BMFC22Wu0rxOwGVWxtCMvZVLmhQg==",
+ "version": "4.45.1",
+ "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.45.1.tgz",
+ "integrity": "sha512-k3dOKCfIVixWjG7OXTCOmDfJj3vbdhN0QYEqB+OuGArOChek22hn7Uy5A/gTDNAcCy5v2YcXRJ/Qcnm4/ma1xw==",
"cpu": [
"arm64"
],
@@ -6510,9 +6851,9 @@
]
},
"node_modules/@rollup/rollup-linux-arm64-musl": {
- "version": "4.40.2",
- "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.40.2.tgz",
- "integrity": "sha512-j8CgxvfM0kbnhu4XgjnCWJQyyBOeBI1Zq91Z850aUddUmPeQvuAy6OiMdPS46gNFgy8gN1xkYyLgwLYZG3rBOg==",
+ "version": "4.45.1",
+ "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.45.1.tgz",
+ "integrity": "sha512-PmI1vxQetnM58ZmDFl9/Uk2lpBBby6B6rF4muJc65uZbxCs0EA7hhKCk2PKlmZKuyVSHAyIw3+/SiuMLxKxWog==",
"cpu": [
"arm64"
],
@@ -6523,9 +6864,9 @@
]
},
"node_modules/@rollup/rollup-linux-loongarch64-gnu": {
- "version": "4.40.2",
- "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loongarch64-gnu/-/rollup-linux-loongarch64-gnu-4.40.2.tgz",
- "integrity": "sha512-Ybc/1qUampKuRF4tQXc7G7QY9YRyeVSykfK36Y5Qc5dmrIxwFhrOzqaVTNoZygqZ1ZieSWTibfFhQ5qK8jpWxw==",
+ "version": "4.45.1",
+ "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loongarch64-gnu/-/rollup-linux-loongarch64-gnu-4.45.1.tgz",
+ "integrity": "sha512-9UmI0VzGmNJ28ibHW2GpE2nF0PBQqsyiS4kcJ5vK+wuwGnV5RlqdczVocDSUfGX/Na7/XINRVoUgJyFIgipoRg==",
"cpu": [
"loong64"
],
@@ -6536,9 +6877,9 @@
]
},
"node_modules/@rollup/rollup-linux-powerpc64le-gnu": {
- "version": "4.40.2",
- "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.40.2.tgz",
- "integrity": "sha512-3FCIrnrt03CCsZqSYAOW/k9n625pjpuMzVfeI+ZBUSDT3MVIFDSPfSUgIl9FqUftxcUXInvFah79hE1c9abD+Q==",
+ "version": "4.45.1",
+ "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.45.1.tgz",
+ "integrity": "sha512-7nR2KY8oEOUTD3pBAxIBBbZr0U7U+R9HDTPNy+5nVVHDXI4ikYniH1oxQz9VoB5PbBU1CZuDGHkLJkd3zLMWsg==",
"cpu": [
"ppc64"
],
@@ -6549,9 +6890,9 @@
]
},
"node_modules/@rollup/rollup-linux-riscv64-gnu": {
- "version": "4.40.2",
- "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.40.2.tgz",
- "integrity": "sha512-QNU7BFHEvHMp2ESSY3SozIkBPaPBDTsfVNGx3Xhv+TdvWXFGOSH2NJvhD1zKAT6AyuuErJgbdvaJhYVhVqrWTg==",
+ "version": "4.45.1",
+ "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.45.1.tgz",
+ "integrity": "sha512-nlcl3jgUultKROfZijKjRQLUu9Ma0PeNv/VFHkZiKbXTBQXhpytS8CIj5/NfBeECZtY2FJQubm6ltIxm/ftxpw==",
"cpu": [
"riscv64"
],
@@ -6562,9 +6903,9 @@
]
},
"node_modules/@rollup/rollup-linux-riscv64-musl": {
- "version": "4.40.2",
- "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.40.2.tgz",
- "integrity": "sha512-5W6vNYkhgfh7URiXTO1E9a0cy4fSgfE4+Hl5agb/U1sa0kjOLMLC1wObxwKxecE17j0URxuTrYZZME4/VH57Hg==",
+ "version": "4.45.1",
+ "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.45.1.tgz",
+ "integrity": "sha512-HJV65KLS51rW0VY6rvZkiieiBnurSzpzore1bMKAhunQiECPuxsROvyeaot/tcK3A3aGnI+qTHqisrpSgQrpgA==",
"cpu": [
"riscv64"
],
@@ -6575,9 +6916,9 @@
]
},
"node_modules/@rollup/rollup-linux-s390x-gnu": {
- "version": "4.40.2",
- "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.40.2.tgz",
- "integrity": "sha512-B7LKIz+0+p348JoAL4X/YxGx9zOx3sR+o6Hj15Y3aaApNfAshK8+mWZEf759DXfRLeL2vg5LYJBB7DdcleYCoQ==",
+ "version": "4.45.1",
+ "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.45.1.tgz",
+ "integrity": "sha512-NITBOCv3Qqc6hhwFt7jLV78VEO/il4YcBzoMGGNxznLgRQf43VQDae0aAzKiBeEPIxnDrACiMgbqjuihx08OOw==",
"cpu": [
"s390x"
],
@@ -6588,9 +6929,9 @@
]
},
"node_modules/@rollup/rollup-linux-x64-gnu": {
- "version": "4.40.2",
- "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.40.2.tgz",
- "integrity": "sha512-lG7Xa+BmBNwpjmVUbmyKxdQJ3Q6whHjMjzQplOs5Z+Gj7mxPtWakGHqzMqNER68G67kmCX9qX57aRsW5V0VOng==",
+ "version": "4.45.1",
+ "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.45.1.tgz",
+ "integrity": "sha512-+E/lYl6qu1zqgPEnTrs4WysQtvc/Sh4fC2nByfFExqgYrqkKWp1tWIbe+ELhixnenSpBbLXNi6vbEEJ8M7fiHw==",
"cpu": [
"x64"
],
@@ -6601,9 +6942,9 @@
]
},
"node_modules/@rollup/rollup-linux-x64-musl": {
- "version": "4.40.2",
- "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.40.2.tgz",
- "integrity": "sha512-tD46wKHd+KJvsmije4bUskNuvWKFcTOIM9tZ/RrmIvcXnbi0YK/cKS9FzFtAm7Oxi2EhV5N2OpfFB348vSQRXA==",
+ "version": "4.45.1",
+ "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.45.1.tgz",
+ "integrity": "sha512-a6WIAp89p3kpNoYStITT9RbTbTnqarU7D8N8F2CV+4Cl9fwCOZraLVuVFvlpsW0SbIiYtEnhCZBPLoNdRkjQFw==",
"cpu": [
"x64"
],
@@ -6614,9 +6955,9 @@
]
},
"node_modules/@rollup/rollup-win32-arm64-msvc": {
- "version": "4.40.2",
- "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.40.2.tgz",
- "integrity": "sha512-Bjv/HG8RRWLNkXwQQemdsWw4Mg+IJ29LK+bJPW2SCzPKOUaMmPEppQlu/Fqk1d7+DX3V7JbFdbkh/NMmurT6Pg==",
+ "version": "4.45.1",
+ "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.45.1.tgz",
+ "integrity": "sha512-T5Bi/NS3fQiJeYdGvRpTAP5P02kqSOpqiopwhj0uaXB6nzs5JVi2XMJb18JUSKhCOX8+UE1UKQufyD6Or48dJg==",
"cpu": [
"arm64"
],
@@ -6627,9 +6968,9 @@
]
},
"node_modules/@rollup/rollup-win32-ia32-msvc": {
- "version": "4.40.2",
- "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.40.2.tgz",
- "integrity": "sha512-dt1llVSGEsGKvzeIO76HToiYPNPYPkmjhMHhP00T9S4rDern8P2ZWvWAQUEJ+R1UdMWJ/42i/QqJ2WV765GZcA==",
+ "version": "4.45.1",
+ "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.45.1.tgz",
+ "integrity": "sha512-lxV2Pako3ujjuUe9jiU3/s7KSrDfH6IgTSQOnDWr9aJ92YsFd7EurmClK0ly/t8dzMkDtd04g60WX6yl0sGfdw==",
"cpu": [
"ia32"
],
@@ -6640,9 +6981,9 @@
]
},
"node_modules/@rollup/rollup-win32-x64-msvc": {
- "version": "4.40.2",
- "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.40.2.tgz",
- "integrity": "sha512-bwspbWB04XJpeElvsp+DCylKfF4trJDa2Y9Go8O6A7YLX2LIKGcNK/CYImJN6ZP4DcuOHB4Utl3iCbnR62DudA==",
+ "version": "4.45.1",
+ "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.45.1.tgz",
+ "integrity": "sha512-M/fKi4sasCdM8i0aWJjCSFm2qEnYRR8AMLG2kxp6wD13+tMGA4Z1tVAuHkNRjud5SW2EM3naLuK35w9twvf6aA==",
"cpu": [
"x64"
],
@@ -6653,89 +6994,89 @@
]
},
"node_modules/@sentry-internal/browser-utils": {
- "version": "9.15.0",
- "resolved": "https://registry.npmjs.org/@sentry-internal/browser-utils/-/browser-utils-9.15.0.tgz",
- "integrity": "sha512-tIM+9zXCefkInRiNmBkXKgkamRjEOlAcf768cBKlMWVOatfNrSEB0UEV7qkAYqnQGWkbPkHFMbFJxWptydLODw==",
+ "version": "9.39.0",
+ "resolved": "https://registry.npmjs.org/@sentry-internal/browser-utils/-/browser-utils-9.39.0.tgz",
+ "integrity": "sha512-f1qUAftQ/aMTJHJDCG9jDJIwLEkSVZ6xWGn2xQMj7PfD1uuYlTy3KHn+wPy1VlPJTZQ44WclTPnY2U/OBIPmsg==",
"license": "MIT",
"dependencies": {
- "@sentry/core": "9.15.0"
+ "@sentry/core": "9.39.0"
},
"engines": {
"node": ">=18"
}
},
"node_modules/@sentry-internal/feedback": {
- "version": "9.15.0",
- "resolved": "https://registry.npmjs.org/@sentry-internal/feedback/-/feedback-9.15.0.tgz",
- "integrity": "sha512-jyN0r57WL8V5ViwZpiNvbIhF9I89jxn6mtIQcyV85EjIXDyzJmeTgxc/FIU0kcDVv6zso3qnGRJUxGK+GvoYZg==",
+ "version": "9.39.0",
+ "resolved": "https://registry.npmjs.org/@sentry-internal/feedback/-/feedback-9.39.0.tgz",
+ "integrity": "sha512-IvD2LDKFderPn6pXN6N8cFJWWIXUADys9WRtfh1CK8DIuU1fXYi61tO23Z+sCsvXReQgr/mdJg5dHa0qY/vDww==",
"license": "MIT",
"dependencies": {
- "@sentry/core": "9.15.0"
+ "@sentry/core": "9.39.0"
},
"engines": {
"node": ">=18"
}
},
"node_modules/@sentry-internal/replay": {
- "version": "9.15.0",
- "resolved": "https://registry.npmjs.org/@sentry-internal/replay/-/replay-9.15.0.tgz",
- "integrity": "sha512-lv6ENRmfeBuod6Tr1WgLeF0+wIIXlHWNAGofsaNUvm8UKS7USicFsQWKOZPk4UyjTfrEClPp2vx+o7aUcZS6TQ==",
+ "version": "9.39.0",
+ "resolved": "https://registry.npmjs.org/@sentry-internal/replay/-/replay-9.39.0.tgz",
+ "integrity": "sha512-6mweqQtfcVG2+FEPjmgjrpCThgs9bR2cmQM2Ew/SlINj8ETq5P/7Z3rdIp+Zs7LArXFIJUA7KX9ZW+noVPI8Gg==",
"license": "MIT",
"dependencies": {
- "@sentry-internal/browser-utils": "9.15.0",
- "@sentry/core": "9.15.0"
+ "@sentry-internal/browser-utils": "9.39.0",
+ "@sentry/core": "9.39.0"
},
"engines": {
"node": ">=18"
}
},
"node_modules/@sentry-internal/replay-canvas": {
- "version": "9.15.0",
- "resolved": "https://registry.npmjs.org/@sentry-internal/replay-canvas/-/replay-canvas-9.15.0.tgz",
- "integrity": "sha512-a1/oiXwcW5OmILjD7/R2UEsPQWXJBUr0u388uCKDUGeyXLxBBbIJGS5E8oLwVQLVxhVJrODgxvT19z9OVcbn7g==",
+ "version": "9.39.0",
+ "resolved": "https://registry.npmjs.org/@sentry-internal/replay-canvas/-/replay-canvas-9.39.0.tgz",
+ "integrity": "sha512-rTw0WZuAwzo36/hXRSuftu7e3qtwXc+bSs1q7M+w7Tb98aoOyXs3GlnYmgP6q3t2v/h7zoIiQcfjnPqo6+DVtQ==",
"license": "MIT",
"dependencies": {
- "@sentry-internal/replay": "9.15.0",
- "@sentry/core": "9.15.0"
+ "@sentry-internal/replay": "9.39.0",
+ "@sentry/core": "9.39.0"
},
"engines": {
"node": ">=18"
}
},
"node_modules/@sentry/babel-plugin-component-annotate": {
- "version": "3.2.4",
- "resolved": "https://registry.npmjs.org/@sentry/babel-plugin-component-annotate/-/babel-plugin-component-annotate-3.2.4.tgz",
- "integrity": "sha512-yBzRn3GEUSv1RPtE4xB4LnuH74ZxtdoRJ5cmQ9i6mzlmGDxlrnKuvem5++AolZTE9oJqAD3Tx2rd1PqmpWnLoA==",
+ "version": "3.6.0",
+ "resolved": "https://registry.npmjs.org/@sentry/babel-plugin-component-annotate/-/babel-plugin-component-annotate-3.6.0.tgz",
+ "integrity": "sha512-QjqqaNghVSPercSU1sA8WcZtka/cHCShU6z38Fi41P/n9HpfxLFv6aBV03kqH5m1uLOPCl+u3AUm3HGMgGYQjg==",
"license": "MIT",
"engines": {
"node": ">= 14"
}
},
"node_modules/@sentry/browser": {
- "version": "9.15.0",
- "resolved": "https://registry.npmjs.org/@sentry/browser/-/browser-9.15.0.tgz",
- "integrity": "sha512-ppHESKFVQFpAb3rQI2ateDkmMytVcvAWsjZrZ3hF9iEnO3iTIIu32ib5nqQUL4KKXZQovYnDrSlDcdv3ZwX/8Q==",
+ "version": "9.39.0",
+ "resolved": "https://registry.npmjs.org/@sentry/browser/-/browser-9.39.0.tgz",
+ "integrity": "sha512-RZ4Zp22ohFLwkR3y6pmSWDrPVP7ErX0ClNOh2Kal3TNWlOGb4WPBPaWj2tiOvc4n/l6EDYaFvQ0Hh8RhesB98A==",
"license": "MIT",
"dependencies": {
- "@sentry-internal/browser-utils": "9.15.0",
- "@sentry-internal/feedback": "9.15.0",
- "@sentry-internal/replay": "9.15.0",
- "@sentry-internal/replay-canvas": "9.15.0",
- "@sentry/core": "9.15.0"
+ "@sentry-internal/browser-utils": "9.39.0",
+ "@sentry-internal/feedback": "9.39.0",
+ "@sentry-internal/replay": "9.39.0",
+ "@sentry-internal/replay-canvas": "9.39.0",
+ "@sentry/core": "9.39.0"
},
"engines": {
"node": ">=18"
}
},
"node_modules/@sentry/bundler-plugin-core": {
- "version": "3.2.4",
- "resolved": "https://registry.npmjs.org/@sentry/bundler-plugin-core/-/bundler-plugin-core-3.2.4.tgz",
- "integrity": "sha512-YMj9XW5W2JA89EeweE7CPKLDz245LBsI1JhCmqpt/bjSvmsSIAAPsLYnvIJBS3LQFm0OhtG8NB54PTi96dAcMA==",
+ "version": "3.6.0",
+ "resolved": "https://registry.npmjs.org/@sentry/bundler-plugin-core/-/bundler-plugin-core-3.6.0.tgz",
+ "integrity": "sha512-26+cLguEtBBtsYi3NIwU6X/UvOPJM9tGm9ciDWYgMFvFIk8hhi0iuffAC6WsDWRebVYXTlA7RS/VGJG/T+1Zcw==",
"license": "MIT",
"dependencies": {
"@babel/core": "^7.18.5",
- "@sentry/babel-plugin-component-annotate": "3.2.4",
- "@sentry/cli": "2.42.2",
+ "@sentry/babel-plugin-component-annotate": "3.6.0",
+ "@sentry/cli": "^2.46.0",
"dotenv": "^16.3.1",
"find-up": "^5.0.0",
"glob": "^9.3.2",
@@ -6837,9 +7178,9 @@
"license": "MIT"
},
"node_modules/@sentry/cli": {
- "version": "2.42.2",
- "resolved": "https://registry.npmjs.org/@sentry/cli/-/cli-2.42.2.tgz",
- "integrity": "sha512-spb7S/RUumCGyiSTg8DlrCX4bivCNmU/A1hcfkwuciTFGu8l5CDc2I6jJWWZw8/0enDGxuj5XujgXvU5tr4bxg==",
+ "version": "2.47.1",
+ "resolved": "https://registry.npmjs.org/@sentry/cli/-/cli-2.47.1.tgz",
+ "integrity": "sha512-t45lfyyMYs6L1oFUmtYuLDJFf0o6a0IGbPJvzOZcP3lmidouEG5nloBF6FG39AkL29pwrS2WN41j2gyDjrQ71g==",
"hasInstallScript": true,
"license": "BSD-3-Clause",
"dependencies": {
@@ -6856,19 +7197,20 @@
"node": ">= 10"
},
"optionalDependencies": {
- "@sentry/cli-darwin": "2.42.2",
- "@sentry/cli-linux-arm": "2.42.2",
- "@sentry/cli-linux-arm64": "2.42.2",
- "@sentry/cli-linux-i686": "2.42.2",
- "@sentry/cli-linux-x64": "2.42.2",
- "@sentry/cli-win32-i686": "2.42.2",
- "@sentry/cli-win32-x64": "2.42.2"
+ "@sentry/cli-darwin": "2.47.1",
+ "@sentry/cli-linux-arm": "2.47.1",
+ "@sentry/cli-linux-arm64": "2.47.1",
+ "@sentry/cli-linux-i686": "2.47.1",
+ "@sentry/cli-linux-x64": "2.47.1",
+ "@sentry/cli-win32-arm64": "2.47.1",
+ "@sentry/cli-win32-i686": "2.47.1",
+ "@sentry/cli-win32-x64": "2.47.1"
}
},
"node_modules/@sentry/cli-darwin": {
- "version": "2.42.2",
- "resolved": "https://registry.npmjs.org/@sentry/cli-darwin/-/cli-darwin-2.42.2.tgz",
- "integrity": "sha512-GtJSuxER7Vrp1IpxdUyRZzcckzMnb4N5KTW7sbTwUiwqARRo+wxS+gczYrS8tdgtmXs5XYhzhs+t4d52ITHMIg==",
+ "version": "2.47.1",
+ "resolved": "https://registry.npmjs.org/@sentry/cli-darwin/-/cli-darwin-2.47.1.tgz",
+ "integrity": "sha512-Vq+8Hs1AR5MFYCI8vkz+rdRJmcNgUf8b8dW8aSLYCHy7wS/X61OB00LupLaaaoN5c/xemb0rZCg4M0ftUqB5Kw==",
"license": "BSD-3-Clause",
"optional": true,
"os": [
@@ -6879,9 +7221,9 @@
}
},
"node_modules/@sentry/cli-linux-arm": {
- "version": "2.42.2",
- "resolved": "https://registry.npmjs.org/@sentry/cli-linux-arm/-/cli-linux-arm-2.42.2.tgz",
- "integrity": "sha512-7udCw+YL9lwq+9eL3WLspvnuG+k5Icg92YE7zsteTzWLwgPVzaxeZD2f8hwhsu+wmL+jNqbpCRmktPteh3i2mg==",
+ "version": "2.47.1",
+ "resolved": "https://registry.npmjs.org/@sentry/cli-linux-arm/-/cli-linux-arm-2.47.1.tgz",
+ "integrity": "sha512-Wkcvr0LYP1XMSoaczQnUtOSZPfyBzdGk7wQyloYWyMv9oZWJYkt1wYI0/FaNM+MIX15RqEAx0nI5CjotLMlj8w==",
"cpu": [
"arm"
],
@@ -6889,16 +7231,17 @@
"optional": true,
"os": [
"linux",
- "freebsd"
+ "freebsd",
+ "android"
],
"engines": {
"node": ">=10"
}
},
"node_modules/@sentry/cli-linux-arm64": {
- "version": "2.42.2",
- "resolved": "https://registry.npmjs.org/@sentry/cli-linux-arm64/-/cli-linux-arm64-2.42.2.tgz",
- "integrity": "sha512-BOxzI7sgEU5Dhq3o4SblFXdE9zScpz6EXc5Zwr1UDZvzgXZGosUtKVc7d1LmkrHP8Q2o18HcDWtF3WvJRb5Zpw==",
+ "version": "2.47.1",
+ "resolved": "https://registry.npmjs.org/@sentry/cli-linux-arm64/-/cli-linux-arm64-2.47.1.tgz",
+ "integrity": "sha512-Kuda8/BFMVyqYayQjP0NQnxnAz5Xpfo2crG1/RRXF9lYQ9O/5YRb3dvlMPX6WasplCzajaSuLrYt/LXcs4McwA==",
"cpu": [
"arm64"
],
@@ -6906,16 +7249,17 @@
"optional": true,
"os": [
"linux",
- "freebsd"
+ "freebsd",
+ "android"
],
"engines": {
"node": ">=10"
}
},
"node_modules/@sentry/cli-linux-i686": {
- "version": "2.42.2",
- "resolved": "https://registry.npmjs.org/@sentry/cli-linux-i686/-/cli-linux-i686-2.42.2.tgz",
- "integrity": "sha512-Sw/dQp5ZPvKnq3/y7wIJyxTUJYPGoTX/YeMbDs8BzDlu9to2LWV3K3r7hE7W1Lpbaw4tSquUHiQjP5QHCOS7aQ==",
+ "version": "2.47.1",
+ "resolved": "https://registry.npmjs.org/@sentry/cli-linux-i686/-/cli-linux-i686-2.47.1.tgz",
+ "integrity": "sha512-WB3FbRjeJmKHhGc5CftaFFJfFc7c+Mu/XKwbI8Es/9f65bVWdB6BA2tH7aHyoAQngA++1ZVXUJwUpxYPNxQEag==",
"cpu": [
"x86",
"ia32"
@@ -6924,16 +7268,17 @@
"optional": true,
"os": [
"linux",
- "freebsd"
+ "freebsd",
+ "android"
],
"engines": {
"node": ">=10"
}
},
"node_modules/@sentry/cli-linux-x64": {
- "version": "2.42.2",
- "resolved": "https://registry.npmjs.org/@sentry/cli-linux-x64/-/cli-linux-x64-2.42.2.tgz",
- "integrity": "sha512-mU4zUspAal6TIwlNLBV5oq6yYqiENnCWSxtSQVzWs0Jyq97wtqGNG9U+QrnwjJZ+ta/hvye9fvL2X25D/RxHQw==",
+ "version": "2.47.1",
+ "resolved": "https://registry.npmjs.org/@sentry/cli-linux-x64/-/cli-linux-x64-2.47.1.tgz",
+ "integrity": "sha512-C+3GJLDpZQMO45toUKiF4bPZpxQiU5/10LtZg2vhpUyyzFGNseVQO/Bsnu9hG/LVjYGLkTgEaorl1liRQsfKVg==",
"cpu": [
"x64"
],
@@ -6941,16 +7286,33 @@
"optional": true,
"os": [
"linux",
- "freebsd"
+ "freebsd",
+ "android"
+ ],
+ "engines": {
+ "node": ">=10"
+ }
+ },
+ "node_modules/@sentry/cli-win32-arm64": {
+ "version": "2.47.1",
+ "resolved": "https://registry.npmjs.org/@sentry/cli-win32-arm64/-/cli-win32-arm64-2.47.1.tgz",
+ "integrity": "sha512-K3yb1yLvA6Lh0UaXjsU6lP/2uOMkZ47cVq0dFxL/hEr4fBHRkXuvg3oOJNDkJ2xXt2W2s7AIa83T2EisZ0a/NQ==",
+ "cpu": [
+ "arm64"
+ ],
+ "license": "BSD-3-Clause",
+ "optional": true,
+ "os": [
+ "win32"
],
"engines": {
"node": ">=10"
}
},
"node_modules/@sentry/cli-win32-i686": {
- "version": "2.42.2",
- "resolved": "https://registry.npmjs.org/@sentry/cli-win32-i686/-/cli-win32-i686-2.42.2.tgz",
- "integrity": "sha512-iHvFHPGqgJMNqXJoQpqttfsv2GI3cGodeTq4aoVLU/BT3+hXzbV0x1VpvvEhncJkDgDicJpFLM8sEPHb3b8abw==",
+ "version": "2.47.1",
+ "resolved": "https://registry.npmjs.org/@sentry/cli-win32-i686/-/cli-win32-i686-2.47.1.tgz",
+ "integrity": "sha512-wk+6IIT+VT28c9uPe9PDzxdh+OiTEDb/0PIdFv1khSfAmEuVSNWzuDWsra7MnA7OPfgzzNDPkP4HRW1CKb3Xiw==",
"cpu": [
"x86",
"ia32"
@@ -6965,9 +7327,9 @@
}
},
"node_modules/@sentry/cli-win32-x64": {
- "version": "2.42.2",
- "resolved": "https://registry.npmjs.org/@sentry/cli-win32-x64/-/cli-win32-x64-2.42.2.tgz",
- "integrity": "sha512-vPPGHjYoaGmfrU7xhfFxG7qlTBacroz5NdT+0FmDn6692D8IvpNXl1K+eV3Kag44ipJBBeR8g1HRJyx/F/9ACw==",
+ "version": "2.47.1",
+ "resolved": "https://registry.npmjs.org/@sentry/cli-win32-x64/-/cli-win32-x64-2.47.1.tgz",
+ "integrity": "sha512-blseDhuUJDsb+3Ku9dvR4b0JO4nunRokF/9jzW+qHqTha7UHE2kQYXkCfsoDg65juvJFeKeQASYV7VphEJgIGQ==",
"cpu": [
"x64"
],
@@ -6980,19 +7342,40 @@
"node": ">=10"
}
},
+ "node_modules/@sentry/cloudflare": {
+ "version": "9.39.0",
+ "resolved": "https://registry.npmjs.org/@sentry/cloudflare/-/cloudflare-9.39.0.tgz",
+ "integrity": "sha512-d5BNM9mO3DvW9SIvCQvEZDTPXuS1N2StzKnMKZw1Ge6RG1Cm1onI0GmWziPUjAKLrisy4avx9vgSMMi8A/TpOA==",
+ "license": "MIT",
+ "dependencies": {
+ "@opentelemetry/api": "^1.9.0",
+ "@sentry/core": "9.39.0"
+ },
+ "engines": {
+ "node": ">=18"
+ },
+ "peerDependencies": {
+ "@cloudflare/workers-types": "^4.x"
+ },
+ "peerDependenciesMeta": {
+ "@cloudflare/workers-types": {
+ "optional": true
+ }
+ }
+ },
"node_modules/@sentry/core": {
- "version": "9.15.0",
- "resolved": "https://registry.npmjs.org/@sentry/core/-/core-9.15.0.tgz",
- "integrity": "sha512-lBmo3bzzaYUesdzc2H5K3fajfXyUNuj5koqyFoCAI8rnt9CBl7SUc/P07+E5eipF8mxgiU3QtkI7ALzRQN8pqQ==",
+ "version": "9.39.0",
+ "resolved": "https://registry.npmjs.org/@sentry/core/-/core-9.39.0.tgz",
+ "integrity": "sha512-9Z32C64rUGEI0ROxXXOtpJDaldPYtkzOQyGzToVgq5LefXkdgQInd8BhCt6PIBALfj7n25lLOYllTrHlboFJug==",
"license": "MIT",
"engines": {
"node": ">=18"
}
},
"node_modules/@sentry/node": {
- "version": "9.15.0",
- "resolved": "https://registry.npmjs.org/@sentry/node/-/node-9.15.0.tgz",
- "integrity": "sha512-K0LdJxIzYbbsbiT+1tKgNq6MUHuDs2DggBDcFEp3T+yXVJYN1AyalUli06Kmxq8yvou6hgLwWL4gjIcB1IQySA==",
+ "version": "9.39.0",
+ "resolved": "https://registry.npmjs.org/@sentry/node/-/node-9.39.0.tgz",
+ "integrity": "sha512-UDDT+yPvggrTcHqdGqnSQjEkyT982rFEAp5Zc8X/yKWSK8n6EA2kXIUe/M7293WtDuAvYsHY36tMqIalqGe1Ew==",
"license": "MIT",
"dependencies": {
"@opentelemetry/api": "^1.9.0",
@@ -7003,7 +7386,6 @@
"@opentelemetry/instrumentation-connect": "0.43.1",
"@opentelemetry/instrumentation-dataloader": "0.16.1",
"@opentelemetry/instrumentation-express": "0.47.1",
- "@opentelemetry/instrumentation-fastify": "0.44.2",
"@opentelemetry/instrumentation-fs": "0.19.1",
"@opentelemetry/instrumentation-generic-pool": "0.43.1",
"@opentelemetry/instrumentation-graphql": "0.47.1",
@@ -7024,156 +7406,90 @@
"@opentelemetry/instrumentation-undici": "0.10.1",
"@opentelemetry/resources": "^1.30.1",
"@opentelemetry/sdk-trace-base": "^1.30.1",
- "@opentelemetry/semantic-conventions": "^1.30.0",
- "@prisma/instrumentation": "6.6.0",
- "@sentry/core": "9.15.0",
- "@sentry/opentelemetry": "9.15.0",
- "import-in-the-middle": "^1.13.0"
+ "@opentelemetry/semantic-conventions": "^1.34.0",
+ "@prisma/instrumentation": "6.11.1",
+ "@sentry/core": "9.39.0",
+ "@sentry/node-core": "9.39.0",
+ "@sentry/opentelemetry": "9.39.0",
+ "import-in-the-middle": "^1.14.2",
+ "minimatch": "^9.0.0"
},
"engines": {
"node": ">=18"
}
},
- "node_modules/@sentry/nuxt": {
- "version": "9.15.0",
- "resolved": "https://registry.npmjs.org/@sentry/nuxt/-/nuxt-9.15.0.tgz",
- "integrity": "sha512-v6/ZUmH1iHSQpSvVVITNM5NlCxo6mn0uqojCBdMVRE09U6hpXgz+RnyXzHKxz/KXWQn8KyEsEft1VmsI063Fyg==",
+ "node_modules/@sentry/node-core": {
+ "version": "9.39.0",
+ "resolved": "https://registry.npmjs.org/@sentry/node-core/-/node-core-9.39.0.tgz",
+ "integrity": "sha512-e+D/5xharSysEqwjGOToI6zyn7zkuufwhO3n4jtqqjCXbSwI2zK9ARmn8ZLIdVnNETL+KZ82+5HRVhJWXxrpNg==",
"license": "MIT",
"dependencies": {
- "@nuxt/kit": "^3.13.2",
- "@sentry/browser": "9.15.0",
- "@sentry/core": "9.15.0",
- "@sentry/node": "9.15.0",
- "@sentry/opentelemetry": "9.15.0",
- "@sentry/rollup-plugin": "3.2.4",
- "@sentry/vite-plugin": "3.2.4",
- "@sentry/vue": "9.15.0"
+ "@sentry/core": "9.39.0",
+ "@sentry/opentelemetry": "9.39.0",
+ "import-in-the-middle": "^1.14.2"
},
"engines": {
- "node": ">=18.19.1"
+ "node": ">=18"
},
"peerDependencies": {
- "nuxt": ">=3.7.0 || 4.x"
- }
- },
- "node_modules/@sentry/nuxt/node_modules/@sentry/vite-plugin": {
- "version": "3.2.4",
- "resolved": "https://registry.npmjs.org/@sentry/vite-plugin/-/vite-plugin-3.2.4.tgz",
- "integrity": "sha512-ZRn5TLlq5xtwKOqaWP+XqS1PYVfbBCgsbMk7wW2Ly6EgF9wYePvtLqKgYnE3hwPg2LpBnRPR2ti1ohlUkR+wXA==",
- "license": "MIT",
- "dependencies": {
- "@sentry/bundler-plugin-core": "3.2.4",
- "unplugin": "1.0.1"
- },
- "engines": {
- "node": ">= 14"
+ "@opentelemetry/api": "^1.9.0",
+ "@opentelemetry/context-async-hooks": "^1.30.1 || ^2.0.0",
+ "@opentelemetry/core": "^1.30.1 || ^2.0.0",
+ "@opentelemetry/instrumentation": "^0.57.1 || ^0.202.0",
+ "@opentelemetry/resources": "^1.30.1 || ^2.0.0",
+ "@opentelemetry/sdk-trace-base": "^1.30.1 || ^2.0.0",
+ "@opentelemetry/semantic-conventions": "^1.34.0"
}
},
- "node_modules/@sentry/nuxt/node_modules/chokidar": {
- "version": "3.6.0",
- "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz",
- "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==",
+ "node_modules/@sentry/nuxt": {
+ "version": "9.39.0",
+ "resolved": "https://registry.npmjs.org/@sentry/nuxt/-/nuxt-9.39.0.tgz",
+ "integrity": "sha512-KH4xFsRLJySKOysFvoDNq4NK3t7wv6wtRw4Hc7N9Z+ncSW8hNxhZlrXrLZoaO0s730osxsdn3DvSOMN5JEz6rQ==",
"license": "MIT",
"dependencies": {
- "anymatch": "~3.1.2",
- "braces": "~3.0.2",
- "glob-parent": "~5.1.2",
- "is-binary-path": "~2.1.0",
- "is-glob": "~4.0.1",
- "normalize-path": "~3.0.0",
- "readdirp": "~3.6.0"
- },
- "engines": {
- "node": ">= 8.10.0"
- },
- "funding": {
- "url": "https://paulmillr.com/funding/"
- },
- "optionalDependencies": {
- "fsevents": "~2.3.2"
- }
- },
- "node_modules/@sentry/nuxt/node_modules/glob-parent": {
- "version": "5.1.2",
- "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
- "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
- "license": "ISC",
- "dependencies": {
- "is-glob": "^4.0.1"
+ "@nuxt/kit": "^3.13.2",
+ "@sentry/browser": "9.39.0",
+ "@sentry/cloudflare": "9.39.0",
+ "@sentry/core": "9.39.0",
+ "@sentry/node": "9.39.0",
+ "@sentry/rollup-plugin": "^3.5.0",
+ "@sentry/vite-plugin": "^3.5.0",
+ "@sentry/vue": "9.39.0"
},
"engines": {
- "node": ">= 6"
- }
- },
- "node_modules/@sentry/nuxt/node_modules/picomatch": {
- "version": "2.3.1",
- "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
- "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
- "license": "MIT",
- "engines": {
- "node": ">=8.6"
- },
- "funding": {
- "url": "https://github.com/sponsors/jonschlinkert"
- }
- },
- "node_modules/@sentry/nuxt/node_modules/readdirp": {
- "version": "3.6.0",
- "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
- "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
- "license": "MIT",
- "dependencies": {
- "picomatch": "^2.2.1"
+ "node": ">=18.19.1"
},
- "engines": {
- "node": ">=8.10.0"
- }
- },
- "node_modules/@sentry/nuxt/node_modules/unplugin": {
- "version": "1.0.1",
- "resolved": "https://registry.npmjs.org/unplugin/-/unplugin-1.0.1.tgz",
- "integrity": "sha512-aqrHaVBWW1JVKBHmGo33T5TxeL0qWzfvjWokObHA9bYmN7eNDkwOxmLjhioHl9878qDFMAaT51XNroRyuz7WxA==",
- "license": "MIT",
- "dependencies": {
- "acorn": "^8.8.1",
- "chokidar": "^3.5.3",
- "webpack-sources": "^3.2.3",
- "webpack-virtual-modules": "^0.5.0"
+ "peerDependencies": {
+ "nuxt": ">=3.7.0 || 4.x"
}
},
- "node_modules/@sentry/nuxt/node_modules/webpack-virtual-modules": {
- "version": "0.5.0",
- "resolved": "https://registry.npmjs.org/webpack-virtual-modules/-/webpack-virtual-modules-0.5.0.tgz",
- "integrity": "sha512-kyDivFZ7ZM0BVOUteVbDFhlRt7Ah/CSPwJdi8hBpkK7QLumUqdLtVfm/PX/hkcnrvr0i77fO5+TjZ94Pe+C9iw==",
- "license": "MIT"
- },
"node_modules/@sentry/opentelemetry": {
- "version": "9.15.0",
- "resolved": "https://registry.npmjs.org/@sentry/opentelemetry/-/opentelemetry-9.15.0.tgz",
- "integrity": "sha512-gGOzgSxbuh4B4SlEonL1LFsazmeqL/fn5CIQqRG0UWWxdt6TKAMlj0ThIlGF3jSHW2eXdpvs+4E73uFEaHIqfg==",
+ "version": "9.39.0",
+ "resolved": "https://registry.npmjs.org/@sentry/opentelemetry/-/opentelemetry-9.39.0.tgz",
+ "integrity": "sha512-FaD+tMXFSdHIyjx1UumTXYayBT9PJHCM8nbTTRsMSlZYWoaSeAl6oO7N8djFVxNGU/mTJMCx2RvjKGI42GNFuA==",
"license": "MIT",
"dependencies": {
- "@sentry/core": "9.15.0"
+ "@sentry/core": "9.39.0"
},
"engines": {
"node": ">=18"
},
"peerDependencies": {
"@opentelemetry/api": "^1.9.0",
- "@opentelemetry/context-async-hooks": "^1.30.1",
- "@opentelemetry/core": "^1.30.1",
- "@opentelemetry/instrumentation": "^0.57.1",
- "@opentelemetry/sdk-trace-base": "^1.30.1",
- "@opentelemetry/semantic-conventions": "^1.28.0"
+ "@opentelemetry/context-async-hooks": "^1.30.1 || ^2.0.0",
+ "@opentelemetry/core": "^1.30.1 || ^2.0.0",
+ "@opentelemetry/instrumentation": "^0.57.1 || ^0.202.0",
+ "@opentelemetry/sdk-trace-base": "^1.30.1 || ^2.0.0",
+ "@opentelemetry/semantic-conventions": "^1.34.0"
}
},
"node_modules/@sentry/rollup-plugin": {
- "version": "3.2.4",
- "resolved": "https://registry.npmjs.org/@sentry/rollup-plugin/-/rollup-plugin-3.2.4.tgz",
- "integrity": "sha512-ZWTT1mc1OiROdRbXX9zTGXvdWpHwMyPJjKsI4+sT/ohwTU3/nh8yGw6+VTxOkrsZj72+p2OcAfpO7Yv/gUP9Yg==",
+ "version": "3.6.0",
+ "resolved": "https://registry.npmjs.org/@sentry/rollup-plugin/-/rollup-plugin-3.6.0.tgz",
+ "integrity": "sha512-K3Lnp2bId7kWqKhHiob3AG+8DlfM+/Nd230FZh2W/N0TNCeDSZzhq+O6nABWWlz31oYp3COl2f3WvmOiYgXzXA==",
"license": "MIT",
"dependencies": {
- "@sentry/bundler-plugin-core": "3.2.4",
+ "@sentry/bundler-plugin-core": "3.6.0",
"unplugin": "1.0.1"
},
"engines": {
@@ -7262,40 +7578,12 @@
"license": "MIT"
},
"node_modules/@sentry/vite-plugin": {
- "version": "3.4.0",
- "resolved": "https://registry.npmjs.org/@sentry/vite-plugin/-/vite-plugin-3.4.0.tgz",
- "integrity": "sha512-pUFBGrKsHuc8K6A7B1wU2nx65n9aIzvTlcHX9yZ1qvjEO0cZFih0JCwu1Fcav/yrtT9RMN44L/ugu/kMBHQhjQ==",
- "license": "MIT",
- "dependencies": {
- "@sentry/bundler-plugin-core": "3.4.0",
- "unplugin": "1.0.1"
- },
- "engines": {
- "node": ">= 14"
- }
- },
- "node_modules/@sentry/vite-plugin/node_modules/@sentry/babel-plugin-component-annotate": {
- "version": "3.4.0",
- "resolved": "https://registry.npmjs.org/@sentry/babel-plugin-component-annotate/-/babel-plugin-component-annotate-3.4.0.tgz",
- "integrity": "sha512-tSzfc3aE7m0PM0Aj7HBDet5llH9AB9oc+tBQ8AvOqUSnWodLrNCuWeQszJ7mIBovD3figgCU3h0cvI6U5cDtsg==",
- "license": "MIT",
- "engines": {
- "node": ">= 14"
- }
- },
- "node_modules/@sentry/vite-plugin/node_modules/@sentry/bundler-plugin-core": {
- "version": "3.4.0",
- "resolved": "https://registry.npmjs.org/@sentry/bundler-plugin-core/-/bundler-plugin-core-3.4.0.tgz",
- "integrity": "sha512-X1Q41AsQ6xcT6hB4wYmBDBukndKM/inT4IsR7pdKLi7ICpX2Qq6lisamBAEPCgEvnLpazSFguaiC0uiwMKAdqw==",
+ "version": "3.6.0",
+ "resolved": "https://registry.npmjs.org/@sentry/vite-plugin/-/vite-plugin-3.6.0.tgz",
+ "integrity": "sha512-gayOzM64kRujYGEPNB9xvQWKVXmJAo0WW9R25XwYXvTkjKpwT/ue3id5Dw4L6GUpj3AfF/qE+ghhY4r3mHkoiw==",
"license": "MIT",
"dependencies": {
- "@babel/core": "^7.18.5",
- "@sentry/babel-plugin-component-annotate": "3.4.0",
- "@sentry/cli": "2.42.2",
- "dotenv": "^16.3.1",
- "find-up": "^5.0.0",
- "glob": "^9.3.2",
- "magic-string": "0.30.8",
+ "@sentry/bundler-plugin-core": "3.6.0",
"unplugin": "1.0.1"
},
"engines": {
@@ -7335,19 +7623,7 @@
"is-glob": "^4.0.1"
},
"engines": {
- "node": ">= 6"
- }
- },
- "node_modules/@sentry/vite-plugin/node_modules/magic-string": {
- "version": "0.30.8",
- "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.8.tgz",
- "integrity": "sha512-ISQTe55T2ao7XtlAStud6qwYPZjE4GK1S/BeVPus4jrq6JuOnQ00YKQC581RWhR122W7msZV263KzVeLoqidyQ==",
- "license": "MIT",
- "dependencies": {
- "@jridgewell/sourcemap-codec": "^1.4.15"
- },
- "engines": {
- "node": ">=12"
+ "node": ">= 6"
}
},
"node_modules/@sentry/vite-plugin/node_modules/picomatch": {
@@ -7393,13 +7669,13 @@
"license": "MIT"
},
"node_modules/@sentry/vue": {
- "version": "9.15.0",
- "resolved": "https://registry.npmjs.org/@sentry/vue/-/vue-9.15.0.tgz",
- "integrity": "sha512-VO9OZ2V3x+94yoLT3FEJ5bv2o4A3tTqBHtFpju3KjsiDU0meWFAUYQEqrVgvmfUo2ULohluDQe+JDFDumQKaRA==",
+ "version": "9.39.0",
+ "resolved": "https://registry.npmjs.org/@sentry/vue/-/vue-9.39.0.tgz",
+ "integrity": "sha512-BRCdfj4qsaJyoqqEPUB3DIcJOTTzGJd73dBGGwc3N2HAwWI5TyTLP3lHhbhE43ZowBO0aE/ogVT1N6dzQYt7Yg==",
"license": "MIT",
"dependencies": {
- "@sentry/browser": "9.15.0",
- "@sentry/core": "9.15.0"
+ "@sentry/browser": "9.39.0",
+ "@sentry/core": "9.39.0"
},
"engines": {
"node": ">=18"
@@ -7415,9 +7691,9 @@
}
},
"node_modules/@sindresorhus/is": {
- "version": "7.0.1",
- "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-7.0.1.tgz",
- "integrity": "sha512-QWLl2P+rsCJeofkDNIT3WFmb6NrRud1SUYW8dIhXK/46XFV8Q/g7Bsvib0Askb0reRLe+WYPeeE+l5cH7SlkuQ==",
+ "version": "7.0.2",
+ "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-7.0.2.tgz",
+ "integrity": "sha512-d9xRovfKNz1SKieM0qJdO+PQonjnnIfSNWfHYnBSJ9hkjm0ZPw6HlxscDXYstp3z+7V2GOFHc+J0CYrYTjqCJw==",
"license": "MIT",
"engines": {
"node": ">=18"
@@ -7460,15 +7736,16 @@
}
},
"node_modules/@stylistic/eslint-plugin": {
- "version": "4.2.0",
- "resolved": "https://registry.npmjs.org/@stylistic/eslint-plugin/-/eslint-plugin-4.2.0.tgz",
- "integrity": "sha512-8hXezgz7jexGHdo5WN6JBEIPHCSFyyU4vgbxevu4YLVS5vl+sxqAAGyXSzfNDyR6xMNSH5H1x67nsXcYMOHtZA==",
+ "version": "5.1.0",
+ "resolved": "https://registry.npmjs.org/@stylistic/eslint-plugin/-/eslint-plugin-5.1.0.tgz",
+ "integrity": "sha512-TJRJul4u/lmry5N/kyCU+7RWWOk0wyXN+BncRlDYBqpLFnzXkd7QGVfN7KewarFIXv0IX0jSF/Ksu7aHWEDeuw==",
"dev": true,
"license": "MIT",
"dependencies": {
- "@typescript-eslint/utils": "^8.23.0",
- "eslint-visitor-keys": "^4.2.0",
- "espree": "^10.3.0",
+ "@eslint-community/eslint-utils": "^4.7.0",
+ "@typescript-eslint/types": "^8.34.1",
+ "eslint-visitor-keys": "^4.2.1",
+ "espree": "^10.4.0",
"estraverse": "^5.3.0",
"picomatch": "^4.0.2"
},
@@ -7480,9 +7757,9 @@
}
},
"node_modules/@stylistic/eslint-plugin/node_modules/eslint-visitor-keys": {
- "version": "4.2.0",
- "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.0.tgz",
- "integrity": "sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==",
+ "version": "4.2.1",
+ "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.1.tgz",
+ "integrity": "sha512-Uhdk5sfqcee/9H/rCOJikYz67o0a2Tw2hGRPOG2Y1R2dg7brRe1uG0yaNQDHu+TO/uQPF/5eCapvYSmHUjt7JQ==",
"dev": true,
"license": "Apache-2.0",
"engines": {
@@ -7492,68 +7769,443 @@
"url": "https://opencollective.com/eslint"
}
},
- "node_modules/@tailwindcss/aspect-ratio": {
- "version": "0.4.2",
- "resolved": "https://registry.npmjs.org/@tailwindcss/aspect-ratio/-/aspect-ratio-0.4.2.tgz",
- "integrity": "sha512-8QPrypskfBa7QIMuKHg2TA7BqES6vhBrDLOv8Unb6FcFyd3TjKbc6lcmb9UPQHxfl24sXoJ41ux/H7qQQvfaSQ==",
+ "node_modules/@swc/helpers": {
+ "version": "0.5.17",
+ "resolved": "https://registry.npmjs.org/@swc/helpers/-/helpers-0.5.17.tgz",
+ "integrity": "sha512-5IKx/Y13RsYd+sauPb2x+U/xZikHjolzfuDgTAl/Tdf3Q8rslRvC19NKDLgAJQ6wsqADk10ntlv08nPFw/gO/A==",
+ "license": "Apache-2.0",
+ "dependencies": {
+ "tslib": "^2.8.0"
+ }
+ },
+ "node_modules/@tailwindcss/node": {
+ "version": "4.1.11",
+ "resolved": "https://registry.npmjs.org/@tailwindcss/node/-/node-4.1.11.tgz",
+ "integrity": "sha512-yzhzuGRmv5QyU9qLNg4GTlYI6STedBWRE7NjxP45CsFYYq9taI0zJXZBMqIC/c8fViNLhmrbpSFS57EoxUmD6Q==",
+ "license": "MIT",
+ "dependencies": {
+ "@ampproject/remapping": "^2.3.0",
+ "enhanced-resolve": "^5.18.1",
+ "jiti": "^2.4.2",
+ "lightningcss": "1.30.1",
+ "magic-string": "^0.30.17",
+ "source-map-js": "^1.2.1",
+ "tailwindcss": "4.1.11"
+ }
+ },
+ "node_modules/@tailwindcss/oxide": {
+ "version": "4.1.11",
+ "resolved": "https://registry.npmjs.org/@tailwindcss/oxide/-/oxide-4.1.11.tgz",
+ "integrity": "sha512-Q69XzrtAhuyfHo+5/HMgr1lAiPP/G40OMFAnws7xcFEYqcypZmdW8eGXaOUIeOl1dzPJBPENXgbjsOyhg2nkrg==",
+ "hasInstallScript": true,
+ "license": "MIT",
+ "dependencies": {
+ "detect-libc": "^2.0.4",
+ "tar": "^7.4.3"
+ },
+ "engines": {
+ "node": ">= 10"
+ },
+ "optionalDependencies": {
+ "@tailwindcss/oxide-android-arm64": "4.1.11",
+ "@tailwindcss/oxide-darwin-arm64": "4.1.11",
+ "@tailwindcss/oxide-darwin-x64": "4.1.11",
+ "@tailwindcss/oxide-freebsd-x64": "4.1.11",
+ "@tailwindcss/oxide-linux-arm-gnueabihf": "4.1.11",
+ "@tailwindcss/oxide-linux-arm64-gnu": "4.1.11",
+ "@tailwindcss/oxide-linux-arm64-musl": "4.1.11",
+ "@tailwindcss/oxide-linux-x64-gnu": "4.1.11",
+ "@tailwindcss/oxide-linux-x64-musl": "4.1.11",
+ "@tailwindcss/oxide-wasm32-wasi": "4.1.11",
+ "@tailwindcss/oxide-win32-arm64-msvc": "4.1.11",
+ "@tailwindcss/oxide-win32-x64-msvc": "4.1.11"
+ }
+ },
+ "node_modules/@tailwindcss/oxide-android-arm64": {
+ "version": "4.1.11",
+ "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-android-arm64/-/oxide-android-arm64-4.1.11.tgz",
+ "integrity": "sha512-3IfFuATVRUMZZprEIx9OGDjG3Ou3jG4xQzNTvjDoKmU9JdmoCohQJ83MYd0GPnQIu89YoJqvMM0G3uqLRFtetg==",
+ "cpu": [
+ "arm64"
+ ],
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "android"
+ ],
+ "engines": {
+ "node": ">= 10"
+ }
+ },
+ "node_modules/@tailwindcss/oxide-darwin-arm64": {
+ "version": "4.1.11",
+ "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-darwin-arm64/-/oxide-darwin-arm64-4.1.11.tgz",
+ "integrity": "sha512-ESgStEOEsyg8J5YcMb1xl8WFOXfeBmrhAwGsFxxB2CxY9evy63+AtpbDLAyRkJnxLy2WsD1qF13E97uQyP1lfQ==",
+ "cpu": [
+ "arm64"
+ ],
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "darwin"
+ ],
+ "engines": {
+ "node": ">= 10"
+ }
+ },
+ "node_modules/@tailwindcss/oxide-darwin-x64": {
+ "version": "4.1.11",
+ "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-darwin-x64/-/oxide-darwin-x64-4.1.11.tgz",
+ "integrity": "sha512-EgnK8kRchgmgzG6jE10UQNaH9Mwi2n+yw1jWmof9Vyg2lpKNX2ioe7CJdf9M5f8V9uaQxInenZkOxnTVL3fhAw==",
+ "cpu": [
+ "x64"
+ ],
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "darwin"
+ ],
+ "engines": {
+ "node": ">= 10"
+ }
+ },
+ "node_modules/@tailwindcss/oxide-freebsd-x64": {
+ "version": "4.1.11",
+ "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-freebsd-x64/-/oxide-freebsd-x64-4.1.11.tgz",
+ "integrity": "sha512-xdqKtbpHs7pQhIKmqVpxStnY1skuNh4CtbcyOHeX1YBE0hArj2romsFGb6yUmzkq/6M24nkxDqU8GYrKrz+UcA==",
+ "cpu": [
+ "x64"
+ ],
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "freebsd"
+ ],
+ "engines": {
+ "node": ">= 10"
+ }
+ },
+ "node_modules/@tailwindcss/oxide-linux-arm-gnueabihf": {
+ "version": "4.1.11",
+ "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-linux-arm-gnueabihf/-/oxide-linux-arm-gnueabihf-4.1.11.tgz",
+ "integrity": "sha512-ryHQK2eyDYYMwB5wZL46uoxz2zzDZsFBwfjssgB7pzytAeCCa6glsiJGjhTEddq/4OsIjsLNMAiMlHNYnkEEeg==",
+ "cpu": [
+ "arm"
+ ],
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "linux"
+ ],
+ "engines": {
+ "node": ">= 10"
+ }
+ },
+ "node_modules/@tailwindcss/oxide-linux-arm64-gnu": {
+ "version": "4.1.11",
+ "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-linux-arm64-gnu/-/oxide-linux-arm64-gnu-4.1.11.tgz",
+ "integrity": "sha512-mYwqheq4BXF83j/w75ewkPJmPZIqqP1nhoghS9D57CLjsh3Nfq0m4ftTotRYtGnZd3eCztgbSPJ9QhfC91gDZQ==",
+ "cpu": [
+ "arm64"
+ ],
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "linux"
+ ],
+ "engines": {
+ "node": ">= 10"
+ }
+ },
+ "node_modules/@tailwindcss/oxide-linux-arm64-musl": {
+ "version": "4.1.11",
+ "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-linux-arm64-musl/-/oxide-linux-arm64-musl-4.1.11.tgz",
+ "integrity": "sha512-m/NVRFNGlEHJrNVk3O6I9ggVuNjXHIPoD6bqay/pubtYC9QIdAMpS+cswZQPBLvVvEF6GtSNONbDkZrjWZXYNQ==",
+ "cpu": [
+ "arm64"
+ ],
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "linux"
+ ],
+ "engines": {
+ "node": ">= 10"
+ }
+ },
+ "node_modules/@tailwindcss/oxide-linux-x64-gnu": {
+ "version": "4.1.11",
+ "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-linux-x64-gnu/-/oxide-linux-x64-gnu-4.1.11.tgz",
+ "integrity": "sha512-YW6sblI7xukSD2TdbbaeQVDysIm/UPJtObHJHKxDEcW2exAtY47j52f8jZXkqE1krdnkhCMGqP3dbniu1Te2Fg==",
+ "cpu": [
+ "x64"
+ ],
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "linux"
+ ],
+ "engines": {
+ "node": ">= 10"
+ }
+ },
+ "node_modules/@tailwindcss/oxide-linux-x64-musl": {
+ "version": "4.1.11",
+ "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-linux-x64-musl/-/oxide-linux-x64-musl-4.1.11.tgz",
+ "integrity": "sha512-e3C/RRhGunWYNC3aSF7exsQkdXzQ/M+aYuZHKnw4U7KQwTJotnWsGOIVih0s2qQzmEzOFIJ3+xt7iq67K/p56Q==",
+ "cpu": [
+ "x64"
+ ],
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "linux"
+ ],
+ "engines": {
+ "node": ">= 10"
+ }
+ },
+ "node_modules/@tailwindcss/oxide-wasm32-wasi": {
+ "version": "4.1.11",
+ "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-wasm32-wasi/-/oxide-wasm32-wasi-4.1.11.tgz",
+ "integrity": "sha512-Xo1+/GU0JEN/C/dvcammKHzeM6NqKovG+6921MR6oadee5XPBaKOumrJCXvopJ/Qb5TH7LX/UAywbqrP4lax0g==",
+ "bundleDependencies": [
+ "@napi-rs/wasm-runtime",
+ "@emnapi/core",
+ "@emnapi/runtime",
+ "@tybys/wasm-util",
+ "@emnapi/wasi-threads",
+ "tslib"
+ ],
+ "cpu": [
+ "wasm32"
+ ],
+ "license": "MIT",
+ "optional": true,
+ "dependencies": {
+ "@emnapi/core": "^1.4.3",
+ "@emnapi/runtime": "^1.4.3",
+ "@emnapi/wasi-threads": "^1.0.2",
+ "@napi-rs/wasm-runtime": "^0.2.11",
+ "@tybys/wasm-util": "^0.9.0",
+ "tslib": "^2.8.0"
+ },
+ "engines": {
+ "node": ">=14.0.0"
+ }
+ },
+ "node_modules/@tailwindcss/oxide-win32-arm64-msvc": {
+ "version": "4.1.11",
+ "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-win32-arm64-msvc/-/oxide-win32-arm64-msvc-4.1.11.tgz",
+ "integrity": "sha512-UgKYx5PwEKrac3GPNPf6HVMNhUIGuUh4wlDFR2jYYdkX6pL/rn73zTq/4pzUm8fOjAn5L8zDeHp9iXmUGOXZ+w==",
+ "cpu": [
+ "arm64"
+ ],
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "win32"
+ ],
+ "engines": {
+ "node": ">= 10"
+ }
+ },
+ "node_modules/@tailwindcss/oxide-win32-x64-msvc": {
+ "version": "4.1.11",
+ "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-win32-x64-msvc/-/oxide-win32-x64-msvc-4.1.11.tgz",
+ "integrity": "sha512-YfHoggn1j0LK7wR82TOucWc5LDCguHnoS879idHekmmiR7g9HUtMw9MI0NHatS28u/Xlkfi9w5RJWgz2Dl+5Qg==",
+ "cpu": [
+ "x64"
+ ],
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "win32"
+ ],
+ "engines": {
+ "node": ">= 10"
+ }
+ },
+ "node_modules/@tailwindcss/postcss": {
+ "version": "4.1.11",
+ "resolved": "https://registry.npmjs.org/@tailwindcss/postcss/-/postcss-4.1.11.tgz",
+ "integrity": "sha512-q/EAIIpF6WpLhKEuQSEVMZNMIY8KhWoAemZ9eylNAih9jxMGAYPPWBn3I9QL/2jZ+e7OEz/tZkX5HwbBR4HohA==",
+ "license": "MIT",
+ "dependencies": {
+ "@alloc/quick-lru": "^5.2.0",
+ "@tailwindcss/node": "4.1.11",
+ "@tailwindcss/oxide": "4.1.11",
+ "postcss": "^8.4.41",
+ "tailwindcss": "4.1.11"
+ }
+ },
+ "node_modules/@tailwindcss/vite": {
+ "version": "4.1.11",
+ "resolved": "https://registry.npmjs.org/@tailwindcss/vite/-/vite-4.1.11.tgz",
+ "integrity": "sha512-RHYhrR3hku0MJFRV+fN2gNbDNEh3dwKvY8XJvTxCSXeMOsCRSr+uKvDWQcbizrHgjML6ZmTE5OwMrl5wKcujCw==",
"license": "MIT",
+ "dependencies": {
+ "@tailwindcss/node": "4.1.11",
+ "@tailwindcss/oxide": "4.1.11",
+ "tailwindcss": "4.1.11"
+ },
"peerDependencies": {
- "tailwindcss": ">=2.0.0 || >=3.0.0 || >=3.0.0-alpha.1"
+ "vite": "^5.2.0 || ^6 || ^7"
}
},
- "node_modules/@tailwindcss/container-queries": {
- "version": "0.1.1",
- "resolved": "https://registry.npmjs.org/@tailwindcss/container-queries/-/container-queries-0.1.1.tgz",
- "integrity": "sha512-p18dswChx6WnTSaJCSGx6lTmrGzNNvm2FtXmiO6AuA1V4U5REyoqwmT6kgAsIMdjo07QdAfYXHJ4hnMtfHzWgA==",
+ "node_modules/@tanstack/match-sorter-utils": {
+ "version": "8.19.4",
+ "resolved": "https://registry.npmjs.org/@tanstack/match-sorter-utils/-/match-sorter-utils-8.19.4.tgz",
+ "integrity": "sha512-Wo1iKt2b9OT7d+YGhvEPD3DXvPv2etTusIMhMUoG7fbhmxcXCtIjJDEygy91Y2JFlwGyjqiBPRozme7UD8hoqg==",
+ "license": "MIT",
+ "dependencies": {
+ "remove-accents": "0.5.0"
+ },
+ "engines": {
+ "node": ">=12"
+ },
+ "funding": {
+ "type": "github",
+ "url": "https://github.com/sponsors/tannerlinsley"
+ }
+ },
+ "node_modules/@tanstack/query-core": {
+ "version": "5.83.0",
+ "resolved": "https://registry.npmjs.org/@tanstack/query-core/-/query-core-5.83.0.tgz",
+ "integrity": "sha512-0M8dA+amXUkyz5cVUm/B+zSk3xkQAcuXuz5/Q/LveT4ots2rBpPTZOzd7yJa2Utsf8D2Upl5KyjhHRY+9lB/XA==",
+ "license": "MIT",
+ "funding": {
+ "type": "github",
+ "url": "https://github.com/sponsors/tannerlinsley"
+ }
+ },
+ "node_modules/@tanstack/query-devtools": {
+ "version": "5.81.2",
+ "resolved": "https://registry.npmjs.org/@tanstack/query-devtools/-/query-devtools-5.81.2.tgz",
+ "integrity": "sha512-jCeJcDCwKfoyyBXjXe9+Lo8aTkavygHHsUHAlxQKKaDeyT0qyQNLKl7+UyqYH2dDF6UN/14873IPBHchcsU+Zg==",
+ "license": "MIT",
+ "funding": {
+ "type": "github",
+ "url": "https://github.com/sponsors/tannerlinsley"
+ }
+ },
+ "node_modules/@tanstack/table-core": {
+ "version": "8.21.3",
+ "resolved": "https://registry.npmjs.org/@tanstack/table-core/-/table-core-8.21.3.tgz",
+ "integrity": "sha512-ldZXEhOBb8Is7xLs01fR3YEc3DERiz5silj8tnGkFZytt1abEvl/GhUmCE0PMLaMPTa3Jk4HbKmRlHmu+gCftg==",
+ "license": "MIT",
+ "engines": {
+ "node": ">=12"
+ },
+ "funding": {
+ "type": "github",
+ "url": "https://github.com/sponsors/tannerlinsley"
+ }
+ },
+ "node_modules/@tanstack/virtual-core": {
+ "version": "3.13.12",
+ "resolved": "https://registry.npmjs.org/@tanstack/virtual-core/-/virtual-core-3.13.12.tgz",
+ "integrity": "sha512-1YBOJfRHV4sXUmWsFSf5rQor4Ss82G8dQWLRbnk3GA4jeP8hQt1hxXh0tmflpC0dz3VgEv/1+qwPyLeWkQuPFA==",
+ "license": "MIT",
+ "funding": {
+ "type": "github",
+ "url": "https://github.com/sponsors/tannerlinsley"
+ }
+ },
+ "node_modules/@tanstack/vue-query": {
+ "version": "5.83.0",
+ "resolved": "https://registry.npmjs.org/@tanstack/vue-query/-/vue-query-5.83.0.tgz",
+ "integrity": "sha512-sC3nnFEyAPOV4aGgt36ILrFIoR42UzRb+kqva96tiT3c80PCX99wDnVC5P01uxw6b3PaH7AD60HFFLBMFCKYow==",
"license": "MIT",
+ "dependencies": {
+ "@tanstack/match-sorter-utils": "^8.19.4",
+ "@tanstack/query-core": "5.83.0",
+ "@vue/devtools-api": "^6.6.3",
+ "vue-demi": "^0.14.10"
+ },
+ "funding": {
+ "type": "github",
+ "url": "https://github.com/sponsors/tannerlinsley"
+ },
"peerDependencies": {
- "tailwindcss": ">=3.2.0"
+ "@vue/composition-api": "^1.1.2",
+ "vue": "^2.6.0 || ^3.3.0"
+ },
+ "peerDependenciesMeta": {
+ "@vue/composition-api": {
+ "optional": true
+ }
}
},
- "node_modules/@tailwindcss/forms": {
- "version": "0.5.10",
- "resolved": "https://registry.npmjs.org/@tailwindcss/forms/-/forms-0.5.10.tgz",
- "integrity": "sha512-utI1ONF6uf/pPNO68kmN1b8rEwNXv3czukalo8VtJH8ksIkZXr3Q3VYudZLkCsDd4Wku120uF02hYK25XGPorw==",
+ "node_modules/@tanstack/vue-query-devtools": {
+ "version": "5.83.0",
+ "resolved": "https://registry.npmjs.org/@tanstack/vue-query-devtools/-/vue-query-devtools-5.83.0.tgz",
+ "integrity": "sha512-HXQCfmC4ndeaMTv97tdprmN3dwT6z3LHxeJTpbl2R2qK+eFpctoqTyCvNhrRpOpOZabaaLN3rH2GCttHmHjU/Q==",
"license": "MIT",
"dependencies": {
- "mini-svg-data-uri": "^1.2.3"
+ "@tanstack/query-devtools": "5.81.2"
+ },
+ "funding": {
+ "type": "github",
+ "url": "https://github.com/sponsors/tannerlinsley"
+ },
+ "peerDependencies": {
+ "@tanstack/vue-query": "^5.83.0",
+ "vue": "^3.3.0"
+ }
+ },
+ "node_modules/@tanstack/vue-query/node_modules/vue-demi": {
+ "version": "0.14.10",
+ "resolved": "https://registry.npmjs.org/vue-demi/-/vue-demi-0.14.10.tgz",
+ "integrity": "sha512-nMZBOwuzabUO0nLgIcc6rycZEebF6eeUfaiQx9+WSk8e29IbLvPU9feI6tqW4kTo3hvoYAJkMh8n8D0fuISphg==",
+ "hasInstallScript": true,
+ "license": "MIT",
+ "bin": {
+ "vue-demi-fix": "bin/vue-demi-fix.js",
+ "vue-demi-switch": "bin/vue-demi-switch.js"
+ },
+ "engines": {
+ "node": ">=12"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/antfu"
+ },
+ "peerDependencies": {
+ "@vue/composition-api": "^1.0.0-rc.1",
+ "vue": "^3.0.0-0 || ^2.6.0"
},
- "peerDependencies": {
- "tailwindcss": ">=3.0.0 || >= 3.0.0-alpha.1 || >= 4.0.0-alpha.20 || >= 4.0.0-beta.1"
+ "peerDependenciesMeta": {
+ "@vue/composition-api": {
+ "optional": true
+ }
}
},
- "node_modules/@tailwindcss/typography": {
- "version": "0.5.16",
- "resolved": "https://registry.npmjs.org/@tailwindcss/typography/-/typography-0.5.16.tgz",
- "integrity": "sha512-0wDLwCVF5V3x3b1SGXPCDcdsbDHMBe+lkFzBRaHeLvNi+nrrnZ1lA18u+OTWO8iSWU2GxUOCvlXtDuqftc1oiA==",
+ "node_modules/@tanstack/vue-table": {
+ "version": "8.21.3",
+ "resolved": "https://registry.npmjs.org/@tanstack/vue-table/-/vue-table-8.21.3.tgz",
+ "integrity": "sha512-rusRyd77c5tDPloPskctMyPLFEQUeBzxdQ+2Eow4F7gDPlPOB1UnnhzfpdvqZ8ZyX2rRNGmqNnQWm87OI2OQPw==",
"license": "MIT",
"dependencies": {
- "lodash.castarray": "^4.4.0",
- "lodash.isplainobject": "^4.0.6",
- "lodash.merge": "^4.6.2",
- "postcss-selector-parser": "6.0.10"
+ "@tanstack/table-core": "8.21.3"
+ },
+ "engines": {
+ "node": ">=12"
},
- "peerDependencies": {
- "tailwindcss": ">=3.0.0 || insiders || >=4.0.0-alpha.20 || >=4.0.0-beta.1"
- }
- },
- "node_modules/@tanstack/virtual-core": {
- "version": "3.13.8",
- "resolved": "https://registry.npmjs.org/@tanstack/virtual-core/-/virtual-core-3.13.8.tgz",
- "integrity": "sha512-BT6w89Hqy7YKaWewYzmecXQzcJh6HTBbKYJIIkMaNU49DZ06LoTV3z32DWWEdUsgW6n1xTmwTLs4GtWrZC261w==",
- "license": "MIT",
"funding": {
"type": "github",
"url": "https://github.com/sponsors/tannerlinsley"
+ },
+ "peerDependencies": {
+ "vue": ">=3.2"
}
},
"node_modules/@tanstack/vue-virtual": {
- "version": "3.13.8",
- "resolved": "https://registry.npmjs.org/@tanstack/vue-virtual/-/vue-virtual-3.13.8.tgz",
- "integrity": "sha512-CqyjKVc88YlE8JPth8a5Gi4CUoYrwJ2PZxtFbhoekx8Z2qqymxX2jzkbUMKFsX4EVNET90D5bLsG3epyozbzcg==",
+ "version": "3.13.12",
+ "resolved": "https://registry.npmjs.org/@tanstack/vue-virtual/-/vue-virtual-3.13.12.tgz",
+ "integrity": "sha512-vhF7kEU9EXWXh+HdAwKJ2m3xaOnTTmgcdXcF2pim8g4GvI7eRrk2YRuV5nUlZnd/NbCIX4/Ja2OZu5EjJL06Ww==",
"license": "MIT",
"dependencies": {
- "@tanstack/virtual-core": "3.13.8"
+ "@tanstack/virtual-core": "3.13.12"
},
"funding": {
"type": "github",
@@ -7563,19 +8215,10 @@
"vue": "^2.7.0 || ^3.0.0"
}
},
- "node_modules/@trysound/sax": {
- "version": "0.2.0",
- "resolved": "https://registry.npmjs.org/@trysound/sax/-/sax-0.2.0.tgz",
- "integrity": "sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==",
- "license": "ISC",
- "engines": {
- "node": ">=10.13.0"
- }
- },
"node_modules/@tybys/wasm-util": {
- "version": "0.9.0",
- "resolved": "https://registry.npmjs.org/@tybys/wasm-util/-/wasm-util-0.9.0.tgz",
- "integrity": "sha512-6+7nlbMVX/PVDCwaIQ8nTOPveOcFLSt8GcXdx8hD0bt39uWxYT88uXzqTd4fTvqta7oeUJqudepapKNt2DYJFw==",
+ "version": "0.10.0",
+ "resolved": "https://registry.npmjs.org/@tybys/wasm-util/-/wasm-util-0.10.0.tgz",
+ "integrity": "sha512-VyyPYFlOMNylG45GoAe0xDoLwWuowvf92F9kySqzYh8vmYm7D2u4iUJKa1tOUpS70Ku13ASrOkS4ScXFsTaCNQ==",
"license": "MIT",
"optional": true,
"dependencies": {
@@ -7592,9 +8235,9 @@
}
},
"node_modules/@types/estree": {
- "version": "1.0.7",
- "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.7.tgz",
- "integrity": "sha512-w28IoSUCJpidD/TGviZwwMJckNESJZXFu7NBZ5YJ4mEUnNraUn9Pm8HSZm/jDF1pDWYKspWE7oVphigUPRakIQ==",
+ "version": "1.0.8",
+ "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.8.tgz",
+ "integrity": "sha512-dWHzHa2WqEXI/O1E9OjrocMTKJl2mSrEolh1Iomrv6U+JuNwaHXsXx9bLu5gG7BUWFIN0skIQJQ/L1rIex4X6w==",
"license": "MIT"
},
"node_modules/@types/json-schema": {
@@ -7605,9 +8248,9 @@
"license": "MIT"
},
"node_modules/@types/lodash": {
- "version": "4.17.16",
- "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.16.tgz",
- "integrity": "sha512-HX7Em5NYQAXKW+1T+FiuG27NGwzJfCX3s1GjOa7ujxZa52kjJLOr4FUxT+giF6Tgxv1e+/czV/iTtBw27WTU9g==",
+ "version": "4.17.20",
+ "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.20.tgz",
+ "integrity": "sha512-H3MHACvFUEiujabxhaI/ImO6gUrd8oOurg7LQtS7mbwIXA/cUqWrvBsaeJ23aZEPk1TAYkurjfMbSELfoCXlGA==",
"license": "MIT"
},
"node_modules/@types/mysql": {
@@ -7620,12 +8263,12 @@
}
},
"node_modules/@types/node": {
- "version": "22.15.14",
- "resolved": "https://registry.npmjs.org/@types/node/-/node-22.15.14.tgz",
- "integrity": "sha512-BL1eyu/XWsFGTtDWOYULQEs4KR0qdtYfCxYAUYRoB7JP7h9ETYLgQTww6kH8Sj2C0pFGgrpM0XKv6/kbIzYJ1g==",
+ "version": "24.0.14",
+ "resolved": "https://registry.npmjs.org/@types/node/-/node-24.0.14.tgz",
+ "integrity": "sha512-4zXMWD91vBLGRtHK3YbIoFMia+1nqEz72coM42C5ETjnNCa/heoj7NT1G67iAfOqMmcfhuCZ4uNpyz8EjlAejw==",
"license": "MIT",
"dependencies": {
- "undici-types": "~6.21.0"
+ "undici-types": "~7.8.0"
}
},
"node_modules/@types/normalize-package-data": {
@@ -7710,19 +8353,19 @@
}
},
"node_modules/@typescript-eslint/eslint-plugin": {
- "version": "8.32.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.32.0.tgz",
- "integrity": "sha512-/jU9ettcntkBFmWUzzGgsClEi2ZFiikMX5eEQsmxIAWMOn4H3D4rvHssstmAHGVvrYnaMqdWWWg0b5M6IN/MTQ==",
+ "version": "8.37.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.37.0.tgz",
+ "integrity": "sha512-jsuVWeIkb6ggzB+wPCsR4e6loj+rM72ohW6IBn2C+5NCvfUVY8s33iFPySSVXqtm5Hu29Ne/9bnA0JmyLmgenA==",
"dev": true,
"license": "MIT",
"dependencies": {
"@eslint-community/regexpp": "^4.10.0",
- "@typescript-eslint/scope-manager": "8.32.0",
- "@typescript-eslint/type-utils": "8.32.0",
- "@typescript-eslint/utils": "8.32.0",
- "@typescript-eslint/visitor-keys": "8.32.0",
+ "@typescript-eslint/scope-manager": "8.37.0",
+ "@typescript-eslint/type-utils": "8.37.0",
+ "@typescript-eslint/utils": "8.37.0",
+ "@typescript-eslint/visitor-keys": "8.37.0",
"graphemer": "^1.4.0",
- "ignore": "^5.3.1",
+ "ignore": "^7.0.0",
"natural-compare": "^1.4.0",
"ts-api-utils": "^2.1.0"
},
@@ -7734,32 +8377,44 @@
"url": "https://opencollective.com/typescript-eslint"
},
"peerDependencies": {
- "@typescript-eslint/parser": "^8.0.0 || ^8.0.0-alpha.0",
+ "@typescript-eslint/parser": "^8.37.0",
"eslint": "^8.57.0 || ^9.0.0",
"typescript": ">=4.8.4 <5.9.0"
}
},
- "node_modules/@typescript-eslint/eslint-plugin/node_modules/ignore": {
- "version": "5.3.2",
- "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz",
- "integrity": "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==",
+ "node_modules/@typescript-eslint/parser": {
+ "version": "8.37.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.37.0.tgz",
+ "integrity": "sha512-kVIaQE9vrN9RLCQMQ3iyRlVJpTiDUY6woHGb30JDkfJErqrQEmtdWH3gV0PBAfGZgQXoqzXOO0T3K6ioApbbAA==",
"dev": true,
"license": "MIT",
+ "dependencies": {
+ "@typescript-eslint/scope-manager": "8.37.0",
+ "@typescript-eslint/types": "8.37.0",
+ "@typescript-eslint/typescript-estree": "8.37.0",
+ "@typescript-eslint/visitor-keys": "8.37.0",
+ "debug": "^4.3.4"
+ },
"engines": {
- "node": ">= 4"
+ "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+ },
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/typescript-eslint"
+ },
+ "peerDependencies": {
+ "eslint": "^8.57.0 || ^9.0.0",
+ "typescript": ">=4.8.4 <5.9.0"
}
},
- "node_modules/@typescript-eslint/parser": {
- "version": "8.32.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.32.0.tgz",
- "integrity": "sha512-B2MdzyWxCE2+SqiZHAjPphft+/2x2FlO9YBx7eKE1BCb+rqBlQdhtAEhzIEdozHd55DXPmxBdpMygFJjfjjA9A==",
- "dev": true,
+ "node_modules/@typescript-eslint/project-service": {
+ "version": "8.37.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.37.0.tgz",
+ "integrity": "sha512-BIUXYsbkl5A1aJDdYJCBAo8rCEbAvdquQ8AnLb6z5Lp1u3x5PNgSSx9A/zqYc++Xnr/0DVpls8iQ2cJs/izTXA==",
"license": "MIT",
"dependencies": {
- "@typescript-eslint/scope-manager": "8.32.0",
- "@typescript-eslint/types": "8.32.0",
- "@typescript-eslint/typescript-estree": "8.32.0",
- "@typescript-eslint/visitor-keys": "8.32.0",
+ "@typescript-eslint/tsconfig-utils": "^8.37.0",
+ "@typescript-eslint/types": "^8.37.0",
"debug": "^4.3.4"
},
"engines": {
@@ -7770,37 +8425,53 @@
"url": "https://opencollective.com/typescript-eslint"
},
"peerDependencies": {
- "eslint": "^8.57.0 || ^9.0.0",
"typescript": ">=4.8.4 <5.9.0"
}
},
"node_modules/@typescript-eslint/scope-manager": {
- "version": "8.32.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.32.0.tgz",
- "integrity": "sha512-jc/4IxGNedXkmG4mx4nJTILb6TMjL66D41vyeaPWvDUmeYQzF3lKtN15WsAeTr65ce4mPxwopPSo1yUUAWw0hQ==",
+ "version": "8.37.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.37.0.tgz",
+ "integrity": "sha512-0vGq0yiU1gbjKob2q691ybTg9JX6ShiVXAAfm2jGf3q0hdP6/BruaFjL/ManAR/lj05AvYCH+5bbVo0VtzmjOA==",
"dev": true,
"license": "MIT",
"dependencies": {
- "@typescript-eslint/types": "8.32.0",
- "@typescript-eslint/visitor-keys": "8.32.0"
+ "@typescript-eslint/types": "8.37.0",
+ "@typescript-eslint/visitor-keys": "8.37.0"
+ },
+ "engines": {
+ "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
},
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/typescript-eslint"
+ }
+ },
+ "node_modules/@typescript-eslint/tsconfig-utils": {
+ "version": "8.37.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.37.0.tgz",
+ "integrity": "sha512-1/YHvAVTimMM9mmlPvTec9NP4bobA1RkDbMydxG8omqwJJLEW/Iy2C4adsAESIXU3WGLXFHSZUU+C9EoFWl4Zg==",
+ "license": "MIT",
"engines": {
"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
},
"funding": {
"type": "opencollective",
"url": "https://opencollective.com/typescript-eslint"
+ },
+ "peerDependencies": {
+ "typescript": ">=4.8.4 <5.9.0"
}
},
"node_modules/@typescript-eslint/type-utils": {
- "version": "8.32.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.32.0.tgz",
- "integrity": "sha512-t2vouuYQKEKSLtJaa5bB4jHeha2HJczQ6E5IXPDPgIty9EqcJxpr1QHQ86YyIPwDwxvUmLfP2YADQ5ZY4qddZg==",
+ "version": "8.37.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.37.0.tgz",
+ "integrity": "sha512-SPkXWIkVZxhgwSwVq9rqj/4VFo7MnWwVaRNznfQDc/xPYHjXnPfLWn+4L6FF1cAz6e7dsqBeMawgl7QjUMj4Ow==",
"dev": true,
"license": "MIT",
"dependencies": {
- "@typescript-eslint/typescript-estree": "8.32.0",
- "@typescript-eslint/utils": "8.32.0",
+ "@typescript-eslint/types": "8.37.0",
+ "@typescript-eslint/typescript-estree": "8.37.0",
+ "@typescript-eslint/utils": "8.37.0",
"debug": "^4.3.4",
"ts-api-utils": "^2.1.0"
},
@@ -7817,10 +8488,9 @@
}
},
"node_modules/@typescript-eslint/types": {
- "version": "8.32.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.32.0.tgz",
- "integrity": "sha512-O5Id6tGadAZEMThM6L9HmVf5hQUXNSxLVKeGJYWNhhVseps/0LddMkp7//VDkzwJ69lPL0UmZdcZwggj9akJaA==",
- "dev": true,
+ "version": "8.37.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.37.0.tgz",
+ "integrity": "sha512-ax0nv7PUF9NOVPs+lmQ7yIE7IQmAf8LGcXbMvHX5Gm+YJUYNAl340XkGnrimxZ0elXyoQJuN5sbg6C4evKA4SQ==",
"license": "MIT",
"engines": {
"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -7831,14 +8501,15 @@
}
},
"node_modules/@typescript-eslint/typescript-estree": {
- "version": "8.32.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.32.0.tgz",
- "integrity": "sha512-pU9VD7anSCOIoBFnhTGfOzlVFQIA1XXiQpH/CezqOBaDppRwTglJzCC6fUQGpfwey4T183NKhF1/mfatYmjRqQ==",
- "dev": true,
+ "version": "8.37.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.37.0.tgz",
+ "integrity": "sha512-zuWDMDuzMRbQOM+bHyU4/slw27bAUEcKSKKs3hcv2aNnc/tvE/h7w60dwVw8vnal2Pub6RT1T7BI8tFZ1fE+yg==",
"license": "MIT",
"dependencies": {
- "@typescript-eslint/types": "8.32.0",
- "@typescript-eslint/visitor-keys": "8.32.0",
+ "@typescript-eslint/project-service": "8.37.0",
+ "@typescript-eslint/tsconfig-utils": "8.37.0",
+ "@typescript-eslint/types": "8.37.0",
+ "@typescript-eslint/visitor-keys": "8.37.0",
"debug": "^4.3.4",
"fast-glob": "^3.3.2",
"is-glob": "^4.0.3",
@@ -7858,16 +8529,16 @@
}
},
"node_modules/@typescript-eslint/utils": {
- "version": "8.32.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.32.0.tgz",
- "integrity": "sha512-8S9hXau6nQ/sYVtC3D6ISIDoJzS1NsCK+gluVhLN2YkBPX+/1wkwyUiDKnxRh15579WoOIyVWnoyIf3yGI9REw==",
+ "version": "8.37.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.37.0.tgz",
+ "integrity": "sha512-TSFvkIW6gGjN2p6zbXo20FzCABbyUAuq6tBvNRGsKdsSQ6a7rnV6ADfZ7f4iI3lIiXc4F4WWvtUfDw9CJ9pO5A==",
"dev": true,
"license": "MIT",
"dependencies": {
"@eslint-community/eslint-utils": "^4.7.0",
- "@typescript-eslint/scope-manager": "8.32.0",
- "@typescript-eslint/types": "8.32.0",
- "@typescript-eslint/typescript-estree": "8.32.0"
+ "@typescript-eslint/scope-manager": "8.37.0",
+ "@typescript-eslint/types": "8.37.0",
+ "@typescript-eslint/typescript-estree": "8.37.0"
},
"engines": {
"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -7882,14 +8553,13 @@
}
},
"node_modules/@typescript-eslint/visitor-keys": {
- "version": "8.32.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.32.0.tgz",
- "integrity": "sha512-1rYQTCLFFzOI5Nl0c8LUpJT8HxpwVRn9E4CkMsYfuN6ctmQqExjSTzzSk0Tz2apmXy7WU6/6fyaZVVA/thPN+w==",
- "dev": true,
+ "version": "8.37.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.37.0.tgz",
+ "integrity": "sha512-YzfhzcTnZVPiLfP/oeKtDp2evwvHLMe0LOy7oe+hb9KKIumLNohYS9Hgp1ifwpu42YWxhZE8yieggz6JpqO/1w==",
"license": "MIT",
"dependencies": {
- "@typescript-eslint/types": "8.32.0",
- "eslint-visitor-keys": "^4.2.0"
+ "@typescript-eslint/types": "8.37.0",
+ "eslint-visitor-keys": "^4.2.1"
},
"engines": {
"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -7900,274 +8570,32 @@
}
},
"node_modules/@typescript-eslint/visitor-keys/node_modules/eslint-visitor-keys": {
- "version": "4.2.0",
- "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.0.tgz",
- "integrity": "sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==",
- "dev": true,
+ "version": "4.2.1",
+ "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.1.tgz",
+ "integrity": "sha512-Uhdk5sfqcee/9H/rCOJikYz67o0a2Tw2hGRPOG2Y1R2dg7brRe1uG0yaNQDHu+TO/uQPF/5eCapvYSmHUjt7JQ==",
"license": "Apache-2.0",
"engines": {
"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
},
- "funding": {
- "url": "https://opencollective.com/eslint"
- }
- },
- "node_modules/@unhead/vue": {
- "version": "2.0.8",
- "resolved": "https://registry.npmjs.org/@unhead/vue/-/vue-2.0.8.tgz",
- "integrity": "sha512-e30+CfCl1avR+hzFtpvnBSesZ5TN2KbShStdT2Z+zs5WIBUvobQwVxSR0arX43To6KfwtCXAfi0iOOIH0kufHQ==",
- "license": "MIT",
- "dependencies": {
- "hookable": "^5.5.3",
- "unhead": "2.0.8"
- },
- "funding": {
- "url": "https://github.com/sponsors/harlan-zw"
- },
- "peerDependencies": {
- "vue": ">=3.5.13"
- }
- },
- "node_modules/@unrs/resolver-binding-darwin-arm64": {
- "version": "1.7.2",
- "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-darwin-arm64/-/resolver-binding-darwin-arm64-1.7.2.tgz",
- "integrity": "sha512-vxtBno4xvowwNmO/ASL0Y45TpHqmNkAaDtz4Jqb+clmcVSSl8XCG/PNFFkGsXXXS6AMjP+ja/TtNCFFa1QwLRg==",
- "cpu": [
- "arm64"
- ],
- "dev": true,
- "license": "MIT",
- "optional": true,
- "os": [
- "darwin"
- ]
- },
- "node_modules/@unrs/resolver-binding-darwin-x64": {
- "version": "1.7.2",
- "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-darwin-x64/-/resolver-binding-darwin-x64-1.7.2.tgz",
- "integrity": "sha512-qhVa8ozu92C23Hsmv0BF4+5Dyyd5STT1FolV4whNgbY6mj3kA0qsrGPe35zNR3wAN7eFict3s4Rc2dDTPBTuFQ==",
- "cpu": [
- "x64"
- ],
- "dev": true,
- "license": "MIT",
- "optional": true,
- "os": [
- "darwin"
- ]
- },
- "node_modules/@unrs/resolver-binding-freebsd-x64": {
- "version": "1.7.2",
- "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-freebsd-x64/-/resolver-binding-freebsd-x64-1.7.2.tgz",
- "integrity": "sha512-zKKdm2uMXqLFX6Ac7K5ElnnG5VIXbDlFWzg4WJ8CGUedJryM5A3cTgHuGMw1+P5ziV8CRhnSEgOnurTI4vpHpg==",
- "cpu": [
- "x64"
- ],
- "dev": true,
- "license": "MIT",
- "optional": true,
- "os": [
- "freebsd"
- ]
- },
- "node_modules/@unrs/resolver-binding-linux-arm-gnueabihf": {
- "version": "1.7.2",
- "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-arm-gnueabihf/-/resolver-binding-linux-arm-gnueabihf-1.7.2.tgz",
- "integrity": "sha512-8N1z1TbPnHH+iDS/42GJ0bMPLiGK+cUqOhNbMKtWJ4oFGzqSJk/zoXFzcQkgtI63qMcUI7wW1tq2usZQSb2jxw==",
- "cpu": [
- "arm"
- ],
- "dev": true,
- "license": "MIT",
- "optional": true,
- "os": [
- "linux"
- ]
- },
- "node_modules/@unrs/resolver-binding-linux-arm-musleabihf": {
- "version": "1.7.2",
- "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-arm-musleabihf/-/resolver-binding-linux-arm-musleabihf-1.7.2.tgz",
- "integrity": "sha512-tjYzI9LcAXR9MYd9rO45m1s0B/6bJNuZ6jeOxo1pq1K6OBuRMMmfyvJYval3s9FPPGmrldYA3mi4gWDlWuTFGA==",
- "cpu": [
- "arm"
- ],
- "dev": true,
- "license": "MIT",
- "optional": true,
- "os": [
- "linux"
- ]
- },
- "node_modules/@unrs/resolver-binding-linux-arm64-gnu": {
- "version": "1.7.2",
- "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-arm64-gnu/-/resolver-binding-linux-arm64-gnu-1.7.2.tgz",
- "integrity": "sha512-jon9M7DKRLGZ9VYSkFMflvNqu9hDtOCEnO2QAryFWgT6o6AXU8du56V7YqnaLKr6rAbZBWYsYpikF226v423QA==",
- "cpu": [
- "arm64"
- ],
- "dev": true,
- "license": "MIT",
- "optional": true,
- "os": [
- "linux"
- ]
- },
- "node_modules/@unrs/resolver-binding-linux-arm64-musl": {
- "version": "1.7.2",
- "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-arm64-musl/-/resolver-binding-linux-arm64-musl-1.7.2.tgz",
- "integrity": "sha512-c8Cg4/h+kQ63pL43wBNaVMmOjXI/X62wQmru51qjfTvI7kmCy5uHTJvK/9LrF0G8Jdx8r34d019P1DVJmhXQpA==",
- "cpu": [
- "arm64"
- ],
- "dev": true,
- "license": "MIT",
- "optional": true,
- "os": [
- "linux"
- ]
- },
- "node_modules/@unrs/resolver-binding-linux-ppc64-gnu": {
- "version": "1.7.2",
- "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-ppc64-gnu/-/resolver-binding-linux-ppc64-gnu-1.7.2.tgz",
- "integrity": "sha512-A+lcwRFyrjeJmv3JJvhz5NbcCkLQL6Mk16kHTNm6/aGNc4FwPHPE4DR9DwuCvCnVHvF5IAd9U4VIs/VvVir5lg==",
- "cpu": [
- "ppc64"
- ],
- "dev": true,
- "license": "MIT",
- "optional": true,
- "os": [
- "linux"
- ]
- },
- "node_modules/@unrs/resolver-binding-linux-riscv64-gnu": {
- "version": "1.7.2",
- "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-riscv64-gnu/-/resolver-binding-linux-riscv64-gnu-1.7.2.tgz",
- "integrity": "sha512-hQQ4TJQrSQW8JlPm7tRpXN8OCNP9ez7PajJNjRD1ZTHQAy685OYqPrKjfaMw/8LiHCt8AZ74rfUVHP9vn0N69Q==",
- "cpu": [
- "riscv64"
- ],
- "dev": true,
- "license": "MIT",
- "optional": true,
- "os": [
- "linux"
- ]
- },
- "node_modules/@unrs/resolver-binding-linux-riscv64-musl": {
- "version": "1.7.2",
- "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-riscv64-musl/-/resolver-binding-linux-riscv64-musl-1.7.2.tgz",
- "integrity": "sha512-NoAGbiqrxtY8kVooZ24i70CjLDlUFI7nDj3I9y54U94p+3kPxwd2L692YsdLa+cqQ0VoqMWoehDFp21PKRUoIQ==",
- "cpu": [
- "riscv64"
- ],
- "dev": true,
- "license": "MIT",
- "optional": true,
- "os": [
- "linux"
- ]
- },
- "node_modules/@unrs/resolver-binding-linux-s390x-gnu": {
- "version": "1.7.2",
- "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-s390x-gnu/-/resolver-binding-linux-s390x-gnu-1.7.2.tgz",
- "integrity": "sha512-KaZByo8xuQZbUhhreBTW+yUnOIHUsv04P8lKjQ5otiGoSJ17ISGYArc+4vKdLEpGaLbemGzr4ZeUbYQQsLWFjA==",
- "cpu": [
- "s390x"
- ],
- "dev": true,
- "license": "MIT",
- "optional": true,
- "os": [
- "linux"
- ]
- },
- "node_modules/@unrs/resolver-binding-linux-x64-gnu": {
- "version": "1.7.2",
- "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-x64-gnu/-/resolver-binding-linux-x64-gnu-1.7.2.tgz",
- "integrity": "sha512-dEidzJDubxxhUCBJ/SHSMJD/9q7JkyfBMT77Px1npl4xpg9t0POLvnWywSk66BgZS/b2Hy9Y1yFaoMTFJUe9yg==",
- "cpu": [
- "x64"
- ],
- "dev": true,
- "license": "MIT",
- "optional": true,
- "os": [
- "linux"
- ]
- },
- "node_modules/@unrs/resolver-binding-linux-x64-musl": {
- "version": "1.7.2",
- "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-x64-musl/-/resolver-binding-linux-x64-musl-1.7.2.tgz",
- "integrity": "sha512-RvP+Ux3wDjmnZDT4XWFfNBRVG0fMsc+yVzNFUqOflnDfZ9OYujv6nkh+GOr+watwrW4wdp6ASfG/e7bkDradsw==",
- "cpu": [
- "x64"
- ],
- "dev": true,
- "license": "MIT",
- "optional": true,
- "os": [
- "linux"
- ]
- },
- "node_modules/@unrs/resolver-binding-wasm32-wasi": {
- "version": "1.7.2",
- "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-wasm32-wasi/-/resolver-binding-wasm32-wasi-1.7.2.tgz",
- "integrity": "sha512-y797JBmO9IsvXVRCKDXOxjyAE4+CcZpla2GSoBQ33TVb3ILXuFnMrbR/QQZoauBYeOFuu4w3ifWLw52sdHGz6g==",
- "cpu": [
- "wasm32"
- ],
- "dev": true,
- "license": "MIT",
- "optional": true,
- "dependencies": {
- "@napi-rs/wasm-runtime": "^0.2.9"
- },
- "engines": {
- "node": ">=14.0.0"
- }
- },
- "node_modules/@unrs/resolver-binding-win32-arm64-msvc": {
- "version": "1.7.2",
- "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-win32-arm64-msvc/-/resolver-binding-win32-arm64-msvc-1.7.2.tgz",
- "integrity": "sha512-gtYTh4/VREVSLA+gHrfbWxaMO/00y+34htY7XpioBTy56YN2eBjkPrY1ML1Zys89X3RJDKVaogzwxlM1qU7egg==",
- "cpu": [
- "arm64"
- ],
- "dev": true,
- "license": "MIT",
- "optional": true,
- "os": [
- "win32"
- ]
- },
- "node_modules/@unrs/resolver-binding-win32-ia32-msvc": {
- "version": "1.7.2",
- "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-win32-ia32-msvc/-/resolver-binding-win32-ia32-msvc-1.7.2.tgz",
- "integrity": "sha512-Ywv20XHvHTDRQs12jd3MY8X5C8KLjDbg/jyaal/QLKx3fAShhJyD4blEANInsjxW3P7isHx1Blt56iUDDJO3jg==",
- "cpu": [
- "ia32"
- ],
- "dev": true,
- "license": "MIT",
- "optional": true,
- "os": [
- "win32"
- ]
+ "funding": {
+ "url": "https://opencollective.com/eslint"
+ }
},
- "node_modules/@unrs/resolver-binding-win32-x64-msvc": {
- "version": "1.7.2",
- "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-win32-x64-msvc/-/resolver-binding-win32-x64-msvc-1.7.2.tgz",
- "integrity": "sha512-friS8NEQfHaDbkThxopGk+LuE5v3iY0StruifjQEt7SLbA46OnfgMO15sOTkbpJkol6RB+1l1TYPXh0sCddpvA==",
- "cpu": [
- "x64"
- ],
- "dev": true,
+ "node_modules/@unhead/vue": {
+ "version": "2.0.12",
+ "resolved": "https://registry.npmjs.org/@unhead/vue/-/vue-2.0.12.tgz",
+ "integrity": "sha512-WFaiCVbBd39FK6Bx3GQskhgT9s45Vjx6dRQegYheVwU1AnF+FAfJVgWbrl21p6fRJcLAFp0xDz6wE18JYBM0eQ==",
"license": "MIT",
- "optional": true,
- "os": [
- "win32"
- ]
+ "dependencies": {
+ "hookable": "^5.5.3",
+ "unhead": "2.0.12"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/harlan-zw"
+ },
+ "peerDependencies": {
+ "vue": ">=3.5.13"
+ }
},
"node_modules/@vercel/nft": {
"version": "0.27.10",
@@ -8196,9 +8624,9 @@
}
},
"node_modules/@vercel/nft/node_modules/brace-expansion": {
- "version": "1.1.11",
- "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
- "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+ "version": "1.1.12",
+ "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz",
+ "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==",
"license": "MIT",
"dependencies": {
"balanced-match": "^1.0.0",
@@ -8254,9 +8682,9 @@
}
},
"node_modules/@vitejs/plugin-vue": {
- "version": "5.2.3",
- "resolved": "https://registry.npmjs.org/@vitejs/plugin-vue/-/plugin-vue-5.2.3.tgz",
- "integrity": "sha512-IYSLEQj4LgZZuoVpdSUCw3dIynTWQgPlaRP6iAvMle4My0HdYwr5g5wQAfwOeHQBmYwEkqF70nRpSilr6PoUDg==",
+ "version": "5.2.4",
+ "resolved": "https://registry.npmjs.org/@vitejs/plugin-vue/-/plugin-vue-5.2.4.tgz",
+ "integrity": "sha512-7Yx/SXSOcQq5HiiV3orevHUFn+pmMB4cgbEkDYgnkUWb0WfeQ/wa2yFv6D5ICiCQOVpjA7vYDXrC7AGO8yjDHA==",
"license": "MIT",
"engines": {
"node": "^18.0.0 || >=20.0.0"
@@ -8267,14 +8695,15 @@
}
},
"node_modules/@vitejs/plugin-vue-jsx": {
- "version": "4.1.2",
- "resolved": "https://registry.npmjs.org/@vitejs/plugin-vue-jsx/-/plugin-vue-jsx-4.1.2.tgz",
- "integrity": "sha512-4Rk0GdE0QCdsIkuMmWeg11gmM4x8UmTnZR/LWPm7QJ7+BsK4tq08udrN0isrrWqz5heFy9HLV/7bOLgFS8hUjA==",
+ "version": "4.2.0",
+ "resolved": "https://registry.npmjs.org/@vitejs/plugin-vue-jsx/-/plugin-vue-jsx-4.2.0.tgz",
+ "integrity": "sha512-DSTrmrdLp+0LDNF77fqrKfx7X0ErRbOcUAgJL/HbSesqQwoUvUQ4uYQqaex+rovqgGcoPqVk+AwUh3v9CuiYIw==",
"license": "MIT",
"dependencies": {
- "@babel/core": "^7.26.7",
- "@babel/plugin-transform-typescript": "^7.26.7",
- "@vue/babel-plugin-jsx": "^1.2.5"
+ "@babel/core": "^7.27.1",
+ "@babel/plugin-transform-typescript": "^7.27.1",
+ "@rolldown/pluginutils": "^1.0.0-beta.9",
+ "@vue/babel-plugin-jsx": "^1.4.0"
},
"engines": {
"node": "^18.0.0 || >=20.0.0"
@@ -8360,16 +8789,16 @@
}
},
"node_modules/@vue/compiler-core": {
- "version": "3.5.13",
- "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.5.13.tgz",
- "integrity": "sha512-oOdAkwqUfW1WqpwSYJce06wvt6HljgY3fGeM9NcVA1HaYOij3mZG9Rkysn0OHuyUAGMbEbARIpsG+LPVlBJ5/Q==",
+ "version": "3.5.17",
+ "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.5.17.tgz",
+ "integrity": "sha512-Xe+AittLbAyV0pabcN7cP7/BenRBNcteM4aSDCtRvGw0d9OL+HG1u/XHLY/kt1q4fyMeZYXyIYrsHuPSiDPosA==",
"license": "MIT",
"dependencies": {
- "@babel/parser": "^7.25.3",
- "@vue/shared": "3.5.13",
+ "@babel/parser": "^7.27.5",
+ "@vue/shared": "3.5.17",
"entities": "^4.5.0",
"estree-walker": "^2.0.2",
- "source-map-js": "^1.2.0"
+ "source-map-js": "^1.2.1"
}
},
"node_modules/@vue/compiler-core/node_modules/estree-walker": {
@@ -8379,30 +8808,30 @@
"license": "MIT"
},
"node_modules/@vue/compiler-dom": {
- "version": "3.5.13",
- "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.5.13.tgz",
- "integrity": "sha512-ZOJ46sMOKUjO3e94wPdCzQ6P1Lx/vhp2RSvfaab88Ajexs0AHeV0uasYhi99WPaogmBlRHNRuly8xV75cNTMDA==",
+ "version": "3.5.17",
+ "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.5.17.tgz",
+ "integrity": "sha512-+2UgfLKoaNLhgfhV5Ihnk6wB4ljyW1/7wUIog2puUqajiC29Lp5R/IKDdkebh9jTbTogTbsgB+OY9cEWzG95JQ==",
"license": "MIT",
"dependencies": {
- "@vue/compiler-core": "3.5.13",
- "@vue/shared": "3.5.13"
+ "@vue/compiler-core": "3.5.17",
+ "@vue/shared": "3.5.17"
}
},
"node_modules/@vue/compiler-sfc": {
- "version": "3.5.13",
- "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.5.13.tgz",
- "integrity": "sha512-6VdaljMpD82w6c2749Zhf5T9u5uLBWKnVue6XWxprDobftnletJ8+oel7sexFfM3qIxNmVE7LSFGTpv6obNyaQ==",
+ "version": "3.5.17",
+ "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.5.17.tgz",
+ "integrity": "sha512-rQQxbRJMgTqwRugtjw0cnyQv9cP4/4BxWfTdRBkqsTfLOHWykLzbOc3C4GGzAmdMDxhzU/1Ija5bTjMVrddqww==",
"license": "MIT",
"dependencies": {
- "@babel/parser": "^7.25.3",
- "@vue/compiler-core": "3.5.13",
- "@vue/compiler-dom": "3.5.13",
- "@vue/compiler-ssr": "3.5.13",
- "@vue/shared": "3.5.13",
+ "@babel/parser": "^7.27.5",
+ "@vue/compiler-core": "3.5.17",
+ "@vue/compiler-dom": "3.5.17",
+ "@vue/compiler-ssr": "3.5.17",
+ "@vue/shared": "3.5.17",
"estree-walker": "^2.0.2",
- "magic-string": "^0.30.11",
- "postcss": "^8.4.48",
- "source-map-js": "^1.2.0"
+ "magic-string": "^0.30.17",
+ "postcss": "^8.5.6",
+ "source-map-js": "^1.2.1"
}
},
"node_modules/@vue/compiler-sfc/node_modules/estree-walker": {
@@ -8412,32 +8841,29 @@
"license": "MIT"
},
"node_modules/@vue/compiler-ssr": {
- "version": "3.5.13",
- "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.5.13.tgz",
- "integrity": "sha512-wMH6vrYHxQl/IybKJagqbquvxpWCuVYpoUJfCqFZwa/JY1GdATAQ+TgVtgrwwMZ0D07QhA99rs/EAAWfvG6KpA==",
+ "version": "3.5.17",
+ "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.5.17.tgz",
+ "integrity": "sha512-hkDbA0Q20ZzGgpj5uZjb9rBzQtIHLS78mMilwrlpWk2Ep37DYntUz0PonQ6kr113vfOEdM+zTBuJDaceNIW0tQ==",
"license": "MIT",
"dependencies": {
- "@vue/compiler-dom": "3.5.13",
- "@vue/shared": "3.5.13"
+ "@vue/compiler-dom": "3.5.17",
+ "@vue/shared": "3.5.17"
}
},
"node_modules/@vue/devtools-api": {
- "version": "7.7.6",
- "resolved": "https://registry.npmjs.org/@vue/devtools-api/-/devtools-api-7.7.6.tgz",
- "integrity": "sha512-b2Xx0KvXZObePpXPYHvBRRJLDQn5nhKjXh7vUhMEtWxz1AYNFOVIsh5+HLP8xDGL7sy+Q7hXeUxPHB/KgbtsPw==",
- "license": "MIT",
- "dependencies": {
- "@vue/devtools-kit": "^7.7.6"
- }
+ "version": "6.6.4",
+ "resolved": "https://registry.npmjs.org/@vue/devtools-api/-/devtools-api-6.6.4.tgz",
+ "integrity": "sha512-sGhTPMuXqZ1rVOk32RylztWkfXTRhuS7vgAKv0zjqk8gbsHkJ7xfFf+jbySxt7tWObEJwyKaHMikV/WGDiQm8g==",
+ "license": "MIT"
},
"node_modules/@vue/devtools-core": {
- "version": "7.7.6",
- "resolved": "https://registry.npmjs.org/@vue/devtools-core/-/devtools-core-7.7.6.tgz",
- "integrity": "sha512-ghVX3zjKPtSHu94Xs03giRIeIWlb9M+gvDRVpIZ/cRIxKHdW6HE/sm1PT3rUYS3aV92CazirT93ne+7IOvGUWg==",
+ "version": "7.7.7",
+ "resolved": "https://registry.npmjs.org/@vue/devtools-core/-/devtools-core-7.7.7.tgz",
+ "integrity": "sha512-9z9TLbfC+AjAi1PQyWX+OErjIaJmdFlbDHcD+cAMYKY6Bh5VlsAtCeGyRMrXwIlMEQPukvnWt3gZBLwTAIMKzQ==",
"license": "MIT",
"dependencies": {
- "@vue/devtools-kit": "^7.7.6",
- "@vue/devtools-shared": "^7.7.6",
+ "@vue/devtools-kit": "^7.7.7",
+ "@vue/devtools-shared": "^7.7.7",
"mitt": "^3.0.1",
"nanoid": "^5.1.0",
"pathe": "^2.0.3",
@@ -8448,12 +8874,12 @@
}
},
"node_modules/@vue/devtools-kit": {
- "version": "7.7.6",
- "resolved": "https://registry.npmjs.org/@vue/devtools-kit/-/devtools-kit-7.7.6.tgz",
- "integrity": "sha512-geu7ds7tem2Y7Wz+WgbnbZ6T5eadOvozHZ23Atk/8tksHMFOFylKi1xgGlQlVn0wlkEf4hu+vd5ctj1G4kFtwA==",
+ "version": "7.7.7",
+ "resolved": "https://registry.npmjs.org/@vue/devtools-kit/-/devtools-kit-7.7.7.tgz",
+ "integrity": "sha512-wgoZtxcTta65cnZ1Q6MbAfePVFxfM+gq0saaeytoph7nEa7yMXoi6sCPy4ufO111B9msnw0VOWjPEFCXuAKRHA==",
"license": "MIT",
"dependencies": {
- "@vue/devtools-shared": "^7.7.6",
+ "@vue/devtools-shared": "^7.7.7",
"birpc": "^2.3.0",
"hookable": "^5.5.3",
"mitt": "^3.0.1",
@@ -8463,62 +8889,62 @@
}
},
"node_modules/@vue/devtools-shared": {
- "version": "7.7.6",
- "resolved": "https://registry.npmjs.org/@vue/devtools-shared/-/devtools-shared-7.7.6.tgz",
- "integrity": "sha512-yFEgJZ/WblEsojQQceuyK6FzpFDx4kqrz2ohInxNj5/DnhoX023upTv4OD6lNPLAA5LLkbwPVb10o/7b+Y4FVA==",
+ "version": "7.7.7",
+ "resolved": "https://registry.npmjs.org/@vue/devtools-shared/-/devtools-shared-7.7.7.tgz",
+ "integrity": "sha512-+udSj47aRl5aKb0memBvcUG9koarqnxNM5yjuREvqwK6T3ap4mn3Zqqc17QrBFTqSMjr3HK1cvStEZpMDpfdyw==",
"license": "MIT",
"dependencies": {
"rfdc": "^1.4.1"
}
},
"node_modules/@vue/reactivity": {
- "version": "3.5.13",
- "resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.5.13.tgz",
- "integrity": "sha512-NaCwtw8o48B9I6L1zl2p41OHo/2Z4wqYGGIK1Khu5T7yxrn+ATOixn/Udn2m+6kZKB/J7cuT9DbWWhRxqixACg==",
+ "version": "3.5.17",
+ "resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.5.17.tgz",
+ "integrity": "sha512-l/rmw2STIscWi7SNJp708FK4Kofs97zc/5aEPQh4bOsReD/8ICuBcEmS7KGwDj5ODQLYWVN2lNibKJL1z5b+Lw==",
"license": "MIT",
"dependencies": {
- "@vue/shared": "3.5.13"
+ "@vue/shared": "3.5.17"
}
},
"node_modules/@vue/runtime-core": {
- "version": "3.5.13",
- "resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.5.13.tgz",
- "integrity": "sha512-Fj4YRQ3Az0WTZw1sFe+QDb0aXCerigEpw418pw1HBUKFtnQHWzwojaukAs2X/c9DQz4MQ4bsXTGlcpGxU/RCIw==",
+ "version": "3.5.17",
+ "resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.5.17.tgz",
+ "integrity": "sha512-QQLXa20dHg1R0ri4bjKeGFKEkJA7MMBxrKo2G+gJikmumRS7PTD4BOU9FKrDQWMKowz7frJJGqBffYMgQYS96Q==",
"license": "MIT",
"dependencies": {
- "@vue/reactivity": "3.5.13",
- "@vue/shared": "3.5.13"
+ "@vue/reactivity": "3.5.17",
+ "@vue/shared": "3.5.17"
}
},
"node_modules/@vue/runtime-dom": {
- "version": "3.5.13",
- "resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.5.13.tgz",
- "integrity": "sha512-dLaj94s93NYLqjLiyFzVs9X6dWhTdAlEAciC3Moq7gzAc13VJUdCnjjRurNM6uTLFATRHexHCTu/Xp3eW6yoog==",
+ "version": "3.5.17",
+ "resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.5.17.tgz",
+ "integrity": "sha512-8El0M60TcwZ1QMz4/os2MdlQECgGoVHPuLnQBU3m9h3gdNRW9xRmI8iLS4t/22OQlOE6aJvNNlBiCzPHur4H9g==",
"license": "MIT",
"dependencies": {
- "@vue/reactivity": "3.5.13",
- "@vue/runtime-core": "3.5.13",
- "@vue/shared": "3.5.13",
+ "@vue/reactivity": "3.5.17",
+ "@vue/runtime-core": "3.5.17",
+ "@vue/shared": "3.5.17",
"csstype": "^3.1.3"
}
},
"node_modules/@vue/server-renderer": {
- "version": "3.5.13",
- "resolved": "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.5.13.tgz",
- "integrity": "sha512-wAi4IRJV/2SAW3htkTlB+dHeRmpTiVIK1OGLWV1yeStVSebSQQOwGwIq0D3ZIoBj2C2qpgz5+vX9iEBkTdk5YA==",
+ "version": "3.5.17",
+ "resolved": "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.5.17.tgz",
+ "integrity": "sha512-BOHhm8HalujY6lmC3DbqF6uXN/K00uWiEeF22LfEsm9Q93XeJ/plHTepGwf6tqFcF7GA5oGSSAAUock3VvzaCA==",
"license": "MIT",
"dependencies": {
- "@vue/compiler-ssr": "3.5.13",
- "@vue/shared": "3.5.13"
+ "@vue/compiler-ssr": "3.5.17",
+ "@vue/shared": "3.5.17"
},
"peerDependencies": {
- "vue": "3.5.13"
+ "vue": "3.5.17"
}
},
"node_modules/@vue/shared": {
- "version": "3.5.13",
- "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.5.13.tgz",
- "integrity": "sha512-/hnE/qP5ZoGpol0a5mDi45bOd7t3tjYJBjsgCsivow7D48cJeV5l05RD82lPqi7gRiphZM37rnhW1l6ZoCNNnQ==",
+ "version": "3.5.17",
+ "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.5.17.tgz",
+ "integrity": "sha512-CabR+UN630VnsJO/jHWYBC1YVXyMq94KKp6iF5MQgZJs5I8cmjw6oVMO1oDbtBkENSHSSn/UadWlW/OAgdmKrg==",
"license": "MIT"
},
"node_modules/@vueuse/components": {
@@ -8589,14 +9015,14 @@
}
},
"node_modules/@vueuse/core": {
- "version": "13.1.0",
- "resolved": "https://registry.npmjs.org/@vueuse/core/-/core-13.1.0.tgz",
- "integrity": "sha512-PAauvdRXZvTWXtGLg8cPUFjiZEddTqmogdwYpnn60t08AA5a8Q4hZokBnpTOnVNqySlFlTcRYIC8OqreV4hv3Q==",
+ "version": "13.5.0",
+ "resolved": "https://registry.npmjs.org/@vueuse/core/-/core-13.5.0.tgz",
+ "integrity": "sha512-wV7z0eUpifKmvmN78UBZX8T7lMW53Nrk6JP5+6hbzrB9+cJ3jr//hUlhl9TZO/03bUkMK6gGkQpqOPWoabr72g==",
"license": "MIT",
"dependencies": {
"@types/web-bluetooth": "^0.0.21",
- "@vueuse/metadata": "13.1.0",
- "@vueuse/shared": "13.1.0"
+ "@vueuse/metadata": "13.5.0",
+ "@vueuse/shared": "13.5.0"
},
"funding": {
"url": "https://github.com/sponsors/antfu"
@@ -8606,9 +9032,9 @@
}
},
"node_modules/@vueuse/core/node_modules/@vueuse/shared": {
- "version": "13.1.0",
- "resolved": "https://registry.npmjs.org/@vueuse/shared/-/shared-13.1.0.tgz",
- "integrity": "sha512-IVS/qRRjhPTZ6C2/AM3jieqXACGwFZwWTdw5sNTSKk2m/ZpkuuN+ri+WCVUP8TqaKwJYt/KuMwmXspMAw8E6ew==",
+ "version": "13.5.0",
+ "resolved": "https://registry.npmjs.org/@vueuse/shared/-/shared-13.5.0.tgz",
+ "integrity": "sha512-K7GrQIxJ/ANtucxIXbQlUHdB0TPA8c+q5i+zbrjxuhJCnJ9GtBg75sBSnvmLSxHKPg2Yo8w62PWksl9kwH0Q8g==",
"license": "MIT",
"funding": {
"url": "https://github.com/sponsors/antfu"
@@ -8739,37 +9165,10 @@
}
}
},
- "node_modules/@vueuse/math": {
- "version": "13.1.0",
- "resolved": "https://registry.npmjs.org/@vueuse/math/-/math-13.1.0.tgz",
- "integrity": "sha512-iTpUKYUWhZHzc6RTbkEkpA9L/CJBtIY7nwN0Lc6JkX3KOFTRU1vmN9odX9ZTNnndlE51HS5d68VvUBh1v5n84A==",
- "license": "MIT",
- "dependencies": {
- "@vueuse/shared": "13.1.0"
- },
- "funding": {
- "url": "https://github.com/sponsors/antfu"
- },
- "peerDependencies": {
- "vue": "^3.5.0"
- }
- },
- "node_modules/@vueuse/math/node_modules/@vueuse/shared": {
- "version": "13.1.0",
- "resolved": "https://registry.npmjs.org/@vueuse/shared/-/shared-13.1.0.tgz",
- "integrity": "sha512-IVS/qRRjhPTZ6C2/AM3jieqXACGwFZwWTdw5sNTSKk2m/ZpkuuN+ri+WCVUP8TqaKwJYt/KuMwmXspMAw8E6ew==",
- "license": "MIT",
- "funding": {
- "url": "https://github.com/sponsors/antfu"
- },
- "peerDependencies": {
- "vue": "^3.5.0"
- }
- },
"node_modules/@vueuse/metadata": {
- "version": "13.1.0",
- "resolved": "https://registry.npmjs.org/@vueuse/metadata/-/metadata-13.1.0.tgz",
- "integrity": "sha512-+TDd7/a78jale5YbHX9KHW3cEDav1lz1JptwDvep2zSG8XjCsVE+9mHIzjTOaPbHUAk5XiE4jXLz51/tS+aKQw==",
+ "version": "13.5.0",
+ "resolved": "https://registry.npmjs.org/@vueuse/metadata/-/metadata-13.5.0.tgz",
+ "integrity": "sha512-euhItU3b0SqXxSy8u1XHxUCdQ8M++bsRs+TYhOLDU/OykS7KvJnyIFfep0XM5WjIFry9uAPlVSjmVHiqeshmkw==",
"license": "MIT",
"funding": {
"url": "https://github.com/sponsors/antfu"
@@ -8997,6 +9396,34 @@
}
}
},
+ "node_modules/@vueuse/router": {
+ "version": "13.5.0",
+ "resolved": "https://registry.npmjs.org/@vueuse/router/-/router-13.5.0.tgz",
+ "integrity": "sha512-QI735rn3FPMnEAqiwJKdYN2byMn1orRBcBq9YuZS/QSYUNV7tR8jhU99s7Vix+BL0YEIk/nU7lUZA0IOCarGzg==",
+ "license": "MIT",
+ "dependencies": {
+ "@vueuse/shared": "13.5.0"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/antfu"
+ },
+ "peerDependencies": {
+ "vue": "^3.5.0",
+ "vue-router": "^4.0.0"
+ }
+ },
+ "node_modules/@vueuse/router/node_modules/@vueuse/shared": {
+ "version": "13.5.0",
+ "resolved": "https://registry.npmjs.org/@vueuse/shared/-/shared-13.5.0.tgz",
+ "integrity": "sha512-K7GrQIxJ/ANtucxIXbQlUHdB0TPA8c+q5i+zbrjxuhJCnJ9GtBg75sBSnvmLSxHKPg2Yo8w62PWksl9kwH0Q8g==",
+ "license": "MIT",
+ "funding": {
+ "url": "https://github.com/sponsors/antfu"
+ },
+ "peerDependencies": {
+ "vue": "^3.5.0"
+ }
+ },
"node_modules/@vueuse/shared": {
"version": "11.3.0",
"resolved": "https://registry.npmjs.org/@vueuse/shared/-/shared-11.3.0.tgz",
@@ -9049,12 +9476,12 @@
}
},
"node_modules/@whatwg-node/fetch": {
- "version": "0.10.6",
- "resolved": "https://registry.npmjs.org/@whatwg-node/fetch/-/fetch-0.10.6.tgz",
- "integrity": "sha512-6uzhO2aQ757p3bSHcemA8C4pqEXuyBqyGAM7cYpO0c6/igRMV9As9XL0W12h5EPYMclgr7FgjmbVQBoWEdJ/yA==",
+ "version": "0.10.8",
+ "resolved": "https://registry.npmjs.org/@whatwg-node/fetch/-/fetch-0.10.8.tgz",
+ "integrity": "sha512-Rw9z3ctmeEj8QIB9MavkNJqekiu9usBCSMZa+uuAvM0lF3v70oQVCXNppMIqaV6OTZbdaHF1M2HLow58DEw+wg==",
"license": "MIT",
"dependencies": {
- "@whatwg-node/node-fetch": "^0.7.18",
+ "@whatwg-node/node-fetch": "^0.7.21",
"urlpattern-polyfill": "^10.0.0"
},
"engines": {
@@ -9062,20 +9489,20 @@
}
},
"node_modules/@whatwg-node/fetch/node_modules/urlpattern-polyfill": {
- "version": "10.0.0",
- "resolved": "https://registry.npmjs.org/urlpattern-polyfill/-/urlpattern-polyfill-10.0.0.tgz",
- "integrity": "sha512-H/A06tKD7sS1O1X2SshBVeA5FLycRpjqiBeqGKmBwBDBy28EnRjORxTNe269KSSr5un5qyWi1iL61wLxpd+ZOg==",
+ "version": "10.1.0",
+ "resolved": "https://registry.npmjs.org/urlpattern-polyfill/-/urlpattern-polyfill-10.1.0.tgz",
+ "integrity": "sha512-IGjKp/o0NL3Bso1PymYURCJxMPNAf/ILOpendP9f5B6e1rTJgdgiOvgfoT8VxCAdY+Wisb9uhGaJJf3yZ2V9nw==",
"license": "MIT"
},
"node_modules/@whatwg-node/node-fetch": {
- "version": "0.7.18",
- "resolved": "https://registry.npmjs.org/@whatwg-node/node-fetch/-/node-fetch-0.7.18.tgz",
- "integrity": "sha512-IxKdVWfZYasGiyxBcsROxq6FmDQu3MNNiOYJ/yqLKhe+Qq27IIWsK7ItbjS2M9L5aM5JxjWkIS7JDh7wnsn+CQ==",
+ "version": "0.7.21",
+ "resolved": "https://registry.npmjs.org/@whatwg-node/node-fetch/-/node-fetch-0.7.21.tgz",
+ "integrity": "sha512-QC16IdsEyIW7kZd77aodrMO7zAoDyyqRCTLg+qG4wqtP4JV9AA+p7/lgqMdD29XyiYdVvIdFrfI9yh7B1QvRvw==",
"license": "MIT",
"dependencies": {
"@fastify/busboy": "^3.1.1",
"@whatwg-node/disposablestack": "^0.0.6",
- "@whatwg-node/promise-helpers": "^1.3.1",
+ "@whatwg-node/promise-helpers": "^1.3.2",
"tslib": "^2.6.3"
},
"engines": {
@@ -9083,9 +9510,9 @@
}
},
"node_modules/@whatwg-node/promise-helpers": {
- "version": "1.3.1",
- "resolved": "https://registry.npmjs.org/@whatwg-node/promise-helpers/-/promise-helpers-1.3.1.tgz",
- "integrity": "sha512-D+OwTEunoQhVHVToD80dPhfz9xgPLqJyEA3F5jCRM14A2u8tBBQVdZekqfqx6ZAfZ+POT4Hb0dn601UKMsvADw==",
+ "version": "1.3.2",
+ "resolved": "https://registry.npmjs.org/@whatwg-node/promise-helpers/-/promise-helpers-1.3.2.tgz",
+ "integrity": "sha512-Nst5JdK47VIl9UcGwtv2Rcgyn5lWtZ0/mhRQ4G8NN2isxpq2TO30iqHzmwoJycjWuyUfg3GFXqP/gFHXeV57IA==",
"license": "MIT",
"dependencies": {
"tslib": "^2.6.3"
@@ -9142,6 +9569,7 @@
"version": "0.21.3",
"resolved": "https://registry.npmjs.org/@zxing/library/-/library-0.21.3.tgz",
"integrity": "sha512-hZHqFe2JyH/ZxviJZosZjV+2s6EDSY0O24R+FQmlWZBZXP9IqMo7S3nb3+2LBWxodJQkSurdQGnqE7KXqrYgow==",
+ "license": "MIT",
"dependencies": {
"ts-custom-error": "^3.2.1"
},
@@ -9156,6 +9584,7 @@
"version": "0.9.0",
"resolved": "https://registry.npmjs.org/@zxing/text-encoding/-/text-encoding-0.9.0.tgz",
"integrity": "sha512-U/4aVJ2mxI0aDNI8Uq0wEhMgY+u4CNtEb0om3+y3+niDAsoTCOB33UF0sxpzqzdqXLqmvc+vZyAt4O8pPdfkwA==",
+ "license": "(Unlicense OR Apache-2.0)",
"optional": true
},
"node_modules/abbrev": {
@@ -9179,24 +9608,10 @@
"node": ">=6.5"
}
},
- "node_modules/accepts": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/accepts/-/accepts-2.0.0.tgz",
- "integrity": "sha512-5cvg6CtKwfgdmVqY1WIiXKc3Q1bkRqGLi+2W/6ao+6Y7gu/RCwRuAhGEzh5B4KlszSuTLgZYuqFqo5bImjNKng==",
- "devOptional": true,
- "license": "MIT",
- "dependencies": {
- "mime-types": "^3.0.0",
- "negotiator": "^1.0.0"
- },
- "engines": {
- "node": ">= 0.6"
- }
- },
"node_modules/acorn": {
- "version": "8.14.1",
- "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.1.tgz",
- "integrity": "sha512-OvQ/2pUDKmgfCg++xsTX1wGxfTaszcHVcTctW4UJB4hibJx2HXxxO5UmVgyjMa+ZDsiaf5wWLXYpRWMmBI0QHg==",
+ "version": "8.15.0",
+ "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.15.0.tgz",
+ "integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==",
"license": "MIT",
"bin": {
"acorn": "bin/acorn"
@@ -9307,20 +9722,14 @@
}
},
"node_modules/ansis": {
- "version": "3.17.0",
- "resolved": "https://registry.npmjs.org/ansis/-/ansis-3.17.0.tgz",
- "integrity": "sha512-0qWUglt9JEqLFr3w1I1pbrChn1grhaiAR2ocX1PP/flRmxgtwTzPFFFnfIlD6aMOLQZgSuCRlidD70lvx8yhzg==",
+ "version": "4.1.0",
+ "resolved": "https://registry.npmjs.org/ansis/-/ansis-4.1.0.tgz",
+ "integrity": "sha512-BGcItUBWSMRgOCe+SVZJ+S7yTRG0eGt9cXAHev72yuGcY23hnLA7Bky5L/xLyPINoSN95geovfBkqoTlNZYa7w==",
"license": "ISC",
"engines": {
"node": ">=14"
}
},
- "node_modules/any-promise": {
- "version": "1.3.0",
- "resolved": "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz",
- "integrity": "sha512-7UvmKalWRt1wgjL1RrGxoSJW/0QZFIegpeGvZG9kjp8vrRu55XTHbwnqq2GpXm9uLbcuhxm3IqX9OB4MZR1b2A==",
- "license": "MIT"
- },
"node_modules/anymatch": {
"version": "3.1.3",
"resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz",
@@ -9433,12 +9842,6 @@
"node": ">=14"
}
},
- "node_modules/arg": {
- "version": "5.0.2",
- "resolved": "https://registry.npmjs.org/arg/-/arg-5.0.2.tgz",
- "integrity": "sha512-PYjyFOLKQ9y57JvQ6QLo8dAgNqswh8M1RMJYdQduT6xbWSgK36P/Z/v+p888pM69jMMfS8Xd8F6I1kQ/I9HUGg==",
- "license": "MIT"
- },
"node_modules/argparse": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
@@ -9446,13 +9849,16 @@
"devOptional": true,
"license": "Python-2.0"
},
- "node_modules/array-union": {
- "version": "2.1.0",
- "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
- "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
+ "node_modules/aria-hidden": {
+ "version": "1.2.6",
+ "resolved": "https://registry.npmjs.org/aria-hidden/-/aria-hidden-1.2.6.tgz",
+ "integrity": "sha512-ik3ZgC9dY/lYVVM++OISsaYDeg1tb0VtP5uL3ouh1koGOaUMDPpbFIei4JkFimWUFPn90sbMNMXQAIVOlnYKJA==",
"license": "MIT",
+ "dependencies": {
+ "tslib": "^2.0.0"
+ },
"engines": {
- "node": ">=8"
+ "node": ">=10"
}
},
"node_modules/ast-kit": {
@@ -9472,12 +9878,12 @@
}
},
"node_modules/ast-module-types": {
- "version": "5.0.0",
- "resolved": "https://registry.npmjs.org/ast-module-types/-/ast-module-types-5.0.0.tgz",
- "integrity": "sha512-JvqziE0Wc0rXQfma0HZC/aY7URXHFuZV84fJRtP8u+lhp0JYCNd5wJzVXP45t0PH0Mej3ynlzvdyITYIu0G4LQ==",
+ "version": "6.0.1",
+ "resolved": "https://registry.npmjs.org/ast-module-types/-/ast-module-types-6.0.1.tgz",
+ "integrity": "sha512-WHw67kLXYbZuHTmcdbIrVArCq5wxo6NEuj3hiYAWr8mwJeC+C2mMCIBIWCiDoCye/OF/xelc+teJ1ERoWmnEIA==",
"license": "MIT",
"engines": {
- "node": ">=14"
+ "node": ">=18"
}
},
"node_modules/ast-walker-scope": {
@@ -9505,15 +9911,6 @@
"integrity": "sha512-tLRNUXati5MFePdAk8dw7Qt7DpxPB60ofAgn8WRhW6a2rcimZnYBP9oxHiv0OHy+Wz7kPMG+t4LGdt31+4EmGg==",
"license": "MIT"
},
- "node_modules/at-least-node": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/at-least-node/-/at-least-node-1.0.0.tgz",
- "integrity": "sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==",
- "license": "ISC",
- "engines": {
- "node": ">= 4.0.0"
- }
- },
"node_modules/autoprefixer": {
"version": "10.4.21",
"resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.21.tgz",
@@ -9564,9 +9961,9 @@
"license": "MIT"
},
"node_modules/bare-events": {
- "version": "2.5.4",
- "resolved": "https://registry.npmjs.org/bare-events/-/bare-events-2.5.4.tgz",
- "integrity": "sha512-+gFfDkR8pj4/TrWCGUGWmJIkBwuxPS5F+a5yWjOHQt2hHvNZd5YLzadjmDUtFmMM4y429bnKLa8bYBMHcYdnQA==",
+ "version": "2.6.0",
+ "resolved": "https://registry.npmjs.org/bare-events/-/bare-events-2.6.0.tgz",
+ "integrity": "sha512-EKZ5BTXYExaNqi3I3f9RtEsaI/xBSGjE0XZCZilPzFAV/goswFHuPd9jEZlPIZ/iNZJwDSao9qRiScySz7MbQg==",
"license": "Apache-2.0",
"optional": true
},
@@ -9612,29 +10009,18 @@
}
},
"node_modules/birpc": {
- "version": "2.3.0",
- "resolved": "https://registry.npmjs.org/birpc/-/birpc-2.3.0.tgz",
- "integrity": "sha512-ijbtkn/F3Pvzb6jHypHRyve2QApOCZDR25D/VnkY2G/lBNcXCTsnsCxgY4k4PkVB7zfwzYbY3O9Lcqe3xufS5g==",
+ "version": "2.5.0",
+ "resolved": "https://registry.npmjs.org/birpc/-/birpc-2.5.0.tgz",
+ "integrity": "sha512-VSWO/W6nNQdyP520F1mhf+Lc2f8pjGQOtoHHm7Ze8Go1kX7akpVIrtTa0fn+HB0QJEDVacl6aO08YE0PgXfdnQ==",
"license": "MIT",
"funding": {
"url": "https://github.com/sponsors/antfu"
}
},
- "node_modules/bl": {
- "version": "4.1.0",
- "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz",
- "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==",
- "license": "MIT",
- "dependencies": {
- "buffer": "^5.5.0",
- "inherits": "^2.0.4",
- "readable-stream": "^3.4.0"
- }
- },
- "node_modules/bl/node_modules/buffer": {
- "version": "5.7.1",
- "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
- "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
+ "node_modules/blob-to-buffer": {
+ "version": "1.2.9",
+ "resolved": "https://registry.npmjs.org/blob-to-buffer/-/blob-to-buffer-1.2.9.tgz",
+ "integrity": "sha512-BF033y5fN6OCofD3vgHmNtwZWRcq9NLyyxyILx9hfMy1sXYy4ojFl765hJ2lP0YaN2fuxPaLO2Vzzoxy0FLFFA==",
"funding": [
{
"type": "github",
@@ -9649,25 +10035,7 @@
"url": "https://feross.org/support"
}
],
- "license": "MIT",
- "dependencies": {
- "base64-js": "^1.3.1",
- "ieee754": "^1.1.13"
- }
- },
- "node_modules/bl/node_modules/readable-stream": {
- "version": "3.6.2",
- "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
- "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
- "license": "MIT",
- "dependencies": {
- "inherits": "^2.0.3",
- "string_decoder": "^1.1.1",
- "util-deprecate": "^1.0.1"
- },
- "engines": {
- "node": ">= 6"
- }
+ "license": "MIT"
},
"node_modules/blueimp-md5": {
"version": "2.19.0",
@@ -9675,27 +10043,6 @@
"integrity": "sha512-DRQrD6gJyy8FbiE4s+bDoXS9hiW3Vbx5uCdwvcCf3zLHL+Iv7LtGHLpr+GZV8rHG8tK766FGYBwRbu8pELTt+w==",
"license": "MIT"
},
- "node_modules/body-parser": {
- "version": "2.2.0",
- "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-2.2.0.tgz",
- "integrity": "sha512-02qvAaxv8tp7fBa/mw1ga98OGm+eCbqzJOKoRt70sLmfEEi+jyBYVTDGfCL/k06/4EMk/z01gCe7HoCH/f2LTg==",
- "devOptional": true,
- "license": "MIT",
- "dependencies": {
- "bytes": "^3.1.2",
- "content-type": "^1.0.5",
- "debug": "^4.4.0",
- "http-errors": "^2.0.0",
- "iconv-lite": "^0.6.3",
- "on-finished": "^2.4.1",
- "qs": "^6.14.0",
- "raw-body": "^3.0.0",
- "type-is": "^2.0.0"
- },
- "engines": {
- "node": ">=18"
- }
- },
"node_modules/boolbase": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz",
@@ -9703,9 +10050,9 @@
"license": "ISC"
},
"node_modules/brace-expansion": {
- "version": "2.0.1",
- "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
- "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+ "version": "2.0.2",
+ "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
+ "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
"license": "MIT",
"dependencies": {
"balanced-match": "^1.0.0"
@@ -9723,10 +10070,19 @@
"node": ">=8"
}
},
+ "node_modules/brotli": {
+ "version": "1.3.3",
+ "resolved": "https://registry.npmjs.org/brotli/-/brotli-1.3.3.tgz",
+ "integrity": "sha512-oTKjJdShmDuGW94SyyaoQvAjf30dZaHnjJ8uAF+u2/vGJkJbJPJAT1gDiOJP5v1Zb6f9KEyW/1HpuaWIXtGHPg==",
+ "license": "MIT",
+ "dependencies": {
+ "base64-js": "^1.1.2"
+ }
+ },
"node_modules/browserslist": {
- "version": "4.24.5",
- "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.24.5.tgz",
- "integrity": "sha512-FDToo4Wo82hIdgc1CQ+NQD0hEhmpPjrZ3hiUgwgOG6IuTdlpr8jdjyG24P6cNP1yJpTLzS5OcGgSw0xmDU1/Tw==",
+ "version": "4.25.1",
+ "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.25.1.tgz",
+ "integrity": "sha512-KGj0KoOMXLpSNkkEI6Z6mShmQy0bc1I+T7K9N81k4WWMrfz+6fQ6es80B/YLAeRoKvjYE1YSHHOW1qe9xIVzHw==",
"funding": [
{
"type": "opencollective",
@@ -9743,8 +10099,8 @@
],
"license": "MIT",
"dependencies": {
- "caniuse-lite": "^1.0.30001716",
- "electron-to-chromium": "^1.5.149",
+ "caniuse-lite": "^1.0.30001726",
+ "electron-to-chromium": "^1.5.173",
"node-releases": "^2.0.19",
"update-browserslist-db": "^1.1.3"
},
@@ -9822,33 +10178,23 @@
"url": "https://github.com/sponsors/sindresorhus"
}
},
- "node_modules/bytes": {
- "version": "3.1.2",
- "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
- "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==",
- "devOptional": true,
- "license": "MIT",
- "engines": {
- "node": ">= 0.8"
- }
- },
"node_modules/c12": {
- "version": "3.0.3",
- "resolved": "https://registry.npmjs.org/c12/-/c12-3.0.3.tgz",
- "integrity": "sha512-uC3MacKBb0Z15o5QWCHvHWj5Zv34pGQj9P+iXKSpTuSGFS0KKhUWf4t9AJ+gWjYOdmWCPEGpEzm8sS0iqbpo1w==",
+ "version": "3.1.0",
+ "resolved": "https://registry.npmjs.org/c12/-/c12-3.1.0.tgz",
+ "integrity": "sha512-uWoS8OU1MEIsOv8p/5a82c3H31LsWVR5qiyXVfBNOzfffjUWtPnhAb4BYI2uG2HfGmZmFjCtui5XNWaps+iFuw==",
"license": "MIT",
"dependencies": {
"chokidar": "^4.0.3",
"confbox": "^0.2.2",
"defu": "^6.1.4",
- "dotenv": "^16.4.7",
- "exsolve": "^1.0.4",
+ "dotenv": "^16.6.1",
+ "exsolve": "^1.0.7",
"giget": "^2.0.0",
"jiti": "^2.4.2",
"ohash": "^2.0.11",
"pathe": "^2.0.3",
"perfect-debounce": "^1.0.0",
- "pkg-types": "^2.1.0",
+ "pkg-types": "^2.2.0",
"rc9": "^2.1.2"
},
"peerDependencies": {
@@ -9869,40 +10215,6 @@
"node": ">=8"
}
},
- "node_modules/cache-content-type": {
- "version": "1.0.1",
- "resolved": "https://registry.npmjs.org/cache-content-type/-/cache-content-type-1.0.1.tgz",
- "integrity": "sha512-IKufZ1o4Ut42YUrZSo8+qnMTrFuKkvyoLXUywKz9GJ5BrhOFGhLdkx9sG4KAnVvbY6kEcSFjLQul+DVmBm2bgA==",
- "license": "MIT",
- "dependencies": {
- "mime-types": "^2.1.18",
- "ylru": "^1.2.0"
- },
- "engines": {
- "node": ">= 6.0.0"
- }
- },
- "node_modules/cache-content-type/node_modules/mime-db": {
- "version": "1.52.0",
- "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
- "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
- "license": "MIT",
- "engines": {
- "node": ">= 0.6"
- }
- },
- "node_modules/cache-content-type/node_modules/mime-types": {
- "version": "2.1.35",
- "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
- "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
- "license": "MIT",
- "dependencies": {
- "mime-db": "1.52.0"
- },
- "engines": {
- "node": ">= 0.6"
- }
- },
"node_modules/call-bind-apply-helpers": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz",
@@ -9959,15 +10271,6 @@
"node": ">=6"
}
},
- "node_modules/camelcase-css": {
- "version": "2.0.1",
- "resolved": "https://registry.npmjs.org/camelcase-css/-/camelcase-css-2.0.1.tgz",
- "integrity": "sha512-QOSvevhslijgYwRx6Rv7zKdMF8lbRmx+uQGx2+vDc+KI/eBnsy9kit5aj23AgGu3pa4t9AgwbnXWqS+iOY+2aA==",
- "license": "MIT",
- "engines": {
- "node": ">= 6"
- }
- },
"node_modules/caniuse-api": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/caniuse-api/-/caniuse-api-3.0.0.tgz",
@@ -9981,9 +10284,9 @@
}
},
"node_modules/caniuse-lite": {
- "version": "1.0.30001717",
- "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001717.tgz",
- "integrity": "sha512-auPpttCq6BDEG8ZAuHJIplGw6GODhjw+/11e7IjpnYCxZcW/ONgPs0KVBJ0d1bY3e2+7PRe5RCLyP+PfwVgkYw==",
+ "version": "1.0.30001727",
+ "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001727.tgz",
+ "integrity": "sha512-pB68nIHmbN6L/4C6MH1DokyR3bYqFwjaSs/sWDHGj4CTcFtQUQMuJftVwWkXq7mNWOybD3KhUv3oWHoGxgP14Q==",
"funding": [
{
"type": "opencollective",
@@ -10014,9 +10317,9 @@
}
},
"node_modules/chart.js": {
- "version": "4.4.9",
- "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-4.4.9.tgz",
- "integrity": "sha512-EyZ9wWKgpAU0fLJ43YAEIF8sr5F2W3LqbS40ZJyHIner2lY14ufqv2VMp69MAiZ2rpwxEUxEhIH/0U3xyRynxg==",
+ "version": "4.5.0",
+ "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-4.5.0.tgz",
+ "integrity": "sha512-aYeC/jDgSEx8SHWZvANYMioYMZ2KX02W6f6uVfyteuCGcadDLcYVHdfdygsTQkQ4TKn5lghoojAsPj5pu0SnvQ==",
"license": "MIT",
"dependencies": {
"@kurkle/color": "^0.3.0"
@@ -10050,9 +10353,9 @@
}
},
"node_modules/ci-info": {
- "version": "4.2.0",
- "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-4.2.0.tgz",
- "integrity": "sha512-cYY9mypksY8NRqgDB1XD1RiJL338v/551niynFTGkZOO2LHuB2OmOYxDIe/ttN9AHwrqdum1360G3ald0W9kCg==",
+ "version": "4.3.0",
+ "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-4.3.0.tgz",
+ "integrity": "sha512-l+2bNRMiQgcfILUi33labAZYIWlH1kWDp+ecNo5iisRKrbm0xcRyCww71/YU0Fkw0mAFpz9bJayXPjey6vkmaQ==",
"dev": true,
"funding": [
{
@@ -10155,6 +10458,15 @@
"node": ">=8"
}
},
+ "node_modules/clone": {
+ "version": "2.1.2",
+ "resolved": "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz",
+ "integrity": "sha512-3Pe/CF1Nn94hyhIYpjtiLhdCoEoz0DqQ+988E9gmeEdQZlojxnOb74wctFyuwWQHzqyf9X7C7MG8juUpqBJT8w==",
+ "license": "MIT",
+ "engines": {
+ "node": ">=0.8"
+ }
+ },
"node_modules/clone-deep": {
"version": "4.0.1",
"resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-4.0.1.tgz",
@@ -10178,20 +10490,10 @@
"node": ">=0.10.0"
}
},
- "node_modules/co": {
- "version": "4.6.0",
- "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
- "integrity": "sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ==",
- "license": "MIT",
- "engines": {
- "iojs": ">= 1.0.0",
- "node": ">= 0.12.0"
- }
- },
"node_modules/codemirror": {
- "version": "6.0.1",
- "resolved": "https://registry.npmjs.org/codemirror/-/codemirror-6.0.1.tgz",
- "integrity": "sha512-J8j+nZ+CdWmIeFIGXEFbFPtpiYacFMDR8GlHK3IyHQJMCaVRfGx9NT+Hxivv1ckLWPvNdZqndbr/7lVhrf/Svg==",
+ "version": "6.0.2",
+ "resolved": "https://registry.npmjs.org/codemirror/-/codemirror-6.0.2.tgz",
+ "integrity": "sha512-VhydHotNW5w1UGK0Qj96BwSk/Zqbp9WbnyK2W/eVMv4QyF41INRGpjUhFJY7/uDNuudSc33a/PKr4iDqRduvHw==",
"license": "MIT",
"dependencies": {
"@codemirror/autocomplete": "^6.0.0",
@@ -10260,6 +10562,12 @@
"text-hex": "1.0.x"
}
},
+ "node_modules/colortranslator": {
+ "version": "5.0.0",
+ "resolved": "https://registry.npmjs.org/colortranslator/-/colortranslator-5.0.0.tgz",
+ "integrity": "sha512-Z3UPUKasUVDFCDYAjP2fmlVRf1jFHJv1izAmPjiOa0OCIw1W7iC8PZ2GsoDa8uZv+mKyWopxxStT9q05+27h7w==",
+ "license": "Apache-2.0"
+ },
"node_modules/commander": {
"version": "8.3.0",
"resolved": "https://registry.npmjs.org/commander/-/commander-8.3.0.tgz",
@@ -10347,28 +10655,6 @@
"node": "^14.18.0 || >=16.10.0"
}
},
- "node_modules/content-disposition": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-1.0.0.tgz",
- "integrity": "sha512-Au9nRL8VNUut/XSzbQA38+M78dzP4D+eqg3gfJHMIHHYa3bg067xj1KxMUWj+VULbiZMowKngFFbKczUrNJ1mg==",
- "devOptional": true,
- "license": "MIT",
- "dependencies": {
- "safe-buffer": "5.2.1"
- },
- "engines": {
- "node": ">= 0.6"
- }
- },
- "node_modules/content-type": {
- "version": "1.0.5",
- "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz",
- "integrity": "sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==",
- "license": "MIT",
- "engines": {
- "node": ">= 0.6"
- }
- },
"node_modules/convert-source-map": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
@@ -10376,13 +10662,12 @@
"license": "MIT"
},
"node_modules/cookie": {
- "version": "0.7.2",
- "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.2.tgz",
- "integrity": "sha512-yki5XnKuf750l50uGTllt6kKILY4nQ1eNIQatoXEByZ5dWgnKqbnqmTrBE5B4N7lrMJKQ2ytWMiTO2o0v6Ew/w==",
- "devOptional": true,
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/cookie/-/cookie-1.0.2.tgz",
+ "integrity": "sha512-9Kr/j4O16ISv8zBBhJoi4bXOYNTkFLOqSL3UDB0njXxCXNezjeyVrJyGOWtgfs/q2km1gwBcfH8q1yEGoMYunA==",
"license": "MIT",
"engines": {
- "node": ">= 0.6"
+ "node": ">=18"
}
},
"node_modules/cookie-es": {
@@ -10391,52 +10676,45 @@
"integrity": "sha512-+W7VmiVINB+ywl1HGXJXmrqkOhpKrIiVZV6tQuV54ZyQC7MMuBt81Vc336GMLoHBq5hV/F9eXgt5Mnx0Rha5Fg==",
"license": "MIT"
},
- "node_modules/cookie-signature": {
- "version": "1.2.2",
- "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.2.2.tgz",
- "integrity": "sha512-D76uU73ulSXrD1UXF4KE2TMxVVwhsnCgfAyTg9k8P6KGZjlXKrOLe4dJQKI3Bxi5wjesZoFXJWElNWBjPZMbhg==",
- "devOptional": true,
- "license": "MIT",
- "engines": {
- "node": ">=6.6.0"
- }
- },
- "node_modules/cookies": {
- "version": "0.9.1",
- "resolved": "https://registry.npmjs.org/cookies/-/cookies-0.9.1.tgz",
- "integrity": "sha512-TG2hpqe4ELx54QER/S3HQ9SRVnQnGBtKUz5bLQWtYAQ+o6GpgMs6sYUvaiJjVxb+UXwhRhAEP3m7LbsIZ77Hmw==",
+ "node_modules/copy-anything": {
+ "version": "3.0.5",
+ "resolved": "https://registry.npmjs.org/copy-anything/-/copy-anything-3.0.5.tgz",
+ "integrity": "sha512-yCEafptTtb4bk7GLEQoM8KVJpxAfdBJYaXyzQEgQQQgYrZiDp8SJmGKlYza6CYjEDNstAdNdKA3UuoULlEbS6w==",
"license": "MIT",
"dependencies": {
- "depd": "~2.0.0",
- "keygrip": "~1.1.0"
+ "is-what": "^4.1.8"
},
"engines": {
- "node": ">= 0.8"
+ "node": ">=12.13"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/mesqueeb"
}
},
- "node_modules/copy-anything": {
- "version": "3.0.5",
- "resolved": "https://registry.npmjs.org/copy-anything/-/copy-anything-3.0.5.tgz",
- "integrity": "sha512-yCEafptTtb4bk7GLEQoM8KVJpxAfdBJYaXyzQEgQQQgYrZiDp8SJmGKlYza6CYjEDNstAdNdKA3UuoULlEbS6w==",
+ "node_modules/copy-file": {
+ "version": "11.0.0",
+ "resolved": "https://registry.npmjs.org/copy-file/-/copy-file-11.0.0.tgz",
+ "integrity": "sha512-mFsNh/DIANLqFt5VHZoGirdg7bK5+oTWlhnGu6tgRhzBlnEKWaPX2xrFaLltii/6rmhqFMJqffUgknuRdpYlHw==",
"license": "MIT",
"dependencies": {
- "is-what": "^4.1.8"
+ "graceful-fs": "^4.2.11",
+ "p-event": "^6.0.0"
},
"engines": {
- "node": ">=12.13"
+ "node": ">=18"
},
"funding": {
- "url": "https://github.com/sponsors/mesqueeb"
+ "url": "https://github.com/sponsors/sindresorhus"
}
},
"node_modules/core-js-compat": {
- "version": "3.42.0",
- "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.42.0.tgz",
- "integrity": "sha512-bQasjMfyDGyaeWKBIu33lHh9qlSR0MFE/Nmc6nMjf/iU9b3rSMdAYz1Baxrv4lPdGUsTqZudHA4jIGSJy0SWZQ==",
+ "version": "3.44.0",
+ "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.44.0.tgz",
+ "integrity": "sha512-JepmAj2zfl6ogy34qfWtcE7nHKAJnKsQFRn++scjVS2bZFllwptzw61BZcZFYBPpUznLfAvh0LGhxKppk04ClA==",
"dev": true,
"license": "MIT",
"dependencies": {
- "browserslist": "^4.24.4"
+ "browserslist": "^4.25.1"
},
"funding": {
"type": "opencollective",
@@ -10444,42 +10722,11 @@
}
},
"node_modules/core-util-is": {
- "version": "1.0.2",
- "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
- "integrity": "sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ==",
+ "version": "1.0.3",
+ "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz",
+ "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==",
"license": "MIT"
},
- "node_modules/cors": {
- "version": "2.8.5",
- "resolved": "https://registry.npmjs.org/cors/-/cors-2.8.5.tgz",
- "integrity": "sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==",
- "devOptional": true,
- "license": "MIT",
- "dependencies": {
- "object-assign": "^4",
- "vary": "^1"
- },
- "engines": {
- "node": ">= 0.10"
- }
- },
- "node_modules/cp-file": {
- "version": "10.0.0",
- "resolved": "https://registry.npmjs.org/cp-file/-/cp-file-10.0.0.tgz",
- "integrity": "sha512-vy2Vi1r2epK5WqxOLnskeKeZkdZvTKfFZQCplE3XWsP+SUJyd5XAUFC9lFgTjjXJF2GMne/UML14iEmkAaDfFg==",
- "license": "MIT",
- "dependencies": {
- "graceful-fs": "^4.2.10",
- "nested-error-stacks": "^2.1.1",
- "p-event": "^5.0.1"
- },
- "engines": {
- "node": ">=14.16"
- },
- "funding": {
- "url": "https://github.com/sponsors/sindresorhus"
- }
- },
"node_modules/crc-32": {
"version": "1.2.2",
"resolved": "https://registry.npmjs.org/crc-32/-/crc-32-1.2.2.tgz",
@@ -10530,14 +10777,23 @@
}
},
"node_modules/croner": {
- "version": "9.0.0",
- "resolved": "https://registry.npmjs.org/croner/-/croner-9.0.0.tgz",
- "integrity": "sha512-onMB0OkDjkXunhdW9htFjEhqrD54+M94i6ackoUkjHKbRnXdyEyKRelp4nJ1kAz32+s27jP1FsebpJCVl0BsvA==",
+ "version": "9.1.0",
+ "resolved": "https://registry.npmjs.org/croner/-/croner-9.1.0.tgz",
+ "integrity": "sha512-p9nwwR4qyT5W996vBZhdvBCnMhicY5ytZkR4D1Xj0wuTDEiMnjwR57Q3RXYY/s0EpX6Ay3vgIcfaR+ewGHsi+g==",
"license": "MIT",
"engines": {
"node": ">=18.0"
}
},
+ "node_modules/cross-fetch": {
+ "version": "3.2.0",
+ "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.2.0.tgz",
+ "integrity": "sha512-Q+xVJLoGOeIMXZmbUK4HYk+69cQH6LudR0Vu/pRm2YlU/hDV9CiS0gKUMaWY5f2NeUH9C1nV3bsTlCo0FsTV1Q==",
+ "license": "MIT",
+ "dependencies": {
+ "node-fetch": "^2.7.0"
+ }
+ },
"node_modules/cross-spawn": {
"version": "7.0.6",
"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
@@ -10553,9 +10809,9 @@
}
},
"node_modules/crossws": {
- "version": "0.3.4",
- "resolved": "https://registry.npmjs.org/crossws/-/crossws-0.3.4.tgz",
- "integrity": "sha512-uj0O1ETYX1Bh6uSgktfPvwDiPYGQ3aI4qVsaC/LWpkIzGj1nUYm5FK3K+t11oOlpN01lGbprFCH4wBlKdJjVgw==",
+ "version": "0.3.5",
+ "resolved": "https://registry.npmjs.org/crossws/-/crossws-0.3.5.tgz",
+ "integrity": "sha512-ojKiDvcmByhwa8YYqbQI/hg7MEU0NC03+pSdEq4ZUnZR9xXpwk7E43SMNGkn+JxJGPFtNvQ48+vV2p+P1ml5PA==",
"license": "MIT",
"dependencies": {
"uncrypto": "^0.1.3"
@@ -10574,9 +10830,9 @@
}
},
"node_modules/css-select": {
- "version": "5.1.0",
- "resolved": "https://registry.npmjs.org/css-select/-/css-select-5.1.0.tgz",
- "integrity": "sha512-nwoRF1rvRRnnCqqY7updORDsuqKzqYJ28+oSMaJMMgOauh3fvwHqMS7EZpIPqK8GL+g9mKxF1vP/ZjSeNjEVHg==",
+ "version": "5.2.2",
+ "resolved": "https://registry.npmjs.org/css-select/-/css-select-5.2.2.tgz",
+ "integrity": "sha512-TizTzUddG/xYLA3NXodFM0fSbNizXjOKhqiQQwvhlspadZokn1KDy0NZFS0wuEubIYAV5/c1/lAr0TaaFXEXzw==",
"license": "BSD-2-Clause",
"dependencies": {
"boolbase": "^1.0.0",
@@ -10590,12 +10846,12 @@
}
},
"node_modules/css-tree": {
- "version": "2.3.1",
- "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-2.3.1.tgz",
- "integrity": "sha512-6Fv1DV/TYw//QF5IzQdqsNDjx/wc8TrMBZsqjL9eW01tWb7R7k/mq+/VXfJCl7SoD5emsJop9cOByJZfs8hYIw==",
+ "version": "3.1.0",
+ "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-3.1.0.tgz",
+ "integrity": "sha512-0eW44TGN5SQXU1mWSkKwFstI/22X2bG1nYzZTYMAWjylYURhse752YgbE4Cx46AC+bAvI+/dYTPRk1LqSUnu6w==",
"license": "MIT",
"dependencies": {
- "mdn-data": "2.0.30",
+ "mdn-data": "2.12.2",
"source-map-js": "^1.0.1"
},
"engines": {
@@ -10603,9 +10859,9 @@
}
},
"node_modules/css-what": {
- "version": "6.1.0",
- "resolved": "https://registry.npmjs.org/css-what/-/css-what-6.1.0.tgz",
- "integrity": "sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw==",
+ "version": "6.2.2",
+ "resolved": "https://registry.npmjs.org/css-what/-/css-what-6.2.2.tgz",
+ "integrity": "sha512-u/O3vwbptzhMs3L1fQE82ZSLHQQfto5gyZzwteVIEyeaY5Fc7R4dapF/BvRoSYFeqfBk4m0V1Vafq5Pjv25wvA==",
"license": "BSD-2-Clause",
"engines": {
"node": ">= 6"
@@ -10627,12 +10883,12 @@
}
},
"node_modules/cssnano": {
- "version": "7.0.7",
- "resolved": "https://registry.npmjs.org/cssnano/-/cssnano-7.0.7.tgz",
- "integrity": "sha512-evKu7yiDIF7oS+EIpwFlMF730ijRyLFaM2o5cTxRGJR9OKHKkc+qP443ZEVR9kZG0syaAJJCPJyfv5pbrxlSng==",
+ "version": "7.1.0",
+ "resolved": "https://registry.npmjs.org/cssnano/-/cssnano-7.1.0.tgz",
+ "integrity": "sha512-Pu3rlKkd0ZtlCUzBrKL1Z4YmhKppjC1H9jo7u1o4qaKqyhvixFgu5qLyNIAOjSTg9DjVPtUqdROq2EfpVMEe+w==",
"license": "MIT",
"dependencies": {
- "cssnano-preset-default": "^7.0.7",
+ "cssnano-preset-default": "^7.0.8",
"lilconfig": "^3.1.3"
},
"engines": {
@@ -10647,26 +10903,26 @@
}
},
"node_modules/cssnano-preset-default": {
- "version": "7.0.7",
- "resolved": "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-7.0.7.tgz",
- "integrity": "sha512-jW6CG/7PNB6MufOrlovs1TvBTEVmhY45yz+bd0h6nw3h6d+1e+/TX+0fflZ+LzvZombbT5f+KC063w9VoHeHow==",
+ "version": "7.0.8",
+ "resolved": "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-7.0.8.tgz",
+ "integrity": "sha512-d+3R2qwrUV3g4LEMOjnndognKirBZISylDZAF/TPeCWVjEwlXS2e4eN4ICkoobRe7pD3H6lltinKVyS1AJhdjQ==",
"license": "MIT",
"dependencies": {
- "browserslist": "^4.24.5",
+ "browserslist": "^4.25.1",
"css-declaration-sorter": "^7.2.0",
"cssnano-utils": "^5.0.1",
"postcss-calc": "^10.1.1",
- "postcss-colormin": "^7.0.3",
- "postcss-convert-values": "^7.0.5",
+ "postcss-colormin": "^7.0.4",
+ "postcss-convert-values": "^7.0.6",
"postcss-discard-comments": "^7.0.4",
"postcss-discard-duplicates": "^7.0.2",
"postcss-discard-empty": "^7.0.1",
"postcss-discard-overridden": "^7.0.1",
"postcss-merge-longhand": "^7.0.5",
- "postcss-merge-rules": "^7.0.5",
+ "postcss-merge-rules": "^7.0.6",
"postcss-minify-font-values": "^7.0.1",
"postcss-minify-gradients": "^7.0.1",
- "postcss-minify-params": "^7.0.3",
+ "postcss-minify-params": "^7.0.4",
"postcss-minify-selectors": "^7.0.5",
"postcss-normalize-charset": "^7.0.1",
"postcss-normalize-display-values": "^7.0.1",
@@ -10674,13 +10930,13 @@
"postcss-normalize-repeat-style": "^7.0.1",
"postcss-normalize-string": "^7.0.1",
"postcss-normalize-timing-functions": "^7.0.1",
- "postcss-normalize-unicode": "^7.0.3",
+ "postcss-normalize-unicode": "^7.0.4",
"postcss-normalize-url": "^7.0.1",
"postcss-normalize-whitespace": "^7.0.1",
"postcss-ordered-values": "^7.0.2",
- "postcss-reduce-initial": "^7.0.3",
+ "postcss-reduce-initial": "^7.0.4",
"postcss-reduce-transforms": "^7.0.1",
- "postcss-svgo": "^7.0.2",
+ "postcss-svgo": "^7.1.0",
"postcss-unique-selectors": "^7.0.4"
},
"engines": {
@@ -10741,6 +10997,15 @@
"integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==",
"license": "MIT"
},
+ "node_modules/data-uri-to-buffer": {
+ "version": "4.0.1",
+ "resolved": "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-4.0.1.tgz",
+ "integrity": "sha512-0R9ikRb668HB7QDxT1vkpuUBtqc53YyAwMwGeUFKRojY/NWKvdZ+9UYtRfGmhqNbRkTSVpMbmyhXipFFv2cb/A==",
+ "license": "MIT",
+ "engines": {
+ "node": ">= 12"
+ }
+ },
"node_modules/date-fns": {
"version": "2.30.0",
"resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.30.0.tgz",
@@ -10807,9 +11072,9 @@
"license": "MIT"
},
"node_modules/debug": {
- "version": "4.4.0",
- "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.0.tgz",
- "integrity": "sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==",
+ "version": "4.4.1",
+ "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.1.tgz",
+ "integrity": "sha512-KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ==",
"license": "MIT",
"dependencies": {
"ms": "^2.1.3"
@@ -10850,12 +11115,6 @@
"node": ">=14.16"
}
},
- "node_modules/deep-equal": {
- "version": "1.0.1",
- "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.0.1.tgz",
- "integrity": "sha512-bHtC0iYvWhyaTzvV3CZgPeZQqCOBGyGsVV7v4eevpdkLHfiSrXUdBG+qAuSz4RI70sszvjQ1QSZ98An1yNwpSw==",
- "license": "MIT"
- },
"node_modules/deep-is": {
"version": "0.1.4",
"resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
@@ -10915,12 +11174,6 @@
"integrity": "sha512-mEQCMmwJu317oSz8CwdIOdwf3xMif1ttiM8LTufzc3g6kR+9Pe236twL8j3IYT1F7GfRgGcW6MWxzZjLIkuHIg==",
"license": "MIT"
},
- "node_modules/delegates": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
- "integrity": "sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ==",
- "license": "MIT"
- },
"node_modules/denque": {
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/denque/-/denque-2.1.0.tgz",
@@ -10945,228 +11198,145 @@
"integrity": "sha512-ugFTXCtDZunbzasqBxrK93Ik/DRYsO6S/fedkWEMKqt04xZ4csmnmwGDBAb07QWNaGMAmnTIemsYZCksjATwsA==",
"license": "MIT"
},
- "node_modules/destroy": {
- "version": "1.2.0",
- "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz",
- "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==",
- "license": "MIT",
- "engines": {
- "node": ">= 0.8",
- "npm": "1.2.8000 || >= 1.4.16"
- }
- },
"node_modules/detect-libc": {
- "version": "1.0.3",
- "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz",
- "integrity": "sha512-pGjwhsmsp4kL2RTz08wcOlGN83otlqHeD/Z5T8GXZB+/YcpQ/dgo+lbU8ZsGxV0HIvqqxo9l7mqYwyYMD9bKDg==",
+ "version": "2.0.4",
+ "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.4.tgz",
+ "integrity": "sha512-3UDv+G9CsCKO1WKMGw9fwq/SWJYbI0c5Y7LU1AXYoDdbhE2AHQ6N6Nb34sG8Fj7T5APy8qXDCKuuIHd1BR0tVA==",
"license": "Apache-2.0",
- "bin": {
- "detect-libc": "bin/detect-libc.js"
- },
"engines": {
- "node": ">=0.10"
+ "node": ">=8"
}
},
"node_modules/detective-amd": {
- "version": "5.0.2",
- "resolved": "https://registry.npmjs.org/detective-amd/-/detective-amd-5.0.2.tgz",
- "integrity": "sha512-XFd/VEQ76HSpym80zxM68ieB77unNuoMwopU2TFT/ErUk5n4KvUTwW4beafAVUugrjV48l4BmmR0rh2MglBaiA==",
+ "version": "6.0.1",
+ "resolved": "https://registry.npmjs.org/detective-amd/-/detective-amd-6.0.1.tgz",
+ "integrity": "sha512-TtyZ3OhwUoEEIhTFoc1C9IyJIud3y+xYkSRjmvCt65+ycQuc3VcBrPRTMWoO/AnuCyOB8T5gky+xf7Igxtjd3g==",
"license": "MIT",
"dependencies": {
- "ast-module-types": "^5.0.0",
- "escodegen": "^2.0.0",
- "get-amd-module-type": "^5.0.1",
- "node-source-walk": "^6.0.1"
+ "ast-module-types": "^6.0.1",
+ "escodegen": "^2.1.0",
+ "get-amd-module-type": "^6.0.1",
+ "node-source-walk": "^7.0.1"
},
"bin": {
"detective-amd": "bin/cli.js"
},
"engines": {
- "node": ">=14"
+ "node": ">=18"
}
},
"node_modules/detective-cjs": {
- "version": "5.0.1",
- "resolved": "https://registry.npmjs.org/detective-cjs/-/detective-cjs-5.0.1.tgz",
- "integrity": "sha512-6nTvAZtpomyz/2pmEmGX1sXNjaqgMplhQkskq2MLrar0ZAIkHMrDhLXkRiK2mvbu9wSWr0V5/IfiTrZqAQMrmQ==",
+ "version": "6.0.1",
+ "resolved": "https://registry.npmjs.org/detective-cjs/-/detective-cjs-6.0.1.tgz",
+ "integrity": "sha512-tLTQsWvd2WMcmn/60T2inEJNhJoi7a//PQ7DwRKEj1yEeiQs4mrONgsUtEJKnZmrGWBBmE0kJ1vqOG/NAxwaJw==",
"license": "MIT",
"dependencies": {
- "ast-module-types": "^5.0.0",
- "node-source-walk": "^6.0.0"
+ "ast-module-types": "^6.0.1",
+ "node-source-walk": "^7.0.1"
},
"engines": {
- "node": ">=14"
+ "node": ">=18"
}
},
"node_modules/detective-es6": {
- "version": "4.0.1",
- "resolved": "https://registry.npmjs.org/detective-es6/-/detective-es6-4.0.1.tgz",
- "integrity": "sha512-k3Z5tB4LQ8UVHkuMrFOlvb3GgFWdJ9NqAa2YLUU/jTaWJIm+JJnEh4PsMc+6dfT223Y8ACKOaC0qcj7diIhBKw==",
+ "version": "5.0.1",
+ "resolved": "https://registry.npmjs.org/detective-es6/-/detective-es6-5.0.1.tgz",
+ "integrity": "sha512-XusTPuewnSUdoxRSx8OOI6xIA/uld/wMQwYsouvFN2LAg7HgP06NF1lHRV3x6BZxyL2Kkoih4ewcq8hcbGtwew==",
"license": "MIT",
"dependencies": {
- "node-source-walk": "^6.0.1"
+ "node-source-walk": "^7.0.1"
},
"engines": {
- "node": ">=14"
+ "node": ">=18"
}
},
"node_modules/detective-postcss": {
- "version": "6.1.3",
- "resolved": "https://registry.npmjs.org/detective-postcss/-/detective-postcss-6.1.3.tgz",
- "integrity": "sha512-7BRVvE5pPEvk2ukUWNQ+H2XOq43xENWbH0LcdCE14mwgTBEAMoAx+Fc1rdp76SmyZ4Sp48HlV7VedUnP6GA1Tw==",
+ "version": "7.0.1",
+ "resolved": "https://registry.npmjs.org/detective-postcss/-/detective-postcss-7.0.1.tgz",
+ "integrity": "sha512-bEOVpHU9picRZux5XnwGsmCN4+8oZo7vSW0O0/Enq/TO5R2pIAP2279NsszpJR7ocnQt4WXU0+nnh/0JuK4KHQ==",
"license": "MIT",
"dependencies": {
"is-url": "^1.2.4",
- "postcss": "^8.4.23",
"postcss-values-parser": "^6.0.2"
},
"engines": {
- "node": "^12.0.0 || ^14.0.0 || >=16.0.0"
+ "node": "^14.0.0 || >=16.0.0"
+ },
+ "peerDependencies": {
+ "postcss": "^8.4.47"
}
},
"node_modules/detective-sass": {
- "version": "5.0.3",
- "resolved": "https://registry.npmjs.org/detective-sass/-/detective-sass-5.0.3.tgz",
- "integrity": "sha512-YsYT2WuA8YIafp2RVF5CEfGhhyIVdPzlwQgxSjK+TUm3JoHP+Tcorbk3SfG0cNZ7D7+cYWa0ZBcvOaR0O8+LlA==",
+ "version": "6.0.1",
+ "resolved": "https://registry.npmjs.org/detective-sass/-/detective-sass-6.0.1.tgz",
+ "integrity": "sha512-jSGPO8QDy7K7pztUmGC6aiHkexBQT4GIH+mBAL9ZyBmnUIOFbkfZnO8wPRRJFP/QP83irObgsZHCoDHZ173tRw==",
"license": "MIT",
"dependencies": {
"gonzales-pe": "^4.3.0",
- "node-source-walk": "^6.0.1"
+ "node-source-walk": "^7.0.1"
},
"engines": {
- "node": ">=14"
+ "node": ">=18"
}
},
"node_modules/detective-scss": {
- "version": "4.0.3",
- "resolved": "https://registry.npmjs.org/detective-scss/-/detective-scss-4.0.3.tgz",
- "integrity": "sha512-VYI6cHcD0fLokwqqPFFtDQhhSnlFWvU614J42eY6G0s8c+MBhi9QAWycLwIOGxlmD8I/XvGSOUV1kIDhJ70ZPg==",
+ "version": "5.0.1",
+ "resolved": "https://registry.npmjs.org/detective-scss/-/detective-scss-5.0.1.tgz",
+ "integrity": "sha512-MAyPYRgS6DCiS6n6AoSBJXLGVOydsr9huwXORUlJ37K3YLyiN0vYHpzs3AdJOgHobBfispokoqrEon9rbmKacg==",
"license": "MIT",
"dependencies": {
"gonzales-pe": "^4.3.0",
- "node-source-walk": "^6.0.1"
+ "node-source-walk": "^7.0.1"
},
"engines": {
- "node": ">=14"
+ "node": ">=18"
}
},
"node_modules/detective-stylus": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/detective-stylus/-/detective-stylus-4.0.0.tgz",
- "integrity": "sha512-TfPotjhszKLgFBzBhTOxNHDsutIxx9GTWjrL5Wh7Qx/ydxKhwUrlSFeLIn+ZaHPF+h0siVBkAQSuy6CADyTxgQ==",
+ "version": "5.0.1",
+ "resolved": "https://registry.npmjs.org/detective-stylus/-/detective-stylus-5.0.1.tgz",
+ "integrity": "sha512-Dgn0bUqdGbE3oZJ+WCKf8Dmu7VWLcmRJGc6RCzBgG31DLIyai9WAoEhYRgIHpt/BCRMrnXLbGWGPQuBUrnF0TA==",
"license": "MIT",
"engines": {
- "node": ">=14"
+ "node": ">=18"
}
},
"node_modules/detective-typescript": {
- "version": "11.2.0",
- "resolved": "https://registry.npmjs.org/detective-typescript/-/detective-typescript-11.2.0.tgz",
- "integrity": "sha512-ARFxjzizOhPqs1fYC/2NMC3N4jrQ6HvVflnXBTRqNEqJuXwyKLRr9CrJwkRcV/SnZt1sNXgsF6FPm0x57Tq0rw==",
- "license": "MIT",
- "dependencies": {
- "@typescript-eslint/typescript-estree": "^5.62.0",
- "ast-module-types": "^5.0.0",
- "node-source-walk": "^6.0.2",
- "typescript": "^5.4.4"
- },
- "engines": {
- "node": "^14.14.0 || >=16.0.0"
- }
- },
- "node_modules/detective-typescript/node_modules/@typescript-eslint/types": {
- "version": "5.62.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.62.0.tgz",
- "integrity": "sha512-87NVngcbVXUahrRTqIK27gD2t5Cu1yuCXxbLcFtCzZGlfyVWWh8mLHkoxzjsB6DDNnvdL+fW8MiwPEJyGJQDgQ==",
- "license": "MIT",
- "engines": {
- "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
- },
- "funding": {
- "type": "opencollective",
- "url": "https://opencollective.com/typescript-eslint"
- }
- },
- "node_modules/detective-typescript/node_modules/@typescript-eslint/typescript-estree": {
- "version": "5.62.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.62.0.tgz",
- "integrity": "sha512-CmcQ6uY7b9y694lKdRB8FEel7JbU/40iSAPomu++SjLMntB+2Leay2LO6i8VnJk58MtE9/nQSFIH6jpyRWyYzA==",
- "license": "BSD-2-Clause",
- "dependencies": {
- "@typescript-eslint/types": "5.62.0",
- "@typescript-eslint/visitor-keys": "5.62.0",
- "debug": "^4.3.4",
- "globby": "^11.1.0",
- "is-glob": "^4.0.3",
- "semver": "^7.3.7",
- "tsutils": "^3.21.0"
- },
- "engines": {
- "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
- },
- "funding": {
- "type": "opencollective",
- "url": "https://opencollective.com/typescript-eslint"
- },
- "peerDependenciesMeta": {
- "typescript": {
- "optional": true
- }
- }
- },
- "node_modules/detective-typescript/node_modules/@typescript-eslint/visitor-keys": {
- "version": "5.62.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.62.0.tgz",
- "integrity": "sha512-07ny+LHRzQXepkGg6w0mFY41fVUNBrL2Roj/++7V1txKugfjm/Ci/qSND03r2RhlJhJYMcTn9AhhSSqQp0Ysyw==",
+ "version": "14.0.0",
+ "resolved": "https://registry.npmjs.org/detective-typescript/-/detective-typescript-14.0.0.tgz",
+ "integrity": "sha512-pgN43/80MmWVSEi5LUuiVvO/0a9ss5V7fwVfrJ4QzAQRd3cwqU1SfWGXJFcNKUqoD5cS+uIovhw5t/0rSeC5Mw==",
"license": "MIT",
"dependencies": {
- "@typescript-eslint/types": "5.62.0",
- "eslint-visitor-keys": "^3.3.0"
+ "@typescript-eslint/typescript-estree": "^8.23.0",
+ "ast-module-types": "^6.0.1",
+ "node-source-walk": "^7.0.1"
},
"engines": {
- "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+ "node": ">=18"
},
- "funding": {
- "type": "opencollective",
- "url": "https://opencollective.com/typescript-eslint"
+ "peerDependencies": {
+ "typescript": "^5.4.4"
}
},
- "node_modules/detective-typescript/node_modules/globby": {
- "version": "11.1.0",
- "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz",
- "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==",
+ "node_modules/detective-vue2": {
+ "version": "2.2.0",
+ "resolved": "https://registry.npmjs.org/detective-vue2/-/detective-vue2-2.2.0.tgz",
+ "integrity": "sha512-sVg/t6O2z1zna8a/UIV6xL5KUa2cMTQbdTIIvqNM0NIPswp52fe43Nwmbahzj3ww4D844u/vC2PYfiGLvD3zFA==",
"license": "MIT",
"dependencies": {
- "array-union": "^2.1.0",
- "dir-glob": "^3.0.1",
- "fast-glob": "^3.2.9",
- "ignore": "^5.2.0",
- "merge2": "^1.4.1",
- "slash": "^3.0.0"
+ "@dependents/detective-less": "^5.0.1",
+ "@vue/compiler-sfc": "^3.5.13",
+ "detective-es6": "^5.0.1",
+ "detective-sass": "^6.0.1",
+ "detective-scss": "^5.0.1",
+ "detective-stylus": "^5.0.1",
+ "detective-typescript": "^14.0.0"
},
"engines": {
- "node": ">=10"
+ "node": ">=18"
},
- "funding": {
- "url": "https://github.com/sponsors/sindresorhus"
- }
- },
- "node_modules/detective-typescript/node_modules/ignore": {
- "version": "5.3.2",
- "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz",
- "integrity": "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==",
- "license": "MIT",
- "engines": {
- "node": ">= 4"
- }
- },
- "node_modules/detective-typescript/node_modules/slash": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
- "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
- "license": "MIT",
- "engines": {
- "node": ">=8"
+ "peerDependencies": {
+ "typescript": "^5.4.4"
}
},
"node_modules/devalue": {
@@ -11175,16 +11345,16 @@
"integrity": "sha512-maua5KUiapvEwiEAe+XnlZ3Rh0GD+qI1J/nb9vrJc3muPXvcF/8gXYTWF76+5DAqHyDUtOIImEuo0YKE9mshVw==",
"license": "MIT"
},
- "node_modules/didyoumean": {
- "version": "1.2.2",
- "resolved": "https://registry.npmjs.org/didyoumean/-/didyoumean-1.2.2.tgz",
- "integrity": "sha512-gxtyfqMg7GKyhQmb056K7M3xszy/myH8w+B4RT+QXBQsvAOdc3XymqDDPHx1BgPgsdAA5SIifona89YtRATDzw==",
- "license": "Apache-2.0"
+ "node_modules/dfa": {
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/dfa/-/dfa-1.2.0.tgz",
+ "integrity": "sha512-ED3jP8saaweFTjeGX8HQPjeC1YYyZs98jGNZx6IiBvxW7JG5v492kamAQB3m2wop07CvU/RQmzcKr6bgcC5D/Q==",
+ "license": "MIT"
},
"node_modules/diff": {
- "version": "7.0.0",
- "resolved": "https://registry.npmjs.org/diff/-/diff-7.0.0.tgz",
- "integrity": "sha512-PJWHUb1RFevKCwaFA9RlG5tCd+FO5iRh9A8HEtkmBH2Li03iJriB6m6JIN4rGz3K3JLawI7/veA1xzRKP6ISBw==",
+ "version": "8.0.2",
+ "resolved": "https://registry.npmjs.org/diff/-/diff-8.0.2.tgz",
+ "integrity": "sha512-sSuxWU5j5SR9QQji/o2qMvqRNYRDOcBTgsJ/DeCf4iSN4gW+gNMXM7wFIP+fdXZxoNiAnHUTGjCr+TSWXdRDKg==",
"license": "BSD-3-Clause",
"engines": {
"node": ">=0.3.1"
@@ -11196,33 +11366,6 @@
"integrity": "sha512-qiSlmBq9+BCdCA/L46dw8Uy93mloxsPSbwnm5yrKn2vMPiy8KyAskTF6zuV/j5BMsmOGZDPs7KjU+mjb670kfA==",
"license": "MIT"
},
- "node_modules/dir-glob": {
- "version": "3.0.1",
- "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
- "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
- "license": "MIT",
- "dependencies": {
- "path-type": "^4.0.0"
- },
- "engines": {
- "node": ">=8"
- }
- },
- "node_modules/dir-glob/node_modules/path-type": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
- "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
- "license": "MIT",
- "engines": {
- "node": ">=8"
- }
- },
- "node_modules/dlv": {
- "version": "1.1.3",
- "resolved": "https://registry.npmjs.org/dlv/-/dlv-1.1.3.tgz",
- "integrity": "sha512-+HlytyjlPKnIG8XuRG8WvmBP8xs8P71y+SKKS6ZXWoEgLuePxtDoUEiH7WkdePWrQ5JBpE6aoVqfZfJUQkjXwA==",
- "license": "MIT"
- },
"node_modules/dom-serializer": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-2.0.0.tgz",
@@ -11294,9 +11437,9 @@
}
},
"node_modules/dotenv": {
- "version": "16.5.0",
- "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.5.0.tgz",
- "integrity": "sha512-m/C+AwOAr9/W1UOIZUo232ejMNnJAJtYQjUbHoNTBNTJSvqzzDh7vnrei3o3r3m9blf6ZoDkvcw0VmozNRFJxg==",
+ "version": "16.6.1",
+ "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.6.1.tgz",
+ "integrity": "sha512-uBq4egWHTcTt33a72vpSG0z3HnPuIl6NqYcTrKEg2azoEyl2hpW0zqlxysq2pK9HlDIHyHyakeYaYnSAwd8bow==",
"license": "BSD-2-Clause",
"engines": {
"node": ">=12"
@@ -11338,11 +11481,99 @@
"license": "MIT"
},
"node_modules/electron-to-chromium": {
- "version": "1.5.150",
- "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.150.tgz",
- "integrity": "sha512-rOOkP2ZUMx1yL4fCxXQKDHQ8ZXwisb2OycOQVKHgvB3ZI4CvehOd4y2tfnnLDieJ3Zs1RL1Dlp3cMkyIn7nnXA==",
+ "version": "1.5.184",
+ "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.184.tgz",
+ "integrity": "sha512-zlaUk/wwnR/27FHNarzOtMgfxD1Q0/2Aby7PnURumQTal7yauqQ3c2HHcG/pjLFTvF3AWv44kMWyArVlfHeDlw==",
"license": "ISC"
},
+ "node_modules/embla-carousel": {
+ "version": "8.6.0",
+ "resolved": "https://registry.npmjs.org/embla-carousel/-/embla-carousel-8.6.0.tgz",
+ "integrity": "sha512-SjWyZBHJPbqxHOzckOfo8lHisEaJWmwd23XppYFYVh10bU66/Pn5tkVkbkCMZVdbUE5eTCI2nD8OyIP4Z+uwkA==",
+ "license": "MIT"
+ },
+ "node_modules/embla-carousel-auto-height": {
+ "version": "8.6.0",
+ "resolved": "https://registry.npmjs.org/embla-carousel-auto-height/-/embla-carousel-auto-height-8.6.0.tgz",
+ "integrity": "sha512-/HrJQOEM6aol/oF33gd2QlINcXy3e19fJWvHDuHWp2bpyTa+2dm9tVVJak30m2Qy6QyQ6Fc8DkImtv7pxWOJUQ==",
+ "license": "MIT",
+ "peerDependencies": {
+ "embla-carousel": "8.6.0"
+ }
+ },
+ "node_modules/embla-carousel-auto-scroll": {
+ "version": "8.6.0",
+ "resolved": "https://registry.npmjs.org/embla-carousel-auto-scroll/-/embla-carousel-auto-scroll-8.6.0.tgz",
+ "integrity": "sha512-WT9fWhNXFpbQ6kP+aS07oF5IHYLZ1Dx4DkwgCY8Hv2ZyYd2KMCPfMV1q/cA3wFGuLO7GMgKiySLX90/pQkcOdQ==",
+ "license": "MIT",
+ "peerDependencies": {
+ "embla-carousel": "8.6.0"
+ }
+ },
+ "node_modules/embla-carousel-autoplay": {
+ "version": "8.6.0",
+ "resolved": "https://registry.npmjs.org/embla-carousel-autoplay/-/embla-carousel-autoplay-8.6.0.tgz",
+ "integrity": "sha512-OBu5G3nwaSXkZCo1A6LTaFMZ8EpkYbwIaH+bPqdBnDGQ2fh4+NbzjXjs2SktoPNKCtflfVMc75njaDHOYXcrsA==",
+ "license": "MIT",
+ "peerDependencies": {
+ "embla-carousel": "8.6.0"
+ }
+ },
+ "node_modules/embla-carousel-class-names": {
+ "version": "8.6.0",
+ "resolved": "https://registry.npmjs.org/embla-carousel-class-names/-/embla-carousel-class-names-8.6.0.tgz",
+ "integrity": "sha512-l1hm1+7GxQ+zwdU2sea/LhD946on7XO2qk3Xq2XWSwBaWfdgchXdK567yzLtYSHn4sWYdiX+x4nnaj+saKnJkw==",
+ "license": "MIT",
+ "peerDependencies": {
+ "embla-carousel": "8.6.0"
+ }
+ },
+ "node_modules/embla-carousel-fade": {
+ "version": "8.6.0",
+ "resolved": "https://registry.npmjs.org/embla-carousel-fade/-/embla-carousel-fade-8.6.0.tgz",
+ "integrity": "sha512-qaYsx5mwCz72ZrjlsXgs1nKejSrW+UhkbOMwLgfRT7w2LtdEB03nPRI06GHuHv5ac2USvbEiX2/nAHctcDwvpg==",
+ "license": "MIT",
+ "peerDependencies": {
+ "embla-carousel": "8.6.0"
+ }
+ },
+ "node_modules/embla-carousel-reactive-utils": {
+ "version": "8.6.0",
+ "resolved": "https://registry.npmjs.org/embla-carousel-reactive-utils/-/embla-carousel-reactive-utils-8.6.0.tgz",
+ "integrity": "sha512-fMVUDUEx0/uIEDM0Mz3dHznDhfX+znCCDCeIophYb1QGVM7YThSWX+wz11zlYwWFOr74b4QLGg0hrGPJeG2s4A==",
+ "license": "MIT",
+ "peerDependencies": {
+ "embla-carousel": "8.6.0"
+ }
+ },
+ "node_modules/embla-carousel-vue": {
+ "version": "8.6.0",
+ "resolved": "https://registry.npmjs.org/embla-carousel-vue/-/embla-carousel-vue-8.6.0.tgz",
+ "integrity": "sha512-v8UO5UsyLocZnu/LbfQA7Dn2QHuZKurJY93VUmZYP//QRWoCWOsionmvLLAlibkET3pGPs7++03VhJKbWD7vhQ==",
+ "license": "MIT",
+ "dependencies": {
+ "embla-carousel": "8.6.0",
+ "embla-carousel-reactive-utils": "8.6.0"
+ },
+ "peerDependencies": {
+ "vue": "^3.2.37"
+ }
+ },
+ "node_modules/embla-carousel-wheel-gestures": {
+ "version": "8.0.2",
+ "resolved": "https://registry.npmjs.org/embla-carousel-wheel-gestures/-/embla-carousel-wheel-gestures-8.0.2.tgz",
+ "integrity": "sha512-gtE8xHRwMGsfsMAgco/QoYhvcxNoMLmFF0DaWH7FXJJWk8RlEZyiZHZRZL6TZVCgooo9/hKyYWITLaSZLIvkbQ==",
+ "license": "MIT",
+ "dependencies": {
+ "wheel-gestures": "^2.2.5"
+ },
+ "engines": {
+ "node": ">=10"
+ },
+ "peerDependencies": {
+ "embla-carousel": "^8.0.0 || ~8.0.0-rc03"
+ }
+ },
"node_modules/emoji-regex": {
"version": "8.0.0",
"resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
@@ -11365,18 +11596,18 @@
}
},
"node_modules/end-of-stream": {
- "version": "1.4.4",
- "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
- "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
+ "version": "1.4.5",
+ "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.5.tgz",
+ "integrity": "sha512-ooEGc6HP26xXq/N+GCGOT0JKCLDGrq2bQUZrQ7gyrJiZANJ/8YDTxTpQBXGMn+WbIQXNVpyWymm7KYVICQnyOg==",
"license": "MIT",
"dependencies": {
"once": "^1.4.0"
}
},
"node_modules/enhanced-resolve": {
- "version": "5.18.1",
- "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.18.1.tgz",
- "integrity": "sha512-ZSW3ma5GkcQBIpwZTSRAI8N71Uuwgs93IezB7mf7R60tC8ZbJideoDNKjHn2O9KIlx6rkGTTEk1xUCK2E1Y2Yg==",
+ "version": "5.18.2",
+ "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.18.2.tgz",
+ "integrity": "sha512-6Jw4sE1maoRJo3q8MsSIn2onJFbLTOjY9hlx4DZXmOKvLRd1Ok2kXmAGXaafL2+ijsJZ1ClYbl/pmqr9+k4iUQ==",
"license": "MIT",
"dependencies": {
"graceful-fs": "^4.2.4",
@@ -11550,24 +11781,23 @@
}
},
"node_modules/eslint": {
- "version": "9.26.0",
- "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.26.0.tgz",
- "integrity": "sha512-Hx0MOjPh6uK9oq9nVsATZKE/Wlbai7KFjfCuw9UHaguDW3x+HF0O5nIi3ud39TWgrTjTO5nHxmL3R1eANinWHQ==",
+ "version": "9.31.0",
+ "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.31.0.tgz",
+ "integrity": "sha512-QldCVh/ztyKJJZLr4jXNUByx3gR+TDYZCRXEktiZoUR3PGy4qCmSbkxcIle8GEwGpb5JBZazlaJ/CxLidXdEbQ==",
"devOptional": true,
"license": "MIT",
"dependencies": {
"@eslint-community/eslint-utils": "^4.2.0",
"@eslint-community/regexpp": "^4.12.1",
- "@eslint/config-array": "^0.20.0",
- "@eslint/config-helpers": "^0.2.1",
- "@eslint/core": "^0.13.0",
+ "@eslint/config-array": "^0.21.0",
+ "@eslint/config-helpers": "^0.3.0",
+ "@eslint/core": "^0.15.0",
"@eslint/eslintrc": "^3.3.1",
- "@eslint/js": "9.26.0",
- "@eslint/plugin-kit": "^0.2.8",
+ "@eslint/js": "9.31.0",
+ "@eslint/plugin-kit": "^0.3.1",
"@humanfs/node": "^0.16.6",
"@humanwhocodes/module-importer": "^1.0.1",
"@humanwhocodes/retry": "^0.4.2",
- "@modelcontextprotocol/sdk": "^1.8.0",
"@types/estree": "^1.0.6",
"@types/json-schema": "^7.0.15",
"ajv": "^6.12.4",
@@ -11575,9 +11805,9 @@
"cross-spawn": "^7.0.6",
"debug": "^4.3.2",
"escape-string-regexp": "^4.0.0",
- "eslint-scope": "^8.3.0",
- "eslint-visitor-keys": "^4.2.0",
- "espree": "^10.3.0",
+ "eslint-scope": "^8.4.0",
+ "eslint-visitor-keys": "^4.2.1",
+ "espree": "^10.4.0",
"esquery": "^1.5.0",
"esutils": "^2.0.2",
"fast-deep-equal": "^3.1.3",
@@ -11591,8 +11821,7 @@
"lodash.merge": "^4.6.2",
"minimatch": "^3.1.2",
"natural-compare": "^1.4.0",
- "optionator": "^0.9.3",
- "zod": "^3.24.2"
+ "optionator": "^0.9.3"
},
"bin": {
"eslint": "bin/eslint.js"
@@ -11634,46 +11863,24 @@
"integrity": "sha512-NSWl5BFQWEPi1j4TjVNItzYV7dZXZ+wP6I6ZhrBGpChQhZRUaElihE9uRRkcbRnNb76UMKDF3r+WTmNcGPKsqw==",
"dev": true,
"license": "MIT",
- "bin": {
- "eslint-config-prettier": "bin/cli.js"
- },
- "peerDependencies": {
- "eslint": ">=7.0.0"
- }
- },
- "node_modules/eslint-flat-config-utils": {
- "version": "2.0.1",
- "resolved": "https://registry.npmjs.org/eslint-flat-config-utils/-/eslint-flat-config-utils-2.0.1.tgz",
- "integrity": "sha512-brf0eAgQ6JlKj3bKfOTuuI7VcCZvi8ZCD1MMTVoEvS/d38j8cByZViLFALH/36+eqB17ukmfmKq3bWzGvizejA==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "pathe": "^2.0.2"
- },
- "funding": {
- "url": "https://github.com/sponsors/antfu"
- }
- },
- "node_modules/eslint-import-resolver-node": {
- "version": "0.3.9",
- "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.9.tgz",
- "integrity": "sha512-WFj2isz22JahUv+B788TlO3N6zL3nNJGU8CcZbPZvVEkBPaJdCV4vy5wyghty5ROFbCRnm132v8BScu5/1BQ8g==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "debug": "^3.2.7",
- "is-core-module": "^2.13.0",
- "resolve": "^1.22.4"
+ "bin": {
+ "eslint-config-prettier": "bin/cli.js"
+ },
+ "peerDependencies": {
+ "eslint": ">=7.0.0"
}
},
- "node_modules/eslint-import-resolver-node/node_modules/debug": {
- "version": "3.2.7",
- "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
- "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+ "node_modules/eslint-flat-config-utils": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/eslint-flat-config-utils/-/eslint-flat-config-utils-2.1.0.tgz",
+ "integrity": "sha512-6fjOJ9tS0k28ketkUcQ+kKptB4dBZY2VijMZ9rGn8Cwnn1SH0cZBoPXT8AHBFHxmHcLFQK9zbELDinZ2Mr1rng==",
"dev": true,
"license": "MIT",
"dependencies": {
- "ms": "^2.1.1"
+ "pathe": "^2.0.3"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/antfu"
}
},
"node_modules/eslint-merge-processors": {
@@ -11689,69 +11896,63 @@
"eslint": "*"
}
},
- "node_modules/eslint-plugin-import-x": {
- "version": "4.11.0",
- "resolved": "https://registry.npmjs.org/eslint-plugin-import-x/-/eslint-plugin-import-x-4.11.0.tgz",
- "integrity": "sha512-NAaYY49342gj09QGvwnFFl5KcD5aLzjAz97Lo+upnN8MzjEGSIlmL5sxCYGqtIeMjw8fSRDFZIp2xjRLT+yl4Q==",
+ "node_modules/eslint-plugin-import-lite": {
+ "version": "0.3.0",
+ "resolved": "https://registry.npmjs.org/eslint-plugin-import-lite/-/eslint-plugin-import-lite-0.3.0.tgz",
+ "integrity": "sha512-dkNBAL6jcoCsXZsQ/Tt2yXmMDoNt5NaBh/U7yvccjiK8cai6Ay+MK77bMykmqQA2bTF6lngaLCDij6MTO3KkvA==",
"dev": true,
"license": "MIT",
"dependencies": {
- "@typescript-eslint/utils": "^8.31.0",
- "comment-parser": "^1.4.1",
- "debug": "^4.4.0",
- "eslint-import-resolver-node": "^0.3.9",
- "get-tsconfig": "^4.10.0",
- "is-glob": "^4.0.3",
- "minimatch": "^9.0.3 || ^10.0.1",
- "semver": "^7.7.1",
- "stable-hash": "^0.0.5",
- "tslib": "^2.8.1",
- "unrs-resolver": "^1.7.0"
+ "@eslint-community/eslint-utils": "^4.7.0",
+ "@typescript-eslint/types": "^8.34.0"
},
"engines": {
"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
},
- "funding": {
- "url": "https://opencollective.com/eslint-plugin-import-x"
- },
"peerDependencies": {
- "eslint": "^8.57.0 || ^9.0.0"
+ "eslint": ">=9.0.0",
+ "typescript": ">=4.5"
+ },
+ "peerDependenciesMeta": {
+ "typescript": {
+ "optional": true
+ }
}
},
"node_modules/eslint-plugin-jsdoc": {
- "version": "50.6.11",
- "resolved": "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-50.6.11.tgz",
- "integrity": "sha512-k4+MnBCGR8cuIB5MZ++FGd4gbXxjob2rX1Nq0q3nWFF4xSGZENTgTLZSjb+u9B8SAnP6lpGV2FJrBjllV3pVSg==",
+ "version": "51.4.0",
+ "resolved": "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-51.4.0.tgz",
+ "integrity": "sha512-woooKbcFiQdpfJg1g/WmFHItaZuDE14SZ7QVW3eV/5e3mbOicjtgVz6cFkYJ3MP9n5WL9/ZAvuWuGkAkMFhDYQ==",
"dev": true,
"license": "BSD-3-Clause",
"dependencies": {
- "@es-joy/jsdoccomment": "~0.49.0",
+ "@es-joy/jsdoccomment": "~0.52.0",
"are-docs-informative": "^0.0.2",
"comment-parser": "1.4.1",
- "debug": "^4.3.6",
+ "debug": "^4.4.1",
"escape-string-regexp": "^4.0.0",
- "espree": "^10.1.0",
+ "espree": "^10.4.0",
"esquery": "^1.6.0",
"parse-imports-exports": "^0.2.4",
- "semver": "^7.6.3",
+ "semver": "^7.7.2",
"spdx-expression-parse": "^4.0.0"
},
"engines": {
- "node": ">=18"
+ "node": ">=20.11.0"
},
"peerDependencies": {
"eslint": "^7.0.0 || ^8.0.0 || ^9.0.0"
}
},
"node_modules/eslint-plugin-prettier": {
- "version": "5.4.0",
- "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-5.4.0.tgz",
- "integrity": "sha512-BvQOvUhkVQM1i63iMETK9Hjud9QhqBnbtT1Zc642p9ynzBuCe5pybkOnvqZIBypXmMlsGcnU4HZ8sCTPfpAexA==",
+ "version": "5.5.1",
+ "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-5.5.1.tgz",
+ "integrity": "sha512-dobTkHT6XaEVOo8IO90Q4DOSxnm3Y151QxPJlM/vKC0bVy+d6cVWQZLlFiuZPP0wS6vZwSKeJgKkcS+KfMBlRw==",
"dev": true,
"license": "MIT",
"dependencies": {
"prettier-linter-helpers": "^1.0.0",
- "synckit": "^0.11.0"
+ "synckit": "^0.11.7"
},
"engines": {
"node": "^14.18.0 || >=16.0.0"
@@ -11775,9 +11976,9 @@
}
},
"node_modules/eslint-plugin-regexp": {
- "version": "2.7.0",
- "resolved": "https://registry.npmjs.org/eslint-plugin-regexp/-/eslint-plugin-regexp-2.7.0.tgz",
- "integrity": "sha512-U8oZI77SBtH8U3ulZ05iu0qEzIizyEDXd+BWHvyVxTOjGwcDcvy/kEpgFG4DYca2ByRLiVPFZ2GeH7j1pdvZTA==",
+ "version": "2.9.0",
+ "resolved": "https://registry.npmjs.org/eslint-plugin-regexp/-/eslint-plugin-regexp-2.9.0.tgz",
+ "integrity": "sha512-9WqJMnOq8VlE/cK+YAo9C9YHhkOtcEtEk9d12a+H7OSZFwlpI6stiHmYPGa2VE0QhTzodJyhlyprUaXDZLgHBw==",
"dev": true,
"license": "MIT",
"dependencies": {
@@ -11797,9 +11998,9 @@
}
},
"node_modules/eslint-plugin-unicorn": {
- "version": "58.0.0",
- "resolved": "https://registry.npmjs.org/eslint-plugin-unicorn/-/eslint-plugin-unicorn-58.0.0.tgz",
- "integrity": "sha512-fc3iaxCm9chBWOHPVjn+Czb/wHS0D2Mko7wkOdobqo9R2bbFObc4LyZaLTNy0mhZOP84nKkLhTUQxlLOZ7EjKw==",
+ "version": "59.0.1",
+ "resolved": "https://registry.npmjs.org/eslint-plugin-unicorn/-/eslint-plugin-unicorn-59.0.1.tgz",
+ "integrity": "sha512-EtNXYuWPUmkgSU2E7Ttn57LbRREQesIP1BiLn7OZLKodopKfDXfBUkC/0j6mpw2JExwf43Uf3qLSvrSvppgy8Q==",
"dev": true,
"license": "MIT",
"dependencies": {
@@ -11810,12 +12011,12 @@
"clean-regexp": "^1.0.0",
"core-js-compat": "^3.41.0",
"esquery": "^1.6.0",
+ "find-up-simple": "^1.0.1",
"globals": "^16.0.0",
"indent-string": "^5.0.0",
"is-builtin-module": "^5.0.0",
"jsesc": "^3.1.0",
"pluralize": "^8.0.0",
- "read-package-up": "^11.0.0",
"regexp-tree": "^0.1.27",
"regjsparser": "^0.12.0",
"semver": "^7.7.1",
@@ -11831,10 +12032,37 @@
"eslint": ">=9.22.0"
}
},
+ "node_modules/eslint-plugin-unicorn/node_modules/@eslint/core": {
+ "version": "0.13.0",
+ "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.13.0.tgz",
+ "integrity": "sha512-yfkgDw1KR66rkT5A8ci4irzDysN7FRpq3ttJolR88OqQikAWqwA8j5VZyas+vjyBNFIJ7MfybJ9plMILI2UrCw==",
+ "dev": true,
+ "license": "Apache-2.0",
+ "dependencies": {
+ "@types/json-schema": "^7.0.15"
+ },
+ "engines": {
+ "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+ }
+ },
+ "node_modules/eslint-plugin-unicorn/node_modules/@eslint/plugin-kit": {
+ "version": "0.2.8",
+ "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.2.8.tgz",
+ "integrity": "sha512-ZAoA40rNMPwSm+AeHpCq8STiNAwzWLJuP8Xv4CHIc9wv/PSuExjMrmjfYNj682vW0OOiZ1HKxzvjQr9XZIisQA==",
+ "dev": true,
+ "license": "Apache-2.0",
+ "dependencies": {
+ "@eslint/core": "^0.13.0",
+ "levn": "^0.4.1"
+ },
+ "engines": {
+ "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+ }
+ },
"node_modules/eslint-plugin-vue": {
- "version": "10.1.0",
- "resolved": "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-10.1.0.tgz",
- "integrity": "sha512-/VTiJ1eSfNLw6lvG9ENySbGmcVvz6wZ9nA7ZqXlLBY2RkaF15iViYKxglWiIch12KiLAj0j1iXPYU6W4wTROFA==",
+ "version": "10.3.0",
+ "resolved": "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-10.3.0.tgz",
+ "integrity": "sha512-A0u9snqjCfYaPnqqOaH6MBLVWDUIN4trXn8J3x67uDcXvR7X6Ut8p16N+nYhMCQ9Y7edg2BIRGzfyZsY0IdqoQ==",
"dev": true,
"license": "MIT",
"dependencies": {
@@ -11849,22 +12077,14 @@
"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
},
"peerDependencies": {
+ "@typescript-eslint/parser": "^7.0.0 || ^8.0.0",
"eslint": "^8.57.0 || ^9.0.0",
"vue-eslint-parser": "^10.0.0"
- }
- },
- "node_modules/eslint-plugin-vue/node_modules/postcss-selector-parser": {
- "version": "6.1.2",
- "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.1.2.tgz",
- "integrity": "sha512-Q8qQfPiZ+THO/3ZrOrO0cJJKfpYCagtMUkXbnEfmgUjwXg6z/WBeOyS9APBBPCTSiDV+s4SwQGu8yFsiMRIudg==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "cssesc": "^3.0.0",
- "util-deprecate": "^1.0.2"
},
- "engines": {
- "node": ">=4"
+ "peerDependenciesMeta": {
+ "@typescript-eslint/parser": {
+ "optional": true
+ }
}
},
"node_modules/eslint-processor-vue-blocks": {
@@ -11882,9 +12102,9 @@
}
},
"node_modules/eslint-scope": {
- "version": "8.3.0",
- "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.3.0.tgz",
- "integrity": "sha512-pUNxi75F8MJ/GdeKtVLSbYg4ZI34J6C0C7sbL4YOp2exGwen7ZsuBqKzUhXd0qMQ362yET3z+uPwKeg/0C2XCQ==",
+ "version": "8.4.0",
+ "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.4.0.tgz",
+ "integrity": "sha512-sNXOfKCn74rt8RICKMvJS7XKV/Xk9kA7DyJr8mJik3S7Cwgy3qlkkmyS2uQB3jiJg6VNdZd/pDBJu0nvG2NlTg==",
"devOptional": true,
"license": "BSD-2-Clause",
"dependencies": {
@@ -11902,6 +12122,7 @@
"version": "3.4.3",
"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz",
"integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==",
+ "devOptional": true,
"license": "Apache-2.0",
"engines": {
"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
@@ -11911,9 +12132,9 @@
}
},
"node_modules/eslint/node_modules/brace-expansion": {
- "version": "1.1.11",
- "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
- "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+ "version": "1.1.12",
+ "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz",
+ "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==",
"devOptional": true,
"license": "MIT",
"dependencies": {
@@ -11939,9 +12160,9 @@
}
},
"node_modules/eslint/node_modules/eslint-visitor-keys": {
- "version": "4.2.0",
- "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.0.tgz",
- "integrity": "sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==",
+ "version": "4.2.1",
+ "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.1.tgz",
+ "integrity": "sha512-Uhdk5sfqcee/9H/rCOJikYz67o0a2Tw2hGRPOG2Y1R2dg7brRe1uG0yaNQDHu+TO/uQPF/5eCapvYSmHUjt7JQ==",
"devOptional": true,
"license": "Apache-2.0",
"engines": {
@@ -11988,15 +12209,15 @@
}
},
"node_modules/espree": {
- "version": "10.3.0",
- "resolved": "https://registry.npmjs.org/espree/-/espree-10.3.0.tgz",
- "integrity": "sha512-0QYC8b24HWY8zjRnDTL6RiHfDbAWn63qb4LMj1Z4b076A4une81+z03Kg7l7mn/48PUTqoLptSXez8oknU8Clg==",
+ "version": "10.4.0",
+ "resolved": "https://registry.npmjs.org/espree/-/espree-10.4.0.tgz",
+ "integrity": "sha512-j6PAQ2uUr79PZhBjP5C5fhl8e39FmRnOjsD5lGnWrFU8i2G776tBK7+nP8KuQUTTyAZUwfQqXAgrVH5MbH9CYQ==",
"devOptional": true,
"license": "BSD-2-Clause",
"dependencies": {
- "acorn": "^8.14.0",
+ "acorn": "^8.15.0",
"acorn-jsx": "^5.3.2",
- "eslint-visitor-keys": "^4.2.0"
+ "eslint-visitor-keys": "^4.2.1"
},
"engines": {
"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -12006,9 +12227,9 @@
}
},
"node_modules/espree/node_modules/eslint-visitor-keys": {
- "version": "4.2.0",
- "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.0.tgz",
- "integrity": "sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==",
+ "version": "4.2.1",
+ "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.1.tgz",
+ "integrity": "sha512-Uhdk5sfqcee/9H/rCOJikYz67o0a2Tw2hGRPOG2Y1R2dg7brRe1uG0yaNQDHu+TO/uQPF/5eCapvYSmHUjt7JQ==",
"devOptional": true,
"license": "Apache-2.0",
"engines": {
@@ -12117,29 +12338,6 @@
"node": ">=0.8.x"
}
},
- "node_modules/eventsource": {
- "version": "3.0.6",
- "resolved": "https://registry.npmjs.org/eventsource/-/eventsource-3.0.6.tgz",
- "integrity": "sha512-l19WpE2m9hSuyP06+FbuUUf1G+R0SFLrtQfbRb9PRr+oimOfxQhgGCbVaXg5IvZyyTThJsxh6L/srkMiCeBPDA==",
- "devOptional": true,
- "license": "MIT",
- "dependencies": {
- "eventsource-parser": "^3.0.1"
- },
- "engines": {
- "node": ">=18.0.0"
- }
- },
- "node_modules/eventsource-parser": {
- "version": "3.0.1",
- "resolved": "https://registry.npmjs.org/eventsource-parser/-/eventsource-parser-3.0.1.tgz",
- "integrity": "sha512-VARTJ9CYeuQYb0pZEPbzi740OWFgpHe7AYJ2WFZVnUDUQp5Dk2yJUgF36YsZ81cOyxT0QxmXD2EQpapAouzWVA==",
- "devOptional": true,
- "license": "MIT",
- "engines": {
- "node": ">=18.0.0"
- }
- },
"node_modules/execa": {
"version": "8.0.1",
"resolved": "https://registry.npmjs.org/execa/-/execa-8.0.1.tgz",
@@ -12163,69 +12361,10 @@
"url": "https://github.com/sindresorhus/execa?sponsor=1"
}
},
- "node_modules/express": {
- "version": "5.1.0",
- "resolved": "https://registry.npmjs.org/express/-/express-5.1.0.tgz",
- "integrity": "sha512-DT9ck5YIRU+8GYzzU5kT3eHGA5iL+1Zd0EutOmTE9Dtk+Tvuzd23VBU+ec7HPNSTxXYO55gPV/hq4pSBJDjFpA==",
- "devOptional": true,
- "license": "MIT",
- "dependencies": {
- "accepts": "^2.0.0",
- "body-parser": "^2.2.0",
- "content-disposition": "^1.0.0",
- "content-type": "^1.0.5",
- "cookie": "^0.7.1",
- "cookie-signature": "^1.2.1",
- "debug": "^4.4.0",
- "encodeurl": "^2.0.0",
- "escape-html": "^1.0.3",
- "etag": "^1.8.1",
- "finalhandler": "^2.1.0",
- "fresh": "^2.0.0",
- "http-errors": "^2.0.0",
- "merge-descriptors": "^2.0.0",
- "mime-types": "^3.0.0",
- "on-finished": "^2.4.1",
- "once": "^1.4.0",
- "parseurl": "^1.3.3",
- "proxy-addr": "^2.0.7",
- "qs": "^6.14.0",
- "range-parser": "^1.2.1",
- "router": "^2.2.0",
- "send": "^1.1.0",
- "serve-static": "^2.2.0",
- "statuses": "^2.0.1",
- "type-is": "^2.0.1",
- "vary": "^1.1.2"
- },
- "engines": {
- "node": ">= 18"
- },
- "funding": {
- "type": "opencollective",
- "url": "https://opencollective.com/express"
- }
- },
- "node_modules/express-rate-limit": {
- "version": "7.5.0",
- "resolved": "https://registry.npmjs.org/express-rate-limit/-/express-rate-limit-7.5.0.tgz",
- "integrity": "sha512-eB5zbQh5h+VenMPM3fh+nw1YExi5nMr6HUCR62ELSP11huvxm/Uir1H1QEyTkk5QX6A58pX6NmaTMceKZ0Eodg==",
- "devOptional": true,
- "license": "MIT",
- "engines": {
- "node": ">= 16"
- },
- "funding": {
- "url": "https://github.com/sponsors/express-rate-limit"
- },
- "peerDependencies": {
- "express": "^4.11 || 5 || ^5.0.0-beta.1"
- }
- },
"node_modules/exsolve": {
- "version": "1.0.5",
- "resolved": "https://registry.npmjs.org/exsolve/-/exsolve-1.0.5.tgz",
- "integrity": "sha512-pz5dvkYYKQ1AHVrgOzBKWeP4u4FRb3a6DNK2ucr0OoNwYIU4QWsJ+NM36LLzORT+z845MzKHHhpXiUF5nvQoJg==",
+ "version": "1.0.7",
+ "resolved": "https://registry.npmjs.org/exsolve/-/exsolve-1.0.7.tgz",
+ "integrity": "sha512-VO5fQUzZtI6C+vx4w/4BWJpg3s/5l+6pRQEHzFRM8WFi4XffSP1Z+4qi7GbjWbvRQEbdIco5mIMq+zX4rPuLrw==",
"license": "MIT"
},
"node_modules/externality": {
@@ -12285,7 +12424,6 @@
"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==",
- "devOptional": true,
"license": "MIT"
},
"node_modules/fast-diff": {
@@ -12343,14 +12481,33 @@
"license": "MIT"
},
"node_modules/fast-npm-meta": {
- "version": "0.4.2",
- "resolved": "https://registry.npmjs.org/fast-npm-meta/-/fast-npm-meta-0.4.2.tgz",
- "integrity": "sha512-BDN/yv8MN3fjh504wa7/niZojPtf/brWBsLKlw7Fv+Xh8Df+6ZEAFpp3zaal4etgDxxav1CuzKX5H0YVM9urEQ==",
+ "version": "0.4.4",
+ "resolved": "https://registry.npmjs.org/fast-npm-meta/-/fast-npm-meta-0.4.4.tgz",
+ "integrity": "sha512-cq8EVW3jpX1U3dO1AYanz2BJ6n9ITQgCwE1xjNwI5jO2a9erE369OZNO8Wt/Wbw8YHhCD/dimH9BxRsY+6DinA==",
"license": "MIT",
"funding": {
"url": "https://github.com/sponsors/antfu"
}
},
+ "node_modules/fast-xml-parser": {
+ "version": "5.2.5",
+ "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-5.2.5.tgz",
+ "integrity": "sha512-pfX9uG9Ki0yekDHx2SiuRIyFdyAr1kMIMitPvb0YBo8SUfKvia7w7FIyd/l6av85pFYRhZscS75MwMnbvY+hcQ==",
+ "dev": true,
+ "funding": [
+ {
+ "type": "github",
+ "url": "https://github.com/sponsors/NaturalIntelligence"
+ }
+ ],
+ "license": "MIT",
+ "dependencies": {
+ "strnum": "^2.1.0"
+ },
+ "bin": {
+ "fxparser": "src/cli/cli.js"
+ }
+ },
"node_modules/fastq": {
"version": "1.19.1",
"resolved": "https://registry.npmjs.org/fastq/-/fastq-1.19.1.tgz",
@@ -12370,9 +12527,9 @@
}
},
"node_modules/fdir": {
- "version": "6.4.4",
- "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.4.4.tgz",
- "integrity": "sha512-1NZP+GK4GfuAv3PqKvxQRDMjdSRZjnkq7KfhlNrCNNlZ0ygQFpebfrnfnq/W7fpUnAv9aGWmY1zKx7FYL3gwhg==",
+ "version": "6.4.6",
+ "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.4.6.tgz",
+ "integrity": "sha512-hiFoqpyZcfNm1yc4u8oWCf9A2c4D3QjCrks3zmoVKVxpQRzmPNar1hUJcBG2RQHvEVGDN+Jm81ZheVLAQMK6+w==",
"license": "MIT",
"peerDependencies": {
"picomatch": "^3 || ^4"
@@ -12444,35 +12601,17 @@
}
},
"node_modules/filter-obj": {
- "version": "5.1.0",
- "resolved": "https://registry.npmjs.org/filter-obj/-/filter-obj-5.1.0.tgz",
- "integrity": "sha512-qWeTREPoT7I0bifpPUXtxkZJ1XJzxWtfoWWkdVGqa+eCr3SHW/Ocp89o8vLvbUuQnadybJpjOKu4V+RwO6sGng==",
+ "version": "6.1.0",
+ "resolved": "https://registry.npmjs.org/filter-obj/-/filter-obj-6.1.0.tgz",
+ "integrity": "sha512-xdMtCAODmPloU9qtmPcdBV9Kd27NtMse+4ayThxqIHUES5Z2S6bGpap5PpdmNM56ub7y3i1eyr+vJJIIgWGKmA==",
"license": "MIT",
"engines": {
- "node": ">=14.16"
+ "node": ">=18"
},
"funding": {
"url": "https://github.com/sponsors/sindresorhus"
}
},
- "node_modules/finalhandler": {
- "version": "2.1.0",
- "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-2.1.0.tgz",
- "integrity": "sha512-/t88Ty3d5JWQbWYgaOGCCYfXRwV1+be02WqYYlL6h0lEiUAMPM8o8qKGO01YIkOHzka2up08wvgYD0mDiI+q3Q==",
- "devOptional": true,
- "license": "MIT",
- "dependencies": {
- "debug": "^4.4.0",
- "encodeurl": "^2.0.0",
- "escape-html": "^1.0.3",
- "on-finished": "^2.4.1",
- "parseurl": "^1.3.3",
- "statuses": "^2.0.1"
- },
- "engines": {
- "node": ">= 0.8"
- }
- },
"node_modules/find-up": {
"version": "5.0.0",
"resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
@@ -12528,6 +12667,39 @@
"integrity": "sha512-GRnmB5gPyJpAhTQdSZTSp9uaPSvl09KoYcMQtsB9rQoOmzs9dH6ffeccH+Z+cv6P68Hu5bC6JjRh4Ah/mHSNRw==",
"license": "MIT"
},
+ "node_modules/fontaine": {
+ "version": "0.6.0",
+ "resolved": "https://registry.npmjs.org/fontaine/-/fontaine-0.6.0.tgz",
+ "integrity": "sha512-cfKqzB62GmztJhwJ0YXtzNsmpqKAcFzTqsakJ//5COTzbou90LU7So18U+4D8z+lDXr4uztaAUZBonSoPDcj1w==",
+ "license": "MIT",
+ "dependencies": {
+ "@capsizecss/metrics": "^3.5.0",
+ "@capsizecss/unpack": "^2.4.0",
+ "css-tree": "^3.1.0",
+ "magic-regexp": "^0.10.0",
+ "magic-string": "^0.30.17",
+ "pathe": "^2.0.3",
+ "ufo": "^1.6.1",
+ "unplugin": "^2.3.2"
+ }
+ },
+ "node_modules/fontkit": {
+ "version": "2.0.4",
+ "resolved": "https://registry.npmjs.org/fontkit/-/fontkit-2.0.4.tgz",
+ "integrity": "sha512-syetQadaUEDNdxdugga9CpEYVaQIxOwk7GlwZWWZ19//qW4zE5bknOKeMBDYAASwnpaSHKJITRLMF9m1fp3s6g==",
+ "license": "MIT",
+ "dependencies": {
+ "@swc/helpers": "^0.5.12",
+ "brotli": "^1.3.2",
+ "clone": "^2.1.2",
+ "dfa": "^1.2.0",
+ "fast-deep-equal": "^3.1.3",
+ "restructure": "^3.0.0",
+ "tiny-inflate": "^1.0.3",
+ "unicode-properties": "^1.4.0",
+ "unicode-trie": "^2.0.0"
+ }
+ },
"node_modules/foreground-child": {
"version": "3.3.1",
"resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.3.1.tgz",
@@ -12556,16 +12728,6 @@
"node": ">=12.20.0"
}
},
- "node_modules/forwarded": {
- "version": "0.2.0",
- "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz",
- "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==",
- "devOptional": true,
- "license": "MIT",
- "engines": {
- "node": ">= 0.6"
- }
- },
"node_modules/forwarded-parse": {
"version": "2.1.2",
"resolved": "https://registry.npmjs.org/forwarded-parse/-/forwarded-parse-2.1.2.tgz",
@@ -12609,27 +12771,6 @@
"node": ">= 0.8"
}
},
- "node_modules/fs-constants": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz",
- "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==",
- "license": "MIT"
- },
- "node_modules/fs-extra": {
- "version": "9.1.0",
- "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz",
- "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==",
- "license": "MIT",
- "dependencies": {
- "at-least-node": "^1.0.0",
- "graceful-fs": "^4.2.0",
- "jsonfile": "^6.0.1",
- "universalify": "^2.0.0"
- },
- "engines": {
- "node": ">=10"
- }
- },
"node_modules/fs.realpath": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
@@ -12678,16 +12819,16 @@
}
},
"node_modules/get-amd-module-type": {
- "version": "5.0.1",
- "resolved": "https://registry.npmjs.org/get-amd-module-type/-/get-amd-module-type-5.0.1.tgz",
- "integrity": "sha512-jb65zDeHyDjFR1loOVk0HQGM5WNwoGB8aLWy3LKCieMKol0/ProHkhO2X1JxojuN10vbz1qNn09MJ7tNp7qMzw==",
+ "version": "6.0.1",
+ "resolved": "https://registry.npmjs.org/get-amd-module-type/-/get-amd-module-type-6.0.1.tgz",
+ "integrity": "sha512-MtjsmYiCXcYDDrGqtNbeIYdAl85n+5mSv2r3FbzER/YV3ZILw4HNNIw34HuV5pyl0jzs6GFYU1VHVEefhgcNHQ==",
"license": "MIT",
"dependencies": {
- "ast-module-types": "^5.0.0",
- "node-source-walk": "^6.0.1"
+ "ast-module-types": "^6.0.1",
+ "node-source-walk": "^7.0.1"
},
"engines": {
- "node": ">=14"
+ "node": ">=18"
}
},
"node_modules/get-caller-file": {
@@ -12724,9 +12865,9 @@
}
},
"node_modules/get-port-please": {
- "version": "3.1.2",
- "resolved": "https://registry.npmjs.org/get-port-please/-/get-port-please-3.1.2.tgz",
- "integrity": "sha512-Gxc29eLs1fbn6LQ4jSU4vXjlwyZhF5HsGuMAa7gqBP4Rw4yxxltyDUuF5MBclFzDTXO+ACchGQoeela4DSfzdQ==",
+ "version": "3.2.0",
+ "resolved": "https://registry.npmjs.org/get-port-please/-/get-port-please-3.2.0.tgz",
+ "integrity": "sha512-I9QVvBw5U/hw3RmWpYKRumUeaDgxTPd401x364rLmWBJcOQ753eov1eTgzDqRG9bqFIfDc7gfzcQEWrUri3o1A==",
"license": "MIT"
},
"node_modules/get-proto": {
@@ -12754,19 +12895,6 @@
"url": "https://github.com/sponsors/sindresorhus"
}
},
- "node_modules/get-tsconfig": {
- "version": "4.10.0",
- "resolved": "https://registry.npmjs.org/get-tsconfig/-/get-tsconfig-4.10.0.tgz",
- "integrity": "sha512-kGzZ3LWWQcGIAmg6iWvXn0ei6WDtV26wzHRMwDSzmAbcXrTEXxHy6IehI6/4eT6VRKyMP1eF1VqwrVUmE/LR7A==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "resolve-pkg-maps": "^1.0.0"
- },
- "funding": {
- "url": "https://github.com/privatenumber/get-tsconfig?sponsor=1"
- }
- },
"node_modules/giget": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/giget/-/giget-2.0.0.tgz",
@@ -12825,6 +12953,7 @@
"version": "6.0.2",
"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
"integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
+ "devOptional": true,
"license": "ISC",
"dependencies": {
"is-glob": "^4.0.3"
@@ -12864,9 +12993,9 @@
}
},
"node_modules/globals": {
- "version": "16.1.0",
- "resolved": "https://registry.npmjs.org/globals/-/globals-16.1.0.tgz",
- "integrity": "sha512-aibexHNbb/jiUSObBgpHLj+sIuUmJnYcgXBlrfsiDZ9rt4aF2TFRbyLgZ2iFQuVZ1K5Mx3FVkbKRSgKrbK3K2g==",
+ "version": "16.3.0",
+ "resolved": "https://registry.npmjs.org/globals/-/globals-16.3.0.tgz",
+ "integrity": "sha512-bqWEnJ1Nt3neqx2q5SFfGS8r/ahumIakg3HcwtNlrVlwXIeNumWn/c7Pn/wKzGhf6SaW6H6uWXLqC30STCMchQ==",
"dev": true,
"license": "MIT",
"engines": {
@@ -12985,6 +13114,7 @@
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+ "devOptional": true,
"license": "MIT",
"engines": {
"node": ">=8"
@@ -13002,21 +13132,6 @@
"url": "https://github.com/sponsors/ljharb"
}
},
- "node_modules/has-tostringtag": {
- "version": "1.0.2",
- "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.2.tgz",
- "integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==",
- "license": "MIT",
- "dependencies": {
- "has-symbols": "^1.0.3"
- },
- "engines": {
- "node": ">= 0.4"
- },
- "funding": {
- "url": "https://github.com/sponsors/ljharb"
- }
- },
"node_modules/hasown": {
"version": "2.0.2",
"resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
@@ -13059,53 +13174,6 @@
"integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==",
"license": "ISC"
},
- "node_modules/http-assert": {
- "version": "1.5.0",
- "resolved": "https://registry.npmjs.org/http-assert/-/http-assert-1.5.0.tgz",
- "integrity": "sha512-uPpH7OKX4H25hBmU6G1jWNaqJGpTXxey+YOUizJUAgu0AjLUeC8D73hTrhvDS5D+GJN1DN1+hhc/eF/wpxtp0w==",
- "license": "MIT",
- "dependencies": {
- "deep-equal": "~1.0.1",
- "http-errors": "~1.8.0"
- },
- "engines": {
- "node": ">= 0.8"
- }
- },
- "node_modules/http-assert/node_modules/depd": {
- "version": "1.1.2",
- "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
- "integrity": "sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ==",
- "license": "MIT",
- "engines": {
- "node": ">= 0.6"
- }
- },
- "node_modules/http-assert/node_modules/http-errors": {
- "version": "1.8.1",
- "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.8.1.tgz",
- "integrity": "sha512-Kpk9Sm7NmI+RHhnj6OIWDI1d6fIoFAtFt9RLaTMRlg/8w49juAStsrBgp0Dp4OdxdVbRIeKhtCUvoi/RuAhO4g==",
- "license": "MIT",
- "dependencies": {
- "depd": "~1.1.2",
- "inherits": "2.0.4",
- "setprototypeof": "1.2.0",
- "statuses": ">= 1.5.0 < 2",
- "toidentifier": "1.0.1"
- },
- "engines": {
- "node": ">= 0.6"
- }
- },
- "node_modules/http-assert/node_modules/statuses": {
- "version": "1.5.0",
- "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
- "integrity": "sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==",
- "license": "MIT",
- "engines": {
- "node": ">= 0.6"
- }
- },
"node_modules/http-errors": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz",
@@ -13122,6 +13190,15 @@
"node": ">= 0.8"
}
},
+ "node_modules/http-errors/node_modules/statuses": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
+ "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
+ "license": "MIT",
+ "engines": {
+ "node": ">= 0.8"
+ }
+ },
"node_modules/http-shutdown": {
"version": "1.2.2",
"resolved": "https://registry.npmjs.org/http-shutdown/-/http-shutdown-1.2.2.tgz",
@@ -13160,19 +13237,6 @@
"node": ">=16.17.0"
}
},
- "node_modules/iconv-lite": {
- "version": "0.6.3",
- "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
- "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
- "devOptional": true,
- "license": "MIT",
- "dependencies": {
- "safer-buffer": ">= 2.1.2 < 3.0.0"
- },
- "engines": {
- "node": ">=0.10.0"
- }
- },
"node_modules/ieee754": {
"version": "1.2.1",
"resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
@@ -13194,9 +13258,9 @@
"license": "BSD-3-Clause"
},
"node_modules/ignore": {
- "version": "7.0.4",
- "resolved": "https://registry.npmjs.org/ignore/-/ignore-7.0.4.tgz",
- "integrity": "sha512-gJzzk+PQNznz8ysRrC0aOkBNVRBDtE1n53IqyqEf3PXrYwomFs5q4pGMizBMJF+ykh03insJ27hB8gSrD2Hn8A==",
+ "version": "7.0.5",
+ "resolved": "https://registry.npmjs.org/ignore/-/ignore-7.0.5.tgz",
+ "integrity": "sha512-Hs59xBNfUIunMFgWAbGX5cq6893IbWg4KnrjbYwX3tx0ztorVgTDA6B2sxf8ejHJ4wz8BqGUMYlnzNBer5NvGg==",
"license": "MIT",
"engines": {
"node": ">= 4"
@@ -13209,9 +13273,9 @@
"license": "MIT"
},
"node_modules/immutable": {
- "version": "5.1.2",
- "resolved": "https://registry.npmjs.org/immutable/-/immutable-5.1.2.tgz",
- "integrity": "sha512-qHKXW1q6liAk1Oys6umoaZbDRqjcjgSrbnrifHsfsttza7zcvRAsL7mMV6xWcyhwQy7Xj5v4hhbr6b+iDYwlmQ==",
+ "version": "5.1.3",
+ "resolved": "https://registry.npmjs.org/immutable/-/immutable-5.1.3.tgz",
+ "integrity": "sha512-+chQdDfvscSF1SJqv2gn4SRO2ZyS3xL3r7IW/wWEEzrzLisnOlKiQu5ytC/BVNcS15C39WT2Hg/bjKjDMcu+zg==",
"devOptional": true,
"license": "MIT"
},
@@ -13233,9 +13297,9 @@
}
},
"node_modules/import-in-the-middle": {
- "version": "1.13.1",
- "resolved": "https://registry.npmjs.org/import-in-the-middle/-/import-in-the-middle-1.13.1.tgz",
- "integrity": "sha512-k2V9wNm9B+ysuelDTHjI9d5KPc4l8zAZTGqj+pcynvWkypZd857ryzN8jNC7Pg2YZXNMJcHRPpaDyCBbNyVRpA==",
+ "version": "1.14.2",
+ "resolved": "https://registry.npmjs.org/import-in-the-middle/-/import-in-the-middle-1.14.2.tgz",
+ "integrity": "sha512-5tCuY9BV8ujfOpwtAGgsTx9CGUapcFMEEyByLv1B+v2+6DhAcw+Zr0nhQT7uwaZ7DiourxFEscghOR8e1aPLQw==",
"license": "Apache-2.0",
"dependencies": {
"acorn": "^8.14.0",
@@ -13341,16 +13405,6 @@
"url": "https://opencollective.com/ioredis"
}
},
- "node_modules/ipaddr.js": {
- "version": "1.9.1",
- "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz",
- "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==",
- "devOptional": true,
- "license": "MIT",
- "engines": {
- "node": ">= 0.10"
- }
- },
"node_modules/iron-webcrypto": {
"version": "1.2.1",
"resolved": "https://registry.npmjs.org/iron-webcrypto/-/iron-webcrypto-1.2.1.tgz",
@@ -13442,24 +13496,6 @@
"node": ">=8"
}
},
- "node_modules/is-generator-function": {
- "version": "1.1.0",
- "resolved": "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.1.0.tgz",
- "integrity": "sha512-nPUB5km40q9e8UfN/Zc24eLlzdSf9OfKByBw9CIdw4H1giPMeA0OIJvbchsCu4npfI2QcMVBsGEBHKZ7wLTWmQ==",
- "license": "MIT",
- "dependencies": {
- "call-bound": "^1.0.3",
- "get-proto": "^1.0.0",
- "has-tostringtag": "^1.0.2",
- "safe-regex-test": "^1.1.0"
- },
- "engines": {
- "node": ">= 0.4"
- },
- "funding": {
- "url": "https://github.com/sponsors/ljharb"
- }
- },
"node_modules/is-glob": {
"version": "4.0.3",
"resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
@@ -13554,13 +13590,6 @@
"node": ">=0.10.0"
}
},
- "node_modules/is-promise": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-4.0.0.tgz",
- "integrity": "sha512-hvpoI6korhJMnej285dSg6nu1+e6uxs7zG3BYAm5byqDsgJNWwxzM6z6iZiAgQR4TJ30JmBTOwqZUw3WlyH3AQ==",
- "devOptional": true,
- "license": "MIT"
- },
"node_modules/is-reference": {
"version": "1.2.1",
"resolved": "https://registry.npmjs.org/is-reference/-/is-reference-1.2.1.tgz",
@@ -13570,24 +13599,6 @@
"@types/estree": "*"
}
},
- "node_modules/is-regex": {
- "version": "1.2.1",
- "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.2.1.tgz",
- "integrity": "sha512-MjYsKHO5O7mCsmRGxWcLWheFqN9DJ/2TmngvjKXihe6efViPqc274+Fx/4fYj/r03+ESvBdTXK0V6tA3rgez1g==",
- "license": "MIT",
- "dependencies": {
- "call-bound": "^1.0.2",
- "gopd": "^1.2.0",
- "has-tostringtag": "^1.0.2",
- "hasown": "^2.0.2"
- },
- "engines": {
- "node": ">= 0.4"
- },
- "funding": {
- "url": "https://github.com/sponsors/ljharb"
- }
- },
"node_modules/is-ssh": {
"version": "1.4.1",
"resolved": "https://registry.npmjs.org/is-ssh/-/is-ssh-1.4.1.tgz",
@@ -13807,387 +13818,111 @@
"semver": "^7.3.5"
},
"engines": {
- "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
- },
- "funding": {
- "url": "https://github.com/sponsors/ota-meshi"
- }
- },
- "node_modules/jsonc-eslint-parser/node_modules/espree": {
- "version": "9.6.1",
- "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz",
- "integrity": "sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==",
- "dev": true,
- "license": "BSD-2-Clause",
- "dependencies": {
- "acorn": "^8.9.0",
- "acorn-jsx": "^5.3.2",
- "eslint-visitor-keys": "^3.4.1"
- },
- "engines": {
- "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
- },
- "funding": {
- "url": "https://opencollective.com/eslint"
- }
- },
- "node_modules/jsonfile": {
- "version": "6.1.0",
- "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
- "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
- "license": "MIT",
- "dependencies": {
- "universalify": "^2.0.0"
- },
- "optionalDependencies": {
- "graceful-fs": "^4.1.6"
- }
- },
- "node_modules/junk": {
- "version": "4.0.1",
- "resolved": "https://registry.npmjs.org/junk/-/junk-4.0.1.tgz",
- "integrity": "sha512-Qush0uP+G8ZScpGMZvHUiRfI0YBWuB3gVBYlI0v0vvOJt5FLicco+IkP0a50LqTTQhmts/m6tP5SWE+USyIvcQ==",
- "license": "MIT",
- "engines": {
- "node": ">=12.20"
- },
- "funding": {
- "url": "https://github.com/sponsors/sindresorhus"
- }
- },
- "node_modules/jwt-decode": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/jwt-decode/-/jwt-decode-4.0.0.tgz",
- "integrity": "sha512-+KJGIyHgkGuIq3IEBNftfhW/LfWhXUIY6OmyVWjliu5KH1y0fw7VQ8YndE2O4qZdMSd9SqbnC8GOcZEy0Om7sA==",
- "license": "MIT",
- "engines": {
- "node": ">=18"
- }
- },
- "node_modules/katex": {
- "version": "0.16.22",
- "resolved": "https://registry.npmjs.org/katex/-/katex-0.16.22.tgz",
- "integrity": "sha512-XCHRdUw4lf3SKBaJe4EvgqIuWwkPSo9XoeO8GjQW94Bp7TWv9hNhzZjZ+OH9yf1UmLygb7DIT5GSFQiyt16zYg==",
- "funding": [
- "https://opencollective.com/katex",
- "https://github.com/sponsors/katex"
- ],
- "license": "MIT",
- "peer": true,
- "dependencies": {
- "commander": "^8.3.0"
- },
- "bin": {
- "katex": "cli.js"
- }
- },
- "node_modules/keygrip": {
- "version": "1.1.0",
- "resolved": "https://registry.npmjs.org/keygrip/-/keygrip-1.1.0.tgz",
- "integrity": "sha512-iYSchDJ+liQ8iwbSI2QqsQOvqv58eJCEanyJPJi+Khyu8smkcKSFUCbPwzFcL7YVtZ6eONjqRX/38caJ7QjRAQ==",
- "license": "MIT",
- "dependencies": {
- "tsscmp": "1.0.6"
- },
- "engines": {
- "node": ">= 0.6"
- }
- },
- "node_modules/keyv": {
- "version": "4.5.4",
- "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz",
- "integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==",
- "devOptional": true,
- "license": "MIT",
- "dependencies": {
- "json-buffer": "3.0.1"
- }
- },
- "node_modules/kind-of": {
- "version": "6.0.3",
- "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
- "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
- "license": "MIT",
- "engines": {
- "node": ">=0.10.0"
- }
- },
- "node_modules/kleur": {
- "version": "3.0.3",
- "resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz",
- "integrity": "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==",
- "license": "MIT",
- "engines": {
- "node": ">=6"
- }
- },
- "node_modules/klona": {
- "version": "2.0.6",
- "resolved": "https://registry.npmjs.org/klona/-/klona-2.0.6.tgz",
- "integrity": "sha512-dhG34DXATL5hSxJbIexCft8FChFXtmskoZYnoPWjXQuebWYCNkVeV3KkGegCK9CP1oswI/vQibS2GY7Em/sJJA==",
- "license": "MIT",
- "engines": {
- "node": ">= 8"
- }
- },
- "node_modules/knitwork": {
- "version": "1.2.0",
- "resolved": "https://registry.npmjs.org/knitwork/-/knitwork-1.2.0.tgz",
- "integrity": "sha512-xYSH7AvuQ6nXkq42x0v5S8/Iry+cfulBz/DJQzhIyESdLD7425jXsPy4vn5cCXU+HhRN2kVw51Vd1K6/By4BQg==",
- "license": "MIT"
- },
- "node_modules/koa": {
- "version": "2.16.1",
- "resolved": "https://registry.npmjs.org/koa/-/koa-2.16.1.tgz",
- "integrity": "sha512-umfX9d3iuSxTQP4pnzLOz0HKnPg0FaUUIKcye2lOiz3KPu1Y3M3xlz76dISdFPQs37P9eJz1wUpcTS6KDPn9fA==",
- "license": "MIT",
- "dependencies": {
- "accepts": "^1.3.5",
- "cache-content-type": "^1.0.0",
- "content-disposition": "~0.5.2",
- "content-type": "^1.0.4",
- "cookies": "~0.9.0",
- "debug": "^4.3.2",
- "delegates": "^1.0.0",
- "depd": "^2.0.0",
- "destroy": "^1.0.4",
- "encodeurl": "^1.0.2",
- "escape-html": "^1.0.3",
- "fresh": "~0.5.2",
- "http-assert": "^1.3.0",
- "http-errors": "^1.6.3",
- "is-generator-function": "^1.0.7",
- "koa-compose": "^4.1.0",
- "koa-convert": "^2.0.0",
- "on-finished": "^2.3.0",
- "only": "~0.0.2",
- "parseurl": "^1.3.2",
- "statuses": "^1.5.0",
- "type-is": "^1.6.16",
- "vary": "^1.1.2"
- },
- "engines": {
- "node": "^4.8.4 || ^6.10.1 || ^7.10.1 || >= 8.1.4"
- }
- },
- "node_modules/koa-compose": {
- "version": "4.1.0",
- "resolved": "https://registry.npmjs.org/koa-compose/-/koa-compose-4.1.0.tgz",
- "integrity": "sha512-8ODW8TrDuMYvXRwra/Kh7/rJo9BtOfPc6qO8eAfC80CnCvSjSl0bkRM24X6/XBBEyj0v1nRUQ1LyOy3dbqOWXw==",
- "license": "MIT"
- },
- "node_modules/koa-convert": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/koa-convert/-/koa-convert-2.0.0.tgz",
- "integrity": "sha512-asOvN6bFlSnxewce2e/DK3p4tltyfC4VM7ZwuTuepI7dEQVcvpyFuBcEARu1+Hxg8DIwytce2n7jrZtRlPrARA==",
- "license": "MIT",
- "dependencies": {
- "co": "^4.6.0",
- "koa-compose": "^4.1.0"
- },
- "engines": {
- "node": ">= 10"
- }
- },
- "node_modules/koa-send": {
- "version": "5.0.1",
- "resolved": "https://registry.npmjs.org/koa-send/-/koa-send-5.0.1.tgz",
- "integrity": "sha512-tmcyQ/wXXuxpDxyNXv5yNNkdAMdFRqwtegBXUaowiQzUKqJehttS0x2j0eOZDQAyloAth5w6wwBImnFzkUz3pQ==",
- "license": "MIT",
- "dependencies": {
- "debug": "^4.1.1",
- "http-errors": "^1.7.3",
- "resolve-path": "^1.4.0"
- },
- "engines": {
- "node": ">= 8"
- }
- },
- "node_modules/koa-send/node_modules/depd": {
- "version": "1.1.2",
- "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
- "integrity": "sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ==",
- "license": "MIT",
- "engines": {
- "node": ">= 0.6"
- }
- },
- "node_modules/koa-send/node_modules/http-errors": {
- "version": "1.8.1",
- "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.8.1.tgz",
- "integrity": "sha512-Kpk9Sm7NmI+RHhnj6OIWDI1d6fIoFAtFt9RLaTMRlg/8w49juAStsrBgp0Dp4OdxdVbRIeKhtCUvoi/RuAhO4g==",
- "license": "MIT",
- "dependencies": {
- "depd": "~1.1.2",
- "inherits": "2.0.4",
- "setprototypeof": "1.2.0",
- "statuses": ">= 1.5.0 < 2",
- "toidentifier": "1.0.1"
- },
- "engines": {
- "node": ">= 0.6"
- }
- },
- "node_modules/koa-send/node_modules/statuses": {
- "version": "1.5.0",
- "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
- "integrity": "sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==",
- "license": "MIT",
- "engines": {
- "node": ">= 0.6"
- }
- },
- "node_modules/koa-static": {
- "version": "5.0.0",
- "resolved": "https://registry.npmjs.org/koa-static/-/koa-static-5.0.0.tgz",
- "integrity": "sha512-UqyYyH5YEXaJrf9S8E23GoJFQZXkBVJ9zYYMPGz919MSX1KuvAcycIuS0ci150HCoPf4XQVhQ84Qf8xRPWxFaQ==",
- "license": "MIT",
- "dependencies": {
- "debug": "^3.1.0",
- "koa-send": "^5.0.0"
- },
- "engines": {
- "node": ">= 7.6.0"
- }
- },
- "node_modules/koa-static/node_modules/debug": {
- "version": "3.2.7",
- "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
- "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
- "license": "MIT",
- "dependencies": {
- "ms": "^2.1.1"
- }
- },
- "node_modules/koa/node_modules/accepts": {
- "version": "1.3.8",
- "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz",
- "integrity": "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==",
- "license": "MIT",
- "dependencies": {
- "mime-types": "~2.1.34",
- "negotiator": "0.6.3"
- },
- "engines": {
- "node": ">= 0.6"
- }
- },
- "node_modules/koa/node_modules/content-disposition": {
- "version": "0.5.4",
- "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz",
- "integrity": "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==",
- "license": "MIT",
- "dependencies": {
- "safe-buffer": "5.2.1"
- },
- "engines": {
- "node": ">= 0.6"
- }
- },
- "node_modules/koa/node_modules/encodeurl": {
- "version": "1.0.2",
- "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
- "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==",
- "license": "MIT",
- "engines": {
- "node": ">= 0.8"
- }
- },
- "node_modules/koa/node_modules/fresh": {
- "version": "0.5.2",
- "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
- "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==",
- "license": "MIT",
- "engines": {
- "node": ">= 0.6"
+ "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/ota-meshi"
}
},
- "node_modules/koa/node_modules/http-errors": {
- "version": "1.8.1",
- "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.8.1.tgz",
- "integrity": "sha512-Kpk9Sm7NmI+RHhnj6OIWDI1d6fIoFAtFt9RLaTMRlg/8w49juAStsrBgp0Dp4OdxdVbRIeKhtCUvoi/RuAhO4g==",
- "license": "MIT",
+ "node_modules/jsonc-eslint-parser/node_modules/espree": {
+ "version": "9.6.1",
+ "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz",
+ "integrity": "sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==",
+ "dev": true,
+ "license": "BSD-2-Clause",
"dependencies": {
- "depd": "~1.1.2",
- "inherits": "2.0.4",
- "setprototypeof": "1.2.0",
- "statuses": ">= 1.5.0 < 2",
- "toidentifier": "1.0.1"
+ "acorn": "^8.9.0",
+ "acorn-jsx": "^5.3.2",
+ "eslint-visitor-keys": "^3.4.1"
},
"engines": {
- "node": ">= 0.6"
+ "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+ },
+ "funding": {
+ "url": "https://opencollective.com/eslint"
}
},
- "node_modules/koa/node_modules/http-errors/node_modules/depd": {
- "version": "1.1.2",
- "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
- "integrity": "sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ==",
+ "node_modules/junk": {
+ "version": "4.0.1",
+ "resolved": "https://registry.npmjs.org/junk/-/junk-4.0.1.tgz",
+ "integrity": "sha512-Qush0uP+G8ZScpGMZvHUiRfI0YBWuB3gVBYlI0v0vvOJt5FLicco+IkP0a50LqTTQhmts/m6tP5SWE+USyIvcQ==",
"license": "MIT",
"engines": {
- "node": ">= 0.6"
+ "node": ">=12.20"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
}
},
- "node_modules/koa/node_modules/media-typer": {
- "version": "0.3.0",
- "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
- "integrity": "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==",
+ "node_modules/jwt-decode": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/jwt-decode/-/jwt-decode-4.0.0.tgz",
+ "integrity": "sha512-+KJGIyHgkGuIq3IEBNftfhW/LfWhXUIY6OmyVWjliu5KH1y0fw7VQ8YndE2O4qZdMSd9SqbnC8GOcZEy0Om7sA==",
"license": "MIT",
"engines": {
- "node": ">= 0.6"
+ "node": ">=18"
}
},
- "node_modules/koa/node_modules/mime-db": {
- "version": "1.52.0",
- "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
- "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
+ "node_modules/katex": {
+ "version": "0.16.22",
+ "resolved": "https://registry.npmjs.org/katex/-/katex-0.16.22.tgz",
+ "integrity": "sha512-XCHRdUw4lf3SKBaJe4EvgqIuWwkPSo9XoeO8GjQW94Bp7TWv9hNhzZjZ+OH9yf1UmLygb7DIT5GSFQiyt16zYg==",
+ "funding": [
+ "https://opencollective.com/katex",
+ "https://github.com/sponsors/katex"
+ ],
"license": "MIT",
- "engines": {
- "node": ">= 0.6"
+ "peer": true,
+ "dependencies": {
+ "commander": "^8.3.0"
+ },
+ "bin": {
+ "katex": "cli.js"
}
},
- "node_modules/koa/node_modules/mime-types": {
- "version": "2.1.35",
- "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
- "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
+ "node_modules/keyv": {
+ "version": "4.5.4",
+ "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz",
+ "integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==",
+ "devOptional": true,
"license": "MIT",
"dependencies": {
- "mime-db": "1.52.0"
- },
- "engines": {
- "node": ">= 0.6"
+ "json-buffer": "3.0.1"
}
},
- "node_modules/koa/node_modules/negotiator": {
- "version": "0.6.3",
- "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz",
- "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==",
+ "node_modules/kind-of": {
+ "version": "6.0.3",
+ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+ "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
"license": "MIT",
"engines": {
- "node": ">= 0.6"
+ "node": ">=0.10.0"
}
},
- "node_modules/koa/node_modules/statuses": {
- "version": "1.5.0",
- "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
- "integrity": "sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==",
+ "node_modules/kleur": {
+ "version": "3.0.3",
+ "resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz",
+ "integrity": "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==",
"license": "MIT",
"engines": {
- "node": ">= 0.6"
+ "node": ">=6"
}
},
- "node_modules/koa/node_modules/type-is": {
- "version": "1.6.18",
- "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz",
- "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==",
+ "node_modules/klona": {
+ "version": "2.0.6",
+ "resolved": "https://registry.npmjs.org/klona/-/klona-2.0.6.tgz",
+ "integrity": "sha512-dhG34DXATL5hSxJbIexCft8FChFXtmskoZYnoPWjXQuebWYCNkVeV3KkGegCK9CP1oswI/vQibS2GY7Em/sJJA==",
"license": "MIT",
- "dependencies": {
- "media-typer": "0.3.0",
- "mime-types": "~2.1.24"
- },
"engines": {
- "node": ">= 0.6"
+ "node": ">= 8"
}
},
+ "node_modules/knitwork": {
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/knitwork/-/knitwork-1.2.0.tgz",
+ "integrity": "sha512-xYSH7AvuQ6nXkq42x0v5S8/Iry+cfulBz/DJQzhIyESdLD7425jXsPy4vn5cCXU+HhRN2kVw51Vd1K6/By4BQg==",
+ "license": "MIT"
+ },
"node_modules/kolorist": {
"version": "1.8.0",
"resolved": "https://registry.npmjs.org/kolorist/-/kolorist-1.8.0.tgz",
@@ -14292,11 +14027,239 @@
"node": ">= 0.8.0"
}
},
- "node_modules/libphonenumber-js": {
- "version": "1.12.7",
- "resolved": "https://registry.npmjs.org/libphonenumber-js/-/libphonenumber-js-1.12.7.tgz",
- "integrity": "sha512-0nYZSNj/QEikyhcM5RZFXGlCB/mr4PVamnT1C2sKBnDDTYndrvbybYjvg+PMqAndQHlLbwQ3socolnL3WWTUFA==",
- "license": "MIT"
+ "node_modules/libphonenumber-js": {
+ "version": "1.12.10",
+ "resolved": "https://registry.npmjs.org/libphonenumber-js/-/libphonenumber-js-1.12.10.tgz",
+ "integrity": "sha512-E91vHJD61jekHHR/RF/E83T/CMoaLXT7cwYA75T4gim4FZjnM6hbJjVIGg7chqlSqRsSvQ3izGmOjHy1SQzcGQ==",
+ "license": "MIT"
+ },
+ "node_modules/lightningcss": {
+ "version": "1.30.1",
+ "resolved": "https://registry.npmjs.org/lightningcss/-/lightningcss-1.30.1.tgz",
+ "integrity": "sha512-xi6IyHML+c9+Q3W0S4fCQJOym42pyurFiJUHEcEyHS0CeKzia4yZDEsLlqOFykxOdHpNy0NmvVO31vcSqAxJCg==",
+ "license": "MPL-2.0",
+ "dependencies": {
+ "detect-libc": "^2.0.3"
+ },
+ "engines": {
+ "node": ">= 12.0.0"
+ },
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/parcel"
+ },
+ "optionalDependencies": {
+ "lightningcss-darwin-arm64": "1.30.1",
+ "lightningcss-darwin-x64": "1.30.1",
+ "lightningcss-freebsd-x64": "1.30.1",
+ "lightningcss-linux-arm-gnueabihf": "1.30.1",
+ "lightningcss-linux-arm64-gnu": "1.30.1",
+ "lightningcss-linux-arm64-musl": "1.30.1",
+ "lightningcss-linux-x64-gnu": "1.30.1",
+ "lightningcss-linux-x64-musl": "1.30.1",
+ "lightningcss-win32-arm64-msvc": "1.30.1",
+ "lightningcss-win32-x64-msvc": "1.30.1"
+ }
+ },
+ "node_modules/lightningcss-darwin-arm64": {
+ "version": "1.30.1",
+ "resolved": "https://registry.npmjs.org/lightningcss-darwin-arm64/-/lightningcss-darwin-arm64-1.30.1.tgz",
+ "integrity": "sha512-c8JK7hyE65X1MHMN+Viq9n11RRC7hgin3HhYKhrMyaXflk5GVplZ60IxyoVtzILeKr+xAJwg6zK6sjTBJ0FKYQ==",
+ "cpu": [
+ "arm64"
+ ],
+ "license": "MPL-2.0",
+ "optional": true,
+ "os": [
+ "darwin"
+ ],
+ "engines": {
+ "node": ">= 12.0.0"
+ },
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/parcel"
+ }
+ },
+ "node_modules/lightningcss-darwin-x64": {
+ "version": "1.30.1",
+ "resolved": "https://registry.npmjs.org/lightningcss-darwin-x64/-/lightningcss-darwin-x64-1.30.1.tgz",
+ "integrity": "sha512-k1EvjakfumAQoTfcXUcHQZhSpLlkAuEkdMBsI/ivWw9hL+7FtilQc0Cy3hrx0AAQrVtQAbMI7YjCgYgvn37PzA==",
+ "cpu": [
+ "x64"
+ ],
+ "license": "MPL-2.0",
+ "optional": true,
+ "os": [
+ "darwin"
+ ],
+ "engines": {
+ "node": ">= 12.0.0"
+ },
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/parcel"
+ }
+ },
+ "node_modules/lightningcss-freebsd-x64": {
+ "version": "1.30.1",
+ "resolved": "https://registry.npmjs.org/lightningcss-freebsd-x64/-/lightningcss-freebsd-x64-1.30.1.tgz",
+ "integrity": "sha512-kmW6UGCGg2PcyUE59K5r0kWfKPAVy4SltVeut+umLCFoJ53RdCUWxcRDzO1eTaxf/7Q2H7LTquFHPL5R+Gjyig==",
+ "cpu": [
+ "x64"
+ ],
+ "license": "MPL-2.0",
+ "optional": true,
+ "os": [
+ "freebsd"
+ ],
+ "engines": {
+ "node": ">= 12.0.0"
+ },
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/parcel"
+ }
+ },
+ "node_modules/lightningcss-linux-arm-gnueabihf": {
+ "version": "1.30.1",
+ "resolved": "https://registry.npmjs.org/lightningcss-linux-arm-gnueabihf/-/lightningcss-linux-arm-gnueabihf-1.30.1.tgz",
+ "integrity": "sha512-MjxUShl1v8pit+6D/zSPq9S9dQ2NPFSQwGvxBCYaBYLPlCWuPh9/t1MRS8iUaR8i+a6w7aps+B4N0S1TYP/R+Q==",
+ "cpu": [
+ "arm"
+ ],
+ "license": "MPL-2.0",
+ "optional": true,
+ "os": [
+ "linux"
+ ],
+ "engines": {
+ "node": ">= 12.0.0"
+ },
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/parcel"
+ }
+ },
+ "node_modules/lightningcss-linux-arm64-gnu": {
+ "version": "1.30.1",
+ "resolved": "https://registry.npmjs.org/lightningcss-linux-arm64-gnu/-/lightningcss-linux-arm64-gnu-1.30.1.tgz",
+ "integrity": "sha512-gB72maP8rmrKsnKYy8XUuXi/4OctJiuQjcuqWNlJQ6jZiWqtPvqFziskH3hnajfvKB27ynbVCucKSm2rkQp4Bw==",
+ "cpu": [
+ "arm64"
+ ],
+ "license": "MPL-2.0",
+ "optional": true,
+ "os": [
+ "linux"
+ ],
+ "engines": {
+ "node": ">= 12.0.0"
+ },
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/parcel"
+ }
+ },
+ "node_modules/lightningcss-linux-arm64-musl": {
+ "version": "1.30.1",
+ "resolved": "https://registry.npmjs.org/lightningcss-linux-arm64-musl/-/lightningcss-linux-arm64-musl-1.30.1.tgz",
+ "integrity": "sha512-jmUQVx4331m6LIX+0wUhBbmMX7TCfjF5FoOH6SD1CttzuYlGNVpA7QnrmLxrsub43ClTINfGSYyHe2HWeLl5CQ==",
+ "cpu": [
+ "arm64"
+ ],
+ "license": "MPL-2.0",
+ "optional": true,
+ "os": [
+ "linux"
+ ],
+ "engines": {
+ "node": ">= 12.0.0"
+ },
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/parcel"
+ }
+ },
+ "node_modules/lightningcss-linux-x64-gnu": {
+ "version": "1.30.1",
+ "resolved": "https://registry.npmjs.org/lightningcss-linux-x64-gnu/-/lightningcss-linux-x64-gnu-1.30.1.tgz",
+ "integrity": "sha512-piWx3z4wN8J8z3+O5kO74+yr6ze/dKmPnI7vLqfSqI8bccaTGY5xiSGVIJBDd5K5BHlvVLpUB3S2YCfelyJ1bw==",
+ "cpu": [
+ "x64"
+ ],
+ "license": "MPL-2.0",
+ "optional": true,
+ "os": [
+ "linux"
+ ],
+ "engines": {
+ "node": ">= 12.0.0"
+ },
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/parcel"
+ }
+ },
+ "node_modules/lightningcss-linux-x64-musl": {
+ "version": "1.30.1",
+ "resolved": "https://registry.npmjs.org/lightningcss-linux-x64-musl/-/lightningcss-linux-x64-musl-1.30.1.tgz",
+ "integrity": "sha512-rRomAK7eIkL+tHY0YPxbc5Dra2gXlI63HL+v1Pdi1a3sC+tJTcFrHX+E86sulgAXeI7rSzDYhPSeHHjqFhqfeQ==",
+ "cpu": [
+ "x64"
+ ],
+ "license": "MPL-2.0",
+ "optional": true,
+ "os": [
+ "linux"
+ ],
+ "engines": {
+ "node": ">= 12.0.0"
+ },
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/parcel"
+ }
+ },
+ "node_modules/lightningcss-win32-arm64-msvc": {
+ "version": "1.30.1",
+ "resolved": "https://registry.npmjs.org/lightningcss-win32-arm64-msvc/-/lightningcss-win32-arm64-msvc-1.30.1.tgz",
+ "integrity": "sha512-mSL4rqPi4iXq5YVqzSsJgMVFENoa4nGTT/GjO2c0Yl9OuQfPsIfncvLrEW6RbbB24WtZ3xP/2CCmI3tNkNV4oA==",
+ "cpu": [
+ "arm64"
+ ],
+ "license": "MPL-2.0",
+ "optional": true,
+ "os": [
+ "win32"
+ ],
+ "engines": {
+ "node": ">= 12.0.0"
+ },
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/parcel"
+ }
+ },
+ "node_modules/lightningcss-win32-x64-msvc": {
+ "version": "1.30.1",
+ "resolved": "https://registry.npmjs.org/lightningcss-win32-x64-msvc/-/lightningcss-win32-x64-msvc-1.30.1.tgz",
+ "integrity": "sha512-PVqXh48wh4T53F/1CCu8PIPCxLzWyCnn/9T5W1Jpmdy5h9Cwd+0YQS6/LwhHXSafuc61/xg9Lv5OrCby6a++jg==",
+ "cpu": [
+ "x64"
+ ],
+ "license": "MPL-2.0",
+ "optional": true,
+ "os": [
+ "win32"
+ ],
+ "engines": {
+ "node": ">= 12.0.0"
+ },
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/parcel"
+ }
},
"node_modules/lilconfig": {
"version": "3.1.3",
@@ -14310,12 +14273,6 @@
"url": "https://github.com/sponsors/antonk52"
}
},
- "node_modules/lines-and-columns": {
- "version": "1.2.4",
- "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz",
- "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==",
- "license": "MIT"
- },
"node_modules/listhen": {
"version": "1.9.0",
"resolved": "https://registry.npmjs.org/listhen/-/listhen-1.9.0.tgz",
@@ -14396,12 +14353,6 @@
"integrity": "sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==",
"license": "MIT"
},
- "node_modules/lodash.castarray": {
- "version": "4.4.0",
- "resolved": "https://registry.npmjs.org/lodash.castarray/-/lodash.castarray-4.4.0.tgz",
- "integrity": "sha512-aVx8ztPv7/2ULbArGJ2Y42bG1mEQ5mGjpdvrbJcJFU3TbYybe+QlLS4pst9zV52ymy2in1KpFPiZnAOATxD4+Q==",
- "license": "MIT"
- },
"node_modules/lodash.clonedeep": {
"version": "4.5.0",
"resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz",
@@ -14420,18 +14371,6 @@
"integrity": "sha512-qjxPLHd3r5DnsdGacqOMU6pb/avJzdh9tFX2ymgoZE27BmjXrNy/y4LoaiTeAb+O3gL8AfpJGtqfX/ae2leYYQ==",
"license": "MIT"
},
- "node_modules/lodash.difference": {
- "version": "4.5.0",
- "resolved": "https://registry.npmjs.org/lodash.difference/-/lodash.difference-4.5.0.tgz",
- "integrity": "sha512-dS2j+W26TQ7taQBGN8Lbbq04ssV3emRw4NY58WErlTO29pIqS0HmoT5aJ9+TUQ1N3G+JOZSji4eugsWwGp9yPA==",
- "license": "MIT"
- },
- "node_modules/lodash.flatten": {
- "version": "4.4.0",
- "resolved": "https://registry.npmjs.org/lodash.flatten/-/lodash.flatten-4.4.0.tgz",
- "integrity": "sha512-C5N2Z3DgnnKr0LOpv/hKCgKdb7ZZwafIrsesve6lmzvZIRZRGaZ/l6Q8+2W7NaT+ZwO3fFlSCzCzrDCFdJfZ4g==",
- "license": "MIT"
- },
"node_modules/lodash.isarguments": {
"version": "3.1.0",
"resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz",
@@ -14445,12 +14384,6 @@
"deprecated": "This package is deprecated. Use require('node:util').isDeepStrictEqual instead.",
"license": "MIT"
},
- "node_modules/lodash.isplainobject": {
- "version": "4.0.6",
- "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz",
- "integrity": "sha512-oSXzaWypCMHkPC3NvBEaPHf0KsA5mvPrOPgQWDsbg8n7orZ290M0BmC/jgRZ4vcJ6DTAhjrsSYgdsW/F+MFOBA==",
- "license": "MIT"
- },
"node_modules/lodash.memoize": {
"version": "4.1.2",
"resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz",
@@ -14461,12 +14394,7 @@
"version": "4.6.2",
"resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
"integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
- "license": "MIT"
- },
- "node_modules/lodash.union": {
- "version": "4.6.0",
- "resolved": "https://registry.npmjs.org/lodash.union/-/lodash.union-4.6.0.tgz",
- "integrity": "sha512-c4pB2CdGrGdjMKYLA+XiRDO7Y0PRQbm/Gzg8qMj+QH+pFVAoTp5sBpO0odL3FjoPCGjK96p6qsP+yQoiLoOBcw==",
+ "devOptional": true,
"license": "MIT"
},
"node_modules/lodash.uniq": {
@@ -14502,14 +14430,29 @@
}
},
"node_modules/luxon": {
- "version": "3.6.1",
- "resolved": "https://registry.npmjs.org/luxon/-/luxon-3.6.1.tgz",
- "integrity": "sha512-tJLxrKJhO2ukZ5z0gyjY1zPh3Rh88Ej9P7jNrZiHMUXHae1yvI2imgOZtL1TO8TW6biMMKfTtAOoEJANgtWBMQ==",
+ "version": "3.7.1",
+ "resolved": "https://registry.npmjs.org/luxon/-/luxon-3.7.1.tgz",
+ "integrity": "sha512-RkRWjA926cTvz5rAb1BqyWkKbbjzCGchDUIKMCUvNi17j6f6j8uHGDV82Aqcqtzd+icoYpELmG3ksgGiFNNcNg==",
"license": "MIT",
"engines": {
"node": ">=12"
}
},
+ "node_modules/magic-regexp": {
+ "version": "0.10.0",
+ "resolved": "https://registry.npmjs.org/magic-regexp/-/magic-regexp-0.10.0.tgz",
+ "integrity": "sha512-Uly1Bu4lO1hwHUW0CQeSWuRtzCMNO00CmXtS8N6fyvB3B979GOEEeAkiTUDsmbYLAbvpUS/Kt5c4ibosAzVyVg==",
+ "license": "MIT",
+ "dependencies": {
+ "estree-walker": "^3.0.3",
+ "magic-string": "^0.30.12",
+ "mlly": "^1.7.2",
+ "regexp-tree": "^0.1.27",
+ "type-level-regexp": "~0.1.17",
+ "ufo": "^1.5.4",
+ "unplugin": "^2.0.0"
+ }
+ },
"node_modules/magic-string": {
"version": "0.30.17",
"resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.17.tgz",
@@ -14555,34 +14498,11 @@
}
},
"node_modules/mdn-data": {
- "version": "2.0.30",
- "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.30.tgz",
- "integrity": "sha512-GaqWWShW4kv/G9IEucWScBx9G1/vsFZZJUO+tD26M8J8z3Kw5RDQjaoZe03YAClgeS/SWPOcb4nkFBTEi5DUEA==",
+ "version": "2.12.2",
+ "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.12.2.tgz",
+ "integrity": "sha512-IEn+pegP1aManZuckezWCO+XZQDplx1366JoVhTpMpBB1sPey/SbveZQUosKiKiGYjg1wH4pMlNgXbCiYgihQA==",
"license": "CC0-1.0"
},
- "node_modules/media-typer": {
- "version": "1.1.0",
- "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-1.1.0.tgz",
- "integrity": "sha512-aisnrDP4GNe06UcKFnV5bfMNPBUw4jsLGaWwWfnH3v02GnBuXX2MCVn5RbrWo0j3pczUilYblq7fQ7Nw2t5XKw==",
- "devOptional": true,
- "license": "MIT",
- "engines": {
- "node": ">= 0.8"
- }
- },
- "node_modules/merge-descriptors": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-2.0.0.tgz",
- "integrity": "sha512-Snk314V5ayFLhp3fkUREub6WtjBfPdCPY1Ln8/8munuLuiYhsABgBVWsozAG+MWMbVEvcdcpbi9R7ww22l9Q3g==",
- "devOptional": true,
- "license": "MIT",
- "engines": {
- "node": ">=18"
- },
- "funding": {
- "url": "https://github.com/sponsors/sindresorhus"
- }
- },
"node_modules/merge-images": {
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/merge-images/-/merge-images-1.2.0.tgz",
@@ -14616,15 +14536,6 @@
"node": ">= 8"
}
},
- "node_modules/methods": {
- "version": "1.1.2",
- "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
- "integrity": "sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==",
- "license": "MIT",
- "engines": {
- "node": ">= 0.6"
- }
- },
"node_modules/micro-api-client": {
"version": "3.3.0",
"resolved": "https://registry.npmjs.org/micro-api-client/-/micro-api-client-3.3.0.tgz",
@@ -14714,15 +14625,6 @@
"node": ">=4"
}
},
- "node_modules/mini-svg-data-uri": {
- "version": "1.4.4",
- "resolved": "https://registry.npmjs.org/mini-svg-data-uri/-/mini-svg-data-uri-1.4.4.tgz",
- "integrity": "sha512-r9deDe9p5FJUPZAk3A59wGH7Ii9YrjjWw0jmw/liSbHl2CHiyXj6FcDXDu2K3TjVAXqiJdaw3xxwlZZr9E6nHg==",
- "license": "MIT",
- "bin": {
- "mini-svg-data-uri": "cli.js"
- }
- },
"node_modules/minimatch": {
"version": "9.0.5",
"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
@@ -14834,19 +14736,19 @@
"license": "MIT"
},
"node_modules/module-definition": {
- "version": "5.0.1",
- "resolved": "https://registry.npmjs.org/module-definition/-/module-definition-5.0.1.tgz",
- "integrity": "sha512-kvw3B4G19IXk+BOXnYq/D/VeO9qfHaapMeuS7w7sNUqmGaA6hywdFHMi+VWeR9wUScXM7XjoryTffCZ5B0/8IA==",
+ "version": "6.0.1",
+ "resolved": "https://registry.npmjs.org/module-definition/-/module-definition-6.0.1.tgz",
+ "integrity": "sha512-FeVc50FTfVVQnolk/WQT8MX+2WVcDnTGiq6Wo+/+lJ2ET1bRVi3HG3YlJUfqagNMc/kUlFSoR96AJkxGpKz13g==",
"license": "MIT",
"dependencies": {
- "ast-module-types": "^5.0.0",
- "node-source-walk": "^6.0.1"
+ "ast-module-types": "^6.0.1",
+ "node-source-walk": "^7.0.1"
},
"bin": {
"module-definition": "bin/cli.js"
},
"engines": {
- "node": ">=14"
+ "node": ">=18"
}
},
"node_modules/module-details-from-path": {
@@ -14870,17 +14772,6 @@
"integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
"license": "MIT"
},
- "node_modules/mz": {
- "version": "2.7.0",
- "resolved": "https://registry.npmjs.org/mz/-/mz-2.7.0.tgz",
- "integrity": "sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==",
- "license": "MIT",
- "dependencies": {
- "any-promise": "^1.0.0",
- "object-assign": "^4.0.1",
- "thenify-all": "^1.0.0"
- }
- },
"node_modules/nanoid": {
"version": "5.1.5",
"resolved": "https://registry.npmjs.org/nanoid/-/nanoid-5.1.5.tgz",
@@ -14905,22 +14796,6 @@
"integrity": "sha512-9ca1h0Xjvo9bEkE4UOxgAzLV0jHKe6LMaxo37ND2DAhhAtd0j8pR1Wxz+/goMrZO8AEZTWCmyaOsFI/W5AdpCQ==",
"license": "MIT"
},
- "node_modules/napi-postinstall": {
- "version": "0.2.3",
- "resolved": "https://registry.npmjs.org/napi-postinstall/-/napi-postinstall-0.2.3.tgz",
- "integrity": "sha512-Mi7JISo/4Ij2tDZ2xBE2WH+/KvVlkhA6juEjpEeRAVPNCpN3nxJo/5FhDNKgBcdmcmhaH6JjgST4xY/23ZYK0w==",
- "dev": true,
- "license": "MIT",
- "bin": {
- "napi-postinstall": "lib/cli.js"
- },
- "engines": {
- "node": "^12.20.0 || ^14.18.0 || >=16.0.0"
- },
- "funding": {
- "url": "https://opencollective.com/napi-postinstall"
- }
- },
"node_modules/natural-compare": {
"version": "1.4.0",
"resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
@@ -14928,22 +14803,6 @@
"devOptional": true,
"license": "MIT"
},
- "node_modules/negotiator": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-1.0.0.tgz",
- "integrity": "sha512-8Ofs/AUQh8MaEcrlq5xOX0CQ9ypTF5dl78mjlMNfOK08fzpgTHQRQPBxcPlEtIw0yRpws+Zo/3r+5WRby7u3Gg==",
- "devOptional": true,
- "license": "MIT",
- "engines": {
- "node": ">= 0.6"
- }
- },
- "node_modules/nested-error-stacks": {
- "version": "2.1.1",
- "resolved": "https://registry.npmjs.org/nested-error-stacks/-/nested-error-stacks-2.1.1.tgz",
- "integrity": "sha512-9iN1ka/9zmX1ZvLV9ewJYEk9h7RyRRtqdK0woXcqohu8EWIerfPUjYJPg0ULy0UqP7cslmdGc8xKDJcojlKiaw==",
- "license": "MIT"
- },
"node_modules/netlify": {
"version": "13.3.5",
"resolved": "https://registry.npmjs.org/netlify/-/netlify-13.3.5.tgz",
@@ -14961,15 +14820,6 @@
"node": "^14.16.0 || >=16.0.0"
}
},
- "node_modules/netlify/node_modules/data-uri-to-buffer": {
- "version": "4.0.1",
- "resolved": "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-4.0.1.tgz",
- "integrity": "sha512-0R9ikRb668HB7QDxT1vkpuUBtqc53YyAwMwGeUFKRojY/NWKvdZ+9UYtRfGmhqNbRkTSVpMbmyhXipFFv2cb/A==",
- "license": "MIT",
- "engines": {
- "node": ">= 12"
- }
- },
"node_modules/netlify/node_modules/node-fetch": {
"version": "3.3.2",
"resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-3.3.2.tgz",
@@ -14989,39 +14839,39 @@
}
},
"node_modules/nitropack": {
- "version": "2.11.11",
- "resolved": "https://registry.npmjs.org/nitropack/-/nitropack-2.11.11.tgz",
- "integrity": "sha512-KnWkajf2ZIsjr7PNeENvDRi87UdMrn8dRTe/D/Ak3Ud6sbC7ZCArVGeosoY7WZvsvLBN1YAwm//34Bq4dKkAaw==",
+ "version": "2.12.0",
+ "resolved": "https://registry.npmjs.org/nitropack/-/nitropack-2.12.0.tgz",
+ "integrity": "sha512-5H7g7Jbuid99Wv5VuuL/PwysjmDGl+GVFhlSdfRxKkOtvRzNz9HECS6ACjyXqkRGLmtaW0ctB9C4qA+tyqQ8UA==",
"license": "MIT",
"dependencies": {
"@cloudflare/kv-asset-handler": "^0.4.0",
- "@netlify/functions": "^3.1.2",
+ "@netlify/functions": "^3.1.10",
"@rollup/plugin-alias": "^5.1.1",
- "@rollup/plugin-commonjs": "^28.0.3",
+ "@rollup/plugin-commonjs": "^28.0.6",
"@rollup/plugin-inject": "^5.0.5",
"@rollup/plugin-json": "^6.1.0",
"@rollup/plugin-node-resolve": "^16.0.1",
"@rollup/plugin-replace": "^6.0.2",
"@rollup/plugin-terser": "^0.4.4",
- "@vercel/nft": "^0.29.2",
+ "@vercel/nft": "^0.29.4",
"archiver": "^7.0.1",
- "c12": "^3.0.3",
+ "c12": "^3.1.0",
"chokidar": "^4.0.3",
"citty": "^0.1.6",
"compatx": "^0.2.0",
"confbox": "^0.2.2",
"consola": "^3.4.2",
"cookie-es": "^2.0.0",
- "croner": "^9.0.0",
- "crossws": "^0.3.4",
+ "croner": "^9.1.0",
+ "crossws": "^0.3.5",
"db0": "^0.3.2",
"defu": "^6.1.4",
"destr": "^2.0.5",
"dot-prop": "^9.0.0",
- "esbuild": "^0.25.3",
+ "esbuild": "^0.25.6",
"escape-string-regexp": "^5.0.0",
"etag": "^1.8.1",
- "exsolve": "^1.0.5",
+ "exsolve": "^1.0.7",
"globby": "^14.1.0",
"gzip-size": "^7.0.0",
"h3": "^1.15.3",
@@ -15037,18 +14887,18 @@
"mime": "^4.0.7",
"mlly": "^1.7.4",
"node-fetch-native": "^1.6.6",
- "node-mock-http": "^1.0.0",
+ "node-mock-http": "^1.0.1",
"ofetch": "^1.4.1",
"ohash": "^2.0.11",
"pathe": "^2.0.3",
"perfect-debounce": "^1.0.0",
- "pkg-types": "^2.1.0",
+ "pkg-types": "^2.2.0",
"pretty-bytes": "^6.1.1",
"radix3": "^1.1.2",
- "rollup": "^4.40.0",
- "rollup-plugin-visualizer": "^5.14.0",
+ "rollup": "^4.45.0",
+ "rollup-plugin-visualizer": "^6.0.3",
"scule": "^1.3.0",
- "semver": "^7.7.1",
+ "semver": "^7.7.2",
"serve-placeholder": "^2.0.2",
"serve-static": "^2.2.0",
"source-map": "^0.7.4",
@@ -15057,14 +14907,14 @@
"ultrahtml": "^1.6.0",
"uncrypto": "^0.1.3",
"unctx": "^2.4.1",
- "unenv": "^2.0.0-rc.15",
- "unimport": "^5.0.0",
+ "unenv": "^2.0.0-rc.18",
+ "unimport": "^5.1.0",
"unplugin-utils": "^0.2.4",
- "unstorage": "^1.16.0",
+ "unstorage": "^1.16.1",
"untyped": "^2.0.0",
"unwasm": "^0.3.9",
- "youch": "^4.1.0-beta.7",
- "youch-core": "^0.3.2"
+ "youch": "4.1.0-beta.8",
+ "youch-core": "^0.3.3"
},
"bin": {
"nitro": "dist/cli/index.mjs",
@@ -15083,9 +14933,9 @@
}
},
"node_modules/nitropack/node_modules/@esbuild/aix-ppc64": {
- "version": "0.25.4",
- "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.25.4.tgz",
- "integrity": "sha512-1VCICWypeQKhVbE9oW/sJaAmjLxhVqacdkvPLEjwlttjfwENRSClS8EjBz0KzRyFSCPDIkuXW34Je/vk7zdB7Q==",
+ "version": "0.25.6",
+ "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.25.6.tgz",
+ "integrity": "sha512-ShbM/3XxwuxjFiuVBHA+d3j5dyac0aEVVq1oluIDf71hUw0aRF59dV/efUsIwFnR6m8JNM2FjZOzmaZ8yG61kw==",
"cpu": [
"ppc64"
],
@@ -15099,9 +14949,9 @@
}
},
"node_modules/nitropack/node_modules/@esbuild/android-arm": {
- "version": "0.25.4",
- "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.25.4.tgz",
- "integrity": "sha512-QNdQEps7DfFwE3hXiU4BZeOV68HHzYwGd0Nthhd3uCkkEKK7/R6MTgM0P7H7FAs5pU/DIWsviMmEGxEoxIZ+ZQ==",
+ "version": "0.25.6",
+ "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.25.6.tgz",
+ "integrity": "sha512-S8ToEOVfg++AU/bHwdksHNnyLyVM+eMVAOf6yRKFitnwnbwwPNqKr3srzFRe7nzV69RQKb5DgchIX5pt3L53xg==",
"cpu": [
"arm"
],
@@ -15115,9 +14965,9 @@
}
},
"node_modules/nitropack/node_modules/@esbuild/android-arm64": {
- "version": "0.25.4",
- "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.25.4.tgz",
- "integrity": "sha512-bBy69pgfhMGtCnwpC/x5QhfxAz/cBgQ9enbtwjf6V9lnPI/hMyT9iWpR1arm0l3kttTr4L0KSLpKmLp/ilKS9A==",
+ "version": "0.25.6",
+ "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.25.6.tgz",
+ "integrity": "sha512-hd5zdUarsK6strW+3Wxi5qWws+rJhCCbMiC9QZyzoxfk5uHRIE8T287giQxzVpEvCwuJ9Qjg6bEjcRJcgfLqoA==",
"cpu": [
"arm64"
],
@@ -15131,9 +14981,9 @@
}
},
"node_modules/nitropack/node_modules/@esbuild/android-x64": {
- "version": "0.25.4",
- "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.25.4.tgz",
- "integrity": "sha512-TVhdVtQIFuVpIIR282btcGC2oGQoSfZfmBdTip2anCaVYcqWlZXGcdcKIUklfX2wj0JklNYgz39OBqh2cqXvcQ==",
+ "version": "0.25.6",
+ "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.25.6.tgz",
+ "integrity": "sha512-0Z7KpHSr3VBIO9A/1wcT3NTy7EB4oNC4upJ5ye3R7taCc2GUdeynSLArnon5G8scPwaU866d3H4BCrE5xLW25A==",
"cpu": [
"x64"
],
@@ -15147,9 +14997,9 @@
}
},
"node_modules/nitropack/node_modules/@esbuild/darwin-arm64": {
- "version": "0.25.4",
- "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.25.4.tgz",
- "integrity": "sha512-Y1giCfM4nlHDWEfSckMzeWNdQS31BQGs9/rouw6Ub91tkK79aIMTH3q9xHvzH8d0wDru5Ci0kWB8b3up/nl16g==",
+ "version": "0.25.6",
+ "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.25.6.tgz",
+ "integrity": "sha512-FFCssz3XBavjxcFxKsGy2DYK5VSvJqa6y5HXljKzhRZ87LvEi13brPrf/wdyl/BbpbMKJNOr1Sd0jtW4Ge1pAA==",
"cpu": [
"arm64"
],
@@ -15163,9 +15013,9 @@
}
},
"node_modules/nitropack/node_modules/@esbuild/darwin-x64": {
- "version": "0.25.4",
- "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.25.4.tgz",
- "integrity": "sha512-CJsry8ZGM5VFVeyUYB3cdKpd/H69PYez4eJh1W/t38vzutdjEjtP7hB6eLKBoOdxcAlCtEYHzQ/PJ/oU9I4u0A==",
+ "version": "0.25.6",
+ "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.25.6.tgz",
+ "integrity": "sha512-GfXs5kry/TkGM2vKqK2oyiLFygJRqKVhawu3+DOCk7OxLy/6jYkWXhlHwOoTb0WqGnWGAS7sooxbZowy+pK9Yg==",
"cpu": [
"x64"
],
@@ -15179,9 +15029,9 @@
}
},
"node_modules/nitropack/node_modules/@esbuild/freebsd-arm64": {
- "version": "0.25.4",
- "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.25.4.tgz",
- "integrity": "sha512-yYq+39NlTRzU2XmoPW4l5Ifpl9fqSk0nAJYM/V/WUGPEFfek1epLHJIkTQM6bBs1swApjO5nWgvr843g6TjxuQ==",
+ "version": "0.25.6",
+ "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.25.6.tgz",
+ "integrity": "sha512-aoLF2c3OvDn2XDTRvn8hN6DRzVVpDlj2B/F66clWd/FHLiHaG3aVZjxQX2DYphA5y/evbdGvC6Us13tvyt4pWg==",
"cpu": [
"arm64"
],
@@ -15195,9 +15045,9 @@
}
},
"node_modules/nitropack/node_modules/@esbuild/freebsd-x64": {
- "version": "0.25.4",
- "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.25.4.tgz",
- "integrity": "sha512-0FgvOJ6UUMflsHSPLzdfDnnBBVoCDtBTVyn/MrWloUNvq/5SFmh13l3dvgRPkDihRxb77Y17MbqbCAa2strMQQ==",
+ "version": "0.25.6",
+ "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.25.6.tgz",
+ "integrity": "sha512-2SkqTjTSo2dYi/jzFbU9Plt1vk0+nNg8YC8rOXXea+iA3hfNJWebKYPs3xnOUf9+ZWhKAaxnQNUf2X9LOpeiMQ==",
"cpu": [
"x64"
],
@@ -15211,9 +15061,9 @@
}
},
"node_modules/nitropack/node_modules/@esbuild/linux-arm": {
- "version": "0.25.4",
- "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.25.4.tgz",
- "integrity": "sha512-kro4c0P85GMfFYqW4TWOpvmF8rFShbWGnrLqlzp4X1TNWjRY3JMYUfDCtOxPKOIY8B0WC8HN51hGP4I4hz4AaQ==",
+ "version": "0.25.6",
+ "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.25.6.tgz",
+ "integrity": "sha512-SZHQlzvqv4Du5PrKE2faN0qlbsaW/3QQfUUc6yO2EjFcA83xnwm91UbEEVx4ApZ9Z5oG8Bxz4qPE+HFwtVcfyw==",
"cpu": [
"arm"
],
@@ -15227,9 +15077,9 @@
}
},
"node_modules/nitropack/node_modules/@esbuild/linux-arm64": {
- "version": "0.25.4",
- "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.25.4.tgz",
- "integrity": "sha512-+89UsQTfXdmjIvZS6nUnOOLoXnkUTB9hR5QAeLrQdzOSWZvNSAXAtcRDHWtqAUtAmv7ZM1WPOOeSxDzzzMogiQ==",
+ "version": "0.25.6",
+ "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.25.6.tgz",
+ "integrity": "sha512-b967hU0gqKd9Drsh/UuAm21Khpoh6mPBSgz8mKRq4P5mVK8bpA+hQzmm/ZwGVULSNBzKdZPQBRT3+WuVavcWsQ==",
"cpu": [
"arm64"
],
@@ -15243,9 +15093,9 @@
}
},
"node_modules/nitropack/node_modules/@esbuild/linux-ia32": {
- "version": "0.25.4",
- "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.25.4.tgz",
- "integrity": "sha512-yTEjoapy8UP3rv8dB0ip3AfMpRbyhSN3+hY8mo/i4QXFeDxmiYbEKp3ZRjBKcOP862Ua4b1PDfwlvbuwY7hIGQ==",
+ "version": "0.25.6",
+ "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.25.6.tgz",
+ "integrity": "sha512-aHWdQ2AAltRkLPOsKdi3xv0mZ8fUGPdlKEjIEhxCPm5yKEThcUjHpWB1idN74lfXGnZ5SULQSgtr5Qos5B0bPw==",
"cpu": [
"ia32"
],
@@ -15259,9 +15109,9 @@
}
},
"node_modules/nitropack/node_modules/@esbuild/linux-loong64": {
- "version": "0.25.4",
- "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.25.4.tgz",
- "integrity": "sha512-NeqqYkrcGzFwi6CGRGNMOjWGGSYOpqwCjS9fvaUlX5s3zwOtn1qwg1s2iE2svBe4Q/YOG1q6875lcAoQK/F4VA==",
+ "version": "0.25.6",
+ "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.25.6.tgz",
+ "integrity": "sha512-VgKCsHdXRSQ7E1+QXGdRPlQ/e08bN6WMQb27/TMfV+vPjjTImuT9PmLXupRlC90S1JeNNW5lzkAEO/McKeJ2yg==",
"cpu": [
"loong64"
],
@@ -15275,9 +15125,9 @@
}
},
"node_modules/nitropack/node_modules/@esbuild/linux-mips64el": {
- "version": "0.25.4",
- "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.25.4.tgz",
- "integrity": "sha512-IcvTlF9dtLrfL/M8WgNI/qJYBENP3ekgsHbYUIzEzq5XJzzVEV/fXY9WFPfEEXmu3ck2qJP8LG/p3Q8f7Zc2Xg==",
+ "version": "0.25.6",
+ "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.25.6.tgz",
+ "integrity": "sha512-WViNlpivRKT9/py3kCmkHnn44GkGXVdXfdc4drNmRl15zVQ2+D2uFwdlGh6IuK5AAnGTo2qPB1Djppj+t78rzw==",
"cpu": [
"mips64el"
],
@@ -15291,9 +15141,9 @@
}
},
"node_modules/nitropack/node_modules/@esbuild/linux-ppc64": {
- "version": "0.25.4",
- "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.25.4.tgz",
- "integrity": "sha512-HOy0aLTJTVtoTeGZh4HSXaO6M95qu4k5lJcH4gxv56iaycfz1S8GO/5Jh6X4Y1YiI0h7cRyLi+HixMR+88swag==",
+ "version": "0.25.6",
+ "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.25.6.tgz",
+ "integrity": "sha512-wyYKZ9NTdmAMb5730I38lBqVu6cKl4ZfYXIs31Baf8aoOtB4xSGi3THmDYt4BTFHk7/EcVixkOV2uZfwU3Q2Jw==",
"cpu": [
"ppc64"
],
@@ -15307,9 +15157,9 @@
}
},
"node_modules/nitropack/node_modules/@esbuild/linux-riscv64": {
- "version": "0.25.4",
- "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.25.4.tgz",
- "integrity": "sha512-i8JUDAufpz9jOzo4yIShCTcXzS07vEgWzyX3NH2G7LEFVgrLEhjwL3ajFE4fZI3I4ZgiM7JH3GQ7ReObROvSUA==",
+ "version": "0.25.6",
+ "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.25.6.tgz",
+ "integrity": "sha512-KZh7bAGGcrinEj4qzilJ4hqTY3Dg2U82c8bv+e1xqNqZCrCyc+TL9AUEn5WGKDzm3CfC5RODE/qc96OcbIe33w==",
"cpu": [
"riscv64"
],
@@ -15323,9 +15173,9 @@
}
},
"node_modules/nitropack/node_modules/@esbuild/linux-s390x": {
- "version": "0.25.4",
- "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.25.4.tgz",
- "integrity": "sha512-jFnu+6UbLlzIjPQpWCNh5QtrcNfMLjgIavnwPQAfoGx4q17ocOU9MsQ2QVvFxwQoWpZT8DvTLooTvmOQXkO51g==",
+ "version": "0.25.6",
+ "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.25.6.tgz",
+ "integrity": "sha512-9N1LsTwAuE9oj6lHMyyAM+ucxGiVnEqUdp4v7IaMmrwb06ZTEVCIs3oPPplVsnjPfyjmxwHxHMF8b6vzUVAUGw==",
"cpu": [
"s390x"
],
@@ -15339,9 +15189,9 @@
}
},
"node_modules/nitropack/node_modules/@esbuild/linux-x64": {
- "version": "0.25.4",
- "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.25.4.tgz",
- "integrity": "sha512-6e0cvXwzOnVWJHq+mskP8DNSrKBr1bULBvnFLpc1KY+d+irZSgZ02TGse5FsafKS5jg2e4pbvK6TPXaF/A6+CA==",
+ "version": "0.25.6",
+ "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.25.6.tgz",
+ "integrity": "sha512-A6bJB41b4lKFWRKNrWoP2LHsjVzNiaurf7wyj/XtFNTsnPuxwEBWHLty+ZE0dWBKuSK1fvKgrKaNjBS7qbFKig==",
"cpu": [
"x64"
],
@@ -15354,10 +15204,26 @@
"node": ">=18"
}
},
+ "node_modules/nitropack/node_modules/@esbuild/netbsd-arm64": {
+ "version": "0.25.6",
+ "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.25.6.tgz",
+ "integrity": "sha512-IjA+DcwoVpjEvyxZddDqBY+uJ2Snc6duLpjmkXm/v4xuS3H+3FkLZlDm9ZsAbF9rsfP3zeA0/ArNDORZgrxR/Q==",
+ "cpu": [
+ "arm64"
+ ],
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "netbsd"
+ ],
+ "engines": {
+ "node": ">=18"
+ }
+ },
"node_modules/nitropack/node_modules/@esbuild/netbsd-x64": {
- "version": "0.25.4",
- "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.25.4.tgz",
- "integrity": "sha512-XAg8pIQn5CzhOB8odIcAm42QsOfa98SBeKUdo4xa8OvX8LbMZqEtgeWE9P/Wxt7MlG2QqvjGths+nq48TrUiKw==",
+ "version": "0.25.6",
+ "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.25.6.tgz",
+ "integrity": "sha512-dUXuZr5WenIDlMHdMkvDc1FAu4xdWixTCRgP7RQLBOkkGgwuuzaGSYcOpW4jFxzpzL1ejb8yF620UxAqnBrR9g==",
"cpu": [
"x64"
],
@@ -15371,9 +15237,9 @@
}
},
"node_modules/nitropack/node_modules/@esbuild/openbsd-arm64": {
- "version": "0.25.4",
- "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.25.4.tgz",
- "integrity": "sha512-Ct2WcFEANlFDtp1nVAXSNBPDxyU+j7+tId//iHXU2f/lN5AmO4zLyhDcpR5Cz1r08mVxzt3Jpyt4PmXQ1O6+7A==",
+ "version": "0.25.6",
+ "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.25.6.tgz",
+ "integrity": "sha512-l8ZCvXP0tbTJ3iaqdNf3pjaOSd5ex/e6/omLIQCVBLmHTlfXW3zAxQ4fnDmPLOB1x9xrcSi/xtCWFwCZRIaEwg==",
"cpu": [
"arm64"
],
@@ -15387,9 +15253,9 @@
}
},
"node_modules/nitropack/node_modules/@esbuild/openbsd-x64": {
- "version": "0.25.4",
- "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.25.4.tgz",
- "integrity": "sha512-xAGGhyOQ9Otm1Xu8NT1ifGLnA6M3sJxZ6ixylb+vIUVzvvd6GOALpwQrYrtlPouMqd/vSbgehz6HaVk4+7Afhw==",
+ "version": "0.25.6",
+ "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.25.6.tgz",
+ "integrity": "sha512-hKrmDa0aOFOr71KQ/19JC7az1P0GWtCN1t2ahYAf4O007DHZt/dW8ym5+CUdJhQ/qkZmI1HAF8KkJbEFtCL7gw==",
"cpu": [
"x64"
],
@@ -15403,9 +15269,9 @@
}
},
"node_modules/nitropack/node_modules/@esbuild/sunos-x64": {
- "version": "0.25.4",
- "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.25.4.tgz",
- "integrity": "sha512-Mw+tzy4pp6wZEK0+Lwr76pWLjrtjmJyUB23tHKqEDP74R3q95luY/bXqXZeYl4NYlvwOqoRKlInQialgCKy67Q==",
+ "version": "0.25.6",
+ "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.25.6.tgz",
+ "integrity": "sha512-dyCGxv1/Br7MiSC42qinGL8KkG4kX0pEsdb0+TKhmJZgCUDBGmyo1/ArCjNGiOLiIAgdbWgmWgib4HoCi5t7kA==",
"cpu": [
"x64"
],
@@ -15419,9 +15285,9 @@
}
},
"node_modules/nitropack/node_modules/@esbuild/win32-arm64": {
- "version": "0.25.4",
- "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.25.4.tgz",
- "integrity": "sha512-AVUP428VQTSddguz9dO9ngb+E5aScyg7nOeJDrF1HPYu555gmza3bDGMPhmVXL8svDSoqPCsCPjb265yG/kLKQ==",
+ "version": "0.25.6",
+ "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.25.6.tgz",
+ "integrity": "sha512-42QOgcZeZOvXfsCBJF5Afw73t4veOId//XD3i+/9gSkhSV6Gk3VPlWncctI+JcOyERv85FUo7RxuxGy+z8A43Q==",
"cpu": [
"arm64"
],
@@ -15435,9 +15301,9 @@
}
},
"node_modules/nitropack/node_modules/@esbuild/win32-ia32": {
- "version": "0.25.4",
- "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.25.4.tgz",
- "integrity": "sha512-i1sW+1i+oWvQzSgfRcxxG2k4I9n3O9NRqy8U+uugaT2Dy7kLO9Y7wI72haOahxceMX8hZAzgGou1FhndRldxRg==",
+ "version": "0.25.6",
+ "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.25.6.tgz",
+ "integrity": "sha512-4AWhgXmDuYN7rJI6ORB+uU9DHLq/erBbuMoAuB4VWJTu5KtCgcKYPynF0YI1VkBNuEfjNlLrFr9KZPJzrtLkrQ==",
"cpu": [
"ia32"
],
@@ -15451,9 +15317,9 @@
}
},
"node_modules/nitropack/node_modules/@esbuild/win32-x64": {
- "version": "0.25.4",
- "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.25.4.tgz",
- "integrity": "sha512-nOT2vZNw6hJ+z43oP1SPea/G/6AbN6X+bGNhNuq8NtRHy4wsMhw765IKLNmnjek7GvjWBYQ8Q5VBoYTFg9y1UQ==",
+ "version": "0.25.6",
+ "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.25.6.tgz",
+ "integrity": "sha512-NgJPHHbEpLQgDH2MjQu90pzW/5vvXIZ7KOnPyNBm92A6WgZ/7b6fJyUBjoumLqeOQQGqY2QjQxRo97ah4Sj0cA==",
"cpu": [
"x64"
],
@@ -15473,9 +15339,9 @@
"license": "MIT"
},
"node_modules/nitropack/node_modules/esbuild": {
- "version": "0.25.4",
- "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.25.4.tgz",
- "integrity": "sha512-8pgjLUcUjcgDg+2Q4NYXnPbo/vncAY4UmyaCm0jZevERqCHZIaWwdJHkf8XQtu4AxSKCdvrUbT0XUr1IdZzI8Q==",
+ "version": "0.25.6",
+ "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.25.6.tgz",
+ "integrity": "sha512-GVuzuUwtdsghE3ocJ9Bs8PNoF13HNQ5TXbEi2AhvVb8xU1Iwt9Fos9FEamfoee+u/TOsn7GUWc04lz46n2bbTg==",
"hasInstallScript": true,
"license": "MIT",
"bin": {
@@ -15485,31 +15351,32 @@
"node": ">=18"
},
"optionalDependencies": {
- "@esbuild/aix-ppc64": "0.25.4",
- "@esbuild/android-arm": "0.25.4",
- "@esbuild/android-arm64": "0.25.4",
- "@esbuild/android-x64": "0.25.4",
- "@esbuild/darwin-arm64": "0.25.4",
- "@esbuild/darwin-x64": "0.25.4",
- "@esbuild/freebsd-arm64": "0.25.4",
- "@esbuild/freebsd-x64": "0.25.4",
- "@esbuild/linux-arm": "0.25.4",
- "@esbuild/linux-arm64": "0.25.4",
- "@esbuild/linux-ia32": "0.25.4",
- "@esbuild/linux-loong64": "0.25.4",
- "@esbuild/linux-mips64el": "0.25.4",
- "@esbuild/linux-ppc64": "0.25.4",
- "@esbuild/linux-riscv64": "0.25.4",
- "@esbuild/linux-s390x": "0.25.4",
- "@esbuild/linux-x64": "0.25.4",
- "@esbuild/netbsd-arm64": "0.25.4",
- "@esbuild/netbsd-x64": "0.25.4",
- "@esbuild/openbsd-arm64": "0.25.4",
- "@esbuild/openbsd-x64": "0.25.4",
- "@esbuild/sunos-x64": "0.25.4",
- "@esbuild/win32-arm64": "0.25.4",
- "@esbuild/win32-ia32": "0.25.4",
- "@esbuild/win32-x64": "0.25.4"
+ "@esbuild/aix-ppc64": "0.25.6",
+ "@esbuild/android-arm": "0.25.6",
+ "@esbuild/android-arm64": "0.25.6",
+ "@esbuild/android-x64": "0.25.6",
+ "@esbuild/darwin-arm64": "0.25.6",
+ "@esbuild/darwin-x64": "0.25.6",
+ "@esbuild/freebsd-arm64": "0.25.6",
+ "@esbuild/freebsd-x64": "0.25.6",
+ "@esbuild/linux-arm": "0.25.6",
+ "@esbuild/linux-arm64": "0.25.6",
+ "@esbuild/linux-ia32": "0.25.6",
+ "@esbuild/linux-loong64": "0.25.6",
+ "@esbuild/linux-mips64el": "0.25.6",
+ "@esbuild/linux-ppc64": "0.25.6",
+ "@esbuild/linux-riscv64": "0.25.6",
+ "@esbuild/linux-s390x": "0.25.6",
+ "@esbuild/linux-x64": "0.25.6",
+ "@esbuild/netbsd-arm64": "0.25.6",
+ "@esbuild/netbsd-x64": "0.25.6",
+ "@esbuild/openbsd-arm64": "0.25.6",
+ "@esbuild/openbsd-x64": "0.25.6",
+ "@esbuild/openharmony-arm64": "0.25.6",
+ "@esbuild/sunos-x64": "0.25.6",
+ "@esbuild/win32-arm64": "0.25.6",
+ "@esbuild/win32-ia32": "0.25.6",
+ "@esbuild/win32-x64": "0.25.6"
}
},
"node_modules/nitropack/node_modules/escape-string-regexp": {
@@ -15533,6 +15400,22 @@
"node": ">= 8"
}
},
+ "node_modules/nitropack/node_modules/youch": {
+ "version": "4.1.0-beta.8",
+ "resolved": "https://registry.npmjs.org/youch/-/youch-4.1.0-beta.8.tgz",
+ "integrity": "sha512-rY2A2lSF7zC+l7HH9Mq+83D1dLlsPnEvy8jTouzaptDZM6geqZ3aJe/b7ULCwRURPtWV3vbDjA2DDMdoBol0HQ==",
+ "license": "MIT",
+ "dependencies": {
+ "@poppinss/colors": "^4.1.4",
+ "@poppinss/dumper": "^0.6.3",
+ "@speed-highlight/core": "^1.2.7",
+ "cookie": "^1.0.2",
+ "youch-core": "^0.3.1"
+ },
+ "engines": {
+ "node": ">=18"
+ }
+ },
"node_modules/node-addon-api": {
"version": "7.1.1",
"resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-7.1.1.tgz",
@@ -15606,9 +15489,9 @@
}
},
"node_modules/node-mock-http": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/node-mock-http/-/node-mock-http-1.0.0.tgz",
- "integrity": "sha512-0uGYQ1WQL1M5kKvGRXWQ3uZCHtLTO8hln3oBjIusM75WoesZ909uQJs/Hb946i2SS+Gsrhkaa6iAO17jRIv6DQ==",
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/node-mock-http/-/node-mock-http-1.0.1.tgz",
+ "integrity": "sha512-0gJJgENizp4ghds/Ywu2FCmcRsgBTmRQzYPZm61wy+Em2sBarSka0OhQS5huLBg6od1zkNpnWMCZloQDFVvOMQ==",
"license": "MIT"
},
"node_modules/node-releases": {
@@ -15618,15 +15501,15 @@
"license": "MIT"
},
"node_modules/node-source-walk": {
- "version": "6.0.2",
- "resolved": "https://registry.npmjs.org/node-source-walk/-/node-source-walk-6.0.2.tgz",
- "integrity": "sha512-jn9vOIK/nfqoFCcpK89/VCVaLg1IHE6UVfDOzvqmANaJ/rWCTEdH8RZ1V278nv2jr36BJdyQXIAavBLXpzdlag==",
+ "version": "7.0.1",
+ "resolved": "https://registry.npmjs.org/node-source-walk/-/node-source-walk-7.0.1.tgz",
+ "integrity": "sha512-3VW/8JpPqPvnJvseXowjZcirPisssnBuDikk6JIZ8jQzF7KJQX52iPFX4RYYxLycYH7IbMRSPUOga/esVjy5Yg==",
"license": "MIT",
"dependencies": {
- "@babel/parser": "^7.21.8"
+ "@babel/parser": "^7.26.7"
},
"engines": {
- "node": ">=14"
+ "node": ">=18"
}
},
"node_modules/nopt": {
@@ -15716,21 +15599,21 @@
}
},
"node_modules/nuxt": {
- "version": "3.17.2",
- "resolved": "https://registry.npmjs.org/nuxt/-/nuxt-3.17.2.tgz",
- "integrity": "sha512-zPEGeGlHoMCFf+Y9I7iEZKhdfsRq0Zf2qE8wEEcjP9T6omzm776h9KVzoj3+qPL1v0rGzSyCFslFtxk+Ey6neA==",
+ "version": "3.17.5",
+ "resolved": "https://registry.npmjs.org/nuxt/-/nuxt-3.17.5.tgz",
+ "integrity": "sha512-HWTWpM1/RDcCt9DlnzrPcNvUmGqc62IhlZJvr7COSfnJq2lKYiBKIIesEaOF+57Qjw7TfLPc1DQVBNtxfKBxEw==",
"license": "MIT",
"dependencies": {
- "@nuxt/cli": "^3.25.0",
+ "@nuxt/cli": "^3.25.1",
"@nuxt/devalue": "^2.0.2",
- "@nuxt/devtools": "^2.4.0",
- "@nuxt/kit": "3.17.2",
- "@nuxt/schema": "3.17.2",
+ "@nuxt/devtools": "^2.4.1",
+ "@nuxt/kit": "3.17.5",
+ "@nuxt/schema": "3.17.5",
"@nuxt/telemetry": "^2.6.6",
- "@nuxt/vite-builder": "3.17.2",
- "@unhead/vue": "^2.0.8",
- "@vue/shared": "^3.5.13",
- "c12": "^3.0.3",
+ "@nuxt/vite-builder": "3.17.5",
+ "@unhead/vue": "^2.0.10",
+ "@vue/shared": "^3.5.16",
+ "c12": "^3.0.4",
"chokidar": "^4.0.3",
"compatx": "^0.2.0",
"consola": "^3.4.2",
@@ -15739,14 +15622,13 @@
"destr": "^2.0.5",
"devalue": "^5.1.1",
"errx": "^0.1.0",
- "esbuild": "^0.25.3",
+ "esbuild": "^0.25.5",
"escape-string-regexp": "^5.0.0",
"estree-walker": "^3.0.3",
"exsolve": "^1.0.5",
- "globby": "^14.1.0",
"h3": "^1.15.3",
"hookable": "^5.5.3",
- "ignore": "^7.0.4",
+ "ignore": "^7.0.5",
"impound": "^1.0.0",
"jiti": "^2.4.2",
"klona": "^2.0.6",
@@ -15755,31 +15637,31 @@
"mlly": "^1.7.4",
"mocked-exports": "^0.1.1",
"nanotar": "^0.2.0",
- "nitropack": "^2.11.11",
+ "nitropack": "^2.11.12",
"nypm": "^0.6.0",
"ofetch": "^1.4.1",
"ohash": "^2.0.11",
"on-change": "^5.0.1",
- "oxc-parser": "^0.68.1",
+ "oxc-parser": "^0.72.2",
"pathe": "^2.0.3",
"perfect-debounce": "^1.0.0",
"pkg-types": "^2.1.0",
"radix3": "^1.1.2",
"scule": "^1.3.0",
- "semver": "^7.7.1",
+ "semver": "^7.7.2",
"std-env": "^3.9.0",
"strip-literal": "^3.0.0",
- "tinyglobby": "0.2.13",
+ "tinyglobby": "0.2.14",
"ufo": "^1.6.1",
"ultrahtml": "^1.6.0",
"uncrypto": "^0.1.3",
"unctx": "^2.4.1",
"unimport": "^5.0.1",
- "unplugin": "^2.3.2",
+ "unplugin": "^2.3.5",
"unplugin-vue-router": "^0.12.0",
"unstorage": "^1.16.0",
"untyped": "^2.0.0",
- "vue": "^3.5.13",
+ "vue": "^3.5.16",
"vue-bundle-renderer": "^2.1.1",
"vue-devtools-stub": "^0.1.0",
"vue-router": "^4.5.1"
@@ -15805,55 +15687,55 @@
}
},
"node_modules/nuxt-site-config": {
- "version": "3.1.9",
- "resolved": "https://registry.npmjs.org/nuxt-site-config/-/nuxt-site-config-3.1.9.tgz",
- "integrity": "sha512-YB69GX0st8drv1d5xypweseiEWeR22tfGdyVH3U4R+mpUSz8paBx48ArKC6MgV22DKItoQm51LVoapF5pl5bEQ==",
+ "version": "3.2.2",
+ "resolved": "https://registry.npmjs.org/nuxt-site-config/-/nuxt-site-config-3.2.2.tgz",
+ "integrity": "sha512-0zCo8nZKk11F4oEWvioTPpxYesJtiwWGfanh1coOfPmvGdYuCcJ/pusy8zdPb6xQkvAYqpTZUy7KKfjXjrE8rA==",
"dev": true,
"license": "MIT",
"dependencies": {
- "@nuxt/kit": "^3.16.2",
- "nuxt-site-config-kit": "3.1.9",
+ "@nuxt/kit": "^3.17.5",
+ "nuxt-site-config-kit": "3.2.2",
"pathe": "^2.0.3",
"pkg-types": "^2.1.0",
"sirv": "^3.0.1",
- "site-config-stack": "3.1.9",
- "ufo": "^1.5.4"
+ "site-config-stack": "3.2.2",
+ "ufo": "^1.6.1"
},
"funding": {
"url": "https://github.com/sponsors/harlan-zw"
}
},
"node_modules/nuxt-site-config-kit": {
- "version": "3.1.9",
- "resolved": "https://registry.npmjs.org/nuxt-site-config-kit/-/nuxt-site-config-kit-3.1.9.tgz",
- "integrity": "sha512-bcmpajYJgkNzA0jTq6CmmhKF2wHZUUKeVx/CIGI8lwWuAD81EBUZN0T4iKvVDo54g9UBrUUl8/5GhD65YBBG0A==",
+ "version": "3.2.2",
+ "resolved": "https://registry.npmjs.org/nuxt-site-config-kit/-/nuxt-site-config-kit-3.2.2.tgz",
+ "integrity": "sha512-SmTBVm6JQd5zHBy04/qn0gWo3rg1HTRGT/H91hxk/o+mDB3ll+TkzpZekD46RUBO/AD02ArLG5n2ndu6zhWsHA==",
"dev": true,
"license": "MIT",
"dependencies": {
- "@nuxt/kit": "^3.16.2",
+ "@nuxt/kit": "^3.17.5",
"pkg-types": "^2.1.0",
- "site-config-stack": "3.1.9",
+ "site-config-stack": "3.2.2",
"std-env": "^3.9.0",
- "ufo": "^1.5.4"
+ "ufo": "^1.6.1"
},
"funding": {
"url": "https://github.com/sponsors/harlan-zw"
}
},
"node_modules/nuxt-utm": {
- "version": "0.2.7",
- "resolved": "https://registry.npmjs.org/nuxt-utm/-/nuxt-utm-0.2.7.tgz",
- "integrity": "sha512-aQvf/bD91d3ozG3nCpUpQzjWu7UZ926TQ0ygAJeWyUv2S6RufqidyEL8LmRguE+Zv3nc0LEJ3I2u99SFsKJGQw==",
+ "version": "0.2.10",
+ "resolved": "https://registry.npmjs.org/nuxt-utm/-/nuxt-utm-0.2.10.tgz",
+ "integrity": "sha512-D8Uxd7XKdr56PAGECzD7Y3QMvmh5X6qBgNLKrc9TCnklgT38KbjSdOHNkiUFRjRkxm+gsQ5YoMjWXY0354VnzQ==",
"dev": true,
"license": "MIT",
"dependencies": {
- "@nuxt/kit": "^3.7.3"
+ "@nuxt/kit": "^3.17.2"
}
},
"node_modules/nuxt/node_modules/@esbuild/aix-ppc64": {
- "version": "0.25.4",
- "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.25.4.tgz",
- "integrity": "sha512-1VCICWypeQKhVbE9oW/sJaAmjLxhVqacdkvPLEjwlttjfwENRSClS8EjBz0KzRyFSCPDIkuXW34Je/vk7zdB7Q==",
+ "version": "0.25.6",
+ "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.25.6.tgz",
+ "integrity": "sha512-ShbM/3XxwuxjFiuVBHA+d3j5dyac0aEVVq1oluIDf71hUw0aRF59dV/efUsIwFnR6m8JNM2FjZOzmaZ8yG61kw==",
"cpu": [
"ppc64"
],
@@ -15867,9 +15749,9 @@
}
},
"node_modules/nuxt/node_modules/@esbuild/android-arm": {
- "version": "0.25.4",
- "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.25.4.tgz",
- "integrity": "sha512-QNdQEps7DfFwE3hXiU4BZeOV68HHzYwGd0Nthhd3uCkkEKK7/R6MTgM0P7H7FAs5pU/DIWsviMmEGxEoxIZ+ZQ==",
+ "version": "0.25.6",
+ "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.25.6.tgz",
+ "integrity": "sha512-S8ToEOVfg++AU/bHwdksHNnyLyVM+eMVAOf6yRKFitnwnbwwPNqKr3srzFRe7nzV69RQKb5DgchIX5pt3L53xg==",
"cpu": [
"arm"
],
@@ -15883,9 +15765,9 @@
}
},
"node_modules/nuxt/node_modules/@esbuild/android-arm64": {
- "version": "0.25.4",
- "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.25.4.tgz",
- "integrity": "sha512-bBy69pgfhMGtCnwpC/x5QhfxAz/cBgQ9enbtwjf6V9lnPI/hMyT9iWpR1arm0l3kttTr4L0KSLpKmLp/ilKS9A==",
+ "version": "0.25.6",
+ "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.25.6.tgz",
+ "integrity": "sha512-hd5zdUarsK6strW+3Wxi5qWws+rJhCCbMiC9QZyzoxfk5uHRIE8T287giQxzVpEvCwuJ9Qjg6bEjcRJcgfLqoA==",
"cpu": [
"arm64"
],
@@ -15899,9 +15781,9 @@
}
},
"node_modules/nuxt/node_modules/@esbuild/android-x64": {
- "version": "0.25.4",
- "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.25.4.tgz",
- "integrity": "sha512-TVhdVtQIFuVpIIR282btcGC2oGQoSfZfmBdTip2anCaVYcqWlZXGcdcKIUklfX2wj0JklNYgz39OBqh2cqXvcQ==",
+ "version": "0.25.6",
+ "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.25.6.tgz",
+ "integrity": "sha512-0Z7KpHSr3VBIO9A/1wcT3NTy7EB4oNC4upJ5ye3R7taCc2GUdeynSLArnon5G8scPwaU866d3H4BCrE5xLW25A==",
"cpu": [
"x64"
],
@@ -15915,9 +15797,9 @@
}
},
"node_modules/nuxt/node_modules/@esbuild/darwin-arm64": {
- "version": "0.25.4",
- "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.25.4.tgz",
- "integrity": "sha512-Y1giCfM4nlHDWEfSckMzeWNdQS31BQGs9/rouw6Ub91tkK79aIMTH3q9xHvzH8d0wDru5Ci0kWB8b3up/nl16g==",
+ "version": "0.25.6",
+ "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.25.6.tgz",
+ "integrity": "sha512-FFCssz3XBavjxcFxKsGy2DYK5VSvJqa6y5HXljKzhRZ87LvEi13brPrf/wdyl/BbpbMKJNOr1Sd0jtW4Ge1pAA==",
"cpu": [
"arm64"
],
@@ -15931,9 +15813,9 @@
}
},
"node_modules/nuxt/node_modules/@esbuild/darwin-x64": {
- "version": "0.25.4",
- "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.25.4.tgz",
- "integrity": "sha512-CJsry8ZGM5VFVeyUYB3cdKpd/H69PYez4eJh1W/t38vzutdjEjtP7hB6eLKBoOdxcAlCtEYHzQ/PJ/oU9I4u0A==",
+ "version": "0.25.6",
+ "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.25.6.tgz",
+ "integrity": "sha512-GfXs5kry/TkGM2vKqK2oyiLFygJRqKVhawu3+DOCk7OxLy/6jYkWXhlHwOoTb0WqGnWGAS7sooxbZowy+pK9Yg==",
"cpu": [
"x64"
],
@@ -15947,9 +15829,9 @@
}
},
"node_modules/nuxt/node_modules/@esbuild/freebsd-arm64": {
- "version": "0.25.4",
- "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.25.4.tgz",
- "integrity": "sha512-yYq+39NlTRzU2XmoPW4l5Ifpl9fqSk0nAJYM/V/WUGPEFfek1epLHJIkTQM6bBs1swApjO5nWgvr843g6TjxuQ==",
+ "version": "0.25.6",
+ "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.25.6.tgz",
+ "integrity": "sha512-aoLF2c3OvDn2XDTRvn8hN6DRzVVpDlj2B/F66clWd/FHLiHaG3aVZjxQX2DYphA5y/evbdGvC6Us13tvyt4pWg==",
"cpu": [
"arm64"
],
@@ -15963,9 +15845,9 @@
}
},
"node_modules/nuxt/node_modules/@esbuild/freebsd-x64": {
- "version": "0.25.4",
- "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.25.4.tgz",
- "integrity": "sha512-0FgvOJ6UUMflsHSPLzdfDnnBBVoCDtBTVyn/MrWloUNvq/5SFmh13l3dvgRPkDihRxb77Y17MbqbCAa2strMQQ==",
+ "version": "0.25.6",
+ "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.25.6.tgz",
+ "integrity": "sha512-2SkqTjTSo2dYi/jzFbU9Plt1vk0+nNg8YC8rOXXea+iA3hfNJWebKYPs3xnOUf9+ZWhKAaxnQNUf2X9LOpeiMQ==",
"cpu": [
"x64"
],
@@ -15979,9 +15861,9 @@
}
},
"node_modules/nuxt/node_modules/@esbuild/linux-arm": {
- "version": "0.25.4",
- "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.25.4.tgz",
- "integrity": "sha512-kro4c0P85GMfFYqW4TWOpvmF8rFShbWGnrLqlzp4X1TNWjRY3JMYUfDCtOxPKOIY8B0WC8HN51hGP4I4hz4AaQ==",
+ "version": "0.25.6",
+ "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.25.6.tgz",
+ "integrity": "sha512-SZHQlzvqv4Du5PrKE2faN0qlbsaW/3QQfUUc6yO2EjFcA83xnwm91UbEEVx4ApZ9Z5oG8Bxz4qPE+HFwtVcfyw==",
"cpu": [
"arm"
],
@@ -15995,9 +15877,9 @@
}
},
"node_modules/nuxt/node_modules/@esbuild/linux-arm64": {
- "version": "0.25.4",
- "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.25.4.tgz",
- "integrity": "sha512-+89UsQTfXdmjIvZS6nUnOOLoXnkUTB9hR5QAeLrQdzOSWZvNSAXAtcRDHWtqAUtAmv7ZM1WPOOeSxDzzzMogiQ==",
+ "version": "0.25.6",
+ "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.25.6.tgz",
+ "integrity": "sha512-b967hU0gqKd9Drsh/UuAm21Khpoh6mPBSgz8mKRq4P5mVK8bpA+hQzmm/ZwGVULSNBzKdZPQBRT3+WuVavcWsQ==",
"cpu": [
"arm64"
],
@@ -16011,9 +15893,9 @@
}
},
"node_modules/nuxt/node_modules/@esbuild/linux-ia32": {
- "version": "0.25.4",
- "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.25.4.tgz",
- "integrity": "sha512-yTEjoapy8UP3rv8dB0ip3AfMpRbyhSN3+hY8mo/i4QXFeDxmiYbEKp3ZRjBKcOP862Ua4b1PDfwlvbuwY7hIGQ==",
+ "version": "0.25.6",
+ "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.25.6.tgz",
+ "integrity": "sha512-aHWdQ2AAltRkLPOsKdi3xv0mZ8fUGPdlKEjIEhxCPm5yKEThcUjHpWB1idN74lfXGnZ5SULQSgtr5Qos5B0bPw==",
"cpu": [
"ia32"
],
@@ -16027,9 +15909,9 @@
}
},
"node_modules/nuxt/node_modules/@esbuild/linux-loong64": {
- "version": "0.25.4",
- "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.25.4.tgz",
- "integrity": "sha512-NeqqYkrcGzFwi6CGRGNMOjWGGSYOpqwCjS9fvaUlX5s3zwOtn1qwg1s2iE2svBe4Q/YOG1q6875lcAoQK/F4VA==",
+ "version": "0.25.6",
+ "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.25.6.tgz",
+ "integrity": "sha512-VgKCsHdXRSQ7E1+QXGdRPlQ/e08bN6WMQb27/TMfV+vPjjTImuT9PmLXupRlC90S1JeNNW5lzkAEO/McKeJ2yg==",
"cpu": [
"loong64"
],
@@ -16043,9 +15925,9 @@
}
},
"node_modules/nuxt/node_modules/@esbuild/linux-mips64el": {
- "version": "0.25.4",
- "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.25.4.tgz",
- "integrity": "sha512-IcvTlF9dtLrfL/M8WgNI/qJYBENP3ekgsHbYUIzEzq5XJzzVEV/fXY9WFPfEEXmu3ck2qJP8LG/p3Q8f7Zc2Xg==",
+ "version": "0.25.6",
+ "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.25.6.tgz",
+ "integrity": "sha512-WViNlpivRKT9/py3kCmkHnn44GkGXVdXfdc4drNmRl15zVQ2+D2uFwdlGh6IuK5AAnGTo2qPB1Djppj+t78rzw==",
"cpu": [
"mips64el"
],
@@ -16059,9 +15941,9 @@
}
},
"node_modules/nuxt/node_modules/@esbuild/linux-ppc64": {
- "version": "0.25.4",
- "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.25.4.tgz",
- "integrity": "sha512-HOy0aLTJTVtoTeGZh4HSXaO6M95qu4k5lJcH4gxv56iaycfz1S8GO/5Jh6X4Y1YiI0h7cRyLi+HixMR+88swag==",
+ "version": "0.25.6",
+ "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.25.6.tgz",
+ "integrity": "sha512-wyYKZ9NTdmAMb5730I38lBqVu6cKl4ZfYXIs31Baf8aoOtB4xSGi3THmDYt4BTFHk7/EcVixkOV2uZfwU3Q2Jw==",
"cpu": [
"ppc64"
],
@@ -16075,9 +15957,9 @@
}
},
"node_modules/nuxt/node_modules/@esbuild/linux-riscv64": {
- "version": "0.25.4",
- "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.25.4.tgz",
- "integrity": "sha512-i8JUDAufpz9jOzo4yIShCTcXzS07vEgWzyX3NH2G7LEFVgrLEhjwL3ajFE4fZI3I4ZgiM7JH3GQ7ReObROvSUA==",
+ "version": "0.25.6",
+ "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.25.6.tgz",
+ "integrity": "sha512-KZh7bAGGcrinEj4qzilJ4hqTY3Dg2U82c8bv+e1xqNqZCrCyc+TL9AUEn5WGKDzm3CfC5RODE/qc96OcbIe33w==",
"cpu": [
"riscv64"
],
@@ -16091,9 +15973,9 @@
}
},
"node_modules/nuxt/node_modules/@esbuild/linux-s390x": {
- "version": "0.25.4",
- "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.25.4.tgz",
- "integrity": "sha512-jFnu+6UbLlzIjPQpWCNh5QtrcNfMLjgIavnwPQAfoGx4q17ocOU9MsQ2QVvFxwQoWpZT8DvTLooTvmOQXkO51g==",
+ "version": "0.25.6",
+ "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.25.6.tgz",
+ "integrity": "sha512-9N1LsTwAuE9oj6lHMyyAM+ucxGiVnEqUdp4v7IaMmrwb06ZTEVCIs3oPPplVsnjPfyjmxwHxHMF8b6vzUVAUGw==",
"cpu": [
"s390x"
],
@@ -16107,9 +15989,9 @@
}
},
"node_modules/nuxt/node_modules/@esbuild/linux-x64": {
- "version": "0.25.4",
- "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.25.4.tgz",
- "integrity": "sha512-6e0cvXwzOnVWJHq+mskP8DNSrKBr1bULBvnFLpc1KY+d+irZSgZ02TGse5FsafKS5jg2e4pbvK6TPXaF/A6+CA==",
+ "version": "0.25.6",
+ "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.25.6.tgz",
+ "integrity": "sha512-A6bJB41b4lKFWRKNrWoP2LHsjVzNiaurf7wyj/XtFNTsnPuxwEBWHLty+ZE0dWBKuSK1fvKgrKaNjBS7qbFKig==",
"cpu": [
"x64"
],
@@ -16122,10 +16004,26 @@
"node": ">=18"
}
},
+ "node_modules/nuxt/node_modules/@esbuild/netbsd-arm64": {
+ "version": "0.25.6",
+ "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.25.6.tgz",
+ "integrity": "sha512-IjA+DcwoVpjEvyxZddDqBY+uJ2Snc6duLpjmkXm/v4xuS3H+3FkLZlDm9ZsAbF9rsfP3zeA0/ArNDORZgrxR/Q==",
+ "cpu": [
+ "arm64"
+ ],
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "netbsd"
+ ],
+ "engines": {
+ "node": ">=18"
+ }
+ },
"node_modules/nuxt/node_modules/@esbuild/netbsd-x64": {
- "version": "0.25.4",
- "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.25.4.tgz",
- "integrity": "sha512-XAg8pIQn5CzhOB8odIcAm42QsOfa98SBeKUdo4xa8OvX8LbMZqEtgeWE9P/Wxt7MlG2QqvjGths+nq48TrUiKw==",
+ "version": "0.25.6",
+ "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.25.6.tgz",
+ "integrity": "sha512-dUXuZr5WenIDlMHdMkvDc1FAu4xdWixTCRgP7RQLBOkkGgwuuzaGSYcOpW4jFxzpzL1ejb8yF620UxAqnBrR9g==",
"cpu": [
"x64"
],
@@ -16139,9 +16037,9 @@
}
},
"node_modules/nuxt/node_modules/@esbuild/openbsd-arm64": {
- "version": "0.25.4",
- "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.25.4.tgz",
- "integrity": "sha512-Ct2WcFEANlFDtp1nVAXSNBPDxyU+j7+tId//iHXU2f/lN5AmO4zLyhDcpR5Cz1r08mVxzt3Jpyt4PmXQ1O6+7A==",
+ "version": "0.25.6",
+ "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.25.6.tgz",
+ "integrity": "sha512-l8ZCvXP0tbTJ3iaqdNf3pjaOSd5ex/e6/omLIQCVBLmHTlfXW3zAxQ4fnDmPLOB1x9xrcSi/xtCWFwCZRIaEwg==",
"cpu": [
"arm64"
],
@@ -16155,9 +16053,9 @@
}
},
"node_modules/nuxt/node_modules/@esbuild/openbsd-x64": {
- "version": "0.25.4",
- "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.25.4.tgz",
- "integrity": "sha512-xAGGhyOQ9Otm1Xu8NT1ifGLnA6M3sJxZ6ixylb+vIUVzvvd6GOALpwQrYrtlPouMqd/vSbgehz6HaVk4+7Afhw==",
+ "version": "0.25.6",
+ "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.25.6.tgz",
+ "integrity": "sha512-hKrmDa0aOFOr71KQ/19JC7az1P0GWtCN1t2ahYAf4O007DHZt/dW8ym5+CUdJhQ/qkZmI1HAF8KkJbEFtCL7gw==",
"cpu": [
"x64"
],
@@ -16171,9 +16069,9 @@
}
},
"node_modules/nuxt/node_modules/@esbuild/sunos-x64": {
- "version": "0.25.4",
- "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.25.4.tgz",
- "integrity": "sha512-Mw+tzy4pp6wZEK0+Lwr76pWLjrtjmJyUB23tHKqEDP74R3q95luY/bXqXZeYl4NYlvwOqoRKlInQialgCKy67Q==",
+ "version": "0.25.6",
+ "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.25.6.tgz",
+ "integrity": "sha512-dyCGxv1/Br7MiSC42qinGL8KkG4kX0pEsdb0+TKhmJZgCUDBGmyo1/ArCjNGiOLiIAgdbWgmWgib4HoCi5t7kA==",
"cpu": [
"x64"
],
@@ -16187,9 +16085,9 @@
}
},
"node_modules/nuxt/node_modules/@esbuild/win32-arm64": {
- "version": "0.25.4",
- "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.25.4.tgz",
- "integrity": "sha512-AVUP428VQTSddguz9dO9ngb+E5aScyg7nOeJDrF1HPYu555gmza3bDGMPhmVXL8svDSoqPCsCPjb265yG/kLKQ==",
+ "version": "0.25.6",
+ "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.25.6.tgz",
+ "integrity": "sha512-42QOgcZeZOvXfsCBJF5Afw73t4veOId//XD3i+/9gSkhSV6Gk3VPlWncctI+JcOyERv85FUo7RxuxGy+z8A43Q==",
"cpu": [
"arm64"
],
@@ -16203,75 +16101,188 @@
}
},
"node_modules/nuxt/node_modules/@esbuild/win32-ia32": {
- "version": "0.25.4",
- "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.25.4.tgz",
- "integrity": "sha512-i1sW+1i+oWvQzSgfRcxxG2k4I9n3O9NRqy8U+uugaT2Dy7kLO9Y7wI72haOahxceMX8hZAzgGou1FhndRldxRg==",
+ "version": "0.25.6",
+ "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.25.6.tgz",
+ "integrity": "sha512-4AWhgXmDuYN7rJI6ORB+uU9DHLq/erBbuMoAuB4VWJTu5KtCgcKYPynF0YI1VkBNuEfjNlLrFr9KZPJzrtLkrQ==",
"cpu": [
"ia32"
],
"license": "MIT",
"optional": true,
"os": [
- "win32"
+ "win32"
+ ],
+ "engines": {
+ "node": ">=18"
+ }
+ },
+ "node_modules/nuxt/node_modules/@esbuild/win32-x64": {
+ "version": "0.25.6",
+ "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.25.6.tgz",
+ "integrity": "sha512-NgJPHHbEpLQgDH2MjQu90pzW/5vvXIZ7KOnPyNBm92A6WgZ/7b6fJyUBjoumLqeOQQGqY2QjQxRo97ah4Sj0cA==",
+ "cpu": [
+ "x64"
+ ],
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "win32"
+ ],
+ "engines": {
+ "node": ">=18"
+ }
+ },
+ "node_modules/nuxt/node_modules/@nuxt/kit": {
+ "version": "3.17.5",
+ "resolved": "https://registry.npmjs.org/@nuxt/kit/-/kit-3.17.5.tgz",
+ "integrity": "sha512-NdCepmA+S/SzgcaL3oYUeSlXGYO6BXGr9K/m1D0t0O9rApF8CSq/QQ+ja5KYaYMO1kZAEWH4s2XVcE3uPrrAVg==",
+ "license": "MIT",
+ "dependencies": {
+ "c12": "^3.0.4",
+ "consola": "^3.4.2",
+ "defu": "^6.1.4",
+ "destr": "^2.0.5",
+ "errx": "^0.1.0",
+ "exsolve": "^1.0.5",
+ "ignore": "^7.0.5",
+ "jiti": "^2.4.2",
+ "klona": "^2.0.6",
+ "knitwork": "^1.2.0",
+ "mlly": "^1.7.4",
+ "ohash": "^2.0.11",
+ "pathe": "^2.0.3",
+ "pkg-types": "^2.1.0",
+ "scule": "^1.3.0",
+ "semver": "^7.7.2",
+ "std-env": "^3.9.0",
+ "tinyglobby": "^0.2.14",
+ "ufo": "^1.6.1",
+ "unctx": "^2.4.1",
+ "unimport": "^5.0.1",
+ "untyped": "^2.0.0"
+ },
+ "engines": {
+ "node": ">=18.12.0"
+ }
+ },
+ "node_modules/nuxt/node_modules/@nuxt/schema": {
+ "version": "3.17.5",
+ "resolved": "https://registry.npmjs.org/@nuxt/schema/-/schema-3.17.5.tgz",
+ "integrity": "sha512-A1DSQk2uXqRHXlgLWDeFCyZk/yPo9oMBMb9OsbVko9NLv9du2DO2cs9RQ68Amvdk8O2nG7/FxAMNnkMdQ8OexA==",
+ "license": "MIT",
+ "dependencies": {
+ "@vue/shared": "^3.5.16",
+ "consola": "^3.4.2",
+ "defu": "^6.1.4",
+ "pathe": "^2.0.3",
+ "std-env": "^3.9.0"
+ },
+ "engines": {
+ "node": "^14.18.0 || >=16.10.0"
+ }
+ },
+ "node_modules/nuxt/node_modules/@oxc-parser/binding-darwin-arm64": {
+ "version": "0.72.3",
+ "resolved": "https://registry.npmjs.org/@oxc-parser/binding-darwin-arm64/-/binding-darwin-arm64-0.72.3.tgz",
+ "integrity": "sha512-g6wgcfL7At4wHNHutl0NmPZTAju+cUSmSX5WGUMyTJmozRzhx8E9a2KL4rTqNJPwEpbCFrgC29qX9f4fpDnUpA==",
+ "cpu": [
+ "arm64"
+ ],
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "darwin"
+ ],
+ "engines": {
+ "node": ">=14.0.0"
+ }
+ },
+ "node_modules/nuxt/node_modules/@oxc-parser/binding-darwin-x64": {
+ "version": "0.72.3",
+ "resolved": "https://registry.npmjs.org/@oxc-parser/binding-darwin-x64/-/binding-darwin-x64-0.72.3.tgz",
+ "integrity": "sha512-pc+tplB2fd0AqdnXY90FguqSF2OwbxXwrMOLAMmsUiK4/ytr8Z/ftd49+d27GgvQJKeg2LfnIbskaQtY/j2tAA==",
+ "cpu": [
+ "x64"
+ ],
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "darwin"
+ ],
+ "engines": {
+ "node": ">=14.0.0"
+ }
+ },
+ "node_modules/nuxt/node_modules/@oxc-parser/binding-freebsd-x64": {
+ "version": "0.72.3",
+ "resolved": "https://registry.npmjs.org/@oxc-parser/binding-freebsd-x64/-/binding-freebsd-x64-0.72.3.tgz",
+ "integrity": "sha512-igBR6rOvL8t5SBm1f1rjtWNsjB53HNrM3au582JpYzWxOqCjeA5Jlm9KZbjQJC+J8SPB9xyljM7G+6yGZ2UAkQ==",
+ "cpu": [
+ "x64"
+ ],
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "freebsd"
],
"engines": {
- "node": ">=18"
+ "node": ">=14.0.0"
}
},
- "node_modules/nuxt/node_modules/@esbuild/win32-x64": {
- "version": "0.25.4",
- "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.25.4.tgz",
- "integrity": "sha512-nOT2vZNw6hJ+z43oP1SPea/G/6AbN6X+bGNhNuq8NtRHy4wsMhw765IKLNmnjek7GvjWBYQ8Q5VBoYTFg9y1UQ==",
+ "node_modules/nuxt/node_modules/@oxc-parser/binding-linux-arm-gnueabihf": {
+ "version": "0.72.3",
+ "resolved": "https://registry.npmjs.org/@oxc-parser/binding-linux-arm-gnueabihf/-/binding-linux-arm-gnueabihf-0.72.3.tgz",
+ "integrity": "sha512-/izdr3wg7bK+2RmNhZXC2fQwxbaTH3ELeqdR+Wg4FiEJ/C7ZBIjfB0E734bZGgbDu+rbEJTBlbG77XzY0wRX/Q==",
"cpu": [
- "x64"
+ "arm"
],
"license": "MIT",
"optional": true,
"os": [
- "win32"
+ "linux"
],
"engines": {
- "node": ">=18"
+ "node": ">=14.0.0"
}
},
- "node_modules/nuxt/node_modules/@oxc-parser/binding-darwin-arm64": {
- "version": "0.68.1",
- "resolved": "https://registry.npmjs.org/@oxc-parser/binding-darwin-arm64/-/binding-darwin-arm64-0.68.1.tgz",
- "integrity": "sha512-Y5FBQyPCLsldAZYEd+oZcUboXwpcLf42Lakx3EYtiYDbuK9M3IqBXMGxdM07P4PfGQrKYn6/cC8xAqkVHnbWPw==",
+ "node_modules/nuxt/node_modules/@oxc-parser/binding-linux-arm-musleabihf": {
+ "version": "0.72.3",
+ "resolved": "https://registry.npmjs.org/@oxc-parser/binding-linux-arm-musleabihf/-/binding-linux-arm-musleabihf-0.72.3.tgz",
+ "integrity": "sha512-Vz7C+qJb22HIFl3zXMlwvlTOR+MaIp5ps78060zsdeZh2PUGlYuUYkYXtGEjJV3kc8aKFj79XKqAY1EPG2NWQA==",
"cpu": [
- "arm64"
+ "arm"
],
"license": "MIT",
"optional": true,
"os": [
- "darwin"
+ "linux"
],
"engines": {
"node": ">=14.0.0"
}
},
- "node_modules/nuxt/node_modules/@oxc-parser/binding-darwin-x64": {
- "version": "0.68.1",
- "resolved": "https://registry.npmjs.org/@oxc-parser/binding-darwin-x64/-/binding-darwin-x64-0.68.1.tgz",
- "integrity": "sha512-nkiXpEKl8UOhNPdOY5hA2PFq9vQc9xVs7NFu2vUD9eH/j5uYfv8GnNaKkd+v6iH93JwEBxuK5gfwxiiCEMZRyg==",
+ "node_modules/nuxt/node_modules/@oxc-parser/binding-linux-arm64-gnu": {
+ "version": "0.72.3",
+ "resolved": "https://registry.npmjs.org/@oxc-parser/binding-linux-arm64-gnu/-/binding-linux-arm64-gnu-0.72.3.tgz",
+ "integrity": "sha512-nomoMe2VpVxW767jhF+G3mDGmE0U6nvvi5nw9Edqd/5DIylQfq/lEGUWL7qITk+E72YXBsnwHtpRRlIAJOMyZg==",
"cpu": [
- "x64"
+ "arm64"
],
"license": "MIT",
"optional": true,
"os": [
- "darwin"
+ "linux"
],
"engines": {
"node": ">=14.0.0"
}
},
- "node_modules/nuxt/node_modules/@oxc-parser/binding-linux-arm-gnueabihf": {
- "version": "0.68.1",
- "resolved": "https://registry.npmjs.org/@oxc-parser/binding-linux-arm-gnueabihf/-/binding-linux-arm-gnueabihf-0.68.1.tgz",
- "integrity": "sha512-38ejU7GP9sOILA82xcF9laJfCiwZWKp96+jeLQMkebZCfQqaGtld/hbJ2yvZ2laLQS3ISRasDemZEJuk/yb6Uw==",
+ "node_modules/nuxt/node_modules/@oxc-parser/binding-linux-arm64-musl": {
+ "version": "0.72.3",
+ "resolved": "https://registry.npmjs.org/@oxc-parser/binding-linux-arm64-musl/-/binding-linux-arm64-musl-0.72.3.tgz",
+ "integrity": "sha512-4DswiIK5dI7hFqcMKWtZ7IZnWkRuskh6poI1ad4gkY2p678NOGtl6uOGCCRlDmLOOhp3R27u4VCTzQ6zra977w==",
"cpu": [
- "arm"
+ "arm64"
],
"license": "MIT",
"optional": true,
@@ -16282,12 +16293,12 @@
"node": ">=14.0.0"
}
},
- "node_modules/nuxt/node_modules/@oxc-parser/binding-linux-arm64-gnu": {
- "version": "0.68.1",
- "resolved": "https://registry.npmjs.org/@oxc-parser/binding-linux-arm64-gnu/-/binding-linux-arm64-gnu-0.68.1.tgz",
- "integrity": "sha512-qJK9nzelQqMSLdZbWUpQ8rfSAiH5pgB7rR5OC3/DLbmvhnD+vvuet/67cNzYnGW4pcTzsWzcRTSkmH/b6VcDCA==",
+ "node_modules/nuxt/node_modules/@oxc-parser/binding-linux-riscv64-gnu": {
+ "version": "0.72.3",
+ "resolved": "https://registry.npmjs.org/@oxc-parser/binding-linux-riscv64-gnu/-/binding-linux-riscv64-gnu-0.72.3.tgz",
+ "integrity": "sha512-R9GEiA4WFPGU/3RxAhEd6SaMdpqongGTvGEyTvYCS/MAQyXKxX/LFvc2xwjdvESpjIemmc/12aTTq6if28vHkQ==",
"cpu": [
- "arm64"
+ "riscv64"
],
"license": "MIT",
"optional": true,
@@ -16298,12 +16309,12 @@
"node": ">=14.0.0"
}
},
- "node_modules/nuxt/node_modules/@oxc-parser/binding-linux-arm64-musl": {
- "version": "0.68.1",
- "resolved": "https://registry.npmjs.org/@oxc-parser/binding-linux-arm64-musl/-/binding-linux-arm64-musl-0.68.1.tgz",
- "integrity": "sha512-Fd/yP458VG5wit7uku9iEXzl+qfNTuYTVaxfo6EFsBokOf5Xs6Y4LFeKAjtZfb/eCCsc7UY75sAjDyOGnPnNWg==",
+ "node_modules/nuxt/node_modules/@oxc-parser/binding-linux-s390x-gnu": {
+ "version": "0.72.3",
+ "resolved": "https://registry.npmjs.org/@oxc-parser/binding-linux-s390x-gnu/-/binding-linux-s390x-gnu-0.72.3.tgz",
+ "integrity": "sha512-/sEYJQMVqikZO8gK9VDPT4zXo9du3gvvu8jp6erMmW5ev+14PErWRypJjktp0qoTj+uq4MzXro0tg7U+t5hP1w==",
"cpu": [
- "arm64"
+ "s390x"
],
"license": "MIT",
"optional": true,
@@ -16315,9 +16326,9 @@
}
},
"node_modules/nuxt/node_modules/@oxc-parser/binding-linux-x64-gnu": {
- "version": "0.68.1",
- "resolved": "https://registry.npmjs.org/@oxc-parser/binding-linux-x64-gnu/-/binding-linux-x64-gnu-0.68.1.tgz",
- "integrity": "sha512-VH7q2GXcFKiecD2eNloB4o8Ho6dUeB92O9bS/GV0+Q/yZdu/l0zWXetaszaCviPHCf8YBQzpOHxzsqgVu0RYqQ==",
+ "version": "0.72.3",
+ "resolved": "https://registry.npmjs.org/@oxc-parser/binding-linux-x64-gnu/-/binding-linux-x64-gnu-0.72.3.tgz",
+ "integrity": "sha512-hlyljEZ0sMPKJQCd5pxnRh2sAf/w+Ot2iJecgV9Hl3brrYrYCK2kofC0DFaJM3NRmG/8ZB3PlxnSRSKZTocwCw==",
"cpu": [
"x64"
],
@@ -16331,9 +16342,9 @@
}
},
"node_modules/nuxt/node_modules/@oxc-parser/binding-linux-x64-musl": {
- "version": "0.68.1",
- "resolved": "https://registry.npmjs.org/@oxc-parser/binding-linux-x64-musl/-/binding-linux-x64-musl-0.68.1.tgz",
- "integrity": "sha512-35drWZMNp31JL0fjAK10pOfE20xVQXa7/o1NGqSGiZ2Huf4c0OK0TOggw+F7IEwPXpi5qOL6C+apY1zod8299A==",
+ "version": "0.72.3",
+ "resolved": "https://registry.npmjs.org/@oxc-parser/binding-linux-x64-musl/-/binding-linux-x64-musl-0.72.3.tgz",
+ "integrity": "sha512-T17S8ORqAIq+YDFMvLfbNdAiYHYDM1+sLMNhesR5eWBtyTHX510/NbgEvcNemO9N6BNR7m4A9o+q468UG+dmbg==",
"cpu": [
"x64"
],
@@ -16347,25 +16358,25 @@
}
},
"node_modules/nuxt/node_modules/@oxc-parser/binding-wasm32-wasi": {
- "version": "0.68.1",
- "resolved": "https://registry.npmjs.org/@oxc-parser/binding-wasm32-wasi/-/binding-wasm32-wasi-0.68.1.tgz",
- "integrity": "sha512-MkTZeTYEqZm18b1TaLSEuo0MxeAv8MNaKSjEz0GgldV3+lNowMbTLusW/QEgYczx/J9/9Y/oYj36Rja7qmfe1Q==",
+ "version": "0.72.3",
+ "resolved": "https://registry.npmjs.org/@oxc-parser/binding-wasm32-wasi/-/binding-wasm32-wasi-0.72.3.tgz",
+ "integrity": "sha512-x0Ojn/jyRUk6MllvVB/puSvI2tczZBIYweKVYHNv1nBatjPRiqo+6/uXiKrZwSfGLkGARrKkTuHSa5RdZBMOdA==",
"cpu": [
"wasm32"
],
"license": "MIT",
"optional": true,
"dependencies": {
- "@napi-rs/wasm-runtime": "^0.2.9"
+ "@napi-rs/wasm-runtime": "^0.2.10"
},
"engines": {
"node": ">=14.0.0"
}
},
"node_modules/nuxt/node_modules/@oxc-parser/binding-win32-arm64-msvc": {
- "version": "0.68.1",
- "resolved": "https://registry.npmjs.org/@oxc-parser/binding-win32-arm64-msvc/-/binding-win32-arm64-msvc-0.68.1.tgz",
- "integrity": "sha512-27Mrz18+4l7ZzM5FYSCSXDOR+CfZPkxkDz85jADpOTO1lUxH+wkTZiTBAOYuyoyRYbjQOTiZzkYljXtDgNeeLg==",
+ "version": "0.72.3",
+ "resolved": "https://registry.npmjs.org/@oxc-parser/binding-win32-arm64-msvc/-/binding-win32-arm64-msvc-0.72.3.tgz",
+ "integrity": "sha512-kRVAl87ugRjLZTm9vGUyiXU50mqxLPHY81rgnZUP1HtNcqcmTQtM/wUKQL2UdqvhA6xm6zciqzqCgJfU+RW8uA==",
"cpu": [
"arm64"
],
@@ -16379,9 +16390,9 @@
}
},
"node_modules/nuxt/node_modules/@oxc-parser/binding-win32-x64-msvc": {
- "version": "0.68.1",
- "resolved": "https://registry.npmjs.org/@oxc-parser/binding-win32-x64-msvc/-/binding-win32-x64-msvc-0.68.1.tgz",
- "integrity": "sha512-TUsmnbG2ysQ5bUSfWdDliDMXqu7KwAxtIkAtO4mzHKgEu5avVbqk26BhSJsEC9JXqWSo13yTYBmMtC498K3GzQ==",
+ "version": "0.72.3",
+ "resolved": "https://registry.npmjs.org/@oxc-parser/binding-win32-x64-msvc/-/binding-win32-x64-msvc-0.72.3.tgz",
+ "integrity": "sha512-vpVdoGAP5iGE5tIEPJgr7FkQJZA+sKjMkg5x1jarWJ1nnBamfGsfYiZum4QjCfW7jb+pl42rHVSS3lRmMPcyrQ==",
"cpu": [
"x64"
],
@@ -16395,9 +16406,9 @@
}
},
"node_modules/nuxt/node_modules/@oxc-project/types": {
- "version": "0.68.1",
- "resolved": "https://registry.npmjs.org/@oxc-project/types/-/types-0.68.1.tgz",
- "integrity": "sha512-Q/H52+HXPPxuIHwQnVkEM8GebLnNcokkI4zQQdbxLIZdfxMGhAm9+gEqsMku3t95trN/1titHUmCM9NxbKaE2g==",
+ "version": "0.72.3",
+ "resolved": "https://registry.npmjs.org/@oxc-project/types/-/types-0.72.3.tgz",
+ "integrity": "sha512-CfAC4wrmMkUoISpQkFAIfMVvlPfQV3xg7ZlcqPXPOIMQhdKIId44G8W0mCPgtpWdFFAyJ+SFtiM+9vbyCkoVng==",
"license": "MIT",
"funding": {
"url": "https://github.com/sponsors/Boshen"
@@ -16410,9 +16421,9 @@
"license": "MIT"
},
"node_modules/nuxt/node_modules/esbuild": {
- "version": "0.25.4",
- "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.25.4.tgz",
- "integrity": "sha512-8pgjLUcUjcgDg+2Q4NYXnPbo/vncAY4UmyaCm0jZevERqCHZIaWwdJHkf8XQtu4AxSKCdvrUbT0XUr1IdZzI8Q==",
+ "version": "0.25.6",
+ "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.25.6.tgz",
+ "integrity": "sha512-GVuzuUwtdsghE3ocJ9Bs8PNoF13HNQ5TXbEi2AhvVb8xU1Iwt9Fos9FEamfoee+u/TOsn7GUWc04lz46n2bbTg==",
"hasInstallScript": true,
"license": "MIT",
"bin": {
@@ -16422,31 +16433,32 @@
"node": ">=18"
},
"optionalDependencies": {
- "@esbuild/aix-ppc64": "0.25.4",
- "@esbuild/android-arm": "0.25.4",
- "@esbuild/android-arm64": "0.25.4",
- "@esbuild/android-x64": "0.25.4",
- "@esbuild/darwin-arm64": "0.25.4",
- "@esbuild/darwin-x64": "0.25.4",
- "@esbuild/freebsd-arm64": "0.25.4",
- "@esbuild/freebsd-x64": "0.25.4",
- "@esbuild/linux-arm": "0.25.4",
- "@esbuild/linux-arm64": "0.25.4",
- "@esbuild/linux-ia32": "0.25.4",
- "@esbuild/linux-loong64": "0.25.4",
- "@esbuild/linux-mips64el": "0.25.4",
- "@esbuild/linux-ppc64": "0.25.4",
- "@esbuild/linux-riscv64": "0.25.4",
- "@esbuild/linux-s390x": "0.25.4",
- "@esbuild/linux-x64": "0.25.4",
- "@esbuild/netbsd-arm64": "0.25.4",
- "@esbuild/netbsd-x64": "0.25.4",
- "@esbuild/openbsd-arm64": "0.25.4",
- "@esbuild/openbsd-x64": "0.25.4",
- "@esbuild/sunos-x64": "0.25.4",
- "@esbuild/win32-arm64": "0.25.4",
- "@esbuild/win32-ia32": "0.25.4",
- "@esbuild/win32-x64": "0.25.4"
+ "@esbuild/aix-ppc64": "0.25.6",
+ "@esbuild/android-arm": "0.25.6",
+ "@esbuild/android-arm64": "0.25.6",
+ "@esbuild/android-x64": "0.25.6",
+ "@esbuild/darwin-arm64": "0.25.6",
+ "@esbuild/darwin-x64": "0.25.6",
+ "@esbuild/freebsd-arm64": "0.25.6",
+ "@esbuild/freebsd-x64": "0.25.6",
+ "@esbuild/linux-arm": "0.25.6",
+ "@esbuild/linux-arm64": "0.25.6",
+ "@esbuild/linux-ia32": "0.25.6",
+ "@esbuild/linux-loong64": "0.25.6",
+ "@esbuild/linux-mips64el": "0.25.6",
+ "@esbuild/linux-ppc64": "0.25.6",
+ "@esbuild/linux-riscv64": "0.25.6",
+ "@esbuild/linux-s390x": "0.25.6",
+ "@esbuild/linux-x64": "0.25.6",
+ "@esbuild/netbsd-arm64": "0.25.6",
+ "@esbuild/netbsd-x64": "0.25.6",
+ "@esbuild/openbsd-arm64": "0.25.6",
+ "@esbuild/openbsd-x64": "0.25.6",
+ "@esbuild/openharmony-arm64": "0.25.6",
+ "@esbuild/sunos-x64": "0.25.6",
+ "@esbuild/win32-arm64": "0.25.6",
+ "@esbuild/win32-ia32": "0.25.6",
+ "@esbuild/win32-x64": "0.25.6"
}
},
"node_modules/nuxt/node_modules/escape-string-regexp": {
@@ -16462,12 +16474,12 @@
}
},
"node_modules/nuxt/node_modules/oxc-parser": {
- "version": "0.68.1",
- "resolved": "https://registry.npmjs.org/oxc-parser/-/oxc-parser-0.68.1.tgz",
- "integrity": "sha512-dHwz+xP9r1GTvqyywfws4j7EEP/OaeTpHEjTcvIjViB/R2IdUn52AnoUFNjpw8yRU52XVE76rOA4IEj7I0EjnA==",
+ "version": "0.72.3",
+ "resolved": "https://registry.npmjs.org/oxc-parser/-/oxc-parser-0.72.3.tgz",
+ "integrity": "sha512-JYQeJKDcUTTZ/uTdJ+fZBGFjAjkLD1h0p3Tf44ZYXRcoMk+57d81paNPFAAwzrzzqhZmkGvKKXDxwyhJXYZlpg==",
"license": "MIT",
"dependencies": {
- "@oxc-project/types": "^0.68.1"
+ "@oxc-project/types": "^0.72.3"
},
"engines": {
"node": ">=14.0.0"
@@ -16476,16 +16488,20 @@
"url": "https://github.com/sponsors/Boshen"
},
"optionalDependencies": {
- "@oxc-parser/binding-darwin-arm64": "0.68.1",
- "@oxc-parser/binding-darwin-x64": "0.68.1",
- "@oxc-parser/binding-linux-arm-gnueabihf": "0.68.1",
- "@oxc-parser/binding-linux-arm64-gnu": "0.68.1",
- "@oxc-parser/binding-linux-arm64-musl": "0.68.1",
- "@oxc-parser/binding-linux-x64-gnu": "0.68.1",
- "@oxc-parser/binding-linux-x64-musl": "0.68.1",
- "@oxc-parser/binding-wasm32-wasi": "0.68.1",
- "@oxc-parser/binding-win32-arm64-msvc": "0.68.1",
- "@oxc-parser/binding-win32-x64-msvc": "0.68.1"
+ "@oxc-parser/binding-darwin-arm64": "0.72.3",
+ "@oxc-parser/binding-darwin-x64": "0.72.3",
+ "@oxc-parser/binding-freebsd-x64": "0.72.3",
+ "@oxc-parser/binding-linux-arm-gnueabihf": "0.72.3",
+ "@oxc-parser/binding-linux-arm-musleabihf": "0.72.3",
+ "@oxc-parser/binding-linux-arm64-gnu": "0.72.3",
+ "@oxc-parser/binding-linux-arm64-musl": "0.72.3",
+ "@oxc-parser/binding-linux-riscv64-gnu": "0.72.3",
+ "@oxc-parser/binding-linux-s390x-gnu": "0.72.3",
+ "@oxc-parser/binding-linux-x64-gnu": "0.72.3",
+ "@oxc-parser/binding-linux-x64-musl": "0.72.3",
+ "@oxc-parser/binding-wasm32-wasi": "0.72.3",
+ "@oxc-parser/binding-win32-arm64-msvc": "0.72.3",
+ "@oxc-parser/binding-win32-x64-msvc": "0.72.3"
}
},
"node_modules/nypm": {
@@ -16513,24 +16529,6 @@
"integrity": "sha512-KQQR9yN7R5+OSwaK0XQoj22pwHoTlgYqmUscPYoknOoWCWfj/5/ABTMRi69FrKU5ffPVh5QcFikpWJI/P1ocHA==",
"license": "MIT"
},
- "node_modules/object-assign": {
- "version": "4.1.1",
- "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
- "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==",
- "license": "MIT",
- "engines": {
- "node": ">=0.10.0"
- }
- },
- "node_modules/object-hash": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/object-hash/-/object-hash-3.0.0.tgz",
- "integrity": "sha512-RSn9F68PjH9HqtltsSnqYC1XXoWe9Bju5+213R98cNGttag9q9yAOTzdbsqvIa7aNm5WffBZFpWYr2aWrklWAw==",
- "license": "MIT",
- "engines": {
- "node": ">= 6"
- }
- },
"node_modules/object-inspect": {
"version": "1.13.4",
"resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.4.tgz",
@@ -16623,11 +16621,6 @@
"url": "https://github.com/sponsors/sindresorhus"
}
},
- "node_modules/only": {
- "version": "0.0.2",
- "resolved": "https://registry.npmjs.org/only/-/only-0.0.2.tgz",
- "integrity": "sha512-Fvw+Jemq5fjjyWz6CpKx6w9s7xxqo3+JCyM0WXWeCSOboZ8ABkyvP8ID4CZuChA/wxSx+XSJmdOm8rGVyJ1hdQ=="
- },
"node_modules/open": {
"version": "8.4.2",
"resolved": "https://registry.npmjs.org/open/-/open-8.4.2.tgz",
@@ -16691,13 +16684,13 @@
}
},
"node_modules/oxc-parser": {
- "version": "0.61.2",
- "resolved": "https://registry.npmjs.org/oxc-parser/-/oxc-parser-0.61.2.tgz",
- "integrity": "sha512-ZJnAP7VLQhqqnfku7+gssTwmbQyfbZ552Vly4O2BMHkvDwfwLlPtAIYjMq57Lcj5HLmopI0oZlk7xTSML/YsZA==",
+ "version": "0.70.0",
+ "resolved": "https://registry.npmjs.org/oxc-parser/-/oxc-parser-0.70.0.tgz",
+ "integrity": "sha512-YbqTuQDDIYwQF/li0VFK5uTbmHV4jWFeQQONkPdf77vz+JMiq7SusmcSVZ4hBrGM+3WyLdKH5S7spnvz4XVVzQ==",
"dev": true,
"license": "MIT",
"dependencies": {
- "@oxc-project/types": "^0.61.2"
+ "@oxc-project/types": "^0.70.0"
},
"engines": {
"node": ">=14.0.0"
@@ -16706,22 +16699,26 @@
"url": "https://github.com/sponsors/Boshen"
},
"optionalDependencies": {
- "@oxc-parser/binding-darwin-arm64": "0.61.2",
- "@oxc-parser/binding-darwin-x64": "0.61.2",
- "@oxc-parser/binding-linux-arm-gnueabihf": "0.61.2",
- "@oxc-parser/binding-linux-arm64-gnu": "0.61.2",
- "@oxc-parser/binding-linux-arm64-musl": "0.61.2",
- "@oxc-parser/binding-linux-x64-gnu": "0.61.2",
- "@oxc-parser/binding-linux-x64-musl": "0.61.2",
- "@oxc-parser/binding-wasm32-wasi": "0.61.2",
- "@oxc-parser/binding-win32-arm64-msvc": "0.61.2",
- "@oxc-parser/binding-win32-x64-msvc": "0.61.2"
+ "@oxc-parser/binding-darwin-arm64": "0.70.0",
+ "@oxc-parser/binding-darwin-x64": "0.70.0",
+ "@oxc-parser/binding-freebsd-x64": "0.70.0",
+ "@oxc-parser/binding-linux-arm-gnueabihf": "0.70.0",
+ "@oxc-parser/binding-linux-arm-musleabihf": "0.70.0",
+ "@oxc-parser/binding-linux-arm64-gnu": "0.70.0",
+ "@oxc-parser/binding-linux-arm64-musl": "0.70.0",
+ "@oxc-parser/binding-linux-riscv64-gnu": "0.70.0",
+ "@oxc-parser/binding-linux-s390x-gnu": "0.70.0",
+ "@oxc-parser/binding-linux-x64-gnu": "0.70.0",
+ "@oxc-parser/binding-linux-x64-musl": "0.70.0",
+ "@oxc-parser/binding-wasm32-wasi": "0.70.0",
+ "@oxc-parser/binding-win32-arm64-msvc": "0.70.0",
+ "@oxc-parser/binding-win32-x64-msvc": "0.70.0"
}
},
"node_modules/oxc-parser/node_modules/@oxc-project/types": {
- "version": "0.61.2",
- "resolved": "https://registry.npmjs.org/@oxc-project/types/-/types-0.61.2.tgz",
- "integrity": "sha512-rfuwJwvwn9MRthHNXlSo9Eka/u7gC0MhnWAoX3BhE1+rwPOl22nq0K0Y997Hof0tHCOuD7H3/Z8HTfCVhB4c5Q==",
+ "version": "0.70.0",
+ "resolved": "https://registry.npmjs.org/@oxc-project/types/-/types-0.70.0.tgz",
+ "integrity": "sha512-ngyLUpUjO3dpqygSRQDx7nMx8+BmXbWOU4oIwTJFV2MVIDG7knIZwgdwXlQWLg3C3oxg1lS7ppMtPKqKFb7wzw==",
"dev": true,
"license": "MIT",
"funding": {
@@ -16729,15 +16726,15 @@
}
},
"node_modules/p-event": {
- "version": "5.0.1",
- "resolved": "https://registry.npmjs.org/p-event/-/p-event-5.0.1.tgz",
- "integrity": "sha512-dd589iCQ7m1L0bmC5NLlVYfy3TbBEsMUfWx9PyAgPeIcFZ/E2yaTZ4Rz4MiBmmJShviiftHVXOqfnfzJ6kyMrQ==",
+ "version": "6.0.1",
+ "resolved": "https://registry.npmjs.org/p-event/-/p-event-6.0.1.tgz",
+ "integrity": "sha512-Q6Bekk5wpzW5qIyUP4gdMEujObYstZl6DMMOSenwBvV0BlE5LkDwkjs5yHbZmdCEq2o4RJx4tE1vwxFVf2FG1w==",
"license": "MIT",
"dependencies": {
- "p-timeout": "^5.0.2"
+ "p-timeout": "^6.1.2"
},
"engines": {
- "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+ "node": ">=16.17"
},
"funding": {
"url": "https://github.com/sponsors/sindresorhus"
@@ -16786,12 +16783,12 @@
}
},
"node_modules/p-timeout": {
- "version": "5.1.0",
- "resolved": "https://registry.npmjs.org/p-timeout/-/p-timeout-5.1.0.tgz",
- "integrity": "sha512-auFDyzzzGZZZdHz3BtET9VEz0SE/uMEAx7uWfGPucfzEwwe/xH0iVeZibQmANYE/hp9T2+UUZT5m+BKyrDp3Ew==",
+ "version": "6.1.4",
+ "resolved": "https://registry.npmjs.org/p-timeout/-/p-timeout-6.1.4.tgz",
+ "integrity": "sha512-MyIV3ZA/PmyBN/ud8vV9XzwTrNtR4jFrObymZYnZqMmW0zA8Z17vnT0rBgFE/TlohB+YCHqXMgZzb3Csp49vqg==",
"license": "MIT",
"engines": {
- "node": ">=12"
+ "node": ">=14.16"
},
"funding": {
"url": "https://github.com/sponsors/sindresorhus"
@@ -16821,18 +16818,6 @@
"url": "https://github.com/sponsors/sindresorhus"
}
},
- "node_modules/p-wait-for/node_modules/p-timeout": {
- "version": "6.1.4",
- "resolved": "https://registry.npmjs.org/p-timeout/-/p-timeout-6.1.4.tgz",
- "integrity": "sha512-MyIV3ZA/PmyBN/ud8vV9XzwTrNtR4jFrObymZYnZqMmW0zA8Z17vnT0rBgFE/TlohB+YCHqXMgZzb3Csp49vqg==",
- "license": "MIT",
- "engines": {
- "node": ">=14.16"
- },
- "funding": {
- "url": "https://github.com/sponsors/sindresorhus"
- }
- },
"node_modules/package-json-from-dist": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.1.tgz",
@@ -16845,6 +16830,12 @@
"integrity": "sha512-ZsEbbZORsyHuO00lY1kV3/t72yp6Ysay6Pd17ZAlNGuGwmWDLCJxFpRs0IzfXfj1o4icJOkUEioexFHzyPurSQ==",
"license": "MIT"
},
+ "node_modules/pako": {
+ "version": "0.2.9",
+ "resolved": "https://registry.npmjs.org/pako/-/pako-0.2.9.tgz",
+ "integrity": "sha512-NUcwaKxUxWrZLpDG+z/xZaCgQITkA/Dv4V/T6bw7VON6l1Xz/VnrBqrYjZQ12TamKHzITTfOEIYUj48y2KXImA==",
+ "license": "MIT"
+ },
"node_modules/parchment": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/parchment/-/parchment-3.0.0.tgz",
@@ -17002,16 +16993,6 @@
"node": ">=16 || 14 >=14.17"
}
},
- "node_modules/path-to-regexp": {
- "version": "8.2.0",
- "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-8.2.0.tgz",
- "integrity": "sha512-TdrF7fW9Rphjq4RjrW0Kp2AW0Ahwu9sRGTkS6bvDi0SCwZlEZYmcfDbEsTz8RVk0EHIS/Vd1bv3JhG+1xZuAyQ==",
- "devOptional": true,
- "license": "MIT",
- "engines": {
- "node": ">=16"
- }
- },
"node_modules/path-type": {
"version": "6.0.0",
"resolved": "https://registry.npmjs.org/path-type/-/path-type-6.0.0.tgz",
@@ -17052,9 +17033,9 @@
}
},
"node_modules/pg-protocol": {
- "version": "1.9.5",
- "resolved": "https://registry.npmjs.org/pg-protocol/-/pg-protocol-1.9.5.tgz",
- "integrity": "sha512-DYTWtWpfd5FOro3UnAfwvhD8jh59r2ig8bPtc9H8Ds7MscE/9NYruUQWFAOuraRl29jwcT2kyMFQ3MxeaVjUhg==",
+ "version": "1.10.3",
+ "resolved": "https://registry.npmjs.org/pg-protocol/-/pg-protocol-1.10.3.tgz",
+ "integrity": "sha512-6DIBgBQaTKDJyxnXaLiLR8wBpQQcGWuAESkRBX/t6OwA8YsqP+iVSiond2EDy6Y/dsGk8rh/jtax3js5NeV7JQ==",
"license": "MIT"
},
"node_modules/pg-types": {
@@ -17080,9 +17061,9 @@
"license": "ISC"
},
"node_modules/picomatch": {
- "version": "4.0.2",
- "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.2.tgz",
- "integrity": "sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==",
+ "version": "4.0.3",
+ "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz",
+ "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
"license": "MIT",
"engines": {
"node": ">=12"
@@ -17091,19 +17072,10 @@
"url": "https://github.com/sponsors/jonschlinkert"
}
},
- "node_modules/pify": {
- "version": "2.3.0",
- "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
- "integrity": "sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==",
- "license": "MIT",
- "engines": {
- "node": ">=0.10.0"
- }
- },
"node_modules/pinia": {
- "version": "3.0.2",
- "resolved": "https://registry.npmjs.org/pinia/-/pinia-3.0.2.tgz",
- "integrity": "sha512-sH2JK3wNY809JOeiiURUR0wehJ9/gd9qFN2Y828jCbxEzKEmEt0pzCXwqiSTfuRsK9vQsOflSdnbdBOGrhtn+g==",
+ "version": "3.0.3",
+ "resolved": "https://registry.npmjs.org/pinia/-/pinia-3.0.3.tgz",
+ "integrity": "sha512-ttXO/InUULUXkMHpTdp9Fj4hLpD/2AoJdmAbAeW2yu1iy1k+pkFekQXw5VpC0/5p51IOR/jDaDRfRWRnMMsGOA==",
"license": "MIT",
"dependencies": {
"@vue/devtools-api": "^7.7.2"
@@ -17121,33 +17093,23 @@
}
}
},
- "node_modules/pirates": {
- "version": "4.0.7",
- "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.7.tgz",
- "integrity": "sha512-TfySrs/5nm8fQJDcBDuUng3VOUKsd7S+zqvbOTiGXHfxX4wK31ard+hoNuvkicM/2YFzlpDgABOevKSsB4G/FA==",
- "license": "MIT",
- "engines": {
- "node": ">= 6"
- }
- },
- "node_modules/pkce-challenge": {
- "version": "5.0.0",
- "resolved": "https://registry.npmjs.org/pkce-challenge/-/pkce-challenge-5.0.0.tgz",
- "integrity": "sha512-ueGLflrrnvwB3xuo/uGob5pd5FN7l0MsLf0Z87o/UQmRtwjvfylfc9MurIxRAWywCYTgrvpXBcqjV4OfCYGCIQ==",
- "devOptional": true,
+ "node_modules/pinia/node_modules/@vue/devtools-api": {
+ "version": "7.7.7",
+ "resolved": "https://registry.npmjs.org/@vue/devtools-api/-/devtools-api-7.7.7.tgz",
+ "integrity": "sha512-lwOnNBH2e7x1fIIbVT7yF5D+YWhqELm55/4ZKf45R9T8r9dE2AIOy8HKjfqzGsoTHFbWbr337O4E0A0QADnjBg==",
"license": "MIT",
- "engines": {
- "node": ">=16.20.0"
+ "dependencies": {
+ "@vue/devtools-kit": "^7.7.7"
}
},
"node_modules/pkg-types": {
- "version": "2.1.0",
- "resolved": "https://registry.npmjs.org/pkg-types/-/pkg-types-2.1.0.tgz",
- "integrity": "sha512-wmJwA+8ihJixSoHKxZJRBQG1oY8Yr9pGLzRmSsNms0iNWyHHAlZCa7mmKiFR10YPZuz/2k169JiS/inOjBCZ2A==",
+ "version": "2.2.0",
+ "resolved": "https://registry.npmjs.org/pkg-types/-/pkg-types-2.2.0.tgz",
+ "integrity": "sha512-2SM/GZGAEkPp3KWORxQZns4M+WSeXbC2HEvmOIJe3Cmiv6ieAJvdVhDldtHqM5J1Y7MrR1XhkBT/rMlhh9FdqQ==",
"license": "MIT",
"dependencies": {
- "confbox": "^0.2.1",
- "exsolve": "^1.0.1",
+ "confbox": "^0.2.2",
+ "exsolve": "^1.0.7",
"pathe": "^2.0.3"
}
},
@@ -17188,23 +17150,10 @@
"integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==",
"license": "0BSD"
},
- "node_modules/portfinder": {
- "version": "1.0.37",
- "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.37.tgz",
- "integrity": "sha512-yuGIEjDAYnnOex9ddMnKZEMFE0CcGo6zbfzDklkmT1m5z734ss6JMzN9rNB3+RR7iS+F10D4/BVIaXOyh8PQKw==",
- "license": "MIT",
- "dependencies": {
- "async": "^3.2.6",
- "debug": "^4.3.6"
- },
- "engines": {
- "node": ">= 10.12"
- }
- },
"node_modules/postcss": {
- "version": "8.5.3",
- "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.3.tgz",
- "integrity": "sha512-dle9A3yYxlBSrt8Fu+IpjGT8SY8hN0mlaA6GY8t0P5PjIOZemULz/E2Bnm/2dcUOena75OTNkHI76uZBNUUq3A==",
+ "version": "8.5.6",
+ "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.6.tgz",
+ "integrity": "sha512-3Ybi1tAuwAP9s0r1UQ2J4n5Y0G05bJkpUIO0/bI9MhwmD70S5aTWbXGBwxHrelT+XM1k6dM0pk+SwNkpTRN7Pg==",
"funding": [
{
"type": "opencollective",
@@ -17221,7 +17170,7 @@
],
"license": "MIT",
"dependencies": {
- "nanoid": "^3.3.8",
+ "nanoid": "^3.3.11",
"picocolors": "^1.1.1",
"source-map-js": "^1.2.1"
},
@@ -17259,12 +17208,12 @@
}
},
"node_modules/postcss-colormin": {
- "version": "7.0.3",
- "resolved": "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-7.0.3.tgz",
- "integrity": "sha512-xZxQcSyIVZbSsl1vjoqZAcMYYdnJsIyG8OvqShuuqf12S88qQboxxEy0ohNCOLwVPXTU+hFHvJPACRL2B5ohTA==",
+ "version": "7.0.4",
+ "resolved": "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-7.0.4.tgz",
+ "integrity": "sha512-ziQuVzQZBROpKpfeDwmrG+Vvlr0YWmY/ZAk99XD+mGEBuEojoFekL41NCsdhyNUtZI7DPOoIWIR7vQQK9xwluw==",
"license": "MIT",
"dependencies": {
- "browserslist": "^4.24.5",
+ "browserslist": "^4.25.1",
"caniuse-api": "^3.0.0",
"colord": "^2.9.3",
"postcss-value-parser": "^4.2.0"
@@ -17277,12 +17226,12 @@
}
},
"node_modules/postcss-convert-values": {
- "version": "7.0.5",
- "resolved": "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-7.0.5.tgz",
- "integrity": "sha512-0VFhH8nElpIs3uXKnVtotDJJNX0OGYSZmdt4XfSfvOMrFw1jKfpwpZxfC4iN73CTM/MWakDEmsHQXkISYj4BXw==",
+ "version": "7.0.6",
+ "resolved": "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-7.0.6.tgz",
+ "integrity": "sha512-MD/eb39Mr60hvgrqpXsgbiqluawYg/8K4nKsqRsuDX9f+xN1j6awZCUv/5tLH8ak3vYp/EMXwdcnXvfZYiejCQ==",
"license": "MIT",
"dependencies": {
- "browserslist": "^4.24.5",
+ "browserslist": "^4.25.1",
"postcss-value-parser": "^4.2.0"
},
"engines": {
@@ -17356,77 +17305,6 @@
"postcss": "^8.4.32"
}
},
- "node_modules/postcss-import": {
- "version": "15.1.0",
- "resolved": "https://registry.npmjs.org/postcss-import/-/postcss-import-15.1.0.tgz",
- "integrity": "sha512-hpr+J05B2FVYUAXHeK1YyI267J/dDDhMU6B6civm8hSY1jYJnBXxzKDKDswzJmtLHryrjhnDjqqp/49t8FALew==",
- "license": "MIT",
- "dependencies": {
- "postcss-value-parser": "^4.0.0",
- "read-cache": "^1.0.0",
- "resolve": "^1.1.7"
- },
- "engines": {
- "node": ">=14.0.0"
- },
- "peerDependencies": {
- "postcss": "^8.0.0"
- }
- },
- "node_modules/postcss-js": {
- "version": "4.0.1",
- "resolved": "https://registry.npmjs.org/postcss-js/-/postcss-js-4.0.1.tgz",
- "integrity": "sha512-dDLF8pEO191hJMtlHFPRa8xsizHaM82MLfNkUHdUtVEV3tgTp5oj+8qbEqYM57SLfc74KSbw//4SeJma2LRVIw==",
- "license": "MIT",
- "dependencies": {
- "camelcase-css": "^2.0.1"
- },
- "engines": {
- "node": "^12 || ^14 || >= 16"
- },
- "funding": {
- "type": "opencollective",
- "url": "https://opencollective.com/postcss/"
- },
- "peerDependencies": {
- "postcss": "^8.4.21"
- }
- },
- "node_modules/postcss-load-config": {
- "version": "4.0.2",
- "resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-4.0.2.tgz",
- "integrity": "sha512-bSVhyJGL00wMVoPUzAVAnbEoWyqRxkjv64tUl427SKnPrENtq6hJwUojroMz2VB+Q1edmi4IfrAPpami5VVgMQ==",
- "funding": [
- {
- "type": "opencollective",
- "url": "https://opencollective.com/postcss/"
- },
- {
- "type": "github",
- "url": "https://github.com/sponsors/ai"
- }
- ],
- "license": "MIT",
- "dependencies": {
- "lilconfig": "^3.0.0",
- "yaml": "^2.3.4"
- },
- "engines": {
- "node": ">= 14"
- },
- "peerDependencies": {
- "postcss": ">=8.0.9",
- "ts-node": ">=9.0.0"
- },
- "peerDependenciesMeta": {
- "postcss": {
- "optional": true
- },
- "ts-node": {
- "optional": true
- }
- }
- },
"node_modules/postcss-merge-longhand": {
"version": "7.0.5",
"resolved": "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-7.0.5.tgz",
@@ -17444,12 +17322,12 @@
}
},
"node_modules/postcss-merge-rules": {
- "version": "7.0.5",
- "resolved": "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-7.0.5.tgz",
- "integrity": "sha512-ZonhuSwEaWA3+xYbOdJoEReKIBs5eDiBVLAGpYZpNFPzXZcEE5VKR7/qBEQvTZpiwjqhhqEQ+ax5O3VShBj9Wg==",
+ "version": "7.0.6",
+ "resolved": "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-7.0.6.tgz",
+ "integrity": "sha512-2jIPT4Tzs8K87tvgCpSukRQ2jjd+hH6Bb8rEEOUDmmhOeTcqDg5fEFK8uKIu+Pvc3//sm3Uu6FRqfyv7YF7+BQ==",
"license": "MIT",
"dependencies": {
- "browserslist": "^4.24.5",
+ "browserslist": "^4.25.1",
"caniuse-api": "^3.0.0",
"cssnano-utils": "^5.0.1",
"postcss-selector-parser": "^7.1.0"
@@ -17483,185 +17361,63 @@
"postcss-value-parser": "^4.2.0"
},
"engines": {
- "node": "^18.12.0 || ^20.9.0 || >=22.0"
- },
- "peerDependencies": {
- "postcss": "^8.4.32"
- }
- },
- "node_modules/postcss-minify-gradients": {
- "version": "7.0.1",
- "resolved": "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-7.0.1.tgz",
- "integrity": "sha512-X9JjaysZJwlqNkJbUDgOclyG3jZEpAMOfof6PUZjPnPrePnPG62pS17CjdM32uT1Uq1jFvNSff9l7kNbmMSL2A==",
- "license": "MIT",
- "dependencies": {
- "colord": "^2.9.3",
- "cssnano-utils": "^5.0.1",
- "postcss-value-parser": "^4.2.0"
- },
- "engines": {
- "node": "^18.12.0 || ^20.9.0 || >=22.0"
- },
- "peerDependencies": {
- "postcss": "^8.4.32"
- }
- },
- "node_modules/postcss-minify-params": {
- "version": "7.0.3",
- "resolved": "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-7.0.3.tgz",
- "integrity": "sha512-vUKV2+f5mtjewYieanLX0xemxIp1t0W0H/D11u+kQV/MWdygOO7xPMkbK+r9P6Lhms8MgzKARF/g5OPXhb8tgg==",
- "license": "MIT",
- "dependencies": {
- "browserslist": "^4.24.5",
- "cssnano-utils": "^5.0.1",
- "postcss-value-parser": "^4.2.0"
- },
- "engines": {
- "node": "^18.12.0 || ^20.9.0 || >=22.0"
- },
- "peerDependencies": {
- "postcss": "^8.4.32"
- }
- },
- "node_modules/postcss-minify-selectors": {
- "version": "7.0.5",
- "resolved": "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-7.0.5.tgz",
- "integrity": "sha512-x2/IvofHcdIrAm9Q+p06ZD1h6FPcQ32WtCRVodJLDR+WMn8EVHI1kvLxZuGKz/9EY5nAmI6lIQIrpo4tBy5+ug==",
- "license": "MIT",
- "dependencies": {
- "cssesc": "^3.0.0",
- "postcss-selector-parser": "^7.1.0"
- },
- "engines": {
- "node": "^18.12.0 || ^20.9.0 || >=22.0"
- },
- "peerDependencies": {
- "postcss": "^8.4.32"
- }
- },
- "node_modules/postcss-minify-selectors/node_modules/postcss-selector-parser": {
- "version": "7.1.0",
- "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-7.1.0.tgz",
- "integrity": "sha512-8sLjZwK0R+JlxlYcTuVnyT2v+htpdrjDOKuMcOVdYjt52Lh8hWRYpxBPoKx/Zg+bcjc3wx6fmQevMmUztS/ccA==",
- "license": "MIT",
- "dependencies": {
- "cssesc": "^3.0.0",
- "util-deprecate": "^1.0.2"
- },
- "engines": {
- "node": ">=4"
- }
- },
- "node_modules/postcss-nested": {
- "version": "6.2.0",
- "resolved": "https://registry.npmjs.org/postcss-nested/-/postcss-nested-6.2.0.tgz",
- "integrity": "sha512-HQbt28KulC5AJzG+cZtj9kvKB93CFCdLvog1WFLf1D+xmMvPGlBstkpTEZfK5+AN9hfJocyBFCNiqyS48bpgzQ==",
- "funding": [
- {
- "type": "opencollective",
- "url": "https://opencollective.com/postcss/"
- },
- {
- "type": "github",
- "url": "https://github.com/sponsors/ai"
- }
- ],
- "license": "MIT",
- "dependencies": {
- "postcss-selector-parser": "^6.1.1"
- },
- "engines": {
- "node": ">=12.0"
- },
- "peerDependencies": {
- "postcss": "^8.2.14"
- }
- },
- "node_modules/postcss-nested/node_modules/postcss-selector-parser": {
- "version": "6.1.2",
- "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.1.2.tgz",
- "integrity": "sha512-Q8qQfPiZ+THO/3ZrOrO0cJJKfpYCagtMUkXbnEfmgUjwXg6z/WBeOyS9APBBPCTSiDV+s4SwQGu8yFsiMRIudg==",
- "license": "MIT",
- "dependencies": {
- "cssesc": "^3.0.0",
- "util-deprecate": "^1.0.2"
- },
- "engines": {
- "node": ">=4"
+ "node": "^18.12.0 || ^20.9.0 || >=22.0"
+ },
+ "peerDependencies": {
+ "postcss": "^8.4.32"
}
},
- "node_modules/postcss-nesting": {
- "version": "13.0.1",
- "resolved": "https://registry.npmjs.org/postcss-nesting/-/postcss-nesting-13.0.1.tgz",
- "integrity": "sha512-VbqqHkOBOt4Uu3G8Dm8n6lU5+9cJFxiuty9+4rcoyRPO9zZS1JIs6td49VIoix3qYqELHlJIn46Oih9SAKo+yQ==",
- "funding": [
- {
- "type": "github",
- "url": "https://github.com/sponsors/csstools"
- },
- {
- "type": "opencollective",
- "url": "https://opencollective.com/csstools"
- }
- ],
- "license": "MIT-0",
+ "node_modules/postcss-minify-gradients": {
+ "version": "7.0.1",
+ "resolved": "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-7.0.1.tgz",
+ "integrity": "sha512-X9JjaysZJwlqNkJbUDgOclyG3jZEpAMOfof6PUZjPnPrePnPG62pS17CjdM32uT1Uq1jFvNSff9l7kNbmMSL2A==",
+ "license": "MIT",
"dependencies": {
- "@csstools/selector-resolve-nested": "^3.0.0",
- "@csstools/selector-specificity": "^5.0.0",
- "postcss-selector-parser": "^7.0.0"
+ "colord": "^2.9.3",
+ "cssnano-utils": "^5.0.1",
+ "postcss-value-parser": "^4.2.0"
},
"engines": {
- "node": ">=18"
+ "node": "^18.12.0 || ^20.9.0 || >=22.0"
},
"peerDependencies": {
- "postcss": "^8.4"
+ "postcss": "^8.4.32"
}
},
- "node_modules/postcss-nesting/node_modules/@csstools/selector-resolve-nested": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/@csstools/selector-resolve-nested/-/selector-resolve-nested-3.0.0.tgz",
- "integrity": "sha512-ZoK24Yku6VJU1gS79a5PFmC8yn3wIapiKmPgun0hZgEI5AOqgH2kiPRsPz1qkGv4HL+wuDLH83yQyk6inMYrJQ==",
- "funding": [
- {
- "type": "github",
- "url": "https://github.com/sponsors/csstools"
- },
- {
- "type": "opencollective",
- "url": "https://opencollective.com/csstools"
- }
- ],
- "license": "MIT-0",
+ "node_modules/postcss-minify-params": {
+ "version": "7.0.4",
+ "resolved": "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-7.0.4.tgz",
+ "integrity": "sha512-3OqqUddfH8c2e7M35W6zIwv7jssM/3miF9cbCSb1iJiWvtguQjlxZGIHK9JRmc8XAKmE2PFGtHSM7g/VcW97sw==",
+ "license": "MIT",
+ "dependencies": {
+ "browserslist": "^4.25.1",
+ "cssnano-utils": "^5.0.1",
+ "postcss-value-parser": "^4.2.0"
+ },
"engines": {
- "node": ">=18"
+ "node": "^18.12.0 || ^20.9.0 || >=22.0"
},
"peerDependencies": {
- "postcss-selector-parser": "^7.0.0"
+ "postcss": "^8.4.32"
}
},
- "node_modules/postcss-nesting/node_modules/@csstools/selector-specificity": {
- "version": "5.0.0",
- "resolved": "https://registry.npmjs.org/@csstools/selector-specificity/-/selector-specificity-5.0.0.tgz",
- "integrity": "sha512-PCqQV3c4CoVm3kdPhyeZ07VmBRdH2EpMFA/pd9OASpOEC3aXNGoqPDAZ80D0cLpMBxnmk0+yNhGsEx31hq7Gtw==",
- "funding": [
- {
- "type": "github",
- "url": "https://github.com/sponsors/csstools"
- },
- {
- "type": "opencollective",
- "url": "https://opencollective.com/csstools"
- }
- ],
- "license": "MIT-0",
+ "node_modules/postcss-minify-selectors": {
+ "version": "7.0.5",
+ "resolved": "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-7.0.5.tgz",
+ "integrity": "sha512-x2/IvofHcdIrAm9Q+p06ZD1h6FPcQ32WtCRVodJLDR+WMn8EVHI1kvLxZuGKz/9EY5nAmI6lIQIrpo4tBy5+ug==",
+ "license": "MIT",
+ "dependencies": {
+ "cssesc": "^3.0.0",
+ "postcss-selector-parser": "^7.1.0"
+ },
"engines": {
- "node": ">=18"
+ "node": "^18.12.0 || ^20.9.0 || >=22.0"
},
"peerDependencies": {
- "postcss-selector-parser": "^7.0.0"
+ "postcss": "^8.4.32"
}
},
- "node_modules/postcss-nesting/node_modules/postcss-selector-parser": {
+ "node_modules/postcss-minify-selectors/node_modules/postcss-selector-parser": {
"version": "7.1.0",
"resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-7.1.0.tgz",
"integrity": "sha512-8sLjZwK0R+JlxlYcTuVnyT2v+htpdrjDOKuMcOVdYjt52Lh8hWRYpxBPoKx/Zg+bcjc3wx6fmQevMmUztS/ccA==",
@@ -17762,12 +17518,12 @@
}
},
"node_modules/postcss-normalize-unicode": {
- "version": "7.0.3",
- "resolved": "https://registry.npmjs.org/postcss-normalize-unicode/-/postcss-normalize-unicode-7.0.3.tgz",
- "integrity": "sha512-EcoA29LvG3F+EpOh03iqu+tJY3uYYKzArqKJHxDhUYLa2u58aqGq16K6/AOsXD9yqLN8O6y9mmePKN5cx6krOw==",
+ "version": "7.0.4",
+ "resolved": "https://registry.npmjs.org/postcss-normalize-unicode/-/postcss-normalize-unicode-7.0.4.tgz",
+ "integrity": "sha512-LvIURTi1sQoZqj8mEIE8R15yvM+OhbR1avynMtI9bUzj5gGKR/gfZFd8O7VMj0QgJaIFzxDwxGl/ASMYAkqO8g==",
"license": "MIT",
"dependencies": {
- "browserslist": "^4.24.5",
+ "browserslist": "^4.25.1",
"postcss-value-parser": "^4.2.0"
},
"engines": {
@@ -17824,12 +17580,12 @@
}
},
"node_modules/postcss-reduce-initial": {
- "version": "7.0.3",
- "resolved": "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-7.0.3.tgz",
- "integrity": "sha512-RFvkZaqiWtGMlVjlUHpaxGqEL27lgt+Q2Ixjf83CRAzqdo+TsDyGPtJUbPx2MuYIJ+sCQc2TrOvRnhcXQfgIVA==",
+ "version": "7.0.4",
+ "resolved": "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-7.0.4.tgz",
+ "integrity": "sha512-rdIC9IlMBn7zJo6puim58Xd++0HdbvHeHaPgXsimMfG1ijC5A9ULvNLSE0rUKVJOvNMcwewW4Ga21ngyJjY/+Q==",
"license": "MIT",
"dependencies": {
- "browserslist": "^4.24.5",
+ "browserslist": "^4.25.1",
"caniuse-api": "^3.0.0"
},
"engines": {
@@ -17855,9 +17611,10 @@
}
},
"node_modules/postcss-selector-parser": {
- "version": "6.0.10",
- "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.10.tgz",
- "integrity": "sha512-IQ7TZdoaqbT+LCpShg46jnZVlhWD2w6iQYAcYXfHARZ7X1t/UGhhceQDs5X0cGqKvYlHNOuv7Oa1xmb0oQuA3w==",
+ "version": "6.1.2",
+ "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.1.2.tgz",
+ "integrity": "sha512-Q8qQfPiZ+THO/3ZrOrO0cJJKfpYCagtMUkXbnEfmgUjwXg6z/WBeOyS9APBBPCTSiDV+s4SwQGu8yFsiMRIudg==",
+ "dev": true,
"license": "MIT",
"dependencies": {
"cssesc": "^3.0.0",
@@ -17868,13 +17625,13 @@
}
},
"node_modules/postcss-svgo": {
- "version": "7.0.2",
- "resolved": "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-7.0.2.tgz",
- "integrity": "sha512-5Dzy66JlnRM6pkdOTF8+cGsB1fnERTE8Nc+Eed++fOWo1hdsBptCsbG8UuJkgtZt75bRtMJIrPeZmtfANixdFA==",
+ "version": "7.1.0",
+ "resolved": "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-7.1.0.tgz",
+ "integrity": "sha512-KnAlfmhtoLz6IuU3Sij2ycusNs4jPW+QoFE5kuuUOK8awR6tMxZQrs5Ey3BUz7nFCzT3eqyFgqkyrHiaU2xx3w==",
"license": "MIT",
"dependencies": {
"postcss-value-parser": "^4.2.0",
- "svgo": "^3.3.2"
+ "svgo": "^4.0.0"
},
"engines": {
"node": "^18.12.0 || ^20.9.0 || >= 18"
@@ -17992,38 +17749,41 @@
}
},
"node_modules/precinct": {
- "version": "11.0.5",
- "resolved": "https://registry.npmjs.org/precinct/-/precinct-11.0.5.tgz",
- "integrity": "sha512-oHSWLC8cL/0znFhvln26D14KfCQFFn4KOLSw6hmLhd+LQ2SKt9Ljm89but76Pc7flM9Ty1TnXyrA2u16MfRV3w==",
- "license": "MIT",
- "dependencies": {
- "@dependents/detective-less": "^4.1.0",
- "commander": "^10.0.1",
- "detective-amd": "^5.0.2",
- "detective-cjs": "^5.0.1",
- "detective-es6": "^4.0.1",
- "detective-postcss": "^6.1.3",
- "detective-sass": "^5.0.3",
- "detective-scss": "^4.0.3",
- "detective-stylus": "^4.0.0",
- "detective-typescript": "^11.1.0",
- "module-definition": "^5.0.1",
- "node-source-walk": "^6.0.2"
+ "version": "12.2.0",
+ "resolved": "https://registry.npmjs.org/precinct/-/precinct-12.2.0.tgz",
+ "integrity": "sha512-NFBMuwIfaJ4SocE9YXPU/n4AcNSoFMVFjP72nvl3cx69j/ke61/hPOWFREVxLkFhhEGnA8ZuVfTqJBa+PK3b5w==",
+ "license": "MIT",
+ "dependencies": {
+ "@dependents/detective-less": "^5.0.1",
+ "commander": "^12.1.0",
+ "detective-amd": "^6.0.1",
+ "detective-cjs": "^6.0.1",
+ "detective-es6": "^5.0.1",
+ "detective-postcss": "^7.0.1",
+ "detective-sass": "^6.0.1",
+ "detective-scss": "^5.0.1",
+ "detective-stylus": "^5.0.1",
+ "detective-typescript": "^14.0.0",
+ "detective-vue2": "^2.2.0",
+ "module-definition": "^6.0.1",
+ "node-source-walk": "^7.0.1",
+ "postcss": "^8.5.1",
+ "typescript": "^5.7.3"
},
"bin": {
"precinct": "bin/cli.js"
},
"engines": {
- "node": "^14.14.0 || >=16.0.0"
+ "node": ">=18"
}
},
"node_modules/precinct/node_modules/commander": {
- "version": "10.0.1",
- "resolved": "https://registry.npmjs.org/commander/-/commander-10.0.1.tgz",
- "integrity": "sha512-y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug==",
+ "version": "12.1.0",
+ "resolved": "https://registry.npmjs.org/commander/-/commander-12.1.0.tgz",
+ "integrity": "sha512-Vw8qHK3bZM9y/P10u3Vib8o/DdkvA2OtPtZvD871QKjy74Wj1WSKFILMPRPSdUSx5RFK1arlJzEtA4PkFgnbuA==",
"license": "MIT",
"engines": {
- "node": ">=14"
+ "node": ">=18"
}
},
"node_modules/prelude-ls": {
@@ -18037,9 +17797,9 @@
}
},
"node_modules/prettier": {
- "version": "3.5.3",
- "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.5.3.tgz",
- "integrity": "sha512-QQtaxnoDJeAkDvDKWCLiwIXkTgRhwYDEQCghU9Z6q03iyek/rxRh/2lC3HB7P8sWT2xC/y5JDctPLBIGzHKbhw==",
+ "version": "3.6.2",
+ "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.6.2.tgz",
+ "integrity": "sha512-I7AIg5boAr5R0FFtJ6rCfD+LFsWHp81dolrFD8S79U9tb8Az2nGrJncnMSnys+bpQJfRUzqs9hnA81OAA3hCuQ==",
"dev": true,
"license": "MIT",
"bin": {
@@ -18129,20 +17889,6 @@
"integrity": "sha512-hHVTzba3wboROl0/aWRRG9dMytgH6ow//STBZh43l/wQgmMhYhOFi0EHWAPtoCz9IAUymsyP0TSBHkhgMEGNnQ==",
"license": "MIT"
},
- "node_modules/proxy-addr": {
- "version": "2.0.7",
- "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz",
- "integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==",
- "devOptional": true,
- "license": "MIT",
- "dependencies": {
- "forwarded": "0.2.0",
- "ipaddr.js": "1.9.1"
- },
- "engines": {
- "node": ">= 0.10"
- }
- },
"node_modules/proxy-from-env": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
@@ -18150,9 +17896,9 @@
"license": "MIT"
},
"node_modules/pump": {
- "version": "3.0.2",
- "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.2.tgz",
- "integrity": "sha512-tUPXtzlGM8FE3P0ZL6DVs/3P58k9nk8/jZeQCurTJylQA8qFYzHFfhBJkuqyE0FifOsQ0uKWekiZ5g8wtr28cw==",
+ "version": "3.0.3",
+ "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.3.tgz",
+ "integrity": "sha512-todwxLMY7/heScKmntwQG8CXVkWUOdYxIvY2s0VWAAMh/nd8SoYiRaKjlr7+iCs984f2P8zvrfWcDDYVb73NfA==",
"license": "MIT",
"dependencies": {
"end-of-stream": "^1.1.0",
@@ -18387,6 +18133,18 @@
"url": "https://github.com/sponsors/sindresorhus"
}
},
+ "node_modules/query-string/node_modules/filter-obj": {
+ "version": "5.1.0",
+ "resolved": "https://registry.npmjs.org/filter-obj/-/filter-obj-5.1.0.tgz",
+ "integrity": "sha512-qWeTREPoT7I0bifpPUXtxkZJ1XJzxWtfoWWkdVGqa+eCr3SHW/Ocp89o8vLvbUuQnadybJpjOKu4V+RwO6sGng==",
+ "license": "MIT",
+ "engines": {
+ "node": ">=14.16"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
+ },
"node_modules/queue-microtask": {
"version": "1.2.3",
"resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
@@ -18466,22 +18224,6 @@
"node": ">= 0.6"
}
},
- "node_modules/raw-body": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-3.0.0.tgz",
- "integrity": "sha512-RmkhL8CAyCRPXCE28MMH0z2PNWQBNk2Q09ZdxM9IOOXwxwZbN+qbWaatPkdkWIKL2ZVDImrN/pK5HTRz2PcS4g==",
- "devOptional": true,
- "license": "MIT",
- "dependencies": {
- "bytes": "3.1.2",
- "http-errors": "2.0.0",
- "iconv-lite": "0.6.3",
- "unpipe": "1.0.0"
- },
- "engines": {
- "node": ">= 0.8"
- }
- },
"node_modules/rc9": {
"version": "2.1.2",
"resolved": "https://registry.npmjs.org/rc9/-/rc9-2.1.2.tgz",
@@ -18492,15 +18234,6 @@
"destr": "^2.0.3"
}
},
- "node_modules/read-cache": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/read-cache/-/read-cache-1.0.0.tgz",
- "integrity": "sha512-Owdv/Ft7IjOgm/i0xvNDZ1LrRANRfew4b2prF3OWMQLxLfu3bS8FVhCsrSCMK4lR56Y9ya+AThoTpDCTxCmpRA==",
- "license": "MIT",
- "dependencies": {
- "pify": "^2.3.0"
- }
- },
"node_modules/read-package-up": {
"version": "11.0.0",
"resolved": "https://registry.npmjs.org/read-package-up/-/read-package-up-11.0.0.tgz",
@@ -18651,7 +18384,6 @@
"version": "0.1.27",
"resolved": "https://registry.npmjs.org/regexp-tree/-/regexp-tree-0.1.27.tgz",
"integrity": "sha512-iETxpjK6YoRWJG5o6hXLwvjYAoW+FEZn9os0PD/b6AP6xQwsa/Y7lCVgIixBbUPMfhu+i2LtdeAqVTgGlQarfA==",
- "dev": true,
"license": "MIT",
"bin": {
"regexp-tree": "bin/regexp-tree"
@@ -18683,99 +18415,74 @@
"node": ">=6"
}
},
- "node_modules/remove-trailing-separator": {
- "version": "1.1.0",
- "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz",
- "integrity": "sha512-/hS+Y0u3aOfIETiaiirUFwDBDzmXPvO+jAfKTitUngIPzdKc6Z0LoFjM/CK5PL4C+eKwHohlHAb6H0VFfmmUsw==",
- "license": "ISC"
- },
- "node_modules/replace-in-file": {
- "version": "6.3.5",
- "resolved": "https://registry.npmjs.org/replace-in-file/-/replace-in-file-6.3.5.tgz",
- "integrity": "sha512-arB9d3ENdKva2fxRnSjwBEXfK1npgyci7ZZuwysgAp7ORjHSyxz6oqIjTEv8R0Ydl4Ll7uOAZXL4vbkhGIizCg==",
- "license": "MIT",
- "dependencies": {
- "chalk": "^4.1.2",
- "glob": "^7.2.0",
- "yargs": "^17.2.1"
- },
- "bin": {
- "replace-in-file": "bin/cli.js"
+ "node_modules/reka-ui": {
+ "version": "2.3.1",
+ "resolved": "https://registry.npmjs.org/reka-ui/-/reka-ui-2.3.1.tgz",
+ "integrity": "sha512-2SjGeybd7jvD8EQUkzjgg7GdOQdf4cTwdVMq/lDNTMqneUFNnryGO43dg8WaM/jaG9QpSCZBvstfBFWlDdb2Zg==",
+ "license": "MIT",
+ "dependencies": {
+ "@floating-ui/dom": "^1.6.13",
+ "@floating-ui/vue": "^1.1.6",
+ "@internationalized/date": "^3.5.0",
+ "@internationalized/number": "^3.5.0",
+ "@tanstack/vue-virtual": "^3.12.0",
+ "@vueuse/core": "^12.5.0",
+ "@vueuse/shared": "^12.5.0",
+ "aria-hidden": "^1.2.4",
+ "defu": "^6.1.4",
+ "ohash": "^2.0.11"
},
- "engines": {
- "node": ">=10"
+ "peerDependencies": {
+ "vue": ">= 3.2.0"
}
},
- "node_modules/replace-in-file/node_modules/brace-expansion": {
- "version": "1.1.11",
- "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
- "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+ "node_modules/reka-ui/node_modules/@vueuse/core": {
+ "version": "12.8.2",
+ "resolved": "https://registry.npmjs.org/@vueuse/core/-/core-12.8.2.tgz",
+ "integrity": "sha512-HbvCmZdzAu3VGi/pWYm5Ut+Kd9mn1ZHnn4L5G8kOQTPs/IwIAmJoBrmYk2ckLArgMXZj0AW3n5CAejLUO+PhdQ==",
"license": "MIT",
"dependencies": {
- "balanced-match": "^1.0.0",
- "concat-map": "0.0.1"
+ "@types/web-bluetooth": "^0.0.21",
+ "@vueuse/metadata": "12.8.2",
+ "@vueuse/shared": "12.8.2",
+ "vue": "^3.5.13"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/antfu"
}
},
- "node_modules/replace-in-file/node_modules/chalk": {
- "version": "4.1.2",
- "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
- "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+ "node_modules/reka-ui/node_modules/@vueuse/metadata": {
+ "version": "12.8.2",
+ "resolved": "https://registry.npmjs.org/@vueuse/metadata/-/metadata-12.8.2.tgz",
+ "integrity": "sha512-rAyLGEuoBJ/Il5AmFHiziCPdQzRt88VxR+Y/A/QhJ1EWtWqPBBAxTAFaSkviwEuOEZNtW8pvkPgoCZQ+HxqW1A==",
"license": "MIT",
- "dependencies": {
- "ansi-styles": "^4.1.0",
- "supports-color": "^7.1.0"
- },
- "engines": {
- "node": ">=10"
- },
"funding": {
- "url": "https://github.com/chalk/chalk?sponsor=1"
+ "url": "https://github.com/sponsors/antfu"
}
},
- "node_modules/replace-in-file/node_modules/glob": {
- "version": "7.2.3",
- "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
- "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
- "deprecated": "Glob versions prior to v9 are no longer supported",
- "license": "ISC",
+ "node_modules/reka-ui/node_modules/@vueuse/shared": {
+ "version": "12.8.2",
+ "resolved": "https://registry.npmjs.org/@vueuse/shared/-/shared-12.8.2.tgz",
+ "integrity": "sha512-dznP38YzxZoNloI0qpEfpkms8knDtaoQ6Y/sfS0L7Yki4zh40LFHEhur0odJC6xTHG5dxWVPiUWBXn+wCG2s5w==",
+ "license": "MIT",
"dependencies": {
- "fs.realpath": "^1.0.0",
- "inflight": "^1.0.4",
- "inherits": "2",
- "minimatch": "^3.1.1",
- "once": "^1.3.0",
- "path-is-absolute": "^1.0.0"
- },
- "engines": {
- "node": "*"
+ "vue": "^3.5.13"
},
"funding": {
- "url": "https://github.com/sponsors/isaacs"
+ "url": "https://github.com/sponsors/antfu"
}
},
- "node_modules/replace-in-file/node_modules/minimatch": {
- "version": "3.1.2",
- "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
- "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
- "license": "ISC",
- "dependencies": {
- "brace-expansion": "^1.1.7"
- },
- "engines": {
- "node": "*"
- }
+ "node_modules/remove-accents": {
+ "version": "0.5.0",
+ "resolved": "https://registry.npmjs.org/remove-accents/-/remove-accents-0.5.0.tgz",
+ "integrity": "sha512-8g3/Otx1eJaVD12e31UbJj1YzdtVvzH85HV7t+9MJYk/u3XmkOUJ5Ys9wQrf9PCPK8+xn4ymzqYCiZl6QWKn+A==",
+ "license": "MIT"
},
- "node_modules/replace-in-file/node_modules/supports-color": {
- "version": "7.2.0",
- "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
- "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
- "license": "MIT",
- "dependencies": {
- "has-flag": "^4.0.0"
- },
- "engines": {
- "node": ">=8"
- }
+ "node_modules/remove-trailing-separator": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz",
+ "integrity": "sha512-/hS+Y0u3aOfIETiaiirUFwDBDzmXPvO+jAfKTitUngIPzdKc6Z0LoFjM/CK5PL4C+eKwHohlHAb6H0VFfmmUsw==",
+ "license": "ISC"
},
"node_modules/require-directory": {
"version": "2.1.1",
@@ -18800,19 +18507,7 @@
"node": ">=8.6.0"
}
},
- "node_modules/require-main-filename": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
- "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==",
- "license": "ISC"
- },
- "node_modules/require-package-name": {
- "version": "2.0.1",
- "resolved": "https://registry.npmjs.org/require-package-name/-/require-package-name-2.0.1.tgz",
- "integrity": "sha512-uuoJ1hU/k6M0779t3VMVIYpb2VMJk05cehCaABFhXaibcbvfgR8wKiozLjVFSzJPmQMRqIcO0HMyTFqfV09V6Q==",
- "license": "MIT"
- },
- "node_modules/resolve": {
+ "node_modules/require-in-the-middle/node_modules/resolve": {
"version": "1.22.10",
"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.10.tgz",
"integrity": "sha512-NPRy+/ncIMeDlTAsuqwKIiferiawhefFJtkNSW0qZJEqMEb+qBt/77B/jGeeek+F0uOeN05CDa6HXbbIgtVX4w==",
@@ -18832,83 +18527,50 @@
"url": "https://github.com/sponsors/ljharb"
}
},
- "node_modules/resolve-from": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
- "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
- "devOptional": true,
- "license": "MIT",
- "engines": {
- "node": ">=4"
- }
- },
- "node_modules/resolve-path": {
- "version": "1.4.0",
- "resolved": "https://registry.npmjs.org/resolve-path/-/resolve-path-1.4.0.tgz",
- "integrity": "sha512-i1xevIst/Qa+nA9olDxLWnLk8YZbi8R/7JPbCMcgyWaFR6bKWaexgJgEB5oc2PKMjYdrHynyz0NY+if+H98t1w==",
- "license": "MIT",
- "dependencies": {
- "http-errors": "~1.6.2",
- "path-is-absolute": "1.0.1"
- },
- "engines": {
- "node": ">= 0.8"
- }
+ "node_modules/require-main-filename": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
+ "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==",
+ "license": "ISC"
},
- "node_modules/resolve-path/node_modules/depd": {
- "version": "1.1.2",
- "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
- "integrity": "sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ==",
- "license": "MIT",
- "engines": {
- "node": ">= 0.6"
- }
+ "node_modules/require-package-name": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/require-package-name/-/require-package-name-2.0.1.tgz",
+ "integrity": "sha512-uuoJ1hU/k6M0779t3VMVIYpb2VMJk05cehCaABFhXaibcbvfgR8wKiozLjVFSzJPmQMRqIcO0HMyTFqfV09V6Q==",
+ "license": "MIT"
},
- "node_modules/resolve-path/node_modules/http-errors": {
- "version": "1.6.3",
- "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz",
- "integrity": "sha512-lks+lVC8dgGyh97jxvxeYTWQFvh4uw4yC12gVl63Cg30sjPX4wuGcdkICVXDAESr6OJGjqGA8Iz5mkeN6zlD7A==",
+ "node_modules/resolve": {
+ "version": "2.0.0-next.5",
+ "resolved": "https://registry.npmjs.org/resolve/-/resolve-2.0.0-next.5.tgz",
+ "integrity": "sha512-U7WjGVG9sH8tvjW5SmGbQuui75FiyjAX72HX15DwBBwF9dNiQZRQAg9nnPhYy+TUnE0+VcrttuvNI8oSxZcocA==",
"license": "MIT",
"dependencies": {
- "depd": "~1.1.2",
- "inherits": "2.0.3",
- "setprototypeof": "1.1.0",
- "statuses": ">= 1.4.0 < 2"
+ "is-core-module": "^2.13.0",
+ "path-parse": "^1.0.7",
+ "supports-preserve-symlinks-flag": "^1.0.0"
},
- "engines": {
- "node": ">= 0.6"
+ "bin": {
+ "resolve": "bin/resolve"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
}
},
- "node_modules/resolve-path/node_modules/inherits": {
- "version": "2.0.3",
- "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
- "integrity": "sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw==",
- "license": "ISC"
- },
- "node_modules/resolve-path/node_modules/setprototypeof": {
- "version": "1.1.0",
- "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz",
- "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==",
- "license": "ISC"
- },
- "node_modules/resolve-path/node_modules/statuses": {
- "version": "1.5.0",
- "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
- "integrity": "sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==",
+ "node_modules/resolve-from": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
+ "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
+ "devOptional": true,
"license": "MIT",
"engines": {
- "node": ">= 0.6"
+ "node": ">=4"
}
},
- "node_modules/resolve-pkg-maps": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/resolve-pkg-maps/-/resolve-pkg-maps-1.0.0.tgz",
- "integrity": "sha512-seS2Tj26TBVOC2NIc2rOe2y2ZO7efxITtLZcGSOnHHNOQ7CkiUBfw0Iw2ck6xkIhPwLhKNLS8BO+hEpngQlqzw==",
- "dev": true,
- "license": "MIT",
- "funding": {
- "url": "https://github.com/privatenumber/resolve-pkg-maps?sponsor=1"
- }
+ "node_modules/restructure": {
+ "version": "3.0.2",
+ "resolved": "https://registry.npmjs.org/restructure/-/restructure-3.0.2.tgz",
+ "integrity": "sha512-gSfoiOEA0VPE6Tukkrr7I0RBdE0s7H1eFCDBk05l1KIQT1UIKNc5JZy6jdyW6eYH3aR3g5b3PuL77rq0hvwtAw==",
+ "license": "MIT"
},
"node_modules/reusify": {
"version": "1.1.0",
@@ -18927,12 +18589,12 @@
"license": "MIT"
},
"node_modules/rollup": {
- "version": "4.40.2",
- "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.40.2.tgz",
- "integrity": "sha512-tfUOg6DTP4rhQ3VjOO6B4wyrJnGOX85requAXvqYTHsOgb2TFJdZ3aWpT8W2kPoypSGP7dZUyzxJ9ee4buM5Fg==",
+ "version": "4.45.1",
+ "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.45.1.tgz",
+ "integrity": "sha512-4iya7Jb76fVpQyLoiVpzUrsjQ12r3dM7fIVz+4NwoYvZOShknRmiv+iu9CClZml5ZLGb0XMcYLutK6w9tgxHDw==",
"license": "MIT",
"dependencies": {
- "@types/estree": "1.0.7"
+ "@types/estree": "1.0.8"
},
"bin": {
"rollup": "dist/bin/rollup"
@@ -18942,36 +18604,36 @@
"npm": ">=8.0.0"
},
"optionalDependencies": {
- "@rollup/rollup-android-arm-eabi": "4.40.2",
- "@rollup/rollup-android-arm64": "4.40.2",
- "@rollup/rollup-darwin-arm64": "4.40.2",
- "@rollup/rollup-darwin-x64": "4.40.2",
- "@rollup/rollup-freebsd-arm64": "4.40.2",
- "@rollup/rollup-freebsd-x64": "4.40.2",
- "@rollup/rollup-linux-arm-gnueabihf": "4.40.2",
- "@rollup/rollup-linux-arm-musleabihf": "4.40.2",
- "@rollup/rollup-linux-arm64-gnu": "4.40.2",
- "@rollup/rollup-linux-arm64-musl": "4.40.2",
- "@rollup/rollup-linux-loongarch64-gnu": "4.40.2",
- "@rollup/rollup-linux-powerpc64le-gnu": "4.40.2",
- "@rollup/rollup-linux-riscv64-gnu": "4.40.2",
- "@rollup/rollup-linux-riscv64-musl": "4.40.2",
- "@rollup/rollup-linux-s390x-gnu": "4.40.2",
- "@rollup/rollup-linux-x64-gnu": "4.40.2",
- "@rollup/rollup-linux-x64-musl": "4.40.2",
- "@rollup/rollup-win32-arm64-msvc": "4.40.2",
- "@rollup/rollup-win32-ia32-msvc": "4.40.2",
- "@rollup/rollup-win32-x64-msvc": "4.40.2",
+ "@rollup/rollup-android-arm-eabi": "4.45.1",
+ "@rollup/rollup-android-arm64": "4.45.1",
+ "@rollup/rollup-darwin-arm64": "4.45.1",
+ "@rollup/rollup-darwin-x64": "4.45.1",
+ "@rollup/rollup-freebsd-arm64": "4.45.1",
+ "@rollup/rollup-freebsd-x64": "4.45.1",
+ "@rollup/rollup-linux-arm-gnueabihf": "4.45.1",
+ "@rollup/rollup-linux-arm-musleabihf": "4.45.1",
+ "@rollup/rollup-linux-arm64-gnu": "4.45.1",
+ "@rollup/rollup-linux-arm64-musl": "4.45.1",
+ "@rollup/rollup-linux-loongarch64-gnu": "4.45.1",
+ "@rollup/rollup-linux-powerpc64le-gnu": "4.45.1",
+ "@rollup/rollup-linux-riscv64-gnu": "4.45.1",
+ "@rollup/rollup-linux-riscv64-musl": "4.45.1",
+ "@rollup/rollup-linux-s390x-gnu": "4.45.1",
+ "@rollup/rollup-linux-x64-gnu": "4.45.1",
+ "@rollup/rollup-linux-x64-musl": "4.45.1",
+ "@rollup/rollup-win32-arm64-msvc": "4.45.1",
+ "@rollup/rollup-win32-ia32-msvc": "4.45.1",
+ "@rollup/rollup-win32-x64-msvc": "4.45.1",
"fsevents": "~2.3.2"
}
},
"node_modules/rollup-plugin-visualizer": {
- "version": "5.14.0",
- "resolved": "https://registry.npmjs.org/rollup-plugin-visualizer/-/rollup-plugin-visualizer-5.14.0.tgz",
- "integrity": "sha512-VlDXneTDaKsHIw8yzJAFWtrzguoJ/LnQ+lMpoVfYJ3jJF4Ihe5oYLAqLklIK/35lgUY+1yEzCkHyZ1j4A5w5fA==",
+ "version": "6.0.3",
+ "resolved": "https://registry.npmjs.org/rollup-plugin-visualizer/-/rollup-plugin-visualizer-6.0.3.tgz",
+ "integrity": "sha512-ZU41GwrkDcCpVoffviuM9Clwjy5fcUxlz0oMoTXTYsK+tcIFzbdacnrr2n8TXcHxbGKKXtOdjxM2HUS4HjkwIw==",
"license": "MIT",
"dependencies": {
- "open": "^8.4.0",
+ "open": "^8.0.0",
"picomatch": "^4.0.2",
"source-map": "^0.7.4",
"yargs": "^17.5.1"
@@ -18983,7 +18645,7 @@
"node": ">=18"
},
"peerDependencies": {
- "rolldown": "1.x",
+ "rolldown": "1.x || ^1.0.0-beta",
"rollup": "2.x || 3.x || 4.x"
},
"peerDependenciesMeta": {
@@ -19004,23 +18666,6 @@
"node": ">= 8"
}
},
- "node_modules/router": {
- "version": "2.2.0",
- "resolved": "https://registry.npmjs.org/router/-/router-2.2.0.tgz",
- "integrity": "sha512-nLTrUKm2UyiL7rlhapu/Zl45FwNgkZGaCpZbIHajDYgwlJCOzLSk+cIPAnsEqV955GjILJnKbdQC1nVPz+gAYQ==",
- "devOptional": true,
- "license": "MIT",
- "dependencies": {
- "debug": "^4.4.0",
- "depd": "^2.0.0",
- "is-promise": "^4.0.0",
- "parseurl": "^1.3.3",
- "path-to-regexp": "^8.0.0"
- },
- "engines": {
- "node": ">= 18"
- }
- },
"node_modules/run-applescript": {
"version": "7.0.0",
"resolved": "https://registry.npmjs.org/run-applescript/-/run-applescript-7.0.0.tgz",
@@ -19076,23 +18721,6 @@
],
"license": "MIT"
},
- "node_modules/safe-regex-test": {
- "version": "1.1.0",
- "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.1.0.tgz",
- "integrity": "sha512-x/+Cz4YrimQxQccJf5mKEbIa1NzeCRNI5Ecl/ekmlYaampdNLPalVyIcCZNNH3MvmqBugV5TMYZXv0ljslUlaw==",
- "license": "MIT",
- "dependencies": {
- "call-bound": "^1.0.2",
- "es-errors": "^1.3.0",
- "is-regex": "^1.2.1"
- },
- "engines": {
- "node": ">= 0.4"
- },
- "funding": {
- "url": "https://github.com/sponsors/ljharb"
- }
- },
"node_modules/safe-stable-stringify": {
"version": "2.5.0",
"resolved": "https://registry.npmjs.org/safe-stable-stringify/-/safe-stable-stringify-2.5.0.tgz",
@@ -19102,17 +18730,10 @@
"node": ">=10"
}
},
- "node_modules/safer-buffer": {
- "version": "2.1.2",
- "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
- "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
- "devOptional": true,
- "license": "MIT"
- },
"node_modules/sass": {
- "version": "1.87.0",
- "resolved": "https://registry.npmjs.org/sass/-/sass-1.87.0.tgz",
- "integrity": "sha512-d0NoFH4v6SjEK7BoX810Jsrhj7IQSYHAHLi/iSpgqKc7LaIDshFRlSg5LOymf9FqQhxEHs2W5ZQXlvy0KD45Uw==",
+ "version": "1.89.2",
+ "resolved": "https://registry.npmjs.org/sass/-/sass-1.89.2.tgz",
+ "integrity": "sha512-xCmtksBKd/jdJ9Bt9p7nPKiuqrlBMBuuGkQlkhZjjQk3Ty48lv93k5Dq6OPkKt4XwxDJ7tvlfrTa1MPA9bf+QA==",
"devOptional": true,
"license": "MIT",
"dependencies": {
@@ -19130,6 +18751,12 @@
"@parcel/watcher": "^2.4.1"
}
},
+ "node_modules/sax": {
+ "version": "1.4.1",
+ "resolved": "https://registry.npmjs.org/sax/-/sax-1.4.1.tgz",
+ "integrity": "sha512-+aWOz7yVScEGoKNd4PA10LZ8sk0A/z5+nXQG5giUO5rprX9jgYsTdov9qCchZiPIZezbZH+jRut8nPodFAX4Jg==",
+ "license": "ISC"
+ },
"node_modules/scslre": {
"version": "0.3.0",
"resolved": "https://registry.npmjs.org/scslre/-/scslre-0.3.0.tgz",
@@ -19152,9 +18779,9 @@
"license": "MIT"
},
"node_modules/semver": {
- "version": "7.7.1",
- "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz",
- "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==",
+ "version": "7.7.2",
+ "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz",
+ "integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==",
"license": "ISC",
"bin": {
"semver": "bin/semver.js"
@@ -19264,9 +18891,9 @@
}
},
"node_modules/shell-quote": {
- "version": "1.8.2",
- "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.8.2.tgz",
- "integrity": "sha512-AzqKpGKjrj7EM6rKVQEPpB288oCfnrEIuyoT9cyF4nmGa7V8Zk6f7RRqYisX8X9m+Q7bd632aZW4ky7EhbQztA==",
+ "version": "1.8.3",
+ "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.8.3.tgz",
+ "integrity": "sha512-ObmnIF4hXNg1BqhnHmgbDETF8dLPCggZWBjkQfhZpbszZnYur5DUljTcCHii5LC3J5E0yeO/1LIMyH+UvHQgyw==",
"license": "MIT",
"engines": {
"node": ">= 0.4"
@@ -19372,14 +18999,14 @@
"license": "MIT"
},
"node_modules/simple-git": {
- "version": "3.27.0",
- "resolved": "https://registry.npmjs.org/simple-git/-/simple-git-3.27.0.tgz",
- "integrity": "sha512-ivHoFS9Yi9GY49ogc6/YAi3Fl9ROnF4VyubNylgCkA+RVqLaKWnDSzXOVzya8csELIaWaYNutsEuAhZrtOjozA==",
+ "version": "3.28.0",
+ "resolved": "https://registry.npmjs.org/simple-git/-/simple-git-3.28.0.tgz",
+ "integrity": "sha512-Rs/vQRwsn1ILH1oBUy8NucJlXmnnLeLCfcvbSehkPzbv3wwoFWIdtfd6Ndo6ZPhlPsCZ60CPI4rxurnwAa+a2w==",
"license": "MIT",
"dependencies": {
"@kwsites/file-exists": "^1.1.1",
"@kwsites/promise-deferred": "^1.1.1",
- "debug": "^4.3.5"
+ "debug": "^4.4.0"
},
"funding": {
"type": "github",
@@ -19416,13 +19043,13 @@
"license": "MIT"
},
"node_modules/site-config-stack": {
- "version": "3.1.9",
- "resolved": "https://registry.npmjs.org/site-config-stack/-/site-config-stack-3.1.9.tgz",
- "integrity": "sha512-ed53+wLi+36SGqidU+YUpl7f1OHClPLmvUJ/aYZny1dCBnXvOsuFottrMkXDIK2N5UaMED9mz8KrRZTk94ARCg==",
+ "version": "3.2.2",
+ "resolved": "https://registry.npmjs.org/site-config-stack/-/site-config-stack-3.2.2.tgz",
+ "integrity": "sha512-T1NphPh1sWlsIXbD1q1HDgHbX40miTyi++cDqXkVOuHQ/eQnGp6w8cwB8u9XmgSZsnmZpsQJgPUTNH7SX173AA==",
"dev": true,
"license": "MIT",
"dependencies": {
- "ufo": "^1.5.4"
+ "ufo": "^1.6.1"
},
"funding": {
"url": "https://github.com/sponsors/harlan-zw"
@@ -19547,13 +19174,6 @@
"url": "https://github.com/sponsors/sindresorhus"
}
},
- "node_modules/stable-hash": {
- "version": "0.0.5",
- "resolved": "https://registry.npmjs.org/stable-hash/-/stable-hash-0.0.5.tgz",
- "integrity": "sha512-+L3ccpzibovGXFK+Ap/f8LOS0ahMrHTf3xu7mMLSpEGU0EO9ucaysSylKo9eRDFNhWve/y275iPmIZ4z39a9iA==",
- "dev": true,
- "license": "MIT"
- },
"node_modules/stack-trace": {
"version": "0.0.10",
"resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.10.tgz",
@@ -19570,9 +19190,9 @@
"license": "MIT"
},
"node_modules/statuses": {
- "version": "2.0.1",
- "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
- "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
+ "version": "2.0.2",
+ "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.2.tgz",
+ "integrity": "sha512-DvEy55V3DB7uknRo+4iOGT5fP1slR8wQohVdknigZPMpMstaKJQWhwiYBACJE3Ul2pTnATihhBYnRhZQHGBiRw==",
"license": "MIT",
"engines": {
"node": ">= 0.8"
@@ -19585,9 +19205,9 @@
"license": "MIT"
},
"node_modules/streamx": {
- "version": "2.22.0",
- "resolved": "https://registry.npmjs.org/streamx/-/streamx-2.22.0.tgz",
- "integrity": "sha512-sLh1evHOzBy/iWRiR6d1zRcLao4gGZr3C1kzNz4fopCOKJb6xD9ub8Mpi9Mr1R6id5o43S+d93fI48UC5uM9aw==",
+ "version": "2.22.1",
+ "resolved": "https://registry.npmjs.org/streamx/-/streamx-2.22.1.tgz",
+ "integrity": "sha512-znKXEBxfatz2GBNK02kRnCXjV+AA4kjZIUxeWSr3UGirZMJfTE9uiwKHobnbgxWyL/JWro8tTq+vOqAK1/qbSA==",
"license": "MIT",
"dependencies": {
"fast-fifo": "^1.3.2",
@@ -19773,6 +19393,19 @@
"integrity": "sha512-mxa9E9ITFOt0ban3j6L5MpjwegGz6lBQmM1IJkWeBZGcMxto50+eWdjC/52xDbS2vy0k7vIMK0Fe2wfL9OQSpQ==",
"license": "MIT"
},
+ "node_modules/strnum": {
+ "version": "2.1.1",
+ "resolved": "https://registry.npmjs.org/strnum/-/strnum-2.1.1.tgz",
+ "integrity": "sha512-7ZvoFTiCnGxBtDqJ//Cu6fWtZtc7Y3x+QOirG15wztbdngGSkht27o2pyGWrVy0b4WAy3jbKmnoK6g5VlVNUUw==",
+ "dev": true,
+ "funding": [
+ {
+ "type": "github",
+ "url": "https://github.com/sponsors/NaturalIntelligence"
+ }
+ ],
+ "license": "MIT"
+ },
"node_modules/structured-clone-es": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/structured-clone-es/-/structured-clone-es-1.0.0.tgz",
@@ -19802,12 +19435,12 @@
"license": "0BSD"
},
"node_modules/stylehacks": {
- "version": "7.0.5",
- "resolved": "https://registry.npmjs.org/stylehacks/-/stylehacks-7.0.5.tgz",
- "integrity": "sha512-5kNb7V37BNf0Q3w+1pxfa+oiNPS++/b4Jil9e/kPDgrk1zjEd6uR7SZeJiYaLYH6RRSC1XX2/37OTeU/4FvuIA==",
+ "version": "7.0.6",
+ "resolved": "https://registry.npmjs.org/stylehacks/-/stylehacks-7.0.6.tgz",
+ "integrity": "sha512-iitguKivmsueOmTO0wmxURXBP8uqOO+zikLGZ7Mm9e/94R4w5T999Js2taS/KBOnQ/wdC3jN3vNSrkGDrlnqQg==",
"license": "MIT",
"dependencies": {
- "browserslist": "^4.24.5",
+ "browserslist": "^4.25.1",
"postcss-selector-parser": "^7.1.0"
},
"engines": {
@@ -19830,66 +19463,6 @@
"node": ">=4"
}
},
- "node_modules/sucrase": {
- "version": "3.35.0",
- "resolved": "https://registry.npmjs.org/sucrase/-/sucrase-3.35.0.tgz",
- "integrity": "sha512-8EbVDiu9iN/nESwxeSxDKe0dunta1GOlHufmSSXxMD2z2/tMZpDMpvXQGsc+ajGo8y2uYUmixaSRUc/QPoQ0GA==",
- "license": "MIT",
- "dependencies": {
- "@jridgewell/gen-mapping": "^0.3.2",
- "commander": "^4.0.0",
- "glob": "^10.3.10",
- "lines-and-columns": "^1.1.6",
- "mz": "^2.7.0",
- "pirates": "^4.0.1",
- "ts-interface-checker": "^0.1.9"
- },
- "bin": {
- "sucrase": "bin/sucrase",
- "sucrase-node": "bin/sucrase-node"
- },
- "engines": {
- "node": ">=16 || 14 >=14.17"
- }
- },
- "node_modules/sucrase/node_modules/commander": {
- "version": "4.1.1",
- "resolved": "https://registry.npmjs.org/commander/-/commander-4.1.1.tgz",
- "integrity": "sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==",
- "license": "MIT",
- "engines": {
- "node": ">= 6"
- }
- },
- "node_modules/sucrase/node_modules/glob": {
- "version": "10.4.5",
- "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz",
- "integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==",
- "license": "ISC",
- "dependencies": {
- "foreground-child": "^3.1.0",
- "jackspeak": "^3.1.2",
- "minimatch": "^9.0.4",
- "minipass": "^7.1.2",
- "package-json-from-dist": "^1.0.0",
- "path-scurry": "^1.11.1"
- },
- "bin": {
- "glob": "dist/esm/bin.mjs"
- },
- "funding": {
- "url": "https://github.com/sponsors/isaacs"
- }
- },
- "node_modules/sucrase/node_modules/minipass": {
- "version": "7.1.2",
- "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz",
- "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==",
- "license": "ISC",
- "engines": {
- "node": ">=16 || 14 >=14.17"
- }
- },
"node_modules/superjson": {
"version": "2.2.2",
"resolved": "https://registry.npmjs.org/superjson/-/superjson-2.2.2.tgz",
@@ -19927,24 +19500,24 @@
}
},
"node_modules/svgo": {
- "version": "3.3.2",
- "resolved": "https://registry.npmjs.org/svgo/-/svgo-3.3.2.tgz",
- "integrity": "sha512-OoohrmuUlBs8B8o6MB2Aevn+pRIH9zDALSR+6hhqVfa6fRwG/Qw9VUMSMW9VNg2CFc/MTIfabtdOVl9ODIJjpw==",
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/svgo/-/svgo-4.0.0.tgz",
+ "integrity": "sha512-VvrHQ+9uniE+Mvx3+C9IEe/lWasXCU0nXMY2kZeLrHNICuRiC8uMPyM14UEaMOFA5mhyQqEkB02VoQ16n3DLaw==",
"license": "MIT",
"dependencies": {
- "@trysound/sax": "0.2.0",
- "commander": "^7.2.0",
+ "commander": "^11.1.0",
"css-select": "^5.1.0",
- "css-tree": "^2.3.1",
+ "css-tree": "^3.0.1",
"css-what": "^6.1.0",
"csso": "^5.0.5",
- "picocolors": "^1.0.0"
+ "picocolors": "^1.1.1",
+ "sax": "^1.4.1"
},
"bin": {
- "svgo": "bin/svgo"
+ "svgo": "bin/svgo.js"
},
"engines": {
- "node": ">=14.0.0"
+ "node": ">=16"
},
"funding": {
"type": "opencollective",
@@ -19952,254 +19525,88 @@
}
},
"node_modules/svgo/node_modules/commander": {
- "version": "7.2.0",
- "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz",
- "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==",
+ "version": "11.1.0",
+ "resolved": "https://registry.npmjs.org/commander/-/commander-11.1.0.tgz",
+ "integrity": "sha512-yPVavfyCcRhmorC7rWlkHn15b4wDVgVmBA7kV4QVBsF7kv/9TKJAbAXVTxvTnwP8HHKjRCJDClKbciiYS7p0DQ==",
"license": "MIT",
"engines": {
- "node": ">= 10"
+ "node": ">=16"
}
},
"node_modules/synckit": {
- "version": "0.11.4",
- "resolved": "https://registry.npmjs.org/synckit/-/synckit-0.11.4.tgz",
- "integrity": "sha512-Q/XQKRaJiLiFIBNN+mndW7S/RHxvwzuZS6ZwmRzUBqJBv/5QIKCEwkBC8GBf8EQJKYnaFs0wOZbKTXBPj8L9oQ==",
+ "version": "0.11.8",
+ "resolved": "https://registry.npmjs.org/synckit/-/synckit-0.11.8.tgz",
+ "integrity": "sha512-+XZ+r1XGIJGeQk3VvXhT6xx/VpbHsRzsTkGgF6E5RX9TTXD0118l87puaEBZ566FhqblC6U0d4XnubznJDm30A==",
"dev": true,
"license": "MIT",
"dependencies": {
- "@pkgr/core": "^0.2.3",
- "tslib": "^2.8.1"
+ "@pkgr/core": "^0.2.4"
},
"engines": {
"node": "^14.18.0 || >=16.0.0"
},
- "funding": {
- "url": "https://opencollective.com/synckit"
- }
- },
- "node_modules/system-architecture": {
- "version": "0.1.0",
- "resolved": "https://registry.npmjs.org/system-architecture/-/system-architecture-0.1.0.tgz",
- "integrity": "sha512-ulAk51I9UVUyJgxlv9M6lFot2WP3e7t8Kz9+IS6D4rVba1tR9kON+Ey69f+1R4Q8cd45Lod6a4IcJIxnzGc/zA==",
- "license": "MIT",
- "engines": {
- "node": ">=18"
- },
- "funding": {
- "url": "https://github.com/sponsors/sindresorhus"
- }
- },
- "node_modules/tailwind-config-viewer": {
- "version": "2.0.4",
- "resolved": "https://registry.npmjs.org/tailwind-config-viewer/-/tailwind-config-viewer-2.0.4.tgz",
- "integrity": "sha512-icvcmdMmt9dphvas8wL40qttrHwAnW3QEN4ExJ2zICjwRsPj7gowd1cOceaWG3IfTuM/cTNGQcx+bsjMtmV+cw==",
- "license": "MIT",
- "dependencies": {
- "@koa/router": "^12.0.1",
- "commander": "^6.0.0",
- "fs-extra": "^9.0.1",
- "koa": "^2.14.2",
- "koa-static": "^5.0.0",
- "open": "^7.0.4",
- "portfinder": "^1.0.26",
- "replace-in-file": "^6.1.0"
- },
- "bin": {
- "tailwind-config-viewer": "cli/index.js",
- "tailwindcss-config-viewer": "cli/index.js"
- },
- "engines": {
- "node": ">=13"
- },
- "peerDependencies": {
- "tailwindcss": "1 || 2 || 2.0.1-compat || 3"
- }
- },
- "node_modules/tailwind-config-viewer/node_modules/commander": {
- "version": "6.2.1",
- "resolved": "https://registry.npmjs.org/commander/-/commander-6.2.1.tgz",
- "integrity": "sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA==",
- "license": "MIT",
- "engines": {
- "node": ">= 6"
- }
- },
- "node_modules/tailwind-config-viewer/node_modules/is-docker": {
- "version": "2.2.1",
- "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz",
- "integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==",
- "license": "MIT",
- "bin": {
- "is-docker": "cli.js"
- },
- "engines": {
- "node": ">=8"
- },
- "funding": {
- "url": "https://github.com/sponsors/sindresorhus"
- }
- },
- "node_modules/tailwind-config-viewer/node_modules/is-wsl": {
- "version": "2.2.0",
- "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz",
- "integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==",
- "license": "MIT",
- "dependencies": {
- "is-docker": "^2.0.0"
- },
- "engines": {
- "node": ">=8"
- }
- },
- "node_modules/tailwind-config-viewer/node_modules/open": {
- "version": "7.4.2",
- "resolved": "https://registry.npmjs.org/open/-/open-7.4.2.tgz",
- "integrity": "sha512-MVHddDVweXZF3awtlAS+6pgKLlm/JgxZ90+/NBurBoQctVOOB/zDdVjcyPzQ+0laDGbsWgrRkflI65sQeOgT9Q==",
- "license": "MIT",
- "dependencies": {
- "is-docker": "^2.0.0",
- "is-wsl": "^2.1.1"
- },
- "engines": {
- "node": ">=8"
- },
- "funding": {
- "url": "https://github.com/sponsors/sindresorhus"
- }
- },
- "node_modules/tailwind-merge": {
- "version": "2.6.0",
- "resolved": "https://registry.npmjs.org/tailwind-merge/-/tailwind-merge-2.6.0.tgz",
- "integrity": "sha512-P+Vu1qXfzediirmHOC3xKGAYeZtPcV9g76X+xg2FD4tYgR71ewMA35Y3sCz3zhiN/dwefRpJX0yBcgwi1fXNQA==",
- "license": "MIT",
- "funding": {
- "type": "github",
- "url": "https://github.com/sponsors/dcastil"
- }
- },
- "node_modules/tailwindcss": {
- "version": "3.4.17",
- "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.4.17.tgz",
- "integrity": "sha512-w33E2aCvSDP0tW9RZuNXadXlkHXqFzSkQew/aIa2i/Sj8fThxwovwlXHSPXTbAHwEIhBFXAedUhP2tueAKP8Og==",
- "license": "MIT",
- "dependencies": {
- "@alloc/quick-lru": "^5.2.0",
- "arg": "^5.0.2",
- "chokidar": "^3.6.0",
- "didyoumean": "^1.2.2",
- "dlv": "^1.1.3",
- "fast-glob": "^3.3.2",
- "glob-parent": "^6.0.2",
- "is-glob": "^4.0.3",
- "jiti": "^1.21.6",
- "lilconfig": "^3.1.3",
- "micromatch": "^4.0.8",
- "normalize-path": "^3.0.0",
- "object-hash": "^3.0.0",
- "picocolors": "^1.1.1",
- "postcss": "^8.4.47",
- "postcss-import": "^15.1.0",
- "postcss-js": "^4.0.1",
- "postcss-load-config": "^4.0.2",
- "postcss-nested": "^6.2.0",
- "postcss-selector-parser": "^6.1.2",
- "resolve": "^1.22.8",
- "sucrase": "^3.35.0"
- },
- "bin": {
- "tailwind": "lib/cli.js",
- "tailwindcss": "lib/cli.js"
- },
- "engines": {
- "node": ">=14.0.0"
- }
- },
- "node_modules/tailwindcss/node_modules/chokidar": {
- "version": "3.6.0",
- "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz",
- "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==",
- "license": "MIT",
- "dependencies": {
- "anymatch": "~3.1.2",
- "braces": "~3.0.2",
- "glob-parent": "~5.1.2",
- "is-binary-path": "~2.1.0",
- "is-glob": "~4.0.1",
- "normalize-path": "~3.0.0",
- "readdirp": "~3.6.0"
- },
- "engines": {
- "node": ">= 8.10.0"
- },
- "funding": {
- "url": "https://paulmillr.com/funding/"
- },
- "optionalDependencies": {
- "fsevents": "~2.3.2"
- }
- },
- "node_modules/tailwindcss/node_modules/chokidar/node_modules/glob-parent": {
- "version": "5.1.2",
- "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
- "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
- "license": "ISC",
- "dependencies": {
- "is-glob": "^4.0.1"
- },
- "engines": {
- "node": ">= 6"
+ "funding": {
+ "url": "https://opencollective.com/synckit"
}
},
- "node_modules/tailwindcss/node_modules/jiti": {
- "version": "1.21.7",
- "resolved": "https://registry.npmjs.org/jiti/-/jiti-1.21.7.tgz",
- "integrity": "sha512-/imKNG4EbWNrVjoNC/1H5/9GFy+tqjGBHCaSsN+P2RnPqjsLmv6UD3Ej+Kj8nBWaRAwyk7kK5ZUc+OEatnTR3A==",
+ "node_modules/system-architecture": {
+ "version": "0.1.0",
+ "resolved": "https://registry.npmjs.org/system-architecture/-/system-architecture-0.1.0.tgz",
+ "integrity": "sha512-ulAk51I9UVUyJgxlv9M6lFot2WP3e7t8Kz9+IS6D4rVba1tR9kON+Ey69f+1R4Q8cd45Lod6a4IcJIxnzGc/zA==",
"license": "MIT",
- "bin": {
- "jiti": "bin/jiti.js"
+ "engines": {
+ "node": ">=18"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
}
},
- "node_modules/tailwindcss/node_modules/picomatch": {
- "version": "2.3.1",
- "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
- "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
+ "node_modules/tailwind-merge": {
+ "version": "2.6.0",
+ "resolved": "https://registry.npmjs.org/tailwind-merge/-/tailwind-merge-2.6.0.tgz",
+ "integrity": "sha512-P+Vu1qXfzediirmHOC3xKGAYeZtPcV9g76X+xg2FD4tYgR71ewMA35Y3sCz3zhiN/dwefRpJX0yBcgwi1fXNQA==",
"license": "MIT",
- "engines": {
- "node": ">=8.6"
- },
"funding": {
- "url": "https://github.com/sponsors/jonschlinkert"
+ "type": "github",
+ "url": "https://github.com/sponsors/dcastil"
}
},
- "node_modules/tailwindcss/node_modules/postcss-selector-parser": {
- "version": "6.1.2",
- "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.1.2.tgz",
- "integrity": "sha512-Q8qQfPiZ+THO/3ZrOrO0cJJKfpYCagtMUkXbnEfmgUjwXg6z/WBeOyS9APBBPCTSiDV+s4SwQGu8yFsiMRIudg==",
+ "node_modules/tailwind-variants": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/tailwind-variants/-/tailwind-variants-1.0.0.tgz",
+ "integrity": "sha512-2WSbv4ulEEyuBKomOunut65D8UZwxrHoRfYnxGcQNnHqlSCp2+B7Yz2W+yrNDrxRodOXtGD/1oCcKGNBnUqMqA==",
"license": "MIT",
"dependencies": {
- "cssesc": "^3.0.0",
- "util-deprecate": "^1.0.2"
+ "tailwind-merge": "3.0.2"
},
"engines": {
- "node": ">=4"
+ "node": ">=16.x",
+ "pnpm": ">=7.x"
+ },
+ "peerDependencies": {
+ "tailwindcss": "*"
}
},
- "node_modules/tailwindcss/node_modules/readdirp": {
- "version": "3.6.0",
- "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
- "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
+ "node_modules/tailwind-variants/node_modules/tailwind-merge": {
+ "version": "3.0.2",
+ "resolved": "https://registry.npmjs.org/tailwind-merge/-/tailwind-merge-3.0.2.tgz",
+ "integrity": "sha512-l7z+OYZ7mu3DTqrL88RiKrKIqO3NcpEO8V/Od04bNpvk0kiIFndGEoqfuzvj4yuhRkHKjRkII2z+KS2HfPcSxw==",
"license": "MIT",
- "dependencies": {
- "picomatch": "^2.2.1"
- },
- "engines": {
- "node": ">=8.10.0"
+ "funding": {
+ "type": "github",
+ "url": "https://github.com/sponsors/dcastil"
}
},
+ "node_modules/tailwindcss": {
+ "version": "4.1.11",
+ "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-4.1.11.tgz",
+ "integrity": "sha512-2E9TBm6MDD/xKYe+dvJZAmg3yxIEDNRc0jwlNyDg/4Fil2QcSLjFKGVff0lAf1jjeaArlG/M75Ey/EYr/OJtBA==",
+ "license": "MIT"
+ },
"node_modules/tapable": {
- "version": "2.2.1",
- "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz",
- "integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==",
+ "version": "2.2.2",
+ "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.2.tgz",
+ "integrity": "sha512-Re10+NauLTMCudc7T5WLFLAwDhQ0JWdrMK+9B2M8zR5hRExKmsRDCBA7/aV/pNJFltmBFO5BAMlQFi/vq3nKOg==",
"license": "MIT",
"engines": {
"node": ">=6"
@@ -20252,13 +19659,13 @@
}
},
"node_modules/terser": {
- "version": "5.39.0",
- "resolved": "https://registry.npmjs.org/terser/-/terser-5.39.0.tgz",
- "integrity": "sha512-LBAhFyLho16harJoWMg/nZsQYgTrg5jXOn2nCYjRUcZZEdE3qa2zb8QEDRUGVZBW4rlazf2fxkg8tztybTaqWw==",
+ "version": "5.43.1",
+ "resolved": "https://registry.npmjs.org/terser/-/terser-5.43.1.tgz",
+ "integrity": "sha512-+6erLbBm0+LROX2sPXlUYx/ux5PyE9K/a92Wrt6oA+WDAoFTdpHE5tCYCI5PNzq2y8df4rA+QgHLJuR4jNymsg==",
"license": "BSD-2-Clause",
"dependencies": {
"@jridgewell/source-map": "^0.3.3",
- "acorn": "^8.8.2",
+ "acorn": "^8.14.0",
"commander": "^2.20.0",
"source-map-support": "~0.5.20"
},
@@ -20290,26 +19697,11 @@
"integrity": "sha512-uuVGNWzgJ4yhRaNSiubPY7OjISw4sw4E5Uv0wbjp+OzcbmVU/rsT8ujgcXJhn9ypzsgr5vlzpPqP+MBBKcGvbg==",
"license": "MIT"
},
- "node_modules/thenify": {
- "version": "3.3.1",
- "resolved": "https://registry.npmjs.org/thenify/-/thenify-3.3.1.tgz",
- "integrity": "sha512-RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw==",
- "license": "MIT",
- "dependencies": {
- "any-promise": "^1.0.0"
- }
- },
- "node_modules/thenify-all": {
- "version": "1.6.0",
- "resolved": "https://registry.npmjs.org/thenify-all/-/thenify-all-1.6.0.tgz",
- "integrity": "sha512-RNxQH/qI8/t3thXJDwcstUO4zeqo64+Uy/+sNVRBx4Xn2OX+OZ9oP+iJnNFqplFra2ZUVeKCSa2oVWi3T4uVmA==",
- "license": "MIT",
- "dependencies": {
- "thenify": ">= 3.1.0 < 4"
- },
- "engines": {
- "node": ">=0.8"
- }
+ "node_modules/tiny-inflate": {
+ "version": "1.0.3",
+ "resolved": "https://registry.npmjs.org/tiny-inflate/-/tiny-inflate-1.0.3.tgz",
+ "integrity": "sha512-pkY1fj1cKHb2seWDy0B16HeWyczlJA9/WW3u3c4z/NiWDsO3DOU5D7nhTLE9CF0yXv/QZFY7sEJmj24dK+Rrqw==",
+ "license": "MIT"
},
"node_modules/tiny-invariant": {
"version": "1.3.3",
@@ -20324,9 +19716,9 @@
"license": "MIT"
},
"node_modules/tinyglobby": {
- "version": "0.2.13",
- "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.13.tgz",
- "integrity": "sha512-mEwzpUgrLySlveBwEVDMKk5B57bhLPYovRfPAXD5gA/98Opn0rCDj3GtLwFvCvH5RK9uPCExUROW5NjDwvqkxw==",
+ "version": "0.2.14",
+ "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.14.tgz",
+ "integrity": "sha512-tX5e7OM1HnYr2+a2C/4V0htOcSQcoSTH9KgJnVvNm5zm/cyEWKJ7j7YutsH9CxMdtOkkLFy2AHrMci9IM8IPZQ==",
"license": "MIT",
"dependencies": {
"fdir": "^6.4.4",
@@ -20430,7 +19822,6 @@
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-2.1.0.tgz",
"integrity": "sha512-CUgTZL1irw8u29bzrOD/nH85jqyc74D6SshFgujOIA7osm2Rz7dYH77agkx7H4FBNxDq7Cjf+IjaX/8zwFW+ZQ==",
- "dev": true,
"license": "MIT",
"engines": {
"node": ">=18.12"
@@ -20443,52 +19834,17 @@
"version": "3.3.1",
"resolved": "https://registry.npmjs.org/ts-custom-error/-/ts-custom-error-3.3.1.tgz",
"integrity": "sha512-5OX1tzOjxWEgsr/YEUWSuPrQ00deKLh6D7OTWcvNHm12/7QPyRh8SYpyWvA4IZv8H/+GQWQEh/kwo95Q9OVW1A==",
+ "license": "MIT",
"engines": {
"node": ">=14.0.0"
}
},
- "node_modules/ts-interface-checker": {
- "version": "0.1.13",
- "resolved": "https://registry.npmjs.org/ts-interface-checker/-/ts-interface-checker-0.1.13.tgz",
- "integrity": "sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA==",
- "license": "Apache-2.0"
- },
"node_modules/tslib": {
"version": "2.8.1",
"resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
"integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
"license": "0BSD"
},
- "node_modules/tsscmp": {
- "version": "1.0.6",
- "resolved": "https://registry.npmjs.org/tsscmp/-/tsscmp-1.0.6.tgz",
- "integrity": "sha512-LxhtAkPDTkVCMQjt2h6eBVY28KCjikZqZfMcC15YBeNjkgUpdCfBu5HoiOTDu86v6smE8yOjyEktJ8hlbANHQA==",
- "license": "MIT",
- "engines": {
- "node": ">=0.6.x"
- }
- },
- "node_modules/tsutils": {
- "version": "3.21.0",
- "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.21.0.tgz",
- "integrity": "sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==",
- "license": "MIT",
- "dependencies": {
- "tslib": "^1.8.1"
- },
- "engines": {
- "node": ">= 6"
- },
- "peerDependencies": {
- "typescript": ">=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta"
- }
- },
- "node_modules/tsutils/node_modules/tslib": {
- "version": "1.14.1",
- "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
- "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
- "license": "0BSD"
- },
"node_modules/type-check": {
"version": "0.4.0",
"resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
@@ -20514,20 +19870,11 @@
"url": "https://github.com/sponsors/sindresorhus"
}
},
- "node_modules/type-is": {
- "version": "2.0.1",
- "resolved": "https://registry.npmjs.org/type-is/-/type-is-2.0.1.tgz",
- "integrity": "sha512-OZs6gsjF4vMp32qrCbiVSkrFmXtG/AZhY3t0iAMrMBiAZyV9oALtXO8hsrHbMXF9x6L3grlFuwW2oAz7cav+Gw==",
- "devOptional": true,
- "license": "MIT",
- "dependencies": {
- "content-type": "^1.0.5",
- "media-typer": "^1.1.0",
- "mime-types": "^3.0.0"
- },
- "engines": {
- "node": ">= 0.6"
- }
+ "node_modules/type-level-regexp": {
+ "version": "0.1.17",
+ "resolved": "https://registry.npmjs.org/type-level-regexp/-/type-level-regexp-0.1.17.tgz",
+ "integrity": "sha512-wTk4DH3cxwk196uGLK/E9pE45aLfeKJacKmcEgEOA/q5dnPGNxXt0cfYdFxb57L+sEpf1oJH4Dnx/pnRcku9jg==",
+ "license": "MIT"
},
"node_modules/typescript": {
"version": "5.8.3",
@@ -20585,28 +19932,28 @@
}
},
"node_modules/undici-types": {
- "version": "6.21.0",
- "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.21.0.tgz",
- "integrity": "sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ==",
+ "version": "7.8.0",
+ "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.8.0.tgz",
+ "integrity": "sha512-9UJ2xGDvQ43tYyVMpuHlsgApydB8ZKfVYTsLDhXkFL/6gfkp+U8xTGdh8pMJv1SpZna0zxG1DwsKZsreLbXBxw==",
"license": "MIT"
},
"node_modules/unenv": {
- "version": "2.0.0-rc.15",
- "resolved": "https://registry.npmjs.org/unenv/-/unenv-2.0.0-rc.15.tgz",
- "integrity": "sha512-J/rEIZU8w6FOfLNz/hNKsnY+fFHWnu9MH4yRbSZF3xbbGHovcetXPs7sD+9p8L6CeNC//I9bhRYAOsBt2u7/OA==",
+ "version": "2.0.0-rc.18",
+ "resolved": "https://registry.npmjs.org/unenv/-/unenv-2.0.0-rc.18.tgz",
+ "integrity": "sha512-O0oVQVJ2X3Q8H4HITJr4e2cWxMYBeZ+p8S25yoKCxVCgDWtIJDcgwWNonYz12tI3ylVQCRyPV/Bdq0KJeXo7AA==",
"license": "MIT",
"dependencies": {
"defu": "^6.1.4",
- "exsolve": "^1.0.4",
+ "exsolve": "^1.0.7",
"ohash": "^2.0.11",
"pathe": "^2.0.3",
- "ufo": "^1.5.4"
+ "ufo": "^1.6.1"
}
},
"node_modules/unhead": {
- "version": "2.0.8",
- "resolved": "https://registry.npmjs.org/unhead/-/unhead-2.0.8.tgz",
- "integrity": "sha512-63WR+y08RZE7ChiFdgNY64haAkhCtUS5/HM7xo4Q83NA63txWbEh2WGmrKbArdQmSct+XlqbFN8ZL1yWpQEHEA==",
+ "version": "2.0.12",
+ "resolved": "https://registry.npmjs.org/unhead/-/unhead-2.0.12.tgz",
+ "integrity": "sha512-5oo0lwz81XDXCmrHGzgmbaNOxM8R9MZ3FkEs2ROHeW8e16xsrv7qXykENlISrcxr3RLPHQEsD1b6js9P2Oj/Ow==",
"license": "MIT",
"dependencies": {
"hookable": "^5.5.3"
@@ -20615,6 +19962,26 @@
"url": "https://github.com/sponsors/harlan-zw"
}
},
+ "node_modules/unicode-properties": {
+ "version": "1.4.1",
+ "resolved": "https://registry.npmjs.org/unicode-properties/-/unicode-properties-1.4.1.tgz",
+ "integrity": "sha512-CLjCCLQ6UuMxWnbIylkisbRj31qxHPAurvena/0iwSVbQ2G1VY5/HjV0IRabOEbDHlzZlRdCrD4NhB0JtU40Pg==",
+ "license": "MIT",
+ "dependencies": {
+ "base64-js": "^1.3.0",
+ "unicode-trie": "^2.0.0"
+ }
+ },
+ "node_modules/unicode-trie": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/unicode-trie/-/unicode-trie-2.0.0.tgz",
+ "integrity": "sha512-x7bc76x0bm4prf1VLg79uhAzKw8DVboClSN5VxJuQ+LKDOVEW9CdH+VY7SP+vX7xCYQqzzgQpFqz15zeLvAtZQ==",
+ "license": "MIT",
+ "dependencies": {
+ "pako": "^0.2.5",
+ "tiny-inflate": "^1.0.0"
+ }
+ },
"node_modules/unicorn-magic": {
"version": "0.3.0",
"resolved": "https://registry.npmjs.org/unicorn-magic/-/unicorn-magic-0.3.0.tgz",
@@ -20627,13 +19994,23 @@
"url": "https://github.com/sponsors/sindresorhus"
}
},
+ "node_modules/unifont": {
+ "version": "0.4.1",
+ "resolved": "https://registry.npmjs.org/unifont/-/unifont-0.4.1.tgz",
+ "integrity": "sha512-zKSY9qO8svWYns+FGKjyVdLvpGPwqmsCjeJLN1xndMiqxHWBAhoWDMYMG960MxeV48clBmG+fDP59dHY1VoZvg==",
+ "license": "MIT",
+ "dependencies": {
+ "css-tree": "^3.0.0",
+ "ohash": "^2.0.0"
+ }
+ },
"node_modules/unimport": {
- "version": "5.0.1",
- "resolved": "https://registry.npmjs.org/unimport/-/unimport-5.0.1.tgz",
- "integrity": "sha512-1YWzPj6wYhtwHE+9LxRlyqP4DiRrhGfJxdtH475im8ktyZXO3jHj/3PZ97zDdvkYoovFdi0K4SKl3a7l92v3sQ==",
+ "version": "5.1.0",
+ "resolved": "https://registry.npmjs.org/unimport/-/unimport-5.1.0.tgz",
+ "integrity": "sha512-wMmuG+wkzeHh2KCE6yiDlHmKelN8iE/maxkUYMbmrS6iV8+n6eP1TH3yKKlepuF4hrkepinEGmBXdfo9XZUvAw==",
"license": "MIT",
"dependencies": {
- "acorn": "^8.14.1",
+ "acorn": "^8.15.0",
"escape-string-regexp": "^5.0.0",
"estree-walker": "^3.0.3",
"local-pkg": "^1.1.1",
@@ -20641,11 +20018,11 @@
"mlly": "^1.7.4",
"pathe": "^2.0.3",
"picomatch": "^4.0.2",
- "pkg-types": "^2.1.0",
+ "pkg-types": "^2.1.1",
"scule": "^1.3.0",
"strip-literal": "^3.0.0",
- "tinyglobby": "^0.2.13",
- "unplugin": "^2.3.2",
+ "tinyglobby": "^0.2.14",
+ "unplugin": "^2.3.5",
"unplugin-utils": "^0.2.4"
},
"engines": {
@@ -20664,77 +20041,222 @@
"url": "https://github.com/sponsors/sindresorhus"
}
},
- "node_modules/universalify": {
- "version": "2.0.1",
- "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz",
- "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==",
- "license": "MIT",
- "engines": {
- "node": ">= 10.0.0"
- }
- },
"node_modules/unixify": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/unixify/-/unixify-1.0.0.tgz",
"integrity": "sha512-6bc58dPYhCMHHuwxldQxO3RRNZ4eCogZ/st++0+fcC1nr0jiGUtAdBJ2qzmLQWSxbtz42pWt4QQMiZ9HvZf5cg==",
"license": "MIT",
"dependencies": {
- "normalize-path": "^2.1.1"
+ "normalize-path": "^2.1.1"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/unixify/node_modules/normalize-path": {
+ "version": "2.1.1",
+ "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
+ "integrity": "sha512-3pKJwH184Xo/lnH6oyP1q2pMd7HcypqqmRs91/6/i2CGtWwIKGCkOOMTm/zXbgTEWHw1uNpNi/igc3ePOYHb6w==",
+ "license": "MIT",
+ "dependencies": {
+ "remove-trailing-separator": "^1.0.1"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/unplugin": {
+ "version": "2.3.5",
+ "resolved": "https://registry.npmjs.org/unplugin/-/unplugin-2.3.5.tgz",
+ "integrity": "sha512-RyWSb5AHmGtjjNQ6gIlA67sHOsWpsbWpwDokLwTcejVdOjEkJZh7QKu14J00gDDVSh8kGH4KYC/TNBceXFZhtw==",
+ "license": "MIT",
+ "dependencies": {
+ "acorn": "^8.14.1",
+ "picomatch": "^4.0.2",
+ "webpack-virtual-modules": "^0.6.2"
+ },
+ "engines": {
+ "node": ">=18.12.0"
+ }
+ },
+ "node_modules/unplugin-auto-import": {
+ "version": "19.3.0",
+ "resolved": "https://registry.npmjs.org/unplugin-auto-import/-/unplugin-auto-import-19.3.0.tgz",
+ "integrity": "sha512-iIi0u4Gq2uGkAOGqlPJOAMI8vocvjh1clGTfSK4SOrJKrt+tirrixo/FjgBwXQNNdS7ofcr7OxzmOb/RjWxeEQ==",
+ "license": "MIT",
+ "dependencies": {
+ "local-pkg": "^1.1.1",
+ "magic-string": "^0.30.17",
+ "picomatch": "^4.0.2",
+ "unimport": "^4.2.0",
+ "unplugin": "^2.3.4",
+ "unplugin-utils": "^0.2.4"
+ },
+ "engines": {
+ "node": ">=14"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/antfu"
+ },
+ "peerDependencies": {
+ "@nuxt/kit": "^3.2.2",
+ "@vueuse/core": "*"
+ },
+ "peerDependenciesMeta": {
+ "@nuxt/kit": {
+ "optional": true
+ },
+ "@vueuse/core": {
+ "optional": true
+ }
+ }
+ },
+ "node_modules/unplugin-auto-import/node_modules/escape-string-regexp": {
+ "version": "5.0.0",
+ "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-5.0.0.tgz",
+ "integrity": "sha512-/veY75JbMK4j1yjvuUxuVsiS/hr/4iHs9FTT6cgTexxdE0Ly/glccBAkloH/DofkjRbZU3bnoj38mOmhkZ0lHw==",
+ "license": "MIT",
+ "engines": {
+ "node": ">=12"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
+ },
+ "node_modules/unplugin-auto-import/node_modules/unimport": {
+ "version": "4.2.0",
+ "resolved": "https://registry.npmjs.org/unimport/-/unimport-4.2.0.tgz",
+ "integrity": "sha512-mYVtA0nmzrysnYnyb3ALMbByJ+Maosee2+WyE0puXl+Xm2bUwPorPaaeZt0ETfuroPOtG8jj1g/qeFZ6buFnag==",
+ "license": "MIT",
+ "dependencies": {
+ "acorn": "^8.14.1",
+ "escape-string-regexp": "^5.0.0",
+ "estree-walker": "^3.0.3",
+ "local-pkg": "^1.1.1",
+ "magic-string": "^0.30.17",
+ "mlly": "^1.7.4",
+ "pathe": "^2.0.3",
+ "picomatch": "^4.0.2",
+ "pkg-types": "^2.1.0",
+ "scule": "^1.3.0",
+ "strip-literal": "^3.0.0",
+ "tinyglobby": "^0.2.12",
+ "unplugin": "^2.2.2",
+ "unplugin-utils": "^0.2.4"
+ },
+ "engines": {
+ "node": ">=18.12.0"
+ }
+ },
+ "node_modules/unplugin-utils": {
+ "version": "0.2.4",
+ "resolved": "https://registry.npmjs.org/unplugin-utils/-/unplugin-utils-0.2.4.tgz",
+ "integrity": "sha512-8U/MtpkPkkk3Atewj1+RcKIjb5WBimZ/WSLhhR3w6SsIj8XJuKTacSP8g+2JhfSGw0Cb125Y+2zA/IzJZDVbhA==",
+ "license": "MIT",
+ "dependencies": {
+ "pathe": "^2.0.2",
+ "picomatch": "^4.0.2"
+ },
+ "engines": {
+ "node": ">=18.12.0"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sxzz"
+ }
+ },
+ "node_modules/unplugin-vue-components": {
+ "version": "28.8.0",
+ "resolved": "https://registry.npmjs.org/unplugin-vue-components/-/unplugin-vue-components-28.8.0.tgz",
+ "integrity": "sha512-2Q6ZongpoQzuXDK0ZsVzMoshH0MWZQ1pzVL538G7oIDKRTVzHjppBDS8aB99SADGHN3lpGU7frraCG6yWNoL5Q==",
+ "license": "MIT",
+ "dependencies": {
+ "chokidar": "^3.6.0",
+ "debug": "^4.4.1",
+ "local-pkg": "^1.1.1",
+ "magic-string": "^0.30.17",
+ "mlly": "^1.7.4",
+ "tinyglobby": "^0.2.14",
+ "unplugin": "^2.3.5",
+ "unplugin-utils": "^0.2.4"
+ },
+ "engines": {
+ "node": ">=14"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/antfu"
+ },
+ "peerDependencies": {
+ "@babel/parser": "^7.15.8",
+ "@nuxt/kit": "^3.2.2 || ^4.0.0",
+ "vue": "2 || 3"
+ },
+ "peerDependenciesMeta": {
+ "@babel/parser": {
+ "optional": true
+ },
+ "@nuxt/kit": {
+ "optional": true
+ }
+ }
+ },
+ "node_modules/unplugin-vue-components/node_modules/chokidar": {
+ "version": "3.6.0",
+ "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz",
+ "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==",
+ "license": "MIT",
+ "dependencies": {
+ "anymatch": "~3.1.2",
+ "braces": "~3.0.2",
+ "glob-parent": "~5.1.2",
+ "is-binary-path": "~2.1.0",
+ "is-glob": "~4.0.1",
+ "normalize-path": "~3.0.0",
+ "readdirp": "~3.6.0"
},
"engines": {
- "node": ">=0.10.0"
+ "node": ">= 8.10.0"
+ },
+ "funding": {
+ "url": "https://paulmillr.com/funding/"
+ },
+ "optionalDependencies": {
+ "fsevents": "~2.3.2"
}
},
- "node_modules/unixify/node_modules/normalize-path": {
- "version": "2.1.1",
- "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
- "integrity": "sha512-3pKJwH184Xo/lnH6oyP1q2pMd7HcypqqmRs91/6/i2CGtWwIKGCkOOMTm/zXbgTEWHw1uNpNi/igc3ePOYHb6w==",
- "license": "MIT",
+ "node_modules/unplugin-vue-components/node_modules/glob-parent": {
+ "version": "5.1.2",
+ "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
+ "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+ "license": "ISC",
"dependencies": {
- "remove-trailing-separator": "^1.0.1"
+ "is-glob": "^4.0.1"
},
"engines": {
- "node": ">=0.10.0"
+ "node": ">= 6"
}
},
- "node_modules/unpipe": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
- "integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==",
- "devOptional": true,
+ "node_modules/unplugin-vue-components/node_modules/picomatch": {
+ "version": "2.3.1",
+ "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
+ "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
"license": "MIT",
"engines": {
- "node": ">= 0.8"
- }
- },
- "node_modules/unplugin": {
- "version": "2.3.2",
- "resolved": "https://registry.npmjs.org/unplugin/-/unplugin-2.3.2.tgz",
- "integrity": "sha512-3n7YA46rROb3zSj8fFxtxC/PqoyvYQ0llwz9wtUPUutr9ig09C8gGo5CWCwHrUzlqC1LLR43kxp5vEIyH1ac1w==",
- "license": "MIT",
- "dependencies": {
- "acorn": "^8.14.1",
- "picomatch": "^4.0.2",
- "webpack-virtual-modules": "^0.6.2"
+ "node": ">=8.6"
},
- "engines": {
- "node": ">=18.12.0"
+ "funding": {
+ "url": "https://github.com/sponsors/jonschlinkert"
}
},
- "node_modules/unplugin-utils": {
- "version": "0.2.4",
- "resolved": "https://registry.npmjs.org/unplugin-utils/-/unplugin-utils-0.2.4.tgz",
- "integrity": "sha512-8U/MtpkPkkk3Atewj1+RcKIjb5WBimZ/WSLhhR3w6SsIj8XJuKTacSP8g+2JhfSGw0Cb125Y+2zA/IzJZDVbhA==",
+ "node_modules/unplugin-vue-components/node_modules/readdirp": {
+ "version": "3.6.0",
+ "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
+ "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
"license": "MIT",
"dependencies": {
- "pathe": "^2.0.2",
- "picomatch": "^4.0.2"
+ "picomatch": "^2.2.1"
},
"engines": {
- "node": ">=18.12.0"
- },
- "funding": {
- "url": "https://github.com/sponsors/sxzz"
+ "node": ">=8.10.0"
}
},
"node_modules/unplugin-vue-router": {
@@ -20768,49 +20290,16 @@
}
}
},
- "node_modules/unrs-resolver": {
- "version": "1.7.2",
- "resolved": "https://registry.npmjs.org/unrs-resolver/-/unrs-resolver-1.7.2.tgz",
- "integrity": "sha512-BBKpaylOW8KbHsu378Zky/dGh4ckT/4NW/0SHRABdqRLcQJ2dAOjDo9g97p04sWflm0kqPqpUatxReNV/dqI5A==",
- "dev": true,
- "hasInstallScript": true,
- "license": "MIT",
- "dependencies": {
- "napi-postinstall": "^0.2.2"
- },
- "funding": {
- "url": "https://github.com/sponsors/JounQin"
- },
- "optionalDependencies": {
- "@unrs/resolver-binding-darwin-arm64": "1.7.2",
- "@unrs/resolver-binding-darwin-x64": "1.7.2",
- "@unrs/resolver-binding-freebsd-x64": "1.7.2",
- "@unrs/resolver-binding-linux-arm-gnueabihf": "1.7.2",
- "@unrs/resolver-binding-linux-arm-musleabihf": "1.7.2",
- "@unrs/resolver-binding-linux-arm64-gnu": "1.7.2",
- "@unrs/resolver-binding-linux-arm64-musl": "1.7.2",
- "@unrs/resolver-binding-linux-ppc64-gnu": "1.7.2",
- "@unrs/resolver-binding-linux-riscv64-gnu": "1.7.2",
- "@unrs/resolver-binding-linux-riscv64-musl": "1.7.2",
- "@unrs/resolver-binding-linux-s390x-gnu": "1.7.2",
- "@unrs/resolver-binding-linux-x64-gnu": "1.7.2",
- "@unrs/resolver-binding-linux-x64-musl": "1.7.2",
- "@unrs/resolver-binding-wasm32-wasi": "1.7.2",
- "@unrs/resolver-binding-win32-arm64-msvc": "1.7.2",
- "@unrs/resolver-binding-win32-ia32-msvc": "1.7.2",
- "@unrs/resolver-binding-win32-x64-msvc": "1.7.2"
- }
- },
"node_modules/unstorage": {
- "version": "1.16.0",
- "resolved": "https://registry.npmjs.org/unstorage/-/unstorage-1.16.0.tgz",
- "integrity": "sha512-WQ37/H5A7LcRPWfYOrDa1Ys02xAbpPJq6q5GkO88FBXVSQzHd7+BjEwfRqyaSWCv9MbsJy058GWjjPjcJ16GGA==",
+ "version": "1.16.1",
+ "resolved": "https://registry.npmjs.org/unstorage/-/unstorage-1.16.1.tgz",
+ "integrity": "sha512-gdpZ3guLDhz+zWIlYP1UwQ259tG5T5vYRzDaHMkQ1bBY1SQPutvZnrRjTFaWUUpseErJIgAZS51h6NOcZVZiqQ==",
"license": "MIT",
"dependencies": {
"anymatch": "^3.1.3",
"chokidar": "^4.0.3",
"destr": "^2.0.5",
- "h3": "^1.15.2",
+ "h3": "^1.15.3",
"lru-cache": "^10.4.3",
"node-fetch-native": "^1.6.6",
"ofetch": "^1.4.1",
@@ -20825,7 +20314,7 @@
"@azure/storage-blob": "^12.26.0",
"@capacitor/preferences": "^6.0.3 || ^7.0.0",
"@deno/kv": ">=0.9.0",
- "@netlify/blobs": "^6.5.0 || ^7.0.0 || ^8.1.0",
+ "@netlify/blobs": "^6.5.0 || ^7.0.0 || ^8.1.0 || ^9.0.0 || ^10.0.0",
"@planetscale/database": "^1.19.0",
"@upstash/redis": "^1.34.3",
"@vercel/blob": ">=0.27.1",
@@ -21100,13 +20589,112 @@
"spdx-license-ids": "^3.0.0"
}
},
- "node_modules/vary": {
- "version": "1.1.2",
- "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
- "integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==",
+ "node_modules/vaul-vue": {
+ "version": "0.4.1",
+ "resolved": "https://registry.npmjs.org/vaul-vue/-/vaul-vue-0.4.1.tgz",
+ "integrity": "sha512-A6jOWOZX5yvyo1qMn7IveoWN91mJI5L3BUKsIwkg6qrTGgHs1Sb1JF/vyLJgnbN1rH4OOOxFbtqL9A46bOyGUQ==",
+ "dependencies": {
+ "@vueuse/core": "^10.8.0",
+ "reka-ui": "^2.0.0",
+ "vue": "^3.4.5"
+ },
+ "peerDependencies": {
+ "reka-ui": "^2.0.0",
+ "vue": "^3.3.0"
+ }
+ },
+ "node_modules/vaul-vue/node_modules/@types/web-bluetooth": {
+ "version": "0.0.20",
+ "resolved": "https://registry.npmjs.org/@types/web-bluetooth/-/web-bluetooth-0.0.20.tgz",
+ "integrity": "sha512-g9gZnnXVq7gM7v3tJCWV/qw7w+KeOlSHAhgF9RytFyifW6AF61hdT2ucrYhPq9hLs5JIryeupHV3qGk95dH9ow==",
+ "license": "MIT"
+ },
+ "node_modules/vaul-vue/node_modules/@vueuse/core": {
+ "version": "10.11.1",
+ "resolved": "https://registry.npmjs.org/@vueuse/core/-/core-10.11.1.tgz",
+ "integrity": "sha512-guoy26JQktXPcz+0n3GukWIy/JDNKti9v6VEMu6kV2sYBsWuGiTU8OWdg+ADfUbHg3/3DlqySDe7JmdHrktiww==",
+ "license": "MIT",
+ "dependencies": {
+ "@types/web-bluetooth": "^0.0.20",
+ "@vueuse/metadata": "10.11.1",
+ "@vueuse/shared": "10.11.1",
+ "vue-demi": ">=0.14.8"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/antfu"
+ }
+ },
+ "node_modules/vaul-vue/node_modules/@vueuse/core/node_modules/vue-demi": {
+ "version": "0.14.10",
+ "resolved": "https://registry.npmjs.org/vue-demi/-/vue-demi-0.14.10.tgz",
+ "integrity": "sha512-nMZBOwuzabUO0nLgIcc6rycZEebF6eeUfaiQx9+WSk8e29IbLvPU9feI6tqW4kTo3hvoYAJkMh8n8D0fuISphg==",
+ "hasInstallScript": true,
"license": "MIT",
+ "bin": {
+ "vue-demi-fix": "bin/vue-demi-fix.js",
+ "vue-demi-switch": "bin/vue-demi-switch.js"
+ },
"engines": {
- "node": ">= 0.8"
+ "node": ">=12"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/antfu"
+ },
+ "peerDependencies": {
+ "@vue/composition-api": "^1.0.0-rc.1",
+ "vue": "^3.0.0-0 || ^2.6.0"
+ },
+ "peerDependenciesMeta": {
+ "@vue/composition-api": {
+ "optional": true
+ }
+ }
+ },
+ "node_modules/vaul-vue/node_modules/@vueuse/metadata": {
+ "version": "10.11.1",
+ "resolved": "https://registry.npmjs.org/@vueuse/metadata/-/metadata-10.11.1.tgz",
+ "integrity": "sha512-IGa5FXd003Ug1qAZmyE8wF3sJ81xGLSqTqtQ6jaVfkeZ4i5kS2mwQF61yhVqojRnenVew5PldLyRgvdl4YYuSw==",
+ "license": "MIT",
+ "funding": {
+ "url": "https://github.com/sponsors/antfu"
+ }
+ },
+ "node_modules/vaul-vue/node_modules/@vueuse/shared": {
+ "version": "10.11.1",
+ "resolved": "https://registry.npmjs.org/@vueuse/shared/-/shared-10.11.1.tgz",
+ "integrity": "sha512-LHpC8711VFZlDaYUXEBbFBCQ7GS3dVU9mjOhhMhXP6txTV4EhYQg/KGnQuvt/sPAtoUKq7VVUnL6mVtFoL42sA==",
+ "license": "MIT",
+ "dependencies": {
+ "vue-demi": ">=0.14.8"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/antfu"
+ }
+ },
+ "node_modules/vaul-vue/node_modules/@vueuse/shared/node_modules/vue-demi": {
+ "version": "0.14.10",
+ "resolved": "https://registry.npmjs.org/vue-demi/-/vue-demi-0.14.10.tgz",
+ "integrity": "sha512-nMZBOwuzabUO0nLgIcc6rycZEebF6eeUfaiQx9+WSk8e29IbLvPU9feI6tqW4kTo3hvoYAJkMh8n8D0fuISphg==",
+ "hasInstallScript": true,
+ "license": "MIT",
+ "bin": {
+ "vue-demi-fix": "bin/vue-demi-fix.js",
+ "vue-demi-switch": "bin/vue-demi-switch.js"
+ },
+ "engines": {
+ "node": ">=12"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/antfu"
+ },
+ "peerDependencies": {
+ "@vue/composition-api": "^1.0.0-rc.1",
+ "vue": "^3.0.0-0 || ^2.6.0"
+ },
+ "peerDependenciesMeta": {
+ "@vue/composition-api": {
+ "optional": true
+ }
}
},
"node_modules/vite": {
@@ -21184,44 +20772,44 @@
}
},
"node_modules/vite-dev-rpc": {
- "version": "1.0.7",
- "resolved": "https://registry.npmjs.org/vite-dev-rpc/-/vite-dev-rpc-1.0.7.tgz",
- "integrity": "sha512-FxSTEofDbUi2XXujCA+hdzCDkXFG1PXktMjSk1efq9Qb5lOYaaM9zNSvKvPPF7645Bak79kSp1PTooMW2wktcA==",
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/vite-dev-rpc/-/vite-dev-rpc-1.1.0.tgz",
+ "integrity": "sha512-pKXZlgoXGoE8sEKiKJSng4hI1sQ4wi5YT24FCrwrLt6opmkjlqPPVmiPWWJn8M8byMxRGzp1CrFuqQs4M/Z39A==",
"license": "MIT",
"dependencies": {
- "birpc": "^2.0.19",
- "vite-hot-client": "^2.0.4"
+ "birpc": "^2.4.0",
+ "vite-hot-client": "^2.1.0"
},
"funding": {
"url": "https://github.com/sponsors/antfu"
},
"peerDependencies": {
- "vite": "^2.9.0 || ^3.0.0-0 || ^4.0.0-0 || ^5.0.0-0 || ^6.0.1"
+ "vite": "^2.9.0 || ^3.0.0-0 || ^4.0.0-0 || ^5.0.0-0 || ^6.0.1 || ^7.0.0-0"
}
},
"node_modules/vite-hot-client": {
- "version": "2.0.4",
- "resolved": "https://registry.npmjs.org/vite-hot-client/-/vite-hot-client-2.0.4.tgz",
- "integrity": "sha512-W9LOGAyGMrbGArYJN4LBCdOC5+Zwh7dHvOHC0KmGKkJhsOzaKbpo/jEjpPKVHIW0/jBWj8RZG0NUxfgA8BxgAg==",
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/vite-hot-client/-/vite-hot-client-2.1.0.tgz",
+ "integrity": "sha512-7SpgZmU7R+dDnSmvXE1mfDtnHLHQSisdySVR7lO8ceAXvM0otZeuQQ6C8LrS5d/aYyP/QZ0hI0L+dIPrm4YlFQ==",
"license": "MIT",
"funding": {
"url": "https://github.com/sponsors/antfu"
},
"peerDependencies": {
- "vite": "^2.6.0 || ^3.0.0 || ^4.0.0 || ^5.0.0-0 || ^6.0.0-0"
+ "vite": "^2.6.0 || ^3.0.0 || ^4.0.0 || ^5.0.0-0 || ^6.0.0-0 || ^7.0.0-0"
}
},
"node_modules/vite-node": {
- "version": "3.1.3",
- "resolved": "https://registry.npmjs.org/vite-node/-/vite-node-3.1.3.tgz",
- "integrity": "sha512-uHV4plJ2IxCl4u1up1FQRrqclylKAogbtBfOTwcuJ28xFi+89PZ57BRh+naIRvH70HPwxy5QHYzg1OrEaC7AbA==",
+ "version": "3.2.4",
+ "resolved": "https://registry.npmjs.org/vite-node/-/vite-node-3.2.4.tgz",
+ "integrity": "sha512-EbKSKh+bh1E1IFxeO0pg1n4dvoOTt0UDiXMd/qn++r98+jPO1xtJilvXldeuQ8giIB5IkpjCgMleHMNEsGH6pg==",
"license": "MIT",
"dependencies": {
"cac": "^6.7.14",
- "debug": "^4.4.0",
+ "debug": "^4.4.1",
"es-module-lexer": "^1.7.0",
"pathe": "^2.0.3",
- "vite": "^5.0.0 || ^6.0.0"
+ "vite": "^5.0.0 || ^6.0.0 || ^7.0.0-0"
},
"bin": {
"vite-node": "vite-node.mjs"
@@ -21323,20 +20911,20 @@
}
},
"node_modules/vite-plugin-inspect": {
- "version": "11.0.1",
- "resolved": "https://registry.npmjs.org/vite-plugin-inspect/-/vite-plugin-inspect-11.0.1.tgz",
- "integrity": "sha512-aABw7eGTr9Cmbn9RAs76e0BztVUFDl6a2R+/IJXpoUZxjx5YHB0P+Em3ZTWzpIPZzuRj28tAMblvcUyhgJc4aQ==",
+ "version": "11.3.0",
+ "resolved": "https://registry.npmjs.org/vite-plugin-inspect/-/vite-plugin-inspect-11.3.0.tgz",
+ "integrity": "sha512-vmt7K1WVKQkuiwvsM6e5h3HDJ2pSWTnzoj+JP9Kvu3Sh2G+nFap1F1V7tqpyA4qFxM1GQ84ryffWFGQrwShERQ==",
"license": "MIT",
"dependencies": {
- "ansis": "^3.17.0",
- "debug": "^4.4.0",
+ "ansis": "^4.1.0",
+ "debug": "^4.4.1",
"error-stack-parser-es": "^1.0.5",
"ohash": "^2.0.11",
- "open": "^10.1.0",
+ "open": "^10.1.2",
"perfect-debounce": "^1.0.0",
"sirv": "^3.0.1",
"unplugin-utils": "^0.2.4",
- "vite-dev-rpc": "^1.0.7"
+ "vite-dev-rpc": "^1.1.0"
},
"engines": {
"node": ">=14"
@@ -21345,7 +20933,7 @@
"url": "https://github.com/sponsors/antfu"
},
"peerDependencies": {
- "vite": "^6.0.0"
+ "vite": "^6.0.0 || ^7.0.0-0"
},
"peerDependenciesMeta": {
"@nuxt/kit": {
@@ -21366,15 +20954,15 @@
}
},
"node_modules/vite-plugin-inspect/node_modules/open": {
- "version": "10.1.2",
- "resolved": "https://registry.npmjs.org/open/-/open-10.1.2.tgz",
- "integrity": "sha512-cxN6aIDPz6rm8hbebcP7vrQNhvRcveZoJU72Y7vskh4oIm+BZwBECnx5nTmrlres1Qapvx27Qo1Auukpf8PKXw==",
+ "version": "10.2.0",
+ "resolved": "https://registry.npmjs.org/open/-/open-10.2.0.tgz",
+ "integrity": "sha512-YgBpdJHPyQ2UE5x+hlSXcnejzAvD0b22U2OuAP+8OnlJT+PjWPxtgmGqKKc+RgTM63U9gN0YzrYc71R2WT/hTA==",
"license": "MIT",
"dependencies": {
"default-browser": "^5.2.1",
"define-lazy-prop": "^3.0.0",
"is-inside-container": "^1.0.0",
- "is-wsl": "^3.1.0"
+ "wsl-utils": "^0.1.0"
},
"engines": {
"node": ">=18"
@@ -21384,13 +20972,13 @@
}
},
"node_modules/vite-plugin-vue-tracer": {
- "version": "0.1.3",
- "resolved": "https://registry.npmjs.org/vite-plugin-vue-tracer/-/vite-plugin-vue-tracer-0.1.3.tgz",
- "integrity": "sha512-+fN6oo0//dwZP9Ax9gRKeUroCqpQ43P57qlWgL0ljCIxAs+Rpqn/L4anIPZPgjDPga5dZH+ZJsshbF0PNJbm3Q==",
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/vite-plugin-vue-tracer/-/vite-plugin-vue-tracer-1.0.0.tgz",
+ "integrity": "sha512-a+UB9IwGx5uwS4uG/a9kM6fCMnxONDkOTbgCUbhFpiGhqfxrrC1+9BibV7sWwUnwj1Dg6MnRxG0trLgUZslDXA==",
"license": "MIT",
"dependencies": {
"estree-walker": "^3.0.3",
- "exsolve": "^1.0.4",
+ "exsolve": "^1.0.7",
"magic-string": "^0.30.17",
"pathe": "^2.0.3",
"source-map-js": "^1.2.1"
@@ -21399,14 +20987,14 @@
"url": "https://github.com/sponsors/antfu"
},
"peerDependencies": {
- "vite": "^6.0.0",
+ "vite": "^6.0.0 || ^7.0.0",
"vue": "^3.5.0"
}
},
"node_modules/vite/node_modules/@esbuild/aix-ppc64": {
- "version": "0.25.4",
- "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.25.4.tgz",
- "integrity": "sha512-1VCICWypeQKhVbE9oW/sJaAmjLxhVqacdkvPLEjwlttjfwENRSClS8EjBz0KzRyFSCPDIkuXW34Je/vk7zdB7Q==",
+ "version": "0.25.6",
+ "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.25.6.tgz",
+ "integrity": "sha512-ShbM/3XxwuxjFiuVBHA+d3j5dyac0aEVVq1oluIDf71hUw0aRF59dV/efUsIwFnR6m8JNM2FjZOzmaZ8yG61kw==",
"cpu": [
"ppc64"
],
@@ -21420,9 +21008,9 @@
}
},
"node_modules/vite/node_modules/@esbuild/android-arm": {
- "version": "0.25.4",
- "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.25.4.tgz",
- "integrity": "sha512-QNdQEps7DfFwE3hXiU4BZeOV68HHzYwGd0Nthhd3uCkkEKK7/R6MTgM0P7H7FAs5pU/DIWsviMmEGxEoxIZ+ZQ==",
+ "version": "0.25.6",
+ "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.25.6.tgz",
+ "integrity": "sha512-S8ToEOVfg++AU/bHwdksHNnyLyVM+eMVAOf6yRKFitnwnbwwPNqKr3srzFRe7nzV69RQKb5DgchIX5pt3L53xg==",
"cpu": [
"arm"
],
@@ -21436,9 +21024,9 @@
}
},
"node_modules/vite/node_modules/@esbuild/android-arm64": {
- "version": "0.25.4",
- "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.25.4.tgz",
- "integrity": "sha512-bBy69pgfhMGtCnwpC/x5QhfxAz/cBgQ9enbtwjf6V9lnPI/hMyT9iWpR1arm0l3kttTr4L0KSLpKmLp/ilKS9A==",
+ "version": "0.25.6",
+ "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.25.6.tgz",
+ "integrity": "sha512-hd5zdUarsK6strW+3Wxi5qWws+rJhCCbMiC9QZyzoxfk5uHRIE8T287giQxzVpEvCwuJ9Qjg6bEjcRJcgfLqoA==",
"cpu": [
"arm64"
],
@@ -21452,9 +21040,9 @@
}
},
"node_modules/vite/node_modules/@esbuild/android-x64": {
- "version": "0.25.4",
- "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.25.4.tgz",
- "integrity": "sha512-TVhdVtQIFuVpIIR282btcGC2oGQoSfZfmBdTip2anCaVYcqWlZXGcdcKIUklfX2wj0JklNYgz39OBqh2cqXvcQ==",
+ "version": "0.25.6",
+ "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.25.6.tgz",
+ "integrity": "sha512-0Z7KpHSr3VBIO9A/1wcT3NTy7EB4oNC4upJ5ye3R7taCc2GUdeynSLArnon5G8scPwaU866d3H4BCrE5xLW25A==",
"cpu": [
"x64"
],
@@ -21468,9 +21056,9 @@
}
},
"node_modules/vite/node_modules/@esbuild/darwin-arm64": {
- "version": "0.25.4",
- "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.25.4.tgz",
- "integrity": "sha512-Y1giCfM4nlHDWEfSckMzeWNdQS31BQGs9/rouw6Ub91tkK79aIMTH3q9xHvzH8d0wDru5Ci0kWB8b3up/nl16g==",
+ "version": "0.25.6",
+ "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.25.6.tgz",
+ "integrity": "sha512-FFCssz3XBavjxcFxKsGy2DYK5VSvJqa6y5HXljKzhRZ87LvEi13brPrf/wdyl/BbpbMKJNOr1Sd0jtW4Ge1pAA==",
"cpu": [
"arm64"
],
@@ -21484,9 +21072,9 @@
}
},
"node_modules/vite/node_modules/@esbuild/darwin-x64": {
- "version": "0.25.4",
- "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.25.4.tgz",
- "integrity": "sha512-CJsry8ZGM5VFVeyUYB3cdKpd/H69PYez4eJh1W/t38vzutdjEjtP7hB6eLKBoOdxcAlCtEYHzQ/PJ/oU9I4u0A==",
+ "version": "0.25.6",
+ "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.25.6.tgz",
+ "integrity": "sha512-GfXs5kry/TkGM2vKqK2oyiLFygJRqKVhawu3+DOCk7OxLy/6jYkWXhlHwOoTb0WqGnWGAS7sooxbZowy+pK9Yg==",
"cpu": [
"x64"
],
@@ -21500,9 +21088,9 @@
}
},
"node_modules/vite/node_modules/@esbuild/freebsd-arm64": {
- "version": "0.25.4",
- "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.25.4.tgz",
- "integrity": "sha512-yYq+39NlTRzU2XmoPW4l5Ifpl9fqSk0nAJYM/V/WUGPEFfek1epLHJIkTQM6bBs1swApjO5nWgvr843g6TjxuQ==",
+ "version": "0.25.6",
+ "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.25.6.tgz",
+ "integrity": "sha512-aoLF2c3OvDn2XDTRvn8hN6DRzVVpDlj2B/F66clWd/FHLiHaG3aVZjxQX2DYphA5y/evbdGvC6Us13tvyt4pWg==",
"cpu": [
"arm64"
],
@@ -21516,9 +21104,9 @@
}
},
"node_modules/vite/node_modules/@esbuild/freebsd-x64": {
- "version": "0.25.4",
- "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.25.4.tgz",
- "integrity": "sha512-0FgvOJ6UUMflsHSPLzdfDnnBBVoCDtBTVyn/MrWloUNvq/5SFmh13l3dvgRPkDihRxb77Y17MbqbCAa2strMQQ==",
+ "version": "0.25.6",
+ "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.25.6.tgz",
+ "integrity": "sha512-2SkqTjTSo2dYi/jzFbU9Plt1vk0+nNg8YC8rOXXea+iA3hfNJWebKYPs3xnOUf9+ZWhKAaxnQNUf2X9LOpeiMQ==",
"cpu": [
"x64"
],
@@ -21532,9 +21120,9 @@
}
},
"node_modules/vite/node_modules/@esbuild/linux-arm": {
- "version": "0.25.4",
- "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.25.4.tgz",
- "integrity": "sha512-kro4c0P85GMfFYqW4TWOpvmF8rFShbWGnrLqlzp4X1TNWjRY3JMYUfDCtOxPKOIY8B0WC8HN51hGP4I4hz4AaQ==",
+ "version": "0.25.6",
+ "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.25.6.tgz",
+ "integrity": "sha512-SZHQlzvqv4Du5PrKE2faN0qlbsaW/3QQfUUc6yO2EjFcA83xnwm91UbEEVx4ApZ9Z5oG8Bxz4qPE+HFwtVcfyw==",
"cpu": [
"arm"
],
@@ -21548,9 +21136,9 @@
}
},
"node_modules/vite/node_modules/@esbuild/linux-arm64": {
- "version": "0.25.4",
- "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.25.4.tgz",
- "integrity": "sha512-+89UsQTfXdmjIvZS6nUnOOLoXnkUTB9hR5QAeLrQdzOSWZvNSAXAtcRDHWtqAUtAmv7ZM1WPOOeSxDzzzMogiQ==",
+ "version": "0.25.6",
+ "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.25.6.tgz",
+ "integrity": "sha512-b967hU0gqKd9Drsh/UuAm21Khpoh6mPBSgz8mKRq4P5mVK8bpA+hQzmm/ZwGVULSNBzKdZPQBRT3+WuVavcWsQ==",
"cpu": [
"arm64"
],
@@ -21564,9 +21152,9 @@
}
},
"node_modules/vite/node_modules/@esbuild/linux-ia32": {
- "version": "0.25.4",
- "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.25.4.tgz",
- "integrity": "sha512-yTEjoapy8UP3rv8dB0ip3AfMpRbyhSN3+hY8mo/i4QXFeDxmiYbEKp3ZRjBKcOP862Ua4b1PDfwlvbuwY7hIGQ==",
+ "version": "0.25.6",
+ "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.25.6.tgz",
+ "integrity": "sha512-aHWdQ2AAltRkLPOsKdi3xv0mZ8fUGPdlKEjIEhxCPm5yKEThcUjHpWB1idN74lfXGnZ5SULQSgtr5Qos5B0bPw==",
"cpu": [
"ia32"
],
@@ -21580,9 +21168,9 @@
}
},
"node_modules/vite/node_modules/@esbuild/linux-loong64": {
- "version": "0.25.4",
- "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.25.4.tgz",
- "integrity": "sha512-NeqqYkrcGzFwi6CGRGNMOjWGGSYOpqwCjS9fvaUlX5s3zwOtn1qwg1s2iE2svBe4Q/YOG1q6875lcAoQK/F4VA==",
+ "version": "0.25.6",
+ "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.25.6.tgz",
+ "integrity": "sha512-VgKCsHdXRSQ7E1+QXGdRPlQ/e08bN6WMQb27/TMfV+vPjjTImuT9PmLXupRlC90S1JeNNW5lzkAEO/McKeJ2yg==",
"cpu": [
"loong64"
],
@@ -21596,9 +21184,9 @@
}
},
"node_modules/vite/node_modules/@esbuild/linux-mips64el": {
- "version": "0.25.4",
- "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.25.4.tgz",
- "integrity": "sha512-IcvTlF9dtLrfL/M8WgNI/qJYBENP3ekgsHbYUIzEzq5XJzzVEV/fXY9WFPfEEXmu3ck2qJP8LG/p3Q8f7Zc2Xg==",
+ "version": "0.25.6",
+ "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.25.6.tgz",
+ "integrity": "sha512-WViNlpivRKT9/py3kCmkHnn44GkGXVdXfdc4drNmRl15zVQ2+D2uFwdlGh6IuK5AAnGTo2qPB1Djppj+t78rzw==",
"cpu": [
"mips64el"
],
@@ -21612,9 +21200,9 @@
}
},
"node_modules/vite/node_modules/@esbuild/linux-ppc64": {
- "version": "0.25.4",
- "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.25.4.tgz",
- "integrity": "sha512-HOy0aLTJTVtoTeGZh4HSXaO6M95qu4k5lJcH4gxv56iaycfz1S8GO/5Jh6X4Y1YiI0h7cRyLi+HixMR+88swag==",
+ "version": "0.25.6",
+ "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.25.6.tgz",
+ "integrity": "sha512-wyYKZ9NTdmAMb5730I38lBqVu6cKl4ZfYXIs31Baf8aoOtB4xSGi3THmDYt4BTFHk7/EcVixkOV2uZfwU3Q2Jw==",
"cpu": [
"ppc64"
],
@@ -21628,9 +21216,9 @@
}
},
"node_modules/vite/node_modules/@esbuild/linux-riscv64": {
- "version": "0.25.4",
- "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.25.4.tgz",
- "integrity": "sha512-i8JUDAufpz9jOzo4yIShCTcXzS07vEgWzyX3NH2G7LEFVgrLEhjwL3ajFE4fZI3I4ZgiM7JH3GQ7ReObROvSUA==",
+ "version": "0.25.6",
+ "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.25.6.tgz",
+ "integrity": "sha512-KZh7bAGGcrinEj4qzilJ4hqTY3Dg2U82c8bv+e1xqNqZCrCyc+TL9AUEn5WGKDzm3CfC5RODE/qc96OcbIe33w==",
"cpu": [
"riscv64"
],
@@ -21644,9 +21232,9 @@
}
},
"node_modules/vite/node_modules/@esbuild/linux-s390x": {
- "version": "0.25.4",
- "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.25.4.tgz",
- "integrity": "sha512-jFnu+6UbLlzIjPQpWCNh5QtrcNfMLjgIavnwPQAfoGx4q17ocOU9MsQ2QVvFxwQoWpZT8DvTLooTvmOQXkO51g==",
+ "version": "0.25.6",
+ "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.25.6.tgz",
+ "integrity": "sha512-9N1LsTwAuE9oj6lHMyyAM+ucxGiVnEqUdp4v7IaMmrwb06ZTEVCIs3oPPplVsnjPfyjmxwHxHMF8b6vzUVAUGw==",
"cpu": [
"s390x"
],
@@ -21660,9 +21248,9 @@
}
},
"node_modules/vite/node_modules/@esbuild/linux-x64": {
- "version": "0.25.4",
- "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.25.4.tgz",
- "integrity": "sha512-6e0cvXwzOnVWJHq+mskP8DNSrKBr1bULBvnFLpc1KY+d+irZSgZ02TGse5FsafKS5jg2e4pbvK6TPXaF/A6+CA==",
+ "version": "0.25.6",
+ "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.25.6.tgz",
+ "integrity": "sha512-A6bJB41b4lKFWRKNrWoP2LHsjVzNiaurf7wyj/XtFNTsnPuxwEBWHLty+ZE0dWBKuSK1fvKgrKaNjBS7qbFKig==",
"cpu": [
"x64"
],
@@ -21675,10 +21263,26 @@
"node": ">=18"
}
},
+ "node_modules/vite/node_modules/@esbuild/netbsd-arm64": {
+ "version": "0.25.6",
+ "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.25.6.tgz",
+ "integrity": "sha512-IjA+DcwoVpjEvyxZddDqBY+uJ2Snc6duLpjmkXm/v4xuS3H+3FkLZlDm9ZsAbF9rsfP3zeA0/ArNDORZgrxR/Q==",
+ "cpu": [
+ "arm64"
+ ],
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "netbsd"
+ ],
+ "engines": {
+ "node": ">=18"
+ }
+ },
"node_modules/vite/node_modules/@esbuild/netbsd-x64": {
- "version": "0.25.4",
- "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.25.4.tgz",
- "integrity": "sha512-XAg8pIQn5CzhOB8odIcAm42QsOfa98SBeKUdo4xa8OvX8LbMZqEtgeWE9P/Wxt7MlG2QqvjGths+nq48TrUiKw==",
+ "version": "0.25.6",
+ "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.25.6.tgz",
+ "integrity": "sha512-dUXuZr5WenIDlMHdMkvDc1FAu4xdWixTCRgP7RQLBOkkGgwuuzaGSYcOpW4jFxzpzL1ejb8yF620UxAqnBrR9g==",
"cpu": [
"x64"
],
@@ -21692,9 +21296,9 @@
}
},
"node_modules/vite/node_modules/@esbuild/openbsd-arm64": {
- "version": "0.25.4",
- "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.25.4.tgz",
- "integrity": "sha512-Ct2WcFEANlFDtp1nVAXSNBPDxyU+j7+tId//iHXU2f/lN5AmO4zLyhDcpR5Cz1r08mVxzt3Jpyt4PmXQ1O6+7A==",
+ "version": "0.25.6",
+ "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.25.6.tgz",
+ "integrity": "sha512-l8ZCvXP0tbTJ3iaqdNf3pjaOSd5ex/e6/omLIQCVBLmHTlfXW3zAxQ4fnDmPLOB1x9xrcSi/xtCWFwCZRIaEwg==",
"cpu": [
"arm64"
],
@@ -21708,9 +21312,9 @@
}
},
"node_modules/vite/node_modules/@esbuild/openbsd-x64": {
- "version": "0.25.4",
- "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.25.4.tgz",
- "integrity": "sha512-xAGGhyOQ9Otm1Xu8NT1ifGLnA6M3sJxZ6ixylb+vIUVzvvd6GOALpwQrYrtlPouMqd/vSbgehz6HaVk4+7Afhw==",
+ "version": "0.25.6",
+ "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.25.6.tgz",
+ "integrity": "sha512-hKrmDa0aOFOr71KQ/19JC7az1P0GWtCN1t2ahYAf4O007DHZt/dW8ym5+CUdJhQ/qkZmI1HAF8KkJbEFtCL7gw==",
"cpu": [
"x64"
],
@@ -21724,9 +21328,9 @@
}
},
"node_modules/vite/node_modules/@esbuild/sunos-x64": {
- "version": "0.25.4",
- "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.25.4.tgz",
- "integrity": "sha512-Mw+tzy4pp6wZEK0+Lwr76pWLjrtjmJyUB23tHKqEDP74R3q95luY/bXqXZeYl4NYlvwOqoRKlInQialgCKy67Q==",
+ "version": "0.25.6",
+ "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.25.6.tgz",
+ "integrity": "sha512-dyCGxv1/Br7MiSC42qinGL8KkG4kX0pEsdb0+TKhmJZgCUDBGmyo1/ArCjNGiOLiIAgdbWgmWgib4HoCi5t7kA==",
"cpu": [
"x64"
],
@@ -21740,9 +21344,9 @@
}
},
"node_modules/vite/node_modules/@esbuild/win32-arm64": {
- "version": "0.25.4",
- "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.25.4.tgz",
- "integrity": "sha512-AVUP428VQTSddguz9dO9ngb+E5aScyg7nOeJDrF1HPYu555gmza3bDGMPhmVXL8svDSoqPCsCPjb265yG/kLKQ==",
+ "version": "0.25.6",
+ "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.25.6.tgz",
+ "integrity": "sha512-42QOgcZeZOvXfsCBJF5Afw73t4veOId//XD3i+/9gSkhSV6Gk3VPlWncctI+JcOyERv85FUo7RxuxGy+z8A43Q==",
"cpu": [
"arm64"
],
@@ -21756,9 +21360,9 @@
}
},
"node_modules/vite/node_modules/@esbuild/win32-ia32": {
- "version": "0.25.4",
- "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.25.4.tgz",
- "integrity": "sha512-i1sW+1i+oWvQzSgfRcxxG2k4I9n3O9NRqy8U+uugaT2Dy7kLO9Y7wI72haOahxceMX8hZAzgGou1FhndRldxRg==",
+ "version": "0.25.6",
+ "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.25.6.tgz",
+ "integrity": "sha512-4AWhgXmDuYN7rJI6ORB+uU9DHLq/erBbuMoAuB4VWJTu5KtCgcKYPynF0YI1VkBNuEfjNlLrFr9KZPJzrtLkrQ==",
"cpu": [
"ia32"
],
@@ -21772,9 +21376,9 @@
}
},
"node_modules/vite/node_modules/@esbuild/win32-x64": {
- "version": "0.25.4",
- "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.25.4.tgz",
- "integrity": "sha512-nOT2vZNw6hJ+z43oP1SPea/G/6AbN6X+bGNhNuq8NtRHy4wsMhw765IKLNmnjek7GvjWBYQ8Q5VBoYTFg9y1UQ==",
+ "version": "0.25.6",
+ "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.25.6.tgz",
+ "integrity": "sha512-NgJPHHbEpLQgDH2MjQu90pzW/5vvXIZ7KOnPyNBm92A6WgZ/7b6fJyUBjoumLqeOQQGqY2QjQxRo97ah4Sj0cA==",
"cpu": [
"x64"
],
@@ -21788,9 +21392,9 @@
}
},
"node_modules/vite/node_modules/esbuild": {
- "version": "0.25.4",
- "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.25.4.tgz",
- "integrity": "sha512-8pgjLUcUjcgDg+2Q4NYXnPbo/vncAY4UmyaCm0jZevERqCHZIaWwdJHkf8XQtu4AxSKCdvrUbT0XUr1IdZzI8Q==",
+ "version": "0.25.6",
+ "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.25.6.tgz",
+ "integrity": "sha512-GVuzuUwtdsghE3ocJ9Bs8PNoF13HNQ5TXbEi2AhvVb8xU1Iwt9Fos9FEamfoee+u/TOsn7GUWc04lz46n2bbTg==",
"hasInstallScript": true,
"license": "MIT",
"bin": {
@@ -21800,31 +21404,32 @@
"node": ">=18"
},
"optionalDependencies": {
- "@esbuild/aix-ppc64": "0.25.4",
- "@esbuild/android-arm": "0.25.4",
- "@esbuild/android-arm64": "0.25.4",
- "@esbuild/android-x64": "0.25.4",
- "@esbuild/darwin-arm64": "0.25.4",
- "@esbuild/darwin-x64": "0.25.4",
- "@esbuild/freebsd-arm64": "0.25.4",
- "@esbuild/freebsd-x64": "0.25.4",
- "@esbuild/linux-arm": "0.25.4",
- "@esbuild/linux-arm64": "0.25.4",
- "@esbuild/linux-ia32": "0.25.4",
- "@esbuild/linux-loong64": "0.25.4",
- "@esbuild/linux-mips64el": "0.25.4",
- "@esbuild/linux-ppc64": "0.25.4",
- "@esbuild/linux-riscv64": "0.25.4",
- "@esbuild/linux-s390x": "0.25.4",
- "@esbuild/linux-x64": "0.25.4",
- "@esbuild/netbsd-arm64": "0.25.4",
- "@esbuild/netbsd-x64": "0.25.4",
- "@esbuild/openbsd-arm64": "0.25.4",
- "@esbuild/openbsd-x64": "0.25.4",
- "@esbuild/sunos-x64": "0.25.4",
- "@esbuild/win32-arm64": "0.25.4",
- "@esbuild/win32-ia32": "0.25.4",
- "@esbuild/win32-x64": "0.25.4"
+ "@esbuild/aix-ppc64": "0.25.6",
+ "@esbuild/android-arm": "0.25.6",
+ "@esbuild/android-arm64": "0.25.6",
+ "@esbuild/android-x64": "0.25.6",
+ "@esbuild/darwin-arm64": "0.25.6",
+ "@esbuild/darwin-x64": "0.25.6",
+ "@esbuild/freebsd-arm64": "0.25.6",
+ "@esbuild/freebsd-x64": "0.25.6",
+ "@esbuild/linux-arm": "0.25.6",
+ "@esbuild/linux-arm64": "0.25.6",
+ "@esbuild/linux-ia32": "0.25.6",
+ "@esbuild/linux-loong64": "0.25.6",
+ "@esbuild/linux-mips64el": "0.25.6",
+ "@esbuild/linux-ppc64": "0.25.6",
+ "@esbuild/linux-riscv64": "0.25.6",
+ "@esbuild/linux-s390x": "0.25.6",
+ "@esbuild/linux-x64": "0.25.6",
+ "@esbuild/netbsd-arm64": "0.25.6",
+ "@esbuild/netbsd-x64": "0.25.6",
+ "@esbuild/openbsd-arm64": "0.25.6",
+ "@esbuild/openbsd-x64": "0.25.6",
+ "@esbuild/openharmony-arm64": "0.25.6",
+ "@esbuild/sunos-x64": "0.25.6",
+ "@esbuild/win32-arm64": "0.25.6",
+ "@esbuild/win32-ia32": "0.25.6",
+ "@esbuild/win32-x64": "0.25.6"
}
},
"node_modules/vscode-uri": {
@@ -21834,16 +21439,16 @@
"license": "MIT"
},
"node_modules/vue": {
- "version": "3.5.13",
- "resolved": "https://registry.npmjs.org/vue/-/vue-3.5.13.tgz",
- "integrity": "sha512-wmeiSMxkZCSc+PM2w2VRsOYAZC8GdipNFRTsLSfodVqI9mbejKeXEGr8SckuLnrQPGe3oJN5c3K0vpoU9q/wCQ==",
+ "version": "3.5.17",
+ "resolved": "https://registry.npmjs.org/vue/-/vue-3.5.17.tgz",
+ "integrity": "sha512-LbHV3xPN9BeljML+Xctq4lbz2lVHCR6DtbpTf5XIO6gugpXUN49j2QQPcMj086r9+AkJ0FfUT8xjulKKBkkr9g==",
"license": "MIT",
"dependencies": {
- "@vue/compiler-dom": "3.5.13",
- "@vue/compiler-sfc": "3.5.13",
- "@vue/runtime-dom": "3.5.13",
- "@vue/server-renderer": "3.5.13",
- "@vue/shared": "3.5.13"
+ "@vue/compiler-dom": "3.5.17",
+ "@vue/compiler-sfc": "3.5.17",
+ "@vue/runtime-dom": "3.5.17",
+ "@vue/server-renderer": "3.5.17",
+ "@vue/shared": "3.5.17"
},
"peerDependencies": {
"typescript": "*"
@@ -21889,6 +21494,12 @@
"vue": "3.x"
}
},
+ "node_modules/vue-component-type-helpers": {
+ "version": "2.2.12",
+ "resolved": "https://registry.npmjs.org/vue-component-type-helpers/-/vue-component-type-helpers-2.2.12.tgz",
+ "integrity": "sha512-YbGqHZ5/eW4SnkPNR44mKVc6ZKQoRs/Rux1sxC6rdwXb4qpbOSYfDr9DsTHolOTGmIKgM9j141mZbBeg05R1pw==",
+ "license": "MIT"
+ },
"node_modules/vue-confetti": {
"version": "2.3.0",
"resolved": "https://registry.npmjs.org/vue-confetti/-/vue-confetti-2.3.0.tgz",
@@ -21914,9 +21525,9 @@
"license": "MIT"
},
"node_modules/vue-eslint-parser": {
- "version": "10.1.3",
- "resolved": "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-10.1.3.tgz",
- "integrity": "sha512-dbCBnd2e02dYWsXoqX5yKUZlOt+ExIpq7hmHKPb5ZqKcjf++Eo0hMseFTZMLKThrUk61m+Uv6A2YSBve6ZvuDQ==",
+ "version": "10.2.0",
+ "resolved": "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-10.2.0.tgz",
+ "integrity": "sha512-CydUvFOQKD928UzZhTp4pr2vWz1L+H99t7Pkln2QSPdvmURT0MoC4wUccfCnuEaihNsu9aYYyk+bep8rlfkUXw==",
"dev": true,
"license": "MIT",
"dependencies": {
@@ -21925,7 +21536,6 @@
"eslint-visitor-keys": "^4.2.0",
"espree": "^10.3.0",
"esquery": "^1.6.0",
- "lodash": "^4.17.21",
"semver": "^7.6.3"
},
"engines": {
@@ -21939,9 +21549,9 @@
}
},
"node_modules/vue-eslint-parser/node_modules/eslint-visitor-keys": {
- "version": "4.2.0",
- "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.0.tgz",
- "integrity": "sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==",
+ "version": "4.2.1",
+ "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.1.tgz",
+ "integrity": "sha512-Uhdk5sfqcee/9H/rCOJikYz67o0a2Tw2hGRPOG2Y1R2dg7brRe1uG0yaNQDHu+TO/uQPF/5eCapvYSmHUjt7JQ==",
"dev": true,
"license": "Apache-2.0",
"engines": {
@@ -21972,17 +21582,10 @@
"vue": "^3.0.0"
}
},
- "node_modules/vue-i18n/node_modules/@vue/devtools-api": {
- "version": "6.6.4",
- "resolved": "https://registry.npmjs.org/@vue/devtools-api/-/devtools-api-6.6.4.tgz",
- "integrity": "sha512-sGhTPMuXqZ1rVOk32RylztWkfXTRhuS7vgAKv0zjqk8gbsHkJ7xfFf+jbySxt7tWObEJwyKaHMikV/WGDiQm8g==",
- "dev": true,
- "license": "MIT"
- },
"node_modules/vue-json-pretty": {
- "version": "2.4.0",
- "resolved": "https://registry.npmjs.org/vue-json-pretty/-/vue-json-pretty-2.4.0.tgz",
- "integrity": "sha512-e9bP41DYYIc2tWaB6KuwqFJq5odZ8/GkE6vHQuGcbPn37kGk4a3n1RNw3ZYeDrl66NWXgTlOfS+M6NKkowmkWw==",
+ "version": "2.5.0",
+ "resolved": "https://registry.npmjs.org/vue-json-pretty/-/vue-json-pretty-2.5.0.tgz",
+ "integrity": "sha512-nZA6qXYaiMaE2J0HkKtkrLcPJoN03SDSBdZWEPiRwoOVySWOfoZCyadhBwBN6wAHTga+c/R49ExGWoKFXnu37A==",
"license": "MIT",
"engines": {
"node": ">= 10.0.0",
@@ -22019,12 +21622,6 @@
"vue": "^3.2.0"
}
},
- "node_modules/vue-router/node_modules/@vue/devtools-api": {
- "version": "6.6.4",
- "resolved": "https://registry.npmjs.org/@vue/devtools-api/-/devtools-api-6.6.4.tgz",
- "integrity": "sha512-sGhTPMuXqZ1rVOk32RylztWkfXTRhuS7vgAKv0zjqk8gbsHkJ7xfFf+jbySxt7tWObEJwyKaHMikV/WGDiQm8g==",
- "license": "MIT"
- },
"node_modules/vue-screen-utils": {
"version": "1.0.0-beta.13",
"resolved": "https://registry.npmjs.org/vue-screen-utils/-/vue-screen-utils-1.0.0-beta.13.tgz",
@@ -22105,9 +21702,9 @@
"license": "BSD-2-Clause"
},
"node_modules/webpack-sources": {
- "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==",
+ "version": "3.3.3",
+ "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.3.3.tgz",
+ "integrity": "sha512-yd1RBzSGanHkitROoPFd6qsrxt+oFhg/129YzheDGqeustzX0vTZJZsSsQjVQC4yzBQ56K55XU8gaNCtIzOnTg==",
"license": "MIT",
"engines": {
"node": ">=10.13.0"
@@ -22129,6 +21726,15 @@
"webidl-conversions": "^3.0.0"
}
},
+ "node_modules/wheel-gestures": {
+ "version": "2.2.48",
+ "resolved": "https://registry.npmjs.org/wheel-gestures/-/wheel-gestures-2.2.48.tgz",
+ "integrity": "sha512-f+Gy33Oa5Z14XY9679Zze+7VFhbsQfBFXodnU2x589l4kxGM9L5Y8zETTmcMR5pWOPQyRv4Z0lNax6xCO0NSlA==",
+ "license": "MIT",
+ "engines": {
+ "node": ">=18"
+ }
+ },
"node_modules/which": {
"version": "2.0.2",
"resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
@@ -22333,9 +21939,9 @@
}
},
"node_modules/ws": {
- "version": "8.18.2",
- "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.2.tgz",
- "integrity": "sha512-DMricUmwGZUVr++AEAe2uiVM7UoO9MAVZMDu05UQOaUII0lp+zOzLLU4Xqh/JvTqklB1T4uELaaPBKyjE1r4fQ==",
+ "version": "8.18.3",
+ "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.3.tgz",
+ "integrity": "sha512-PEIGCY5tSlUt50cqyMXfCzX+oOPqN0vuGqWzbcJ2xvnkzkq46oOpz7dQaTDBdfICb4N14+GARUDw2XV2N4tvzg==",
"license": "MIT",
"engines": {
"node": ">=10.0.0"
@@ -22353,6 +21959,21 @@
}
}
},
+ "node_modules/wsl-utils": {
+ "version": "0.1.0",
+ "resolved": "https://registry.npmjs.org/wsl-utils/-/wsl-utils-0.1.0.tgz",
+ "integrity": "sha512-h3Fbisa2nKGPxCpm89Hk33lBLsnaGBvctQopaBSOW/uIs6FTe1ATyAnKFJrzVs9vpGdsTe73WF3V4lIsk4Gacw==",
+ "license": "MIT",
+ "dependencies": {
+ "is-wsl": "^3.1.0"
+ },
+ "engines": {
+ "node": ">=18"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
+ },
"node_modules/xml-name-validator": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-4.0.0.tgz",
@@ -22388,15 +22009,15 @@
"license": "ISC"
},
"node_modules/yaml": {
- "version": "2.7.1",
- "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.7.1.tgz",
- "integrity": "sha512-10ULxpnOCQXxJvBgxsn9ptjq6uviG/htZKk9veJGhlqn3w/DxQ631zFF+nlQXLwmImeS5amR2dl2U8sg6U9jsQ==",
+ "version": "2.8.0",
+ "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.8.0.tgz",
+ "integrity": "sha512-4lLa/EcQCB0cJkyts+FpIRx5G/llPxfP6VQU5KByHEhLxY3IJCH0f0Hy1MHI8sClTvsIb8qwRJ6R/ZdlDJ/leQ==",
"license": "ISC",
"bin": {
"yaml": "bin.mjs"
},
"engines": {
- "node": ">= 14"
+ "node": ">= 14.6"
}
},
"node_modules/yaml-eslint-parser": {
@@ -22462,15 +22083,6 @@
"node": "*"
}
},
- "node_modules/ylru": {
- "version": "1.4.0",
- "resolved": "https://registry.npmjs.org/ylru/-/ylru-1.4.0.tgz",
- "integrity": "sha512-2OQsPNEmBCvXuFlIni/a+Rn+R2pHW9INm0BxXJ4hVDA8TirqMj+J/Rp9ItLatT/5pZqWwefVrTQcHpixsxnVlA==",
- "license": "MIT",
- "engines": {
- "node": ">= 4.0.0"
- }
- },
"node_modules/yocto-queue": {
"version": "0.1.0",
"resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
@@ -22484,40 +22096,26 @@
}
},
"node_modules/youch": {
- "version": "4.1.0-beta.7",
- "resolved": "https://registry.npmjs.org/youch/-/youch-4.1.0-beta.7.tgz",
- "integrity": "sha512-HUn0M24AUTMvjdkoMtH8fJz2FEd+k1xvtR9EoTrDUoVUi6o7xl5X+pST/vjk4T3GEQo2mJ9FlAvhWBm8dIdD4g==",
+ "version": "4.1.0-beta.10",
+ "resolved": "https://registry.npmjs.org/youch/-/youch-4.1.0-beta.10.tgz",
+ "integrity": "sha512-rLfVLB4FgQneDr0dv1oddCVZmKjcJ6yX6mS4pU82Mq/Dt9a3cLZQ62pDBL4AUO+uVrCvtWz3ZFUL2HFAFJ/BXQ==",
"license": "MIT",
"dependencies": {
- "@poppinss/dumper": "^0.6.3",
+ "@poppinss/colors": "^4.1.5",
+ "@poppinss/dumper": "^0.6.4",
"@speed-highlight/core": "^1.2.7",
"cookie": "^1.0.2",
- "youch-core": "^0.3.1"
- },
- "engines": {
- "node": ">=18"
+ "youch-core": "^0.3.3"
}
},
"node_modules/youch-core": {
- "version": "0.3.2",
- "resolved": "https://registry.npmjs.org/youch-core/-/youch-core-0.3.2.tgz",
- "integrity": "sha512-fusrlIMLeRvTFYLUjJ9KzlGC3N+6MOPJ68HNj/yJv2nz7zq8t4HEviLms2gkdRPUS7F5rZ5n+pYx9r88m6IE1g==",
+ "version": "0.3.3",
+ "resolved": "https://registry.npmjs.org/youch-core/-/youch-core-0.3.3.tgz",
+ "integrity": "sha512-ho7XuGjLaJ2hWHoK8yFnsUGy2Y5uDpqSTq1FkHLK4/oqKtyUU1AFbOOxY4IpC9f0fTLjwYbslUz0Po5BpD1wrA==",
"license": "MIT",
"dependencies": {
- "@poppinss/exception": "^1.2.0",
+ "@poppinss/exception": "^1.2.2",
"error-stack-parser-es": "^1.0.5"
- },
- "engines": {
- "node": ">=18"
- }
- },
- "node_modules/youch/node_modules/cookie": {
- "version": "1.0.2",
- "resolved": "https://registry.npmjs.org/cookie/-/cookie-1.0.2.tgz",
- "integrity": "sha512-9Kr/j4O16ISv8zBBhJoi4bXOYNTkFLOqSL3UDB0njXxCXNezjeyVrJyGOWtgfs/q2km1gwBcfH8q1yEGoMYunA==",
- "license": "MIT",
- "engines": {
- "node": ">=18"
}
},
"node_modules/zip-stream": {
@@ -22535,23 +22133,13 @@
}
},
"node_modules/zod": {
- "version": "3.24.4",
- "resolved": "https://registry.npmjs.org/zod/-/zod-3.24.4.tgz",
- "integrity": "sha512-OdqJE9UDRPwWsrHjLN2F8bPxvwJBK22EHLWtanu0LSYr5YqzsaaW3RMgmjwr8Rypg5k+meEJdSPXJZXE/yqOMg==",
+ "version": "3.25.76",
+ "resolved": "https://registry.npmjs.org/zod/-/zod-3.25.76.tgz",
+ "integrity": "sha512-gzUt/qt81nXsFGKIFcC3YnfEAx5NkunCfnDlvuBSSFS02bcXu4Lmea0AFIUwbLWxWPx3d9p8S5QoaujKcNQxcQ==",
"license": "MIT",
"funding": {
"url": "https://github.com/sponsors/colinhacks"
}
- },
- "node_modules/zod-to-json-schema": {
- "version": "3.24.5",
- "resolved": "https://registry.npmjs.org/zod-to-json-schema/-/zod-to-json-schema-3.24.5.tgz",
- "integrity": "sha512-/AuWwMP+YqiPbsJx5D6TfgRTc4kTLjsh5SOcd4bLsfUg2RcEXrFMJl1DGgdHy2aCfsIA/cr/1JM0xcB2GZji8g==",
- "devOptional": true,
- "license": "ISC",
- "peerDependencies": {
- "zod": "^3.24.1"
- }
}
}
}
diff --git a/client/package.json b/client/package.json
index 5cb855b80..f7e6e4c90 100644
--- a/client/package.json
+++ b/client/package.json
@@ -3,8 +3,8 @@
"private": true,
"type": "module",
"scripts": {
- "build": "nuxt build",
- "dev": "export NODE_TLS_REJECT_UNAUTHORIZED=0; nuxt dev",
+ "build": "NODE_OPTIONS='--max-old-space-size=8192' nuxt build",
+ "dev": "export NODE_TLS_REJECT_UNAUTHORIZED=0; NODE_OPTIONS='--max-old-space-size=8192' nuxt dev",
"docker-dev": "export NODE_TLS_REJECT_UNAUTHORIZED=0; nuxt dev --host 0.0.0.0",
"generate": "export NODE_TLS_REJECT_UNAUTHORIZED=0; nuxt generate",
"preview": "nuxt preview",
@@ -14,6 +14,7 @@
},
"devDependencies": {
"@iconify-json/clarity": "^1.2.1",
+ "@iconify-json/heroicons": "^1.2.2",
"@iconify-json/ic": "^1.2.1",
"@iconify-json/octicon": "^1.2.1",
"@iconify-json/tabler": "^1.2.1",
@@ -28,7 +29,7 @@
"eslint-plugin-vue": "^10.1.0",
"nuxt": "^3.17.1",
"nuxt-utm": "^0.2.2",
- "postcss": "^8.4.47",
+ "postcss": "^8.5.6",
"prettier": "^3.3.3",
"sass": "^1.80.2",
"vue": "^3.5.13",
@@ -37,18 +38,23 @@
"dependencies": {
"@codemirror/lang-html": "^6.4.9",
"@iconify-json/material-symbols": "^1.2.4",
- "@nuxt/ui": "^2.19.2",
+ "@nuxt/ui": "^3.2.0",
"@pinia/nuxt": "^0.11.0",
"@popperjs/core": "^2.11.8",
"@sentry/nuxt": "^9.8.0",
"@sentry/vite-plugin": "^3.2.2",
"@sentry/vue": "^9.8.0",
"@stripe/stripe-js": "^5.5.0",
+ "@tailwindcss/postcss": "^4.1.10",
+ "@tanstack/query-devtools": "^5.81.2",
+ "@tanstack/vue-query": "^5.81.5",
+ "@tanstack/vue-query-devtools": "^5.81.5",
"@vueuse/components": "^11.2.0",
"@vueuse/core": "^13.1.0",
"@vueuse/integrations": "^11.2.0",
"@vueuse/motion": "^2.2.6",
"@vueuse/nuxt": "^11.2.0",
+ "@vueuse/router": "^13.4.0",
"@zadigetvoltaire/nuxt-gtm": "^0.0.13",
"@zxing/library": "^0.21.3",
"amplitude-js": "^8.21.9",
@@ -69,6 +75,7 @@
"query-builder-vue-3": "^1.0.1",
"quill": "^2.0.2",
"tailwind-merge": "^2.5.4",
+ "tailwindcss": "^4.1.10",
"tinymotion": "^0.2.0",
"v-calendar": "3.0.1",
"vue-chartjs": "^5.3.2",
diff --git a/client/pages/[...all].vue b/client/pages/[...all].vue
index 1d52ed71a..a4558f7f3 100644
--- a/client/pages/[...all].vue
+++ b/client/pages/[...all].vue
@@ -8,7 +8,7 @@
class="w-56 mb-5"
>
- <h1 class="mb-6 font-semibold text-3xl text-gray-900">
+ <h1 class="mb-6 font-semibold text-3xl text-neutral-900">
Page not found (404)
</h1>
diff --git a/client/pages/admin.vue b/client/pages/admin.vue
new file mode 100644
index 000000000..ed6cb286c
--- /dev/null
+++ b/client/pages/admin.vue
@@ -0,0 +1,255 @@
+<template>
+ <div class="p-4">
+ <div
+ v-if="userInfo"
+ class="flex gap-2 items-center flex-wrap"
+ >
+ <UButton
+ icon="i-heroicons-arrow-left"
+ variant="ghost"
+ color="gray"
+ @click="clearUser"
+ />
+ <h1 class="text-xl font-semibold">
+ {{ userInfo.name }}
+ </h1>
+ <UBadge
+ color="neutral"
+ variant="subtle"
+ class="select-all"
+ >
+ {{ userInfo.id }}
+ </UBadge>
+ <UBadge
+ color="neutral"
+ variant="subtle"
+ class="select-all"
+ >
+ {{ userInfo.email }}
+ </UBadge>
+ <UButton
+ v-if="userInfo.stripe_id"
+ :to="'https://dashboard.stripe.com/customers/'+userInfo.stripe_id"
+ target="_blank"
+ color="purple"
+ variant="subtle"
+ size="xs"
+ class="select-all"
+ :label="userInfo.stripe_id"
+ icon="i-bxl-stripe"
+ />
+ <UBadge
+ v-if="userPlan"
+ v-bind="userPlanBadgeProps"
+ class="capitalize"
+ >
+ {{ userPlan }}
+ </UBadge>
+ </div>
+ <h3
+ v-else
+ class="font-semibold text-2xl text-neutral-900 mb-4"
+ >
+ Admin settings
+ </h3>
+
+
+ <template v-if="!userInfo">
+ <VForm
+ size="sm"
+ class="pb-8 max-w-lg"
+ @submit.prevent="fetchUser"
+ >
+ <TextInput
+ name="identifier"
+ :form="fetchUserForm"
+ label="Identifier"
+ :required="true"
+ help="User Id, User Email, Form Slug or View Slug"
+ />
+ <UButton
+ type="submit"
+ :loading="loading"
+ block
+ class="mt-4"
+ label="Fetch User"
+ />
+ </VForm>
+
+ <VForm
+ size="sm"
+ class="pb-8 max-w-lg"
+ @submit.prevent="createTemplate"
+ >
+ <TextAreaInput
+ name="template_prompt"
+ :form="createTemplateForm"
+ label="Template Description"
+ :required="true"
+ help="Describe the template you want to create"
+ />
+ <UButton
+ type="submit"
+ :loading="templateLoading"
+ block
+ class="mt-4"
+ label="Create Template"
+ />
+ </VForm>
+ </template>
+
+ <div
+ v-else
+ class="flex flex-col"
+ >
+ <div
+ id="admin-buttons"
+ class="flex gap-1 my-4"
+ >
+ <ImpersonateUser :user="userInfo" />
+ <SendPasswordResetEmail :user="userInfo" />
+ </div>
+ <div
+ class="w-full grid gap-2 grid-cols-1 lg:grid-cols-2"
+ >
+ <DiscountOnSubscription
+ :user="userInfo"
+ />
+ <ExtendTrial
+ :user="userInfo"
+ />
+ <CancelSubscription
+ :user="userInfo"
+ />
+ <BillingEmail
+ :user="userInfo"
+ />
+ <UserWorkspaces
+ :user="userInfo"
+ />
+ <UserSubscriptions
+ :user="userInfo"
+ class="lg:col-span-2"
+ />
+ <UserPayments
+ :user="userInfo"
+ class="lg:col-span-2"
+ />
+ <DeletedForms
+ :user="userInfo"
+ class="lg:col-span-2"
+ />
+ </div>
+ </div>
+ </div>
+</template>
+
+<script setup>
+import { computed, ref, onMounted } from 'vue'
+import { adminApi } from '~/api'
+
+definePageMeta({
+ middleware: 'moderator',
+ layout: 'dashboard'
+})
+
+useOpnSeoMeta({
+ title: 'Admin'
+})
+
+const alert = useAlert()
+const router = useRouter()
+
+const userInfo = ref(null)
+const userPlan = ref('free')
+const fetchUserForm = useForm({
+ identifier: ''
+})
+const createTemplateForm = useForm({
+ template_prompt: ''
+})
+const loading = ref(false)
+const templateLoading = ref(false)
+
+const userPlanBadgeProps = computed(() => {
+ switch (userPlan.value) {
+ case 'pro':
+ return { color: 'success', variant: 'subtle' }
+ case 'enterprise':
+ return { color: 'primary', variant: 'subtle' }
+ default:
+ return { color: 'neutral', variant: 'subtle' }
+ }
+})
+
+onMounted(() => {
+ // Shortcut link to impersonate users
+ const urlSearchParams = new URLSearchParams(window.location.search)
+ const params = Object.fromEntries(urlSearchParams.entries())
+ if (params.impersonate) {
+ fetchUserForm.identifier = params.impersonate
+ }
+ if (params.user_id) {
+ fetchUserForm.identifier = params.user_id
+ }
+ if (fetchUserForm.identifier) {
+ fetchUser()
+ }
+})
+
+async function fetchUser() {
+ if (!fetchUserForm.identifier) {
+ alert.error('Identifier is required.')
+ return
+ }
+
+ loading.value = true
+ adminApi.fetchUser(fetchUserForm.identifier).then(async (data) => {
+ loading.value = false
+ userInfo.value = { ...data.user, workspaces: data.workspaces }
+ getUserPlan(data.workspaces)
+ alert.success(`User Fetched: ${userInfo.value.name}`)
+ })
+ .catch((error) => {
+ alert.error(error.data.message)
+ loading.value = false
+ })
+}
+
+function getUserPlan(workspaces) {
+ if (workspaces.some(w => w.plan === 'enterprise')) {
+ userPlan.value = 'enterprise'
+ } else if (workspaces.some(w => w.plan === 'pro')) {
+ userPlan.value = 'pro'
+ } else {
+ userPlan.value = 'free'
+ }
+}
+
+function clearUser() {
+ userInfo.value = null
+ userPlan.value = 'free'
+ fetchUserForm.reset()
+}
+
+async function createTemplate() {
+ if (!createTemplateForm.template_prompt) {
+ alert.error('Template prompt is required.')
+ return
+ }
+
+ templateLoading.value = true
+ adminApi.createTemplate({
+ template_prompt: createTemplateForm.template_prompt
+ }).then((data) => {
+ templateLoading.value = false
+ createTemplateForm.reset()
+ alert.success('Template created.')
+ router.push({ name: 'templates-slug', params: { slug: data.template_slug } })
+ })
+ .catch((error) => {
+ templateLoading.value = false
+ alert.error(error.data.message)
+ })
+}
+</script>
diff --git a/client/pages/ai-form-builder.vue b/client/pages/ai-form-builder.vue
index 001966446..b7dac17eb 100644
--- a/client/pages/ai-form-builder.vue
+++ b/client/pages/ai-form-builder.vue
@@ -2,7 +2,7 @@
<div class="flex-1">
<!-- START HERO -->
<section
- class="bg-gradient-to-b relative from-white to-gray-100 py-12 sm:py-16 lg:py-20 xl:py-24"
+ class="bg-gradient-to-b relative from-white to-neutral-100 py-12 sm:py-16 lg:py-20 xl:py-24"
>
<div class="absolute inset-0">
<img
@@ -15,7 +15,7 @@
<div class="px-4 sm:px-6 lg:px-8 max-w-7xl mx-auto relative">
<div class="max-w-4xl mx-auto text-center">
<h1
- class="text-4xl sm:text-5xl lg:text-6xl font-semibold text-gray-900 tracking-tight"
+ class="text-4xl sm:text-5xl lg:text-6xl font-semibold text-neutral-900 tracking-tight"
>
Say goodbye to tedious form building with OpnForm's new
<span
@@ -23,38 +23,36 @@
>AI-powered feature!</span>
</h1>
<p
- class="mt-4 sm:mt-5 text-base leading-7 sm:text-xl sm:leading-9 font-medium text-gray-500"
+ class="mt-4 sm:mt-5 text-base leading-7 sm:text-xl sm:leading-9 font-medium text-neutral-500"
>
Easily generate a fully working form in seconds with just a simple
description.
</p>
<div class="mt-8 flex justify-center">
- <v-button
+ <UButton
v-if="!authenticated"
class="mr-1"
:to="{ name: 'forms-create-guest' }"
- :arrow="true"
- >
- Get started for free
- </v-button>
- <v-button
+ trailing-icon="i-heroicons-arrow-right"
+ label="Get started for free"
+ />
+ <UButton
v-else
class="mr-1"
:to="{ name: 'forms-create' }"
- :arrow="true"
- >
- Get started for free
- </v-button>
+ trailing-icon="i-heroicons-arrow-right"
+ label="Get started for free"
+ />
</div>
</div>
<div class="max-w-6xl mx-auto mt-12 sm:mt-16">
<div
- class="-m-2 rounded-xl bg-blue-900/5 p-2 backdrop-blur-sm ring-1 ring-inset ring-blue-900/10 lg:-m-4 lg:rounded-2xl lg:p-4"
+ class="-m-2 rounded-xl bg-blue-900/5 p-2 backdrop-blur-xs ring ring-inset ring-blue-900/10 lg:-m-4 lg:rounded-2xl lg:p-4"
>
<video
- class="rounded-md ring-1 ring-gray-200 shadow-xl shadow-blue-600/10 ring-blue-900/10"
+ class="rounded-sm ring ring-neutral-200 shadow-xl shadow-blue-600/10 ring-blue-900/10"
controls
autoplay
loop
@@ -81,10 +79,10 @@
>
<div>
- <p class="text-md font-semibold text-gray-900">
+ <p class="text-md font-semibold text-neutral-900">
Faster than Ever
</p>
- <p class="text-base font-medium text-gray-500 mt-2">
+ <p class="text-base font-medium text-neutral-500 mt-2">
Save time and effort by generating a form in seconds
</p>
</div>
@@ -98,10 +96,10 @@
>
<div>
- <p class="text-md font-semibold text-gray-900">
+ <p class="text-md font-semibold text-neutral-900">
Customizations
</p>
- <p class="text-base font-medium text-gray-500 mt-2">
+ <p class="text-base font-medium text-neutral-500 mt-2">
Customize your form to your exact specifications
</p>
</div>
@@ -115,10 +113,10 @@
>
<div>
- <p class="text-md font-semibold text-gray-900">
+ <p class="text-md font-semibold text-neutral-900">
No Coding Knowledge Required
</p>
- <p class="text-base font-medium text-gray-500 mt-2">
+ <p class="text-base font-medium text-neutral-500 mt-2">
No coding knowledge required and it's completely free to use
</p>
</div>
@@ -136,12 +134,12 @@
How Does It Work?
</h2>
<p
- class="text-3xl mt-4 sm:text-4xl lg:text-5xl font-semibold text-gray-900 tracking-tight lg:leading-tight"
+ class="text-3xl mt-4 sm:text-4xl lg:text-5xl font-semibold text-neutral-900 tracking-tight lg:leading-tight"
>
Save hours in just a few clicks
</p>
<p
- class="text-gray-500 text-base leading-7 sm:text-lg sm:leading-8 font-medium mt-4"
+ class="text-neutral-500 text-base leading-7 sm:text-lg sm:leading-8 font-medium mt-4"
>
Building forms has never been easier
</p>
@@ -154,7 +152,7 @@
class="flex flex-col lg:flex-row lg:items-center lg:justify-between gap-8 lg:gap-12"
>
<img
- class="w-full lg:flex-1 bg-gray-300 lg:shrink-0 rounded-2xl ring-1 ring-gray-200 shadow-sm"
+ class="w-full lg:flex-1 bg-neutral-300 lg:shrink-0 rounded-2xl ring ring-neutral-200 shadow-xs"
src="/img/pages/ai_form_builder/step-1.svg"
alt=""
>
@@ -173,12 +171,12 @@
>
<h3
- class="text-2xl sm:text-3xl lg:text-4xl font-semibold text-gray-900 lg:mt-8"
+ class="text-2xl sm:text-3xl lg:text-4xl font-semibold text-neutral-900 lg:mt-8"
>
Building forms made easy
</h3>
<p
- class="text-base font-medium leading-7 sm:text-lg sm:leading-8 text-gray-500 mt-4"
+ class="text-base font-medium leading-7 sm:text-lg sm:leading-8 text-neutral-500 mt-4"
>
OpnForm's easy-to-use online form creator lets you create a
beautiful web form in no time. Whether you need to create
@@ -193,7 +191,7 @@
class="flex flex-col lg:flex-row lg:items-center lg:justify-between gap-8 lg:gap-12"
>
<img
- class="w-full lg:flex-1 bg-gray-300 lg:shrink-0 rounded-2xl ring-1 ring-gray-200 shadow-sm lg:order-3"
+ class="w-full lg:flex-1 bg-neutral-300 lg:shrink-0 rounded-2xl ring ring-neutral-200 shadow-xs lg:order-3"
src="/img/pages/ai_form_builder/step-2.svg"
alt=""
>
@@ -211,12 +209,12 @@
>
<h3
- class="text-2xl sm:text-3xl lg:text-4xl font-semibold text-gray-900 lg:mt-8"
+ class="text-2xl sm:text-3xl lg:text-4xl font-semibold text-neutral-900 lg:mt-8"
>
Customized forms work wonders
</h3>
<p
- class="text-base font-medium leading-7 sm:text-lg sm:leading-8 text-gray-500 mt-4"
+ class="text-base font-medium leading-7 sm:text-lg sm:leading-8 text-neutral-500 mt-4"
>
Did you know that good-looking forms are more likely to convert
more responses than ordinary ones? On OpnForm, you can customize
@@ -230,7 +228,7 @@
class="flex flex-col lg:flex-row lg:items-center lg:justify-between gap-8 lg:gap-12"
>
<img
- class="w-full lg:flex-1 bg-gray-300 lg:shrink-0 rounded-2xl ring-1 ring-gray-200 shadow-sm"
+ class="w-full lg:flex-1 bg-neutral-300 lg:shrink-0 rounded-2xl ring ring-neutral-200 shadow-xs"
src="/img/pages/ai_form_builder/step-3.svg"
alt=""
>
@@ -248,12 +246,12 @@
>
<h3
- class="text-2xl sm:text-3xl lg:text-4xl font-semibold text-gray-900 lg:mt-8"
+ class="text-2xl sm:text-3xl lg:text-4xl font-semibold text-neutral-900 lg:mt-8"
>
Share your forms anywhere
</h3>
<p
- class="text-base font-medium leading-7 sm:text-lg sm:leading-8 text-gray-500 mt-4"
+ class="text-base font-medium leading-7 sm:text-lg sm:leading-8 text-neutral-500 mt-4"
>
You can share your forms anywhere using their unique weblink or
embed them on your landing pages seamlessly. Furthermore, you
@@ -268,17 +266,17 @@
<!-- END HOW IT WORKS -->
<!-- START EXAMPLES -->
- <!-- <section class="bg-gray-50 py-12 sm:py-16 lg:py-20 xl:py-24">-->
+ <!-- <section class="bg-neutral-50 py-12 sm:py-16 lg:py-20 xl:py-24">-->
<!-- <div class="px-4 sm:px-6 lg:px-8 max-w-7xl mx-auto">-->
<!-- <div class="text-center max-w-3xl mx-auto">-->
<!-- <h2 class="text-sm font-semibold text-blue-600">-->
<!-- Examples-->
<!-- </h2>-->
<!-- <p-->
- <!-- class="text-3xl mt-4 sm:text-4xl lg:text-5xl font-semibold text-gray-900 tracking-tight lg:leading-tight">-->
+ <!-- class="text-3xl mt-4 sm:text-4xl lg:text-5xl font-semibold text-neutral-900 tracking-tight lg:leading-tight">-->
<!-- What our user has created-->
<!-- </p>-->
- <!-- <p class="text-gray-500 text-base leading-7 sm:text-lg sm:leading-8 font-medium mt-4">-->
+ <!-- <p class="text-neutral-500 text-base leading-7 sm:text-lg sm:leading-8 font-medium mt-4">-->
<!-- Amet minim mollit non deserunt ullamco est sit aliqua dolor do amet sint. Velit officia consequat duis-->
<!-- enim velit-->
<!-- mollit.-->
@@ -287,85 +285,85 @@
<!-- <div class="grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-4 gap-6 mt-8 sm:mt-12 lg:mt-16">-->
<!-- <div-->
- <!-- class="bg-white overflow-hidden rounded-2xl ring-1 ring-gray-200 shadow-sm hover:shadow-lg hover:-translate-y-2 transition-all duration-150">-->
+ <!-- class="bg-white overflow-hidden rounded-2xl ring-1 ring-neutral-200 shadow-sm hover:shadow-lg hover:-translate-y-2 transition-all duration-150">-->
<!-- <img class="w-full" src="/img/pages/ai_form_builder/examples-placeholder.png" alt=""/>
-->
<!-- <div class="px-4 py-5 sm:p-6">-->
- <!-- <h3 class="text-lg font-semibold text-gray-900">-->
+ <!-- <h3 class="text-lg font-semibold text-neutral-900">-->
<!-- Example 1-->
<!-- </h3>-->
- <!-- <p class="text-base font-medium text-gray-500 mt-2 line-clamp-2">-->
+ <!-- <p class="text-base font-medium text-neutral-500 mt-2 line-clamp-2">-->
<!-- Nulla Lorem mollit cupidatat irure. Laborum magna nulla duis ullamco cillum dolor-->
<!-- </p>-->
<!-- </div>-->
<!-- </div>-->
<!-- <div-->
- <!-- class="bg-white overflow-hidden rounded-2xl ring-1 ring-gray-200 shadow-sm hover:shadow-lg hover:-translate-y-2 transition-all duration-150">-->
+ <!-- class="bg-white overflow-hidden rounded-2xl ring-1 ring-neutral-200 shadow-sm hover:shadow-lg hover:-translate-y-2 transition-all duration-150">-->
<!-- <img class="w-full" src="/img/pages/ai_form_builder/examples-placeholder.png" alt=""/>
-->
<!-- <div class="px-4 py-5 sm:p-6">-->
- <!-- <h3 class="text-lg font-semibold text-gray-900">-->
+ <!-- <h3 class="text-lg font-semibold text-neutral-900">-->
<!-- Example 2-->
<!-- </h3>-->
- <!-- <p class="text-base font-medium text-gray-500 mt-2 line-clamp-2">-->
+ <!-- <p class="text-base font-medium text-neutral-500 mt-2 line-clamp-2">-->
<!-- Nulla Lorem mollit cupidatat irure. Laborum magna nulla duis ullamco cillum dolor-->
<!-- </p>-->
<!-- </div>-->
<!-- </div>-->
<!-- <div-->
- <!-- class="bg-white overflow-hidden rounded-2xl ring-1 ring-gray-200 shadow-sm hover:shadow-lg hover:-translate-y-2 transition-all duration-150">-->
+ <!-- class="bg-white overflow-hidden rounded-2xl ring-1 ring-neutral-200 shadow-sm hover:shadow-lg hover:-translate-y-2 transition-all duration-150">-->
<!-- <img class="w-full" src="/img/pages/ai_form_builder/examples-placeholder.png" alt=""/>
-->
<!-- <div class="px-4 py-5 sm:p-6">-->
- <!-- <h3 class="text-lg font-semibold text-gray-900">-->
+ <!-- <h3 class="text-lg font-semibold text-neutral-900">-->
<!-- Example 3-->
<!-- </h3>-->
- <!-- <p class="text-base font-medium text-gray-500 mt-2 line-clamp-2">-->
+ <!-- <p class="text-base font-medium text-neutral-500 mt-2 line-clamp-2">-->
<!-- Nulla Lorem mollit cupidatat irure. Laborum magna nulla duis ullamco cillum dolor-->
<!-- </p>-->
<!-- </div>-->
<!-- </div>-->
<!-- <div-->
- <!-- class="bg-white overflow-hidden rounded-2xl ring-1 ring-gray-200 shadow-sm hover:shadow-lg hover:-translate-y-2 transition-all duration-150">-->
+ <!-- class="bg-white overflow-hidden rounded-2xl ring-1 ring-neutral-200 shadow-sm hover:shadow-lg hover:-translate-y-2 transition-all duration-150">-->
<!-- <img class="w-full" src="/img/pages/ai_form_builder/examples-placeholder.png" alt=""/>
-->
<!-- <div class="px-4 py-5 sm:p-6">-->
- <!-- <h3 class="text-lg font-semibold text-gray-900">-->
+ <!-- <h3 class="text-lg font-semibold text-neutral-900">-->
<!-- Example 4-->
<!-- </h3>-->
- <!-- <p class="text-base font-medium text-gray-500 mt-2 line-clamp-2">-->
+ <!-- <p class="text-base font-medium text-neutral-500 mt-2 line-clamp-2">-->
<!-- Nulla Lorem mollit cupidatat irure. Laborum magna nulla duis ullamco cillum dolor-->
<!-- </p>-->
<!-- </div>-->
<!-- </div>-->
<!-- </div>-->
- <!--&lt;!&ndash; <hr class="mt-12 border-gray-200 sm:mt-16">&ndash;&gt;-->
+ <!--&lt;!&ndash; <hr class="mt-12 border-neutral-200 sm:mt-16">&ndash;&gt;-->
<!--&lt;!&ndash; <div class="max-w-2xl mx-auto mt-12 text-center sm:mt-16">&ndash;&gt;-->
- <!--&lt;!&ndash; <h4 class="text-2xl font-semibold tracking-tight text-gray-900 sm:text-3xl lg:text-4xl">&ndash;&gt;-->
+ <!--&lt;!&ndash; <h4 class="text-2xl font-semibold tracking-tight text-neutral-900 sm:text-3xl lg:text-4xl">&ndash;&gt;-->
<!--&lt;!&ndash; Ready to level-up?&ndash;&gt;-->
<!--&lt;!&ndash; </h4>&ndash;&gt;-->
- <!--&lt;!&ndash; <p class="mt-4 text-base leading-7 sm:text-xl sm:leading-9 font-medium text-gray-500">&ndash;&gt;-->
+ <!--&lt;!&ndash; <p class="mt-4 text-base leading-7 sm:text-xl sm:leading-9 font-medium text-neutral-500">&ndash;&gt;-->
<!--&lt;!&ndash; Save time and effortlessly create forms with OpnForm&ndash;&gt;-->
<!--&lt;!&ndash; </p>&ndash;&gt;-->
<!--&lt;!&ndash; <div class="mt-8 flex justify-center">&ndash;&gt;-->
- <!--&lt;!&ndash; <v-button v-if="!authenticated" class="mr-1" :to="{ name: 'forms-create-guest' }" :arrow="true">&ndash;&gt;-->
+ <!--&lt;!&ndash; <UButton v-if="!authenticated" class="mr-1" :to="{ name: 'forms-create-guest' }" :arrow="true">&ndash;&gt;-->
<!--&lt;!&ndash; Get started for free&ndash;&gt;-->
- <!--&lt;!&ndash; </v-button>&ndash;&gt;-->
- <!--&lt;!&ndash; <v-button v-else class="mr-1" :to="{ name: 'forms-create' }" :arrow="true">&ndash;&gt;-->
+ <!--&lt;!&ndash; </UButton>&ndash;&gt;-->
+ <!--&lt;!&ndash; <UButton v-else class="mr-1" :to="{ name: 'forms-create' }" :arrow="true">&ndash;&gt;-->
<!--&lt;!&ndash; Get started for free&ndash;&gt;-->
- <!--&lt;!&ndash; </v-button>&ndash;&gt;-->
+ <!--&lt;!&ndash; </UButton>&ndash;&gt;-->
<!--&lt;!&ndash; </div>&ndash;&gt;-->
<!--&lt;!&ndash; <ul&ndash;&gt;-->
- <!--&lt;!&ndash; class="flex mt-8 sm:mt-12 text-sm font-medium text-gray-900 items-center justify-center flex-wrap gap-x-6 gap-y-4">&ndash;&gt;-->
+ <!--&lt;!&ndash; class="flex mt-8 sm:mt-12 text-sm font-medium text-neutral-900 items-center justify-center flex-wrap gap-x-6 gap-y-4">&ndash;&gt;-->
<!--&lt;!&ndash; <li class="flex items-center gap-2">&ndash;&gt;-->
- <!--&lt;!&ndash; <svg aria-hidden="true" class="h-5 w-5 text-gray-400 shrink-0" xmlns="http://www.w3.org/2000/svg"&ndash;&gt;-->
+ <!--&lt;!&ndash; <svg aria-hidden="true" class="h-5 w-5 text-neutral-400 shrink-0" xmlns="http://www.w3.org/2000/svg"&ndash;&gt;-->
<!--&lt;!&ndash; viewBox="0 0 20 20" fill="currentColor">&ndash;&gt;-->
<!--&lt;!&ndash; <path fill-rule="evenodd"&ndash;&gt;-->
<!--&lt;!&ndash; d="M16.707 5.293a1 1 0 010 1.414l-8 8a1 1 0 01-1.414 0l-4-4a1 1 0 011.414-1.414L8 12.586l7.293-7.293a1 1 0 011.414 0z"&ndash;&gt;-->
@@ -375,7 +373,7 @@
<!--&lt;!&ndash; </li>&ndash;&gt;-->
<!--&lt;!&ndash; <li class="flex items-center gap-2">&ndash;&gt;-->
- <!--&lt;!&ndash; <svg aria-hidden="true" class="h-5 w-5 text-gray-400 shrink-0" xmlns="http://www.w3.org/2000/svg"&ndash;&gt;-->
+ <!--&lt;!&ndash; <svg aria-hidden="true" class="h-5 w-5 text-neutral-400 shrink-0" xmlns="http://www.w3.org/2000/svg"&ndash;&gt;-->
<!--&lt;!&ndash; viewBox="0 0 20 20" fill="currentColor">&ndash;&gt;-->
<!--&lt;!&ndash; <path fill-rule="evenodd"&ndash;&gt;-->
<!--&lt;!&ndash; d="M16.707 5.293a1 1 0 010 1.414l-8 8a1 1 0 01-1.414 0l-4-4a1 1 0 011.414-1.414L8 12.586l7.293-7.293a1 1 0 011.414 0z"&ndash;&gt;-->
@@ -385,7 +383,7 @@
<!--&lt;!&ndash; </li>&ndash;&gt;-->
<!--&lt;!&ndash; <li class="flex items-center gap-2">&ndash;&gt;-->
- <!--&lt;!&ndash; <svg aria-hidden="true" class="h-5 w-5 text-gray-400 shrink-0" xmlns="http://www.w3.org/2000/svg"&ndash;&gt;-->
+ <!--&lt;!&ndash; <svg aria-hidden="true" class="h-5 w-5 text-neutral-400 shrink-0" xmlns="http://www.w3.org/2000/svg"&ndash;&gt;-->
<!--&lt;!&ndash; viewBox="0 0 20 20" fill="currentColor">&ndash;&gt;-->
<!--&lt;!&ndash; <path fill-rule="evenodd"&ndash;&gt;-->
<!--&lt;!&ndash; d="M16.707 5.293a1 1 0 010 1.414l-8 8a1 1 0 01-1.414 0l-4-4a1 1 0 011.414-1.414L8 12.586l7.293-7.293a1 1 0 011.414 0z"&ndash;&gt;-->
@@ -407,10 +405,10 @@
<!-- Customer Testimonials-->
<!-- </h2>-->
<!-- <p-->
- <!-- class="text-3xl mt-4 sm:text-4xl lg:text-5xl font-semibold text-gray-900 tracking-tight lg:leading-tight">-->
+ <!-- class="text-3xl mt-4 sm:text-4xl lg:text-5xl font-semibold text-neutral-900 tracking-tight lg:leading-tight">-->
<!-- See what people are saying-->
<!-- </p>-->
- <!-- <p class="text-gray-500 text-base leading-7 sm:text-lg sm:leading-8 font-medium mt-4">-->
+ <!-- <p class="text-neutral-500 text-base leading-7 sm:text-lg sm:leading-8 font-medium mt-4">-->
<!-- These are the stories of our customers who have joined us with great pleasure when using this crazy-->
<!-- feature.-->
<!-- </p>-->
@@ -420,13 +418,13 @@
<!-- END TESTIMONIALS -->
<!-- START FAQS -->
- <!-- <section class="bg-white py-12 sm:py-16 lg:py-20 xl:py-24 border-t border-gray-200">-->
+ <!-- <section class="bg-white py-12 sm:py-16 lg:py-20 xl:py-24 border-t border-neutral-200">-->
<!-- <div class="px-4 sm:px-6 lg:px-8 max-w-7xl mx-auto">-->
<!-- <div class="text-center max-w-3xl mx-auto">-->
- <!-- <h2 class="text-3xl sm:text-4xl lg:text-5xl font-semibold text-gray-900 tracking-tight lg:leading-tight">-->
+ <!-- <h2 class="text-3xl sm:text-4xl lg:text-5xl font-semibold text-neutral-900 tracking-tight lg:leading-tight">-->
<!-- Frequently Asked Questions-->
<!-- </h2>-->
- <!-- <p class="text-gray-500 text-base leading-7 sm:text-lg sm:leading-8 font-medium mt-4">-->
+ <!-- <p class="text-neutral-500 text-base leading-7 sm:text-lg sm:leading-8 font-medium mt-4">-->
<!-- We've compiled a list of the most common questions we get asked.-->
<!-- </p>-->
<!-- </div>-->
@@ -434,10 +432,10 @@
<!-- <div class="mt-12 sm:mt-16 lg:mt-20">-->
<!-- <dl class="gap-y-12 grid grid-cols-1 sm:grid-cols-2 sm:gap-x-8 sm:gap-y-16 lg:gap-x-10">-->
<!-- <div>-->
- <!-- <dt class="sm:text-lg text-base leading-7 font-medium sm:leading-8 text-gray-900">-->
+ <!-- <dt class="sm:text-lg text-base leading-7 font-medium sm:leading-8 text-neutral-900">-->
<!-- What's the best thing about Switzerland?-->
<!-- </dt>-->
- <!-- <dd class="mt-2 text-base font-medium leading-7 text-gray-500">-->
+ <!-- <dd class="mt-2 text-base font-medium leading-7 text-neutral-500">-->
<!-- I don't know, but the flag is a big plus. Lorem ipsum dolor sit amet consectetur adipisicing elit.-->
<!-- Quas cupiditate-->
<!-- laboriosam fugiat.-->
@@ -445,10 +443,10 @@
<!-- </div>-->
<!-- <div>-->
- <!-- <dt class="sm:text-lg text-base leading-7 font-medium sm:leading-8 text-gray-900">-->
+ <!-- <dt class="sm:text-lg text-base leading-7 font-medium sm:leading-8 text-neutral-900">-->
<!-- How do you make holy water?-->
<!-- </dt>-->
- <!-- <dd class="mt-2 text-base font-medium leading-7 text-gray-500">-->
+ <!-- <dd class="mt-2 text-base font-medium leading-7 text-neutral-500">-->
<!-- You boil the hell out of it. Lorem ipsum dolor sit amet consectetur adipisicing elit. Magnam aut-->
<!-- tempora vitae odio-->
<!-- inventore fuga aliquam nostrum quod porro. Delectus quia facere id sequi expedita natus.-->
@@ -456,10 +454,10 @@
<!-- </div>-->
<!-- <div>-->
- <!-- <dt class="sm:text-lg text-base leading-7 font-medium sm:leading-8 text-gray-900">-->
+ <!-- <dt class="sm:text-lg text-base leading-7 font-medium sm:leading-8 text-neutral-900">-->
<!-- What do you call someone with no body and no nose?-->
<!-- </dt>-->
- <!-- <dd class="mt-2 text-base font-medium leading-7 text-gray-500">-->
+ <!-- <dd class="mt-2 text-base font-medium leading-7 text-neutral-500">-->
<!-- Nobody knows. Lorem ipsum dolor sit amet consectetur adipisicing elit. Culpa, voluptas ipsa quia-->
<!-- excepturi, quibusdam-->
<!-- natus exercitationem sapiente tempore labore voluptatem.-->
@@ -467,10 +465,10 @@
<!-- </div>-->
<!-- <div>-->
- <!-- <dt class="sm:text-lg text-base leading-7 font-medium sm:leading-8 text-gray-900">-->
+ <!-- <dt class="sm:text-lg text-base leading-7 font-medium sm:leading-8 text-neutral-900">-->
<!-- Why do you never see elephants hiding in trees?-->
<!-- </dt>-->
- <!-- <dd class="mt-2 text-base font-medium leading-7 text-gray-500">-->
+ <!-- <dd class="mt-2 text-base font-medium leading-7 text-neutral-500">-->
<!-- Because they're so good at it. Lorem ipsum dolor sit amet consectetur adipisicing elit. Quas-->
<!-- cupiditate laboriosam-->
<!-- fugiat.-->
@@ -478,10 +476,10 @@
<!-- </div>-->
<!-- <div>-->
- <!-- <dt class="sm:text-lg text-base leading-7 font-medium sm:leading-8 text-gray-900">-->
+ <!-- <dt class="sm:text-lg text-base leading-7 font-medium sm:leading-8 text-neutral-900">-->
<!-- Why can't you hear a pterodactyl go to the bathroom?-->
<!-- </dt>-->
- <!-- <dd class="mt-2 text-base font-medium leading-7 text-gray-500">-->
+ <!-- <dd class="mt-2 text-base font-medium leading-7 text-neutral-500">-->
<!-- Because the pee is silent. Lorem ipsum dolor sit amet, consectetur adipisicing elit. Ipsam, quas-->
<!-- voluptatibus ex culpa-->
<!-- ipsum, aspernatur blanditiis fugiat ullam magnam suscipit deserunt illum natus facilis atque vero-->
@@ -491,10 +489,10 @@
<!-- </div>-->
<!-- <div>-->
- <!-- <dt class="sm:text-lg text-base leading-7 font-medium sm:leading-8 text-gray-900">-->
+ <!-- <dt class="sm:text-lg text-base leading-7 font-medium sm:leading-8 text-neutral-900">-->
<!-- Why did the invisible man turn down the job offer?-->
<!-- </dt>-->
- <!-- <dd class="mt-2 text-base font-medium leading-7 text-gray-500">-->
+ <!-- <dd class="mt-2 text-base font-medium leading-7 text-neutral-500">-->
<!-- He couldn't see himself doing it. Lorem ipsum dolor sit, amet consectetur adipisicing elit. Eveniet-->
<!-- perspiciatis-->
<!-- officiis corrupti tenetur. Temporibus ut voluptatibus, perferendis sed unde rerum deserunt eius.-->
@@ -508,7 +506,7 @@
<!-- START CTA -->
<section
- class="bg-gradient-to-b from-gray-100 to-white py-12 sm:py-16 lg:pt-20 xl:pt-24"
+ class="bg-gradient-to-b from-neutral-100 to-white py-12 sm:py-16 lg:pt-20 xl:pt-24"
>
<div class="px-4 sm:px-6 lg:px-8 max-w-7xl mx-auto">
<div class="flex items-center justify-center gap-8">
@@ -533,43 +531,41 @@
<div class="text-center max-w-3xl mx-auto mt-8 sm:mt-12">
<h2
- class="text-3xl sm:text-4xl lg:text-5xl font-semibold text-gray-900 tracking-tight lg:leading-tight"
+ class="text-3xl sm:text-4xl lg:text-5xl font-semibold text-neutral-900 tracking-tight lg:leading-tight"
>
Create beautiful forms and share them anywhere
</h2>
<p
- class="mt-4 sm:mt-5 text-base leading-7 sm:text-xl sm:leading-9 font-medium text-gray-500"
+ class="mt-4 sm:mt-5 text-base leading-7 sm:text-xl sm:leading-9 font-medium text-neutral-500"
>
It takes seconds, you don't need to know how to code and
<span class="text-blue-600">it's free</span>.
</p>
<div class="mt-8 flex justify-center">
- <v-button
+ <UButton
v-if="!authenticated"
class="mr-1"
:to="{ name: 'forms-create-guest' }"
- :arrow="true"
- >
- Get started for free
- </v-button>
- <v-button
+ trailing-icon="i-heroicons-arrow-right"
+ label="Get started for free"
+ />
+ <UButton
v-else
class="mr-1"
:to="{ name: 'forms-create' }"
- :arrow="true"
- >
- Get started for free
- </v-button>
+ trailing-icon="i-heroicons-arrow-right"
+ label="Get started for free"
+ />
</div>
<ul
- class="flex mt-8 sm:mt-12 text-sm font-medium text-gray-900 items-center justify-center flex-wrap gap-x-6 gap-y-4"
+ class="flex mt-8 sm:mt-12 text-sm font-medium text-neutral-900 items-center justify-center flex-wrap gap-x-6 gap-y-4"
>
<li class="flex items-center gap-2">
<svg
aria-hidden="true"
- class="h-5 w-5 text-gray-400 shrink-0"
+ class="h-5 w-5 text-neutral-400 shrink-0"
xmlns="http://www.w3.org/2000/svg"
viewBox="0 0 20 20"
fill="currentColor"
@@ -586,7 +582,7 @@
<li class="flex items-center gap-2">
<svg
aria-hidden="true"
- class="h-5 w-5 text-gray-400 shrink-0"
+ class="h-5 w-5 text-neutral-400 shrink-0"
xmlns="http://www.w3.org/2000/svg"
viewBox="0 0 20 20"
fill="currentColor"
@@ -603,7 +599,7 @@
<li class="flex items-center gap-2">
<svg
aria-hidden="true"
- class="h-5 w-5 text-gray-400 shrink-0"
+ class="h-5 w-5 text-neutral-400 shrink-0"
xmlns="http://www.w3.org/2000/svg"
viewBox="0 0 20 20"
fill="currentColor"
@@ -627,7 +623,6 @@
</template>
<script setup>
-const authStore = useAuthStore()
definePageMeta({
middleware: ['root-redirect','self-hosted']
})
@@ -640,7 +635,7 @@ defineRouteRules({
swr: 3600,
})
-const authenticated = computed(() => authStore.check)
+const { isAuthenticated: authenticated } = useIsAuthenticated()
</script>
<style lang="scss" scoped>
diff --git a/client/pages/forms/[slug]/edit.vue b/client/pages/forms/[slug]/edit.vue
index 30dbd599c..9f0fe73a6 100644
--- a/client/pages/forms/[slug]/edit.vue
+++ b/client/pages/forms/[slug]/edit.vue
@@ -1,43 +1,67 @@
<template>
<div class="w-full flex flex-col flex-grow">
- <form-editor
- v-if="(!formsLoading || form ) && !error "
+ <VTransition name="fade">
+ <FormEditor
+ v-if="!error"
ref="editor"
:is-edit="true"
@on-save="formInitialHash = null"
+ :loading="formsLoading"
/>
- <div
+ <UAlert
v-else-if="error && !formsLoading"
- class="mt-4 rounded-lg max-w-xl mx-auto p-6 bg-red-100 text-red-500"
+ icon="i-heroicons-exclamation-triangle"
+ color="error"
+ variant="soft"
+ class="max-w-xl mx-auto mt-4"
+ title="Error"
+ :description="errorMessage"
>
- {{ error }}
- </div>
- <div
- v-else
- class="text-center mt-4 py-6"
- >
- <Loader class="h-6 w-6 text-nt-blue mx-auto" />
- </div>
+ <template #actions>
+ <UButton
+ color="neutral"
+ variant="outline"
+ :to="{ name: 'home' }"
+ icon="i-heroicons-arrow-left"
+ >
+ Back to dashboard
+ </UButton>
+ </template>
+ </UAlert>
+ </VTransition>
</div>
</template>
<script setup>
-import { computed } from "vue"
+
import FormEditor from "~/components/open/forms/components/FormEditor.vue"
import { hash } from "~/lib/utils.js"
-const formsStore = useFormsStore()
+// Composables
+const route = useRoute()
const workingFormStore = useWorkingFormStore()
-const workspacesStore = useWorkspacesStore()
+const { detail: formDetail } = useForms()
-if (!formsStore.allLoaded) {
- formsStore.startLoading()
-}
-const updatedForm = storeToRefs(workingFormStore).content
-const form = computed(() => formsStore.getByKey(useRoute().params.slug))
-const formsLoading = computed(() => formsStore.loading)
+const slug = route.params.slug
+
+// Get form by slug using TanStack Query
+const { data: form, isLoading: formsLoading, error } = formDetail(slug,{
+ enabled: import.meta.client,
+})
+
+const errorMessage = computed(() => {
+ if (error.value?.response?.status === 401) {
+ return "You are not authorized to access this form."
+ } else if (error.value?.response?.status === 404) {
+ return "Form not found."
+ }
+ if (error.value?.response?.data?.message) {
+ return error.value.response.data.message
+ }
+ return "Error loading form"
+})
-const error = ref(null)
+const updatedForm = storeToRefs(workingFormStore).content
const formInitialHash = ref(null)
function isDirty() {
@@ -54,7 +78,7 @@ function isDirty() {
}
function initUpdatedForm() {
- if (!form.value || !form.value) {
+ if (!form.value) {
return
}
@@ -65,13 +89,18 @@ function initUpdatedForm() {
formInitialHash.value = hash(JSON.stringify(updatedForm.value.data()))
}
-// Create a form.id watcher that updates working form
-watch(form, (form) => {
- if (form?.value) {
- initUpdatedForm()
-
- }
-})
+// Update working form store when form changes
+watch(
+ () => form.value,
+ (newForm) => {
+ workingFormStore.reset()
+ if (newForm) {
+ workingFormStore.set(newForm)
+ initUpdatedForm()
+ }
+ },
+ { immediate: true }
+)
onBeforeRouteLeave((to, from, next) => {
if (isDirty()) {
@@ -93,20 +122,13 @@ onBeforeMount(() => {
}
}
}
-
- if (!form.value && !formsStore.allLoaded) {
- formsStore.loadAll(workspacesStore.currentId).then(() => {
- initUpdatedForm()
- })
- } else {
- initUpdatedForm()
- }
})
useOpnSeoMeta({
- title: "Edit " + (form.value && form.value ? form.value.title : "Your Form"),
+ title: "Edit " + (form.value ? form.value.title : "Your Form"),
})
definePageMeta({
middleware: "auth",
+ layout: 'empty'
})
</script>
diff --git a/client/pages/forms/[slug]/index.vue b/client/pages/forms/[slug]/index.vue
index 90eb47070..c7a626749 100644
--- a/client/pages/forms/[slug]/index.vue
+++ b/client/pages/forms/[slug]/index.vue
@@ -39,7 +39,7 @@
</div>
<div v-else-if="formLoading">
<p class="text-center mt-6 p-4">
- <loader class="h-6 w-6 text-nt-blue mx-auto" />
+ <loader class="h-6 w-6 text-blue-500 mx-auto" />
</p>
</div>
<template v-else>
@@ -70,13 +70,21 @@ import {
import { FormMode } from "~/lib/forms/FormModeStrategy.js"
const crisp = useCrisp()
-const formsStore = useFormsStore()
const darkMode = useDarkMode()
const isIframe = useIsIframe()
-const formLoading = computed(() => formsStore.loading)
const slug = useRoute().params.slug
-const form = computed(() => formsStore.getByKey(slug))
const { t } = useI18n()
+const { performRedirect } = useSubdomainRedirect()
+
+// Use TanStack Query to load the form
+const { data: form, isLoading: formLoading, error: formError, refetch: refetchForm, suspense } = useForms().detail(slug, {
+ retry: false, // Don't auto-retry for 404s
+ refetchOnWindowFocus: false,
+})
+
+if (import.meta.server) {
+ await suspense()
+}
const openCompleteForm = ref(null)
@@ -88,7 +96,7 @@ const passwordEntered = function (password) {
})
cookie.value = sha256(password)
nextTick(() => {
- loadForm().then(() => {
+ refetchForm().then(() => {
if (form.value?.is_password_protected) {
openCompleteForm.value.addPasswordError(t('forms.invalid_password'))
}
@@ -96,44 +104,37 @@ const passwordEntered = function (password) {
})
}
-const loadForm = async (setup=false) => {
- if (formsStore.loading || (form.value && !form.value.is_password_protected)) return Promise.resolve()
+// Handle 404 errors during SSR
+if (import.meta.server && formError.value) {
const event = useRequestEvent()
+ console.error(`Error loading form [${slug}]:`, formError.value)
+
+ // Check if we should redirect on 404 (subdomain redirect feature)
+ await performRedirect({ skipIfIframe: true })
+ setResponseStatus(event, 404, 'Page Not Found')
+}
- if (setup) {
- const {data, error} = await formsStore.publicLoad(slug)
- if (error.value) {
- console.error(`Error loading form [${slug}]:`,error.value)
- formsStore.stopLoading()
- setResponseStatus(event, 404, 'Page Not Found')
- return
- }
- formsStore.save(data.value)
- } else {
- try {
- const data = await formsStore.publicFetch(slug)
- formsStore.save(data)
- } catch {
- formsStore.stopLoading()
- setResponseStatus(event, 404, 'Page Not Found')
- return
- }
- }
- formsStore.stopLoading()
-
- // Adapt page to form: colors, custom code etc
- handleDarkMode(form.value?.dark_mode)
- handleTransparentMode(form.value?.transparent_background)
+// Adapt page to form: colors, custom code etc when form is loaded
+watch(form, (newForm) => {
+ if (newForm) {
+ handleDarkMode(newForm?.dark_mode)
+ handleTransparentMode(newForm?.transparent_background)
- // Remove 'hidden' class from html tag if present
- nextTick(() => {
- if (import.meta.client) {
- window.document.documentElement.classList.remove('hidden')
- }
- })
-}
+ // Remove 'hidden' class from html tag if present
+ nextTick(() => {
+ if (import.meta.client) {
+ window.document.documentElement.classList.remove('hidden')
+ }
+ })
+ }
+}, { immediate: true })
-await loadForm(true)
+// Handle client-side 404 redirects for forms (subdomain redirect feature)
+watch([formLoading, formError], async ([loading, error]) => {
+ if (import.meta.client && !loading && (error || !form.value)) {
+ await performRedirect({ skipIfIframe: true })
+ }
+})
onMounted(() => {
crisp.hideChat()
@@ -265,4 +266,8 @@ useHead({
] : {},
script: [{ src: '/widgets/iframeResizer.contentWindow.min.js' }]
})
+
+definePageMeta({
+ layout: 'empty'
+})
</script>
diff --git a/client/pages/forms/[slug]/show.vue b/client/pages/forms/[slug]/show.vue
index fc44bdf99..4b96e3561 100644
--- a/client/pages/forms/[slug]/show.vue
+++ b/client/pages/forms/[slug]/show.vue
@@ -1,206 +1,228 @@
<template>
- <div class="bg-white">
- <template v-if="form">
- <div class="flex bg-gray-50">
- <div class="w-full md:w-4/5 lg:w-3/5 md:mx-auto md:max-w-4xl px-4">
- <div class="pt-4 pb-0">
- <a
- href="#"
- class="flex text-blue mb-2 font-semibold text-sm"
- @click.prevent="goBack"
- >
- <svg
- class="w-3 h-3 text-blue mt-1 mr-1"
- viewBox="0 0 6 10"
- fill="none"
- xmlns="http://www.w3.org/2000/svg"
- >
- <path
- d="M5 9L1 5L5 1"
- stroke="currentColor"
- stroke-width="1.5"
- stroke-linecap="round"
- stroke-linejoin="round"
- />
- </svg>
- Go back
- </a>
-
- <div class="flex flex-wrap">
- <h2 class="flex-grow text-gray-900 truncate">
- {{ form.title }}
- </h2>
- <div class="flex mt-4 gap-2 lg:mt-0">
- <UButton
- v-if="form.visibility === 'draft'"
- color="white"
- class="hover:no-underline"
- icon="i-heroicons-eye"
- @click="showDraftFormWarningNotification"
- >
- <span class="hidden sm:inline">View <span class="hidden md:inline">form</span></span>
- </UButton>
- <UButton
- v-else
- v-track.view_form_click="{form_id:form.id, form_slug:form.slug}"
- target="_blank"
- :to="form.share_url"
- color="white"
- class="hover:no-underline"
- icon="i-heroicons-eye"
- >
- <span class="hidden sm:inline">View <span class="hidden md:inline">form</span></span>
- </UButton>
- <UButton
- v-if="!workspace.is_readonly"
- v-track.edit_form_click="{form_id: form.id, form_slug: form.slug}"
- color="primary"
- icon="i-heroicons-pencil"
- class="hover:no-underline"
- :to="{ name: 'forms-slug-edit', params: { slug: form.slug } }"
- >
- Edit <span class="hidden md:inline">form</span>
- </UButton>
- <extra-menu
- v-if="!workspace.is_readonly"
- :form="form"
- />
+ <div class="flex flex-col sm:flex-row h-screen bg-white">
+ <!-- Form Sidebar - Always shown -->
+ <FormSidebar :form="form" :loading="isLoading" />
+
+ <!-- Main content area -->
+ <main class="flex-1 sm:pl-58 overflow-hidden">
+ <div class="flex flex-col h-full">
+ <!-- Loading State -->
+ <div v-if="isLoading || !isFormFinished" class="flex-1 bg-white">
+ <!-- Top Bar Skeleton -->
+ <div class="bg-white p-4">
+ <div class="max-w-4xl mx-auto">
+ <!-- Form Title and Actions Skeleton -->
+ <div class="flex flex-wrap items-start justify-between gap-4">
+ <div class="flex-1 min-w-0">
+ <USkeleton class="h-7 w-64 mb-2" />
+ <div class="flex flex-wrap items-center gap-2">
+ <USkeleton class="h-5 w-16" />
+ <USkeleton class="h-5 w-16" />
+ <USkeleton class="h-5 w-32" />
+ </div>
+ </div>
+
+ <!-- Action Buttons Skeleton -->
+ <div class="hidden md:flex gap-2">
+ <USkeleton class="h-9 w-20" />
+ <USkeleton class="h-9 w-20" />
+ <USkeleton class="h-9 w-8" />
+ </div>
+ </div>
+
+ <!-- Status Badges Skeleton -->
+ <div class="flex flex-wrap gap-2 mt-2">
+ <USkeleton class="h-4 w-16" />
+ <USkeleton class="h-4 w-20" />
+ </div>
+ </div>
+ </div>
+
+ <!-- Page Content Skeleton -->
+ <div :class="['flex-1 bg-white p-4', { 'overflow-y-auto': !isSubmissionsPage }]">
+ <div class="max-w-4xl mx-auto space-y-4">
+ <USkeleton class="h-8 w-48" />
+ <div class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-4">
+ <USkeleton class="h-32 w-full" />
+ <USkeleton class="h-32 w-full" />
+ <USkeleton class="h-32 w-full" />
</div>
+ <USkeleton class="h-64 w-full" />
</div>
+ </div>
+ </div>
- <p class="text-gray-500 text-sm">
- <span class="pr-1">{{ form.views_count }} view{{
- form.views_count > 0 ? "s" : ""
- }}</span>
- <span class="pr-1">- {{ form.submissions_count }} submission{{
- form.submissions_count > 0 ? "s" : ""
- }}
- </span>
- <span>- Edited {{ form.last_edited_human }}</span>
- </p>
-
- <FormStatusBadges
- :form="form"
- class="mt-2"
- />
-
- <form-cleanings
- class="mt-4"
- :form="form"
- />
-
- <div class="border-b border-gray-200 dark:border-gray-700">
- <ul class="flex flex-wrap -mb-px text-sm font-medium text-center">
- <li
- v-for="(tab, i) in tabsList"
- :key="i + 1"
- class="mr-6"
- >
- <nuxt-link
- :to="{ name: tab.route, params: tab.params ?? {} }"
- class="hover:no-underline inline-block py-4 rounded-t-lg border-b-2 text-gray-500 hover:text-gray-600"
- active-class="text-blue-600 hover:text-blue-900 dark:text-blue-500 dark:hover:text-blue-500 border-blue-600 dark:border-blue-500"
+ <!-- Loaded Content -->
+ <template v-else-if="form">
+ <!-- Top Bar (Non-Sticky) -->
+ <div class="bg-white p-4 pb-0">
+ <div class="max-w-4xl mx-auto">
+ <!-- Form Title and Actions -->
+ <div class="flex flex-wrap items-start justify-between gap-4">
+ <div class="flex-1 min-w-0 hidden sm:block">
+ <h1 class="text-xl font-semibold text-neutral-900 truncate ">
+ {{ form.title }}
+ </h1>
+ </div>
+
+ <!-- Action Buttons -->
+ <div class="flex gap-2">
+ <UButton
+ v-if="form.visibility === 'draft'"
+ color="neutral"
+ variant="outline"
+ class="hover:no-underline"
+ icon="i-heroicons-eye"
+ @click="showDraftFormWarningNotification"
>
- {{ tab.name }}
- </nuxt-link>
- </li>
- </ul>
+ <span class="hidden sm:inline">Open <span class="hidden md:inline">form</span></span>
+ </UButton>
+ <TrackClick
+ v-else
+ name="view_form_click"
+ :properties="{form_id:form.id, form_slug:form.slug}"
+ >
+ <UButton
+ target="_blank"
+ :to="form.share_url"
+ color="neutral"
+ variant="outline"
+ class="hover:no-underline"
+ icon="i-heroicons-arrow-top-right-on-square"
+ >
+ <span class="hidden sm:inline">Open <span class="hidden md:inline">form</span></span>
+ </UButton>
+ </TrackClick>
+ <TrackClick
+ v-if="!workspace?.is_readonly"
+ name="edit_form_click"
+ :properties="{form_id: form.id, form_slug: form.slug}"
+ >
+ <UButton
+ color="primary"
+ icon="i-heroicons-pencil"
+ class="hover:no-underline"
+ :to="{ name: 'forms-slug-edit', params: { slug: form.slug } }"
+ >
+ Edit <span class="hidden md:inline">form</span>
+ </UButton>
+ </TrackClick>
+ <extra-menu
+ v-if="!workspace?.is_readonly"
+ :form="form"
+ portal="#form-show-portals"
+ />
+ </div>
+ </div>
+
+ <div class="flex flex-wrap items-center gap-2 text-neutral-500 text-xs mt-2 sm:mt-0">
+ <UTooltip :text="`${formatNumberWithCommas(form.views_count)} views`">
+ <div class="flex items-center gap-1">
+ <UIcon name="i-heroicons-eye" />
+ <span>{{ formatNumber(form.views_count) }}</span>
+ </div>
+ </UTooltip>
+
+ <UTooltip :text="`${formatNumberWithCommas(form.submissions_count)} submissions`">
+ <div class="flex items-center gap-1">
+ <UIcon name="i-heroicons-document-text" />
+ <span>{{ formatNumber(form.submissions_count) }}</span>
+ </div>
+ </UTooltip>
+
+ <span class="whitespace-nowrap">Edited {{ form.last_edited_human }}</span>
+ </div>
+
+ <!-- Status Badges and Form Cleanings -->
+ <div class="flex flex-wrap gap-2">
+ <FormStatusBadges class="mt-2" size="sm" :form="form" />
+ <FormCleanings class="mt-2" :form="form" />
+ </div>
+ </div>
+ </div>
+
+ <!-- Page Content -->
+ <div :class="['flex-1 bg-white', { 'overflow-y-auto': !isSubmissionsPage }]">
+ <NuxtPage :form="form" />
+ </div>
+ </template>
+
+ <!-- Not Found State -->
+ <div
+ v-else
+ class="flex items-center justify-center h-screen bg-white"
+ >
+ <div class="flex flex-col gap-4 items-center justify-center">
+ <h2 class="text-lg font-semibold text-neutral-900">Form not found</h2>
+ <p class="text-neutral-500">The form you're looking for doesn't exist or has been deleted.</p>
+ <div class="">
+ <UButton
+ variant="soft"
+ class="hover:no-underline"
+ icon="i-heroicons-arrow-left"
+ :to="{ name: 'home' }"
+ >
+ Go to Dashboard
+ </UButton>
</div>
</div>
</div>
+
+ <div id="form-show-portals" class="z-20" />
</div>
- <div class="flex flex-col bg-white">
- <NuxtPage :form="form" />
- </div>
- </template>
- <div
- v-else-if="loading"
- class="text-center w-full p-5"
- >
- <Loader class="h-6 w-6 mx-auto" />
- </div>
- <div
- v-else
- class="text-center w-full p-5"
- >
- Form not found.
- </div>
+ </main>
</div>
</template>
<script setup>
import { computed } from "vue"
+import { formatNumber, formatNumberWithCommas } from "~/lib/utils.js"
+import FormSidebar from "../../../components/layouts/FormSidebar.vue"
import ExtraMenu from "../../../components/pages/forms/show/ExtraMenu.vue"
import FormCleanings from "../../../components/pages/forms/show/FormCleanings.vue"
import FormStatusBadges from "../../../components/open/forms/components/FormStatusBadges.vue"
+import TrackClick from "../../../components/global/TrackClick.vue"
definePageMeta({
- middleware: "auth",
+ layout: "empty",
})
+
useOpnSeoMeta({
title: "Home",
})
+// Composables
const route = useRoute()
-const formsStore = useFormsStore()
const workingFormStore = useWorkingFormStore()
-const workspacesStore = useWorkspacesStore()
+const { detail: formDetail } = useForms()
-const slug = useRoute().params.slug
+const slug = route.params.slug
-formsStore.startLoading()
-const form = computed(() => formsStore.getByKey(slug))
-const workspace = computed(() => workspacesStore.getCurrent)
+// Get current workspace
+const { current: workspaceRef } = useCurrentWorkspace()
+const workspace = workspaceRef.value
-const loading = computed(() => formsStore.loading || workspacesStore.loading)
+// Get form by slug
+const { data: form, isLoading: isFormLoading, isFetched: isFormFinished } = formDetail(slug)
-const tabsList = [
- {
- name: "Submissions",
- route: "forms-slug-show-submissions",
- params: { 'slug': slug }
- },
- ...workspace.value.is_readonly ? [] : [
- {
- name: "Integrations",
- route: "forms-slug-show-integrations",
- params: { 'slug': slug }
- },
- ],
- {
- name: "Analytics",
- route: "forms-slug-show-stats",
- params: { 'slug': slug }
- },
- {
- name: "Share",
- route: "forms-slug-show-share",
- params: { 'slug': slug }
- },
-]
-
-onMounted(() => {
- workingFormStore.reset()
- if (form.value) {
- workingFormStore.set(form.value)
- } else {
- formsStore.loadForm(route.params.slug)
- }
-})
+// Combined loading state
+const isLoading = computed(() => isFormLoading.value)
+
+// Disable sticky top-bar behaviour on the submissions page only
+const isSubmissionsPage = computed(() => route.name?.includes('submissions'))
+// Update working form store when form changes
watch(
- () => form?.value?.id,
- (id) => {
- if (id) {
- workingFormStore.set(form.value)
+ () => form.value,
+ (newForm) => {
+ workingFormStore.reset()
+ if (newForm) {
+ workingFormStore.set(newForm)
}
},
+ { immediate: true }
)
-const goBack = () => {
- useRouter().push({ name: "home" })
-}
-
const showDraftFormWarningNotification = () => {
useAlert().warning(
"This form is currently in Draft mode and is not publicly accessible, You can change the form status on the edit form page.",
diff --git a/client/pages/forms/[slug]/show/integrations/index.vue b/client/pages/forms/[slug]/show/integrations/index.vue
index 02c272331..cc60e0f5d 100644
--- a/client/pages/forms/[slug]/show/integrations/index.vue
+++ b/client/pages/forms/[slug]/show/integrations/index.vue
@@ -1,39 +1,47 @@
<template>
- <div class="w-full md:w-4/5 lg:w-3/5 md:mx-auto md:max-w-4xl p-4">
- <div class="mb-20">
- <h1 class="font-semibold mt-4 text-xl">
- Your integrations
- </h1>
-
- <div class="text-sm text-gray-500">
- Read, update and create data with dozens of 3rd-party integrations
- </div>
+ <div class="p-4">
+ <div class="w-full max-w-4xl mx-auto">
+ <VTransition name="fade">
+ <div
+ v-if="isIntegrationsLoading || !isSuccess"
+ class="my-6 space-y-2"
+ >
+ <IntegrationCardSkeleton />
+ <IntegrationCardSkeleton />
+ <IntegrationCardSkeleton />
+ </div>
+ <div
+ v-else-if="formIntegrationsList.length"
+ class="my-6 space-y-2"
+ >
+ <IntegrationCard
+ v-for="row in formIntegrationsList"
+ :key="row.id"
+ :integration="row"
+ :form="form"
+ />
+ </div>
+ <div
+ v-else
+ class="text-center py-12 px-6 bg-neutral-50 dark:bg-neutral-900/50 rounded-lg border-2 border-dashed border-neutral-300 dark:border-neutral-700 mt-6"
+ >
+ <UIcon
+ name="i-heroicons-puzzle-piece-20-solid"
+ class="mx-auto h-12 w-12 text-neutral-400"
+ />
+ <h3 class="mt-2 text-lg font-semibold text-neutral-900 dark:text-white">
+ No integrations yet
+ </h3>
+ <p class="mt-1 text-sm text-neutral-500 dark:text-neutral-400">
+ Get started by connecting your form to a third-party app below.
+ </p>
+ </div>
+ </VTransition>
- <div
- v-if="integrationsLoading"
- class="my-6"
- >
- <Loader class="h-6 w-6 mx-auto" />
- </div>
- <div
- v-else-if="formIntegrationsList.length"
- class="my-6"
+ <h1
+ id="add-integration-title"
+ class="font-semibold mt-8 text-xl"
>
- <IntegrationCard
- v-for="row in formIntegrationsList"
- :key="row.id"
- :integration="row"
- :form="form"
- />
- </div>
- <div
- v-else
- class="text-gray-500 border shadow rounded-md p-5 mt-4"
- >
- No integration yet form this form.
- </div>
-
- <h1 class="font-semibold mt-8 text-xl">
Add a new integration
</h1>
<div
@@ -41,10 +49,10 @@
:key="sectionName"
class="mb-8"
>
- <h3 class="text-gray-500">
+ <h3 class="text-neutral-500">
{{ sectionName }}
</h3>
- <div class="flex flex-wrap mt-2 gap-4">
+ <div class="grid grid-cols-2 md:grid-cols-3 xl:grid-cols-4 gap-4 mt-2">
<IntegrationListOption
v-for="(sectionItem, sectionItemKey) in section"
:key="sectionItemKey"
@@ -68,6 +76,9 @@
<script setup>
import { computed } from "vue"
import IntegrationModal from "~/components/open/integrations/components/IntegrationModal.vue"
+import IntegrationCard from "~/components/open/integrations/components/IntegrationCard"
+import IntegrationCardSkeleton from '~/components/open/integrations/components/IntegrationCardSkeleton.vue'
+import IntegrationListOption from '~/components/open/integrations/components/IntegrationListOption.vue'
const props = defineProps({
form: { type: Object, required: true },
@@ -76,37 +87,40 @@ const props = defineProps({
definePageMeta({
middleware: "auth",
})
+
useOpnSeoMeta({
- title: props.form
- ? "Form Integrations - " + props.form.title
- : "Form Integrations",
+ title: computed(() => props.form
+ ? `Form Integrations - ${props.form.title}`
+ : "Form Integrations"
+ ),
})
const alert = useAlert()
-const oAuthProvidersStore = useOAuthProvidersStore()
+const { list, availableIntegrations, integrationsBySection } = useFormIntegrations()
+
+// Reactive form ID for proper dependency tracking
+const formId = computed(() => props.form?.id)
-const formIntegrationsStore = useFormIntegrationsStore()
-const integrationsLoading = computed(() => formIntegrationsStore.loading)
-const integrations = computed(
- () => formIntegrationsStore.availableIntegrations,
-)
-const sectionsList = computed(
- () => formIntegrationsStore.integrationsBySection,
-)
-const formIntegrationsList = computed(() =>
- formIntegrationsStore.getAllByFormId(props.form.id),
-)
+const {
+ data: formIntegrationsData,
+ isLoading: isIntegrationsLoading,
+ isSuccess
+} = list(formId, {
+ enabled: import.meta.client,
+})
+
+// Get available integrations and sections from the composable
+const integrations = availableIntegrations
+const sectionsList = integrationsBySection
+
+// Get form integrations list from the query data
+const formIntegrationsList = computed(() => formIntegrationsData.value || [])
const showIntegrationModal = ref(false)
const selectedIntegrationKey = ref(null)
const selectedIntegration = ref(null)
-onMounted(() => {
- formIntegrationsStore.fetchFormIntegrations(props.form.id)
- oAuthProvidersStore.fetchOAuthProviders(props.form.workspace_id)
-})
-
const openIntegration = (itemKey) => {
if (!itemKey || !integrations.value.has(itemKey)) {
return alert.error("Integration not found")
@@ -118,17 +132,16 @@ const openIntegration = (itemKey) => {
return alert.warning("This integration is not available yet")
}
- if(integration.is_external && integration.url) {
+ if (integration.is_external && integration.url) {
window.open(integration.url, '_blank')
return
}
selectedIntegrationKey.value = itemKey
- selectedIntegration.value = integrations.value.get(
- selectedIntegrationKey.value,
- )
+ selectedIntegration.value = integrations.value.get(selectedIntegrationKey.value)
showIntegrationModal.value = true
}
+
const closeIntegrationModal = () => {
showIntegrationModal.value = false
nextTick(() => {
diff --git a/client/pages/forms/[slug]/show/share.vue b/client/pages/forms/[slug]/show/share.vue
index ffaa3e6e0..76c21a4fb 100644
--- a/client/pages/forms/[slug]/show/share.vue
+++ b/client/pages/forms/[slug]/show/share.vue
@@ -1,61 +1,101 @@
<template>
- <div class="w-full md:w-4/5 lg:w-3/5 md:mx-auto md:max-w-4xl p-4">
- <div class="mb-20">
- <div class="mb-6 pb-6 border-b w-full flex flex-col sm:flex-row gap-2">
- <regenerate-form-link
- v-if="!workspace.is_readonly"
- class="sm:w-1/2 flex"
- :form="props.form"
- />
+ <div class="p-4 space-y-8">
+ <div class="w-full max-w-4xl mx-auto flex flex-col gap-4">
+ <!-- Status Warning Alert -->
+ <UAlert
+ v-if="form.visibility === 'draft'"
+ icon="i-heroicons-information-circle"
+ color="warning"
+ variant="subtle"
+ title="Draft Form"
+ description="Only you can visit the form link while logged in. Visitors won't be able to access this form."
+ />
+
+ <UAlert
+ v-else-if="form.visibility === 'closed'"
+ icon="i-heroicons-lock-closed"
+ color="warning"
+ variant="subtle"
+ title="Closed Form"
+ description="People can access the form but it won't accept new submissions."
+ />
+
+ <!-- Primary Section: Share Link -->
+ <UCard class="shadow">
+ <div class="space-y-4">
+ <div class="flex flex-wrap items-center gap-2">
+ <h2 class="text-xl grow font-semibold">Share Your Form</h2>
+ <div class="flex gap-2">
+ <AdvancedFormUrlSettingsPopover
+ v-model="shareFormConfig"
+ :form="props.form"
+ />
+ </div>
+ </div>
+ <p class="text-neutral-600 text-sm">
+ Share your form with anyone by copying this link. You can use it on social media,
+ in messages, or send it via email to reach your audience.
+ </p>
+
+ <CopyContent
+ :content="share_url"
+ :is-draft="form.visibility == 'draft'"
+ class="w-full"
+ />
+
+ <div class="flex gap-2 pt-2">
+ <SocialShareButton
+ :form="props.form"
+ :share-url="share_url"
+ />
- <url-form-prefill
- class="sm:w-1/2"
+ <FormQrCode
+ :form="props.form"
+ :extra-query-param="shareUrlForQueryParams"
+ />
+ </div>
+ </div>
+ </UCard>
+
+ <div class="flex gap-2">
+ <UrlFormPrefill
:form="props.form"
:extra-query-param="shareUrlForQueryParams"
/>
-
- <embed-form-as-popup-modal
- class="sm:w-1/2 flex"
+ <RegenerateFormLink
:form="props.form"
/>
</div>
- <share-link
- class="mt-4"
- :form="props.form"
- :extra-query-param="shareUrlForQueryParams"
- />
-
- <embed-code
- class="mt-6"
- :form="props.form"
- :extra-query-param="shareUrlForQueryParams"
- />
-
- <form-qr-code
- class="mt-6"
- :form="props.form"
- :extra-query-param="shareUrlForQueryParams"
- />
-
- <advanced-form-url-settings
- v-model="shareFormConfig"
- :form="props.form"
- />
+ <!-- Secondary Section: Embed -->
+ <UCard class="shadow-sm">
+ <div class="space-y-4">
+ <h2 class="text-xl font-semibold">Embed Form</h2>
+ <p class="text-neutral-600 text-sm">Embed your form on your website by copying the HTML code below.</p>
+
+ <EmbedCode
+ :form="props.form"
+ :extra-query-param="shareUrlForQueryParams"
+ />
+
+ <EmbedFormAsPopupModal
+ :form="props.form"
+ class="max-w-fit"
+ />
+ </div>
+ </UCard>
</div>
</div>
</template>
<script setup>
-import ShareLink from "~/components/pages/forms/show/ShareLink.vue"
import EmbedCode from "~/components/pages/forms/show/EmbedCode.vue"
import FormQrCode from "~/components/pages/forms/show/FormQrCode.vue"
import UrlFormPrefill from "~/components/pages/forms/show/UrlFormPrefill.vue"
-import RegenerateFormLink from "~/components/pages/forms/show/RegenerateFormLink.vue"
-import AdvancedFormUrlSettings from "~/components/open/forms/components/AdvancedFormUrlSettings.vue"
+import AdvancedFormUrlSettingsPopover from "~/components/pages/forms/show/AdvancedFormUrlSettingsPopover.vue"
+import SocialShareButton from "~/components/pages/forms/show/SocialShareButton.vue"
import EmbedFormAsPopupModal from "~/components/pages/forms/show/EmbedFormAsPopupModal.vue"
-
-const workspace = computed(() => useWorkspacesStore().getCurrent)
+import CopyContent from "~/components/open/forms/components/CopyContent.vue"
const props = defineProps({
form: { type: Object, required: true },
@@ -64,6 +104,7 @@ const props = defineProps({
definePageMeta({
middleware: "auth",
})
+
useOpnSeoMeta({
title: props.form ? "Share Form - " + props.form.title : "Share Form",
})
@@ -82,4 +123,10 @@ const shareUrlForQueryParams = computed(() => {
}
return queryStr.slice(1)
})
+
+const share_url = computed(() => {
+ return shareUrlForQueryParams.value
+ ? props.form.share_url + "?" + shareUrlForQueryParams.value
+ : props.form.share_url + shareUrlForQueryParams.value
+})
</script>
diff --git a/client/pages/forms/[slug]/show/stats.vue b/client/pages/forms/[slug]/show/stats.vue
index b853b3f52..eee87fc8e 100644
--- a/client/pages/forms/[slug]/show/stats.vue
+++ b/client/pages/forms/[slug]/show/stats.vue
@@ -1,40 +1,42 @@
<template>
- <div class="w-full md:w-4/5 lg:w-3/5 md:mx-auto md:max-w-4xl p-4">
- <div class="w-full flex flex-col sm:flex-row gap-2">
+ <div class="p-4">
+ <div class="w-full max-w-4xl mx-auto grid grid-cols-2 md:grid-cols-4 gap-2">
<div
v-for="(stat, index) in [
{ label: 'Views', value: totalViews, placeholder: '123' },
{ label: 'Submissions', value: totalSubmissions, placeholder: '123' },
- { label: 'Completion Rate', value: completionRate + '%', placeholder: '100%' },
- { label: 'Average Duration', value: averageDuration, placeholder: '10 seconds' }
+ { label: 'Completion', value: completionRate + '%', placeholder: '100%' },
+ { label: 'Avg. Duration', value: averageDuration, placeholder: '10 seconds' }
]"
:key="index"
- class="border border-gray-300 rounded-lg shadow-sm p-4 w-full mx-auto"
+ class="border border-neutral-300 rounded-lg shadow-xs p-4"
>
- <div class="mb-2 text-sm text-gray-500">
+ <div class="mb-2 text-xs text-neutral-500">
{{ stat.label }}
</div>
- <Loader
+ <VTransition name="fade">
+ <USkeleton
v-if="isLoading"
- class="h-6 w-6 text-nt-blue"
+ class="h-7 w-16"
/>
<span
v-else-if="form.is_pro"
- class="font-medium text-2xl"
+ class="font-medium text-xl"
>
{{ stat.value }}
</span>
<span
v-else
- class="blur-[3px]"
+ class="blur-[3px] pointer-events-none"
>
{{ stat.placeholder }}
</span>
+ </VTransition>
</div>
</div>
- <form-stats :form="form" />
+ <FormStats class="w-full max-w-4xl mx-auto" :form="form" />
</div>
</template>
@@ -52,32 +54,28 @@ useOpnSeoMeta({
title: props.form ? "Form Analytics - " + props.form.title : "Form Analytics",
})
-const isLoading = ref(false)
-const totalViews = ref(0)
-const totalSubmissions = ref(0)
-const completionRate = ref(0)
-const averageDuration = ref('-')
+// Use query composables instead of manual API calls
+const { statsDetails } = useFormStats()
-onMounted(() => {
- getCardData()
+// Get stats data using query composable
+const { data: statsData, isFetching: isQueryLoading } = statsDetails(
+ props.form.workspace_id,
+ props.form.id,
+ {
+ enabled: computed(() => import.meta.client && !!props.form && props.form.is_pro)
+ }
+)
+
+const isLoading = computed(() => {
+ if (import.meta.server) {
+ return !!props.form && props.form.is_pro
+ }
+ return isQueryLoading.value
})
-const getCardData = async() => {
- if (!props.form || !props.form.is_pro) { return null }
- isLoading.value = true
- opnFetch(
- "/open/workspaces/" +
- props.form.workspace_id +
- "/form-stats-details/" +
- props.form.id,
- ).then((responseData) => {
- if (responseData) {
- totalViews.value = responseData.views ?? 0
- totalSubmissions.value = responseData.submissions ?? 0
- completionRate.value = Math.min(100,responseData.completion_rate ?? 0)
- averageDuration.value = responseData.average_duration ?? '-'
- isLoading.value = false
- }
- })
-}
+// Computed values derived from query data
+const totalViews = computed(() => statsData.value?.views ?? 0)
+const totalSubmissions = computed(() => statsData.value?.submissions ?? 0)
+const completionRate = computed(() => Math.min(100, statsData.value?.completion_rate ?? 0))
+const averageDuration = computed(() => statsData.value?.average_duration ?? '-')
</script>
diff --git a/client/pages/forms/[slug]/show/submissions.vue b/client/pages/forms/[slug]/show/submissions.vue
index b03b060b0..d76a8cfee 100644
--- a/client/pages/forms/[slug]/show/submissions.vue
+++ b/client/pages/forms/[slug]/show/submissions.vue
@@ -1,5 +1,5 @@
<template>
- <form-submissions />
+ <FormSubmissions :form="form" />
</template>
<script setup>
diff --git a/client/pages/forms/create/guest.vue b/client/pages/forms/create/guest.vue
index ba9791674..a2c7b98f0 100644
--- a/client/pages/forms/create/guest.vue
+++ b/client/pages/forms/create/guest.vue
@@ -5,20 +5,17 @@
@form-generated="formGenerated"
@close="showInitialFormModal = false"
/>
- <form-editor
- v-if="!workspacesLoading"
- ref="editor"
- class="w-full flex flex-grow"
- :error="error"
- :is-guest="isGuest"
- @open-register="appStore.quickRegisterModal = true"
- />
- <div
- v-else
- class="text-center mt-4 py-6"
- >
- <Loader class="h-6 w-6 text-nt-blue mx-auto" />
- </div>
+ <VTransition name="fade">
+ <FormEditor
+ v-if="stateReady"
+ ref="editor"
+ class="w-full flex flex-grow"
+ :error="error"
+ :is-guest="isGuest"
+ :loading="workspacesLoading"
+ @open-register="appStore.quickRegisterModal = true"
+ />
+ </VTransition>
</div>
</template>
@@ -26,24 +23,30 @@
import FormEditor from "~/components/open/forms/components/FormEditor.vue"
import CreateFormBaseModal from "../../../components/pages/forms/create/CreateFormBaseModal.vue"
import { initForm } from "~/composables/forms/initForm.js"
-import { fetchTemplate } from "~/stores/templates.js"
-import { fetchAllWorkspaces } from "~/stores/workspaces.js"
+import { useQueryClient } from "@tanstack/vue-query"
+
import { WindowMessageTypes } from "~/composables/useWindowMessage"
const appStore = useAppStore()
-const templatesStore = useTemplatesStore()
const workingFormStore = useWorkingFormStore()
-const workspacesStore = useWorkspacesStore()
const route = useRoute()
+const queryClient = useQueryClient()
-// Fetch the template
-if (route.query.template !== undefined && route.query.template) {
- const { data } = await fetchTemplate(route.query.template)
- templatesStore.save(data.value)
+let template = null
+if (route.query.template) {
+ const { data, suspense } = useTemplates().detail(route.query.template)
+ await suspense()
+ template = data.value
}
+// Use workspaces query composable for invalidation functionality
+const { invalidateAll } = useWorkspaces()
+
// Store values
-const workspacesLoading = computed(() => workspacesStore.loading)
+const workspacesLoading = computed(() => {
+ // For guest mode, we'll manage loading state manually
+ return !stateReady.value
+})
const form = storeToRefs(workingFormStore).content
useOpnSeoMeta({
@@ -51,6 +54,7 @@ useOpnSeoMeta({
})
definePageMeta({
middleware: ["guest", "self-hosted"],
+ layout: 'empty'
})
// Data
@@ -63,22 +67,20 @@ const showInitialFormModal = ref(false)
const editor = ref(null)
onMounted(() => {
- // Set as guest user
- workspacesStore.set([
- {
- id: null,
- name: "Guest Workspace",
- is_enterprise: false,
- is_pro: false,
- },
- ])
+ // Set guest workspace data in query cache instead of store
+ const guestWorkspace = {
+ id: null,
+ name: "Guest Workspace",
+ is_enterprise: false,
+ is_pro: false,
+ }
+
+ // Manually set the workspace data in query cache
+ queryClient.setQueryData(["workspaces", "list"], [guestWorkspace])
form.value = initForm({}, true)
- if (route.query.template !== undefined && route.query.template) {
- const template = templatesStore.getByKey(route.query.template)
- if (template && template.structure) {
- form.value = useForm({ ...form.value.data(), ...template.structure })
- }
+ if (template && template.structure) {
+ form.value = useForm({ ...form.value.data(), ...template.structure })
} else {
// No template loaded, ask how to start
showInitialFormModal.value = true
@@ -94,7 +96,7 @@ onMounted(() => {
const afterLogin = () => {
isGuest.value = false
- fetchAllWorkspaces()
+ invalidateAll() // Refetch all workspace queries
setTimeout(() => {
if (editor) {
editor.value.saveFormCreate()
diff --git a/client/pages/forms/create/index.vue b/client/pages/forms/create/index.vue
index 80331f6ff..cc4ee1e13 100644
--- a/client/pages/forms/create/index.vue
+++ b/client/pages/forms/create/index.vue
@@ -10,19 +10,15 @@
@close="showInitialFormModal = false"
/>
- <form-editor
- v-if="form && !workspacesLoading"
- ref="editor"
- class="w-full flex flex-grow"
- :error="error"
- @on-save="formInitialHash = null"
- />
- <div
- v-else
- class="text-center mt-4 py-6"
- >
- <Loader class="h-6 w-6 text-nt-blue mx-auto" />
- </div>
+ <VTransition name="fade">
+ <FormEditor
+ v-if="form"
+ ref="editor"
+ class="w-full flex flex-grow"
+ :error="error"
+ @on-save="formInitialHash = null"
+ />
+ </VTransition>
</div>
</div>
</template>
@@ -32,12 +28,12 @@ import { watch } from "vue"
import { initForm } from "~/composables/forms/initForm.js"
import FormEditor from "~/components/open/forms/components/FormEditor.vue"
import CreateFormBaseModal from "../../../components/pages/forms/create/CreateFormBaseModal.vue"
-import { fetchTemplate } from "~/stores/templates.js"
import { hash } from "~/lib/utils.js"
import { onBeforeRouteLeave } from "vue-router"
definePageMeta({
middleware: "auth",
+ layout: 'empty'
})
useOpnSeoMeta({
@@ -57,23 +53,24 @@ onBeforeRouteLeave((to, from, next) => {
})
const route = useRoute()
-const templatesStore = useTemplatesStore()
const workingFormStore = useWorkingFormStore()
-const workspacesStore = useWorkspacesStore()
-const formStore = useFormsStore()
-// Fetch the template
-if (route.query.template !== undefined && route.query.template) {
- const { data } = await fetchTemplate(route.query.template)
- templatesStore.save(data.value)
+let template = null
+if (route.query.template) {
+ const { data, suspense } = useTemplates().detail(route.query.template)
+ await suspense()
+ template = data.value
}
-const {
- getCurrent: workspace,
- workspacesLoading: workspacesLoading,
-} = storeToRefs(workspacesStore)
+const { current: workspace } = useCurrentWorkspace()
const { content: form } = storeToRefs(workingFormStore)
+// Pre-load forms list for the current workspace (replaces formStore.loadAll)
+const workspaceId = computed(() => workspace.value?.id)
+useFormsList(workspaceId, {
+ enabled: computed(() => !!workspaceId.value)
+})
+
// State
const loading = ref(false)
const error = ref("")
@@ -98,22 +95,14 @@ onMounted(() => {
}
}
- if (!formStore.allLoaded) {
- formStore.loadAll(workspace.value.id)
- }
-
form.value = initForm({ workspace_id: workspace.value?.id, no_branding: workspace.value?.is_pro }, true)
formInitialHash.value = hash(JSON.stringify(form.value.data()))
- if (route.query.template !== undefined && route.query.template) {
- const template = templatesStore.getByKey(route.query.template)
- if (template && template.structure) {
- form.value = useForm({ ...form.value.data(), ...template.structure })
- }
+ if (template && template.structure) {
+ form.value = useForm({ ...form.value.data(), ...template.structure })
} else {
// No template loaded, ask how to start
showInitialFormModal.value = true
}
- // workspacesStore.loadIfEmpty()
})
// Methods
diff --git a/client/pages/home.vue b/client/pages/home.vue
index d3e148f9b..6d9bb2537 100644
--- a/client/pages/home.vue
+++ b/client/pages/home.vue
@@ -1,231 +1,141 @@
<template>
- <div
- v-if="workspace"
- class="bg-white"
- >
- <div class="flex bg-gray-50 pb-5 border-b">
- <div class="w-full md:w-4/5 lg:w-3/5 md:mx-auto md:max-w-4xl p-4">
- <div class="pt-4 pb-0">
- <div class="flex">
- <h2 class="flex-grow text-gray-900">
- Your Forms
- </h2>
- <v-button
- v-if="!workspace?.is_readonly"
- v-track.create_form_click
- :to="{ name: 'forms-create' }"
- >
- <svg
- class="w-4 h-4 text-white inline mr-1 -mt-1"
- viewBox="0 0 14 14"
- fill="none"
- xmlns="http://www.w3.org/2000/svg"
- >
- <path
- d="M6.99996 1.1665V12.8332M1.16663 6.99984H12.8333"
- stroke="currentColor"
- stroke-width="1.67"
- stroke-linecap="round"
- stroke-linejoin="round"
- />
- </svg>
- Create a new form
- </v-button>
- </div>
- <small class="flex text-gray-500">Manage your forms and submissions.</small>
- </div>
+ <div v-if="workspace" class="flex flex-col h-full bg-white">
+ <!-- Top Bar -->
+ <div class="sticky top-0 z-50 bg-white h-[49px] border-b border-neutral-200 p-2 sm:px-4">
+ <div class="max-w-4xl mx-auto flex items-center justify-between flex-shrink-0 gap-2 px-2 sm:px-0">
+
+ <VTransition name="fade">
+ <div v-if="(forms?.length > 0) || isFilteringForms" class="flex items-center gap-2">
+ <!-- Search -->
+ <UInput
+ v-model="search"
+ placeholder="Search forms..."
+ icon="i-heroicons-magnifying-glass-solid"
+
+ />
+
+ <!-- Tags filter -->
+ <USelectMenu
+ v-if="allTags.length > 0"
+ v-model="selectedTags"
+ :items="tagOptions"
+ multiple
+ placeholder="Tags"
+ class="hidden sm:block"
+ />
+
+ <!-- Clear button -->
+ <UButton
+ v-if="isFilteringForms"
+ label="Clear"
+ variant="ghost"
+ color="neutral"
+ @click="clearFilters"
+ />
+ </div>
+ <div class="grow" v-else />
+ </VTransition>
+
+ <!-- Create form button -->
+ <TrackClick name="home_top_bar_create_form_click">
+ <UButton
+ v-if="!workspace?.is_readonly"
+ icon="i-heroicons-plus"
+ label="Create Form"
+ :to="{ name: 'forms-create' }"
+ />
+ </TrackClick>
</div>
</div>
- <div class="flex bg-white">
- <div class="w-full md:w-4/5 lg:w-3/5 md:mx-auto md:max-w-4xl">
- <div class="mt-4 pb-0">
- <text-input
- v-if="forms.length > 0"
- v-model="search"
- class="mb-6 px-4"
- name="search"
- label="Search a form"
- placeholder="Name of form to search"
+
+ <!-- Main Content -->
+ <div class="flex-1 overflow-y-auto p-4">
+ <div class="max-w-4xl mx-auto">
+ <VTransition name="fade">
+ <div v-if="isFetched && !isFormsLoading && (forms?.length === 0)" class="text-center py-16 px-4">
+ <UIcon name="i-heroicons-document-plus" class="h-12 w-12 text-neutral-400 mx-auto" />
+ <h3 class="mt-4 text-lg font-semibold text-neutral-900">
+ Create your first form
+ </h3>
+ <p class="mt-1 text-sm text-neutral-500">
+ Get started by creating a new form to collect responses.
+ </p>
+ <UButton
+ v-if="!workspace?.is_readonly"
+ class="mt-6"
+ icon="i-heroicons-plus"
+ label="Create Form"
+ :to="{ name: 'forms-create' }"
/>
- <div
- v-if="allTags.length > 0"
- class="mb-4 px-6"
- >
- <div
- v-for="tag in allTags"
- :key="tag"
- :class="[
- 'inline-flex items-center rounded-full px-2 py-1 text-xs font-medium ring-1 ring-inset cursor-pointer mr-2',
- {
- 'bg-blue-50 text-blue-600 ring-blue-500/10 dark:bg-blue-400':
- selectedTags.has(tag),
- 'bg-gray-50 text-gray-600 ring-gray-500/10 dark:bg-gray-700 hover:bg-blue-50 hover:text-blue-600 hover:ring-blue-500/10 hover:dark:bg-blue-400':
- !selectedTags.has(tag),
- },
- ]"
- title="Click for filter by tag(s)"
- @click="onTagClick(tag)"
- >
- {{ tag }}
- </div>
- </div>
- <div
- v-if="!formsLoading && enrichedForms.length === 0"
- class="flex flex-wrap justify-center max-w-4xl"
- >
- <img
- class="w-56"
- src="/img/pages/forms/search_notfound.png"
- alt="search-not-found"
- >
+ </div>
- <h3 class="w-full mt-4 text-center text-gray-900 font-semibold">
+ <div v-if="isFetched && !isFormsLoading && (forms?.length > 0) && enrichedForms.length === 0" class="text-center py-16 px-4">
+ <UIcon name="i-heroicons-magnifying-glass" class="h-12 w-12 text-neutral-400 mx-auto" />
+ <h3 class="mt-4 text-lg font-semibold text-neutral-900">
No forms found
</h3>
- <div
- v-if="isFilteringForms && enrichedForms.length === 0 && search"
- class="mt-2 w-full text-center"
- >
- Your search "{{ search }}" did not match any forms. Please try
- again.
- </div>
- <v-button
- v-if="!workspace?.is_readonly && forms.length === 0"
- v-track.create_form_click
- class="mt-4"
- :to="{ name: 'forms-create' }"
- >
- <svg
- class="w-4 h-4 text-white inline mr-1 -mt-1"
- viewBox="0 0 14 14"
- fill="none"
- xmlns="http://www.w3.org/2000/svg"
- >
- <path
- d="M6.99996 1.1665V12.8332M1.16663 6.99984H12.8333"
- stroke="currentColor"
- stroke-width="1.67"
- stroke-linecap="round"
- stroke-linejoin="round"
- />
- </svg>
- Create a new form
- </v-button>
+ <p class="mt-1 text-sm text-neutral-500">
+ Your search and filter criteria did not match any forms.
+ </p>
+ <UButton
+ v-if="isFilteringForms"
+ class="mt-6"
+ label="Clear Filters"
+ variant="soft"
+ @click="clearFilters"
+ />
+ </div>
+
+ <!-- Forms List -->
+ <div v-if="enrichedForms.length > 0" class="mb-10">
+ <div class="flex flex-col gap-2 lg:mt-6">
+ <FormCard
+ v-for="form in enrichedForms"
+ :key="form.id"
+ :form="form"
+ />
</div>
- <div
- v-else-if="forms.length > 0"
- class="mb-10"
- >
- <div v-if="enrichedForms && enrichedForms.length">
- <div
- v-for="(form) in enrichedForms"
- :key="form.id"
- class="mt-4 p-4 flex group bg-white hover:bg-gray-50 dark:bg-notion-dark items-center relative"
- >
- <div
- class="flex-grow items-center truncate cursor-pointer relative"
- >
- <NuxtLink
- :to="{name:'forms-slug-show-submissions', params: {slug:form.slug}}"
- class="absolute inset-0"
- />
- <span class="font-semibold text-gray-900 dark:text-white">{{
- form.title
- }}</span>
- <ul class="flex text-gray-500 text-sm gap-4">
- <li class="pr-1 mr-3">
- {{ form.views_count }} view{{
- form.views_count > 0 ? "s" : ""
- }}
- </li>
- <li class="list-disc mr-3">
- {{ form.submissions_count }}
- submission{{ form.submissions_count > 0 ? "s" : "" }}
- </li>
- <li class="list-disc mr-3">
- Edited {{ form.last_edited_human }}
- </li>
- <li
- v-if="form.creator"
- class="list-disc hidden lg:list-item"
- >
- By
- {{ form?.creator?.name }}
- </li>
- </ul>
-
- <FormStatusBadges
- :form="form"
- class="mt-1"
- size="xs"
- />
-
- </div>
- <extra-menu
- :form="form"
- :is-main-page="true"
- />
- </div>
- </div>
- <div
- v-if="!workspace?.is_pro"
- class="px-4"
- >
- <UAlert
- class="mt-8 p-4"
- icon="i-heroicons-sparkles"
- color="primary"
- variant="subtle"
- description="You can add components to your app using the cli."
- >
- <template #title>
- <h3 class="font-semibold text-md">
- Discover our Pro plan
- </h3>
- </template>
- <template #description>
- <div class="flex flex-wrap sm:flex-nowrap gap-4 items-start">
- <p class="flex-grow">
- Remove OpnForm branding, customize forms further, use your custom domain, integrate with your
- favorite tools, invite users, and more!
- </p>
- <UButton
- v-track.upgrade_banner_home_click
- color="white"
- class="block"
- @click.prevent="subscriptionModalStore.openModal()"
- >
- Upgrade Now
- </UButton>
- </div>
- </template>
- </UAlert>
- </div>
+
+ <!-- Loading Skeletons -->
+ <div v-if="isLoadingMore" class="flex flex-col gap-2 mt-2">
+ <FormCardSkeleton />
+ <FormCardSkeleton class="opacity-60" />
+ <FormCardSkeleton class="opacity-30" />
</div>
- <div
- v-if="formsLoading"
- class="text-center"
- >
- <Loader class="h-6 w-6 text-nt-blue mx-auto" />
+
+ <!-- Completion Indicator -->
+ <div v-else-if="!isComplete && totalPages > 1" class="flex justify-center items-center py-4">
+ <div class="text-sm text-neutral-500">
+ Loaded {{ currentPage }} of {{ totalPages }} pages
+ </div>
</div>
+
+ <UpgradeBanner v-if="enrichedForms.length >= 2" class="mt-2" />
</div>
+
+ <!-- Loading Skeletons -->
+ <div v-if="isFormsLoading" class="flex flex-col gap-2">
+ <FormCardSkeleton />
+ <FormCardSkeleton />
+ <FormCardSkeleton />
+ </div>
+ </VTransition>
</div>
</div>
- <open-form-footer class="mt-8 border-t" />
+ <div id="home-portals" class="z-20" />
</div>
</template>
<script setup>
-import {useFormsStore} from "../stores/forms"
-import {useWorkspacesStore} from "../stores/workspaces"
import Fuse from "fuse.js"
-import TextInput from "../components/forms/TextInput.vue"
-import ExtraMenu from "../components/pages/forms/show/ExtraMenu.vue"
-import FormStatusBadges from "../components/open/forms/components/FormStatusBadges.vue"
-import {refDebounced} from "@vueuse/core"
+import FormCard from '~/components/pages/home/FormCard.vue'
+import FormCardSkeleton from '~/components/pages/home/FormCardSkeleton.vue'
+import TrackClick from '~/components/global/TrackClick.vue'
+import UpgradeBanner from "~/components/dashboard/UpgradeBanner.vue"
definePageMeta({
middleware: ["auth", "self-hosted-credentials"],
+ layout: "dashboard",
})
useOpnSeoMeta({
@@ -234,69 +144,79 @@ useOpnSeoMeta({
"All of your OpnForm are here. Create new forms, or update your existing forms.",
})
-const subscriptionModalStore = useSubscriptionModalStore()
-const formsStore = useFormsStore()
-const workspacesStore = useWorkspacesStore()
-formsStore.startLoading()
-
-const workspace = computed(() => workspacesStore.getCurrent)
+// Composables
+const { current: workspace, currentId: workspaceId } = useCurrentWorkspace()
-onMounted(() => {
- if (!formsStore.allLoaded) {
- formsStore.loadAll(workspacesStore.currentId)
- } else {
- formsStore.stopLoading()
+const {
+ forms,
+ isLoading: isFormsLoading,
+ isFetchingNextPage: isLoadingMore,
+ isFetched,
+ currentPage,
+ totalPages,
+ isComplete,
+} = useFormsList(
+ workspaceId,
+ {
+ fetchAll: true,
+ enabled: computed(() => import.meta.client && !!workspaceId.value),
}
-})
+)
// State
-const {
- getAll: forms,
- loading: formsLoading,
- allTags,
-} = storeToRefs(formsStore)
const search = ref("")
const debouncedSearch = refDebounced(search, 500)
-const selectedTags = ref(new Set())
+const selectedTags = ref([])
// Methods
-
-const onTagClick = (tag) => {
- if (selectedTags?.value?.has(tag)) {
- selectedTags.value.delete(tag)
- } else {
- selectedTags.value.add(tag)
- }
+const clearFilters = () => {
+ search.value = ""
+ selectedTags.value = []
}
// Computed
const isFilteringForms = computed(() => {
return (
(search.value !== "" && search.value !== null) ||
- selectedTags.value.size > 0
+ selectedTags.value.length > 0
)
})
+// Extract all unique tags from forms
+const allTags = computed(() => {
+ if (!forms.value) return []
+
+ const tagsSet = new Set()
+ forms.value.forEach(form => {
+ if (form.tags && form.tags.length) {
+ form.tags.forEach(tag => tagsSet.add(tag))
+ }
+ })
+
+ return Array.from(tagsSet).sort()
+})
+
+const tagOptions = computed(() => allTags.value.map(tag => ({ label: tag, value: tag })))
+
const enrichedForms = computed(() => {
- const enrichedForms = forms.value.map((form) => {
- form.workspace = workspacesStore.getByKey(form.workspace_id)
- return form
- }).filter((form) => {
- if (selectedTags.value.size === 0) {
+ if (!forms.value) return []
+
+ const enriched = forms.value.filter((form) => {
+ if (selectedTags.value.length === 0) {
return true
}
- return form.tags && form.tags.length ? [...selectedTags.value].every(r => form.tags.includes(r)) : false
+ return form.tags && form.tags.length ? selectedTags.value.every(r => form.tags.includes(r.value)) : false
})
- if (!isFilteringForms || search.value === "" || search.value === null) {
- return enrichedForms
+ if (!isFilteringForms.value || search.value === "" || search.value === null) {
+ return enriched
}
// Fuze search
const fuzeOptions = {
keys: ["title", "slug", "tags"],
}
- const fuse = new Fuse(enrichedForms, fuzeOptions)
+ const fuse = new Fuse(enriched, fuzeOptions)
return fuse.search(debouncedSearch.value).map((res) => {
return res.item
})
diff --git a/client/pages/index.vue b/client/pages/index.vue
index 204899b6d..29b93941f 100644
--- a/client/pages/index.vue
+++ b/client/pages/index.vue
@@ -1,7 +1,7 @@
<template>
<div>
<section
- class="bg-gradient-to-b relative from-white to-gray-100 py-8 sm:py-16"
+ class="bg-gradient-to-b relative from-white to-neutral-100 py-8 sm:py-16"
>
<div class="absolute inset-0">
<img
@@ -15,11 +15,10 @@
class="px-4 sm:px-6 lg:px-8 max-w-7xl mx-auto relative -mb-32 md:-mb-52 lg:-mb-72"
>
<div class="flex justify-center mb-5">
- <div
- class="relative flex items-center shadow-sm bg-white gap-x-4 rounded-full px-4 py-1 text-sm leading-6 text-gray-600 ring-1 ring-gray-900/10 hover:ring-gray-900/20"
+ <div class="relative flex items-center shadow-xs bg-white gap-x-4 rounded-full px-4 py-1 text-sm leading-6 text-neutral-600 ring ring-neutral-900/10 hover:ring-neutral-900/20"
>
- <span class="font-semibold text-gray-500">We're Open-Source</span><span
- class="h-4 w-px bg-gray-900/10"
+ <span class="font-semibold text-neutral-500">We're Open-Source</span><span
+ class="h-4 w-px bg-neutral-900/10"
aria-hidden="true"
/>
<a
@@ -40,7 +39,7 @@
stroke-width="1.5"
stroke="currentColor"
aria-hidden="true"
- class="-mr-2 h-5 w-5 text-gray-400"
+ class="-mr-2 h-5 w-5 text-neutral-400"
>
<path
stroke-linecap="round"
@@ -53,7 +52,7 @@
</div>
<div class="max-w-4xl mx-auto text-center">
<h1
- class="text-4xl sm:text-5xl lg:text-6xl font-semibold text-gray-900 tracking-tight"
+ class="text-4xl sm:text-5xl lg:text-6xl font-semibold text-neutral-900 tracking-tight"
>
Build
<span
@@ -63,7 +62,7 @@
in seconds
</h1>
<p
- class="mt-4 sm:mt-5 text-base leading-7 sm:text-xl sm:leading-9 font-medium text-gray-500"
+ class="mt-4 sm:mt-5 text-base leading-7 sm:text-xl sm:leading-9 font-medium text-neutral-500"
>
Create beautiful forms and share them anywhere. It's super fast, you
don't need to know how to code. Get started
@@ -71,26 +70,24 @@
</p>
<div class="mt-8 flex justify-center">
- <v-button
+ <UButton
v-if="!authenticated"
class="mr-1"
:to="{ name: 'forms-create-guest' }"
- :arrow="true"
- >
- Create a form for FREE
- </v-button>
- <v-button
+ trailing-icon="i-heroicons-arrow-right-20-solid"
+ label="Create a form for FREE"
+ />
+ <UButton
v-else
class="mr-1"
:to="{ name: 'forms-create' }"
- :arrow="true"
- >
- Create a form for FREE
- </v-button>
+ trailing-icon="i-heroicons-arrow-right-20-solid"
+ label="Create a form for FREE"
+ />
</div>
<div class="justify-center flex gap-2 mt-10">
- <div class="flex items-center text-gray-400 text-sm">
+ <div class="flex items-center text-neutral-400 text-sm">
<svg
xmlns="http://www.w3.org/2000/svg"
fill="none"
@@ -107,7 +104,7 @@
</svg>
<span>Unlimited forms</span>
</div>
- <div class="flex items-center text-gray-400 text-sm">
+ <div class="flex items-center text-neutral-400 text-sm">
<svg
xmlns="http://www.w3.org/2000/svg"
fill="none"
@@ -124,7 +121,7 @@
</svg>
<span> Unlimited fields </span>
</div>
- <div class="flex text-gray-400 text-sm">
+ <div class="flex text-neutral-400 text-sm">
<svg
xmlns="http://www.w3.org/2000/svg"
fill="none"
@@ -148,21 +145,21 @@
class="w-full mt-12 relative px-6 mx-auto max-w-4xl sm:px-10 lg:px-0 z-10 flex items-center justify-center"
>
<div
- class="-m-2 rounded-xl bg-blue-900/5 p-2 backdrop-blur-sm ring-1 ring-inset ring-blue-900/10 lg:-m-4 lg:rounded-2xl lg:p-4 w-full"
+ class="-m-2 rounded-xl bg-blue-900/5 p-2 backdrop-blur-xs ring ring-inset ring-blue-900/10 lg:-m-4 lg:rounded-2xl lg:p-4 w-full"
>
<img
src="/img/pages/welcome/product-cover.jpg"
sizes="320px sm:650px lg:896px"
alt="Product screenshot"
loading="lazy"
- class="rounded-md w-full shadow-2xl ring-1 ring-gray-900/10"
+ class="rounded-sm w-full shadow-2xl ring ring-neutral-900/10"
>
</div>
</div>
</div>
</section>
- <div class="flex flex-col bg-gray-50 dark:bg-notion-dark">
+ <div class="flex flex-col bg-neutral-50 dark:bg-notion-dark">
<div
class="bg-white dark:bg-notion-dark-light pt-32 md:pt-52 lg:pt-72 pb-8"
>
@@ -207,18 +204,19 @@
<h4 class="font-semibold text-3xl text-white">
Take your forms to the next level
</h4>
- <p class="text-gray-300 my-8">
+ <p class="text-neutral-300 my-8">
Generous, unlimited free plan.
</p>
<div class="mt-6 flex justify-center">
- <v-button
- v-track.welcome_create_form_click
- :to="{ name: 'forms-create-guest' }"
- :arrow="true"
- color="blue"
+ <TrackClick
+ name="welcome_create_form_click"
>
- Create a form for FREE
- </v-button>
+ <UButton
+ :to="{ name: 'forms-create-guest' }"
+ trailing-icon="i-heroicons-arrow-right-20-solid"
+ label="Create a form for FREE"
+ />
+ </TrackClick>
</div>
<div class="flex justify-center mt-6">
<a
@@ -298,50 +296,36 @@
</div>
</template>
-<script>
-import { computed } from "vue"
-import { useAuthStore } from "../stores/auth"
+<script setup>
import Features from "~/components/pages/welcome/Features.vue"
-import MoreFeatures from "~/components/pages/welcome/MoreFeatures.vue"
+import MoreFeatures from "../components/pages/welcome/MoreFeatures.vue"
import PricingTable from "../components/pages/pricing/PricingTable.vue"
-import AiFeature from "~/components/pages/welcome/AiFeature.vue"
+import AiFeature from "../components/pages/welcome/AiFeature.vue"
import TemplatesSlider from "../components/pages/welcome/TemplatesSlider.vue"
import opnformConfig from "~/opnform.config.js"
+import TrackClick from "~/components/global/TrackClick.vue"
+import { useIsAuthenticated } from '~/composables/useAuthFlow'
-export default {
- components: {
- Features,
- MoreFeatures,
- PricingTable,
- AiFeature,
- TemplatesSlider,
- },
+definePageMeta({
layout: "default",
+})
- setup() {
- const authStore = useAuthStore()
- defineRouteRules({
- swr: 3600,
- })
- definePageMeta({
- middleware: ['root-redirect']
- })
-
- return {
- authenticated: computed(() => authStore.check),
- config: opnformConfig,
- runtimeConfig: useRuntimeConfig(),
- }
- },
-
- data: () => ({}),
+const { isAuthenticated: authenticated } = useIsAuthenticated()
- computed: {
- configLinks() {
- return this.config.links
+useHead({
+ title: 'OpnForm: Open-Source Form Builder',
+ titleTemplate: '%s',
+ meta: [
+ {
+ hid: 'description',
+ name: 'description',
+ content: 'The Open-Source Typeform Alternative',
},
- },
-}
+ ],
+})
+
+const config = opnformConfig
+const configLinks = computed(() => config.links)
</script>
<style lang="scss" scoped>
diff --git a/client/pages/integrations/[slug].vue b/client/pages/integrations/[slug].vue
index 81e2d3c89..35cec5242 100644
--- a/client/pages/integrations/[slug].vue
+++ b/client/pages/integrations/[slug].vue
@@ -9,7 +9,7 @@
<UButton
:to="{ name: 'integrations' }"
variant="ghost"
- color="gray"
+ color="neutral"
class="mb-4"
icon="i-heroicons-arrow-left"
>
diff --git a/client/pages/integrations/index.vue b/client/pages/integrations/index.vue
index 5cd118ac8..e927aebf3 100644
--- a/client/pages/integrations/index.vue
+++ b/client/pages/integrations/index.vue
@@ -12,10 +12,10 @@
class="bg-white py-12 px-4 sm:px-6 lg:px-8"
>
<div class="max-w-6xl mx-auto">
- <h1 class="text-3xl font-bold text-center text-gray-900">
+ <h1 class="text-3xl font-bold text-center text-neutral-900">
Available Integrations
</h1>
- <p class="text-center text-gray-600 mt-2 mb-10">
+ <p class="text-center text-neutral-600 mt-2 mb-10">
Explore our powerful Integrations
</p>
@@ -23,7 +23,7 @@
<div
v-for="integration in integrationsList"
:key="integration.title"
- class="relative rounded-2xl bg-gray-50 p-6 shadow border border-gray-200 hover:shadow-lg transition-all duration-300 hover:bg-white"
+ class="relative rounded-2xl bg-neutral-50 p-6 shadow-sm border border-neutral-200 hover:shadow-lg transition-all duration-300 hover:bg-white"
>
<a
:href="`/integrations/${integration.slug}`"
@@ -31,12 +31,12 @@
/>
<div
v-if="integration.popular"
- class="absolute -top-2 -left-3 -rotate-12 bg-blue-500 text-white text-xs font-semibold px-2 py-1 rounded-md shadow"
+ class="absolute -top-2 -left-3 -rotate-12 bg-blue-500 text-white text-xs font-semibold px-2 py-1 rounded-sm shadow-sm"
>
Most Popular
</div>
<div class="flex justify-between items-start">
- <div class="w-10 h-10 bg-white border border-gray-200 rounded-xl flex items-center justify-center">
+ <div class="w-10 h-10 bg-white border border-neutral-200 rounded-xl flex items-center justify-center">
<Icon
:name="integration.icon"
class="w-8 h-8"
@@ -56,14 +56,14 @@
</a>
</div>
- <h3 class="mt-4 text-lg font-semibold text-gray-900">
+ <h3 class="mt-4 text-lg font-semibold text-neutral-900">
{{ integration.title }}
</h3>
- <p class="text-sm text-gray-500 mt-1">
+ <p class="text-sm text-neutral-500 mt-1">
{{ integration.description }}
</p>
- <ul class="mt-4 space-y-2 text-sm text-gray-700">
+ <ul class="mt-4 space-y-2 text-sm text-neutral-700">
<li
v-for="step in integration.steps"
:key="step"
@@ -79,14 +79,14 @@
<div class="bg-white p-10 max-w-6xl mx-auto">
- <h2 class="text-4xl font-bold text-center text-gray-900 mb-2">
+ <h2 class="text-4xl font-bold text-center text-neutral-900 mb-2">
Integration General Setup Guides
</h2>
- <p class="text-center text-gray-600 mb-12">
+ <p class="text-center text-neutral-600 mb-12">
This can be another text
</p>
- <div class="grid grid-cols-1 md:grid-cols-3 gap-10 text-gray-800 max-w-6xl mx-auto">
+ <div class="grid grid-cols-1 md:grid-cols-3 gap-10 text-neutral-800 max-w-6xl mx-auto">
<div
v-for="guide in setupGuides"
:key="guide.title"
@@ -110,15 +110,15 @@
<div class="bg-[#f4f9ff] max-w-6xl mx-auto rounded-3xl m-10 p-10 flex justify-between items-center">
<div class="max-w-md">
- <h2 class="text-3xl font-bold text-gray-900">
+ <h2 class="text-3xl font-bold text-neutral-900">
Need help?
</h2>
- <p class="mt-2 text-gray-500 text-lg">
+ <p class="mt-2 text-neutral-500 text-lg">
Visit our Help Center for detailed documentation!
</p>
<a
href="#"
- class="inline-flex items-center gap-2 mt-6 px-4 py-2 bg-blue-500 text-white text-sm font-semibold rounded-lg shadow hover:bg-blue-600 transition"
+ class="inline-flex items-center gap-2 mt-6 px-4 py-2 bg-blue-500 text-white text-sm font-semibold rounded-lg shadow-sm hover:bg-blue-600 transition"
@click.prevent="crisp.openHelpdesk()"
>
Help Center
@@ -131,27 +131,27 @@
</div>
<div class="hidden lg:grid grid-cols-2 gap-4">
<div class="space-y-4">
- <div class="bg-white p-4 rounded-2xl shadow w-64 h-20">
- <div class="bg-gray-200 w-24 h-3 mb-2 rounded" />
- <div class="bg-gray-200 w-full h-6 rounded-full" />
+ <div class="bg-white p-4 rounded-2xl shadow-sm w-64 h-20">
+ <div class="bg-neutral-200 w-24 h-3 mb-2 rounded-sm" />
+ <div class="bg-neutral-200 w-full h-6 rounded-full" />
</div>
- <div class="bg-white p-4 rounded-2xl shadow w-64 h-20">
- <div class="bg-gray-200 w-24 h-3 mb-2 rounded" />
- <div class="bg-gray-200 w-full h-6 rounded-full" />
+ <div class="bg-white p-4 rounded-2xl shadow-sm w-64 h-20">
+ <div class="bg-neutral-200 w-24 h-3 mb-2 rounded-sm" />
+ <div class="bg-neutral-200 w-full h-6 rounded-full" />
</div>
- <div class="bg-white p-4 rounded-2xl shadow w-64 h-20">
- <div class="bg-gray-200 w-24 h-3 mb-2 rounded" />
- <div class="bg-gray-200 w-full h-6 rounded-full" />
+ <div class="bg-white p-4 rounded-2xl shadow-sm w-64 h-20">
+ <div class="bg-neutral-200 w-24 h-3 mb-2 rounded-sm" />
+ <div class="bg-neutral-200 w-full h-6 rounded-full" />
</div>
</div>
<div class="space-y-4 pt-8">
- <div class="bg-white p-4 rounded-2xl shadow w-64 h-20">
- <div class="bg-gray-200 w-24 h-3 mb-2 rounded" />
- <div class="bg-gray-200 w-full h-6 rounded-full" />
+ <div class="bg-white p-4 rounded-2xl shadow-sm w-64 h-20">
+ <div class="bg-neutral-200 w-24 h-3 mb-2 rounded-sm" />
+ <div class="bg-neutral-200 w-full h-6 rounded-full" />
</div>
- <div class="bg-white p-4 rounded-2xl shadow w-64 h-20">
- <div class="bg-gray-200 w-24 h-3 mb-2 rounded" />
- <div class="bg-gray-200 w-full h-6 rounded-full" />
+ <div class="bg-white p-4 rounded-2xl shadow-sm w-64 h-20">
+ <div class="bg-neutral-200 w-24 h-3 mb-2 rounded-sm" />
+ <div class="bg-neutral-200 w-full h-6 rounded-full" />
</div>
</div>
</div>
diff --git a/client/pages/login.vue b/client/pages/login.vue
index 943fa34ff..401b499dd 100644
--- a/client/pages/login.vue
+++ b/client/pages/login.vue
@@ -9,7 +9,7 @@
<h2 class="font-semibold text-2xl">
Login to OpnForm
</h2>
- <p class="text-sm text-gray-500">
+ <p class="text-sm text-neutral-500">
Welcome back! Please enter your details.
</p>
@@ -20,11 +20,11 @@
<h1 class="font-bold">
Create beautiful forms and share them anywhere
</h1>
- <p class="text-gray-900 my-4 text-lg">
+ <p class="text-neutral-900 my-4 text-lg">
It takes seconds, you don't need to know how to code and it's free.
</p>
<div class="flex flex-wrap justify-center">
- <p class="px-3 pb-3 text-sm text-gray-500">
+ <p class="px-3 pb-3 text-sm text-neutral-500">
<svg
xmlns="http://www.w3.org/2000/svg"
class="h-4 w-4 inline"
@@ -41,7 +41,7 @@
</svg>
Unlimited forms
</p>
- <p class="px-3 pb-3 text-sm text-gray-500">
+ <p class="px-3 pb-3 text-sm text-neutral-500">
<svg
xmlns="http://www.w3.org/2000/svg"
class="h-4 w-4 inline"
@@ -58,7 +58,7 @@
</svg>
Unlimited fields
</p>
- <p class="px-3 pb-3 text-sm text-gray-500">
+ <p class="px-3 pb-3 text-sm text-neutral-500">
<svg
xmlns="http://www.w3.org/2000/svg"
class="h-4 w-4 inline"
diff --git a/client/pages/oauth/[provider]/callback.vue b/client/pages/oauth/[provider]/callback.vue
new file mode 100644
index 000000000..86057272e
--- /dev/null
+++ b/client/pages/oauth/[provider]/callback.vue
@@ -0,0 +1,139 @@
+<template>
+ <div class="flex flex-grow mt-6 mb-10">
+ <div class="w-full md:w-2/3 md:mx-auto md:max-w-md px-4">
+ <div
+ v-if="loading"
+ class="m-10"
+ >
+ <h3 class="my-6 text-center">
+ Please wait...
+ </h3>
+ <Loader class="h-6 w-6 mx-auto m-10" />
+ </div>
+ <div
+ v-else
+ class="m-6 flex flex-col items-center space-y-4"
+ >
+ <p class="text-center">
+ Unable to sign in at the moment.
+ </p>
+ <UButton
+ :to="{ name: 'login' }"
+ label="Back to login"
+ />
+ </div>
+ </div>
+ </div>
+</template>
+
+<script setup>
+import { useNuxtApp } from "nuxt/app"
+import { WindowMessageTypes } from "~/composables/useWindowMessage"
+import { authApi } from "~/api"
+
+const { $utm } = useNuxtApp()
+const router = useRouter()
+const route = useRoute()
+const loading = ref(true)
+const authFlow = useAuthFlow()
+
+
+const handleCallback = async () => {
+ const provider = route.params.provider
+
+ try {
+ // Call the OAuth callback endpoint directly to get the raw response
+ const response = await authApi.oauth.callback(provider, {
+ code: route.query.code,
+ utm_data: $utm.value
+ })
+
+ // Check if this is an authentication response (has token) or integration response (has provider)
+ if (response.token) {
+ // Authentication flow - user was not logged in
+ await authFlow.handleAuthSuccess(response, provider, response.new_user)
+
+ if (!response.new_user) {
+ // Handle existing user login
+ if (window.opener) {
+ try {
+ const loginMessage = useWindowMessage(WindowMessageTypes.LOGIN_COMPLETE)
+ const providerMessage = useWindowMessage(WindowMessageTypes.OAUTH_PROVIDER_CONNECTED)
+
+ await Promise.all([
+ loginMessage.send(window.opener, {
+ waitForAcknowledgment: true,
+ timeout: 500
+ }),
+ providerMessage.send(window.opener, {
+ useMessageChannel: false,
+ waitForAcknowledgment: false
+ })
+ ])
+
+ window.close()
+ loading.value = false
+ } catch (err) {
+ console.error("Error in social callback:", err)
+ loading.value = false
+ }
+ } else {
+ router.push({ name: "home" })
+ }
+ } else {
+ // Handle new user registration
+ router.push({ name: "forms-create" })
+ useAlert().success("Success! You're now registered with your Google account! Welcome to OpnForm.")
+ }
+ } else if (response.provider) {
+ // Integration flow - user was already logged in, provider was connected
+ if (window.opener) {
+ try {
+ const providerMessage = useWindowMessage(WindowMessageTypes.OAUTH_PROVIDER_CONNECTED)
+
+ await providerMessage.send(window.opener, {
+ useMessageChannel: false,
+ waitForAcknowledgment: false
+ })
+
+ // Auto-close if specified in response
+ if (response.autoClose) {
+ window.close()
+ } else {
+ useAlert().success(`${response.provider.name} account connected successfully!`)
+ loading.value = false
+ }
+ } catch (err) {
+ console.error("Error in integration callback:", err)
+ useAlert().success(`${response.provider.name} account connected successfully!`)
+ loading.value = false
+ }
+ } else {
+ // No opener, show success and redirect
+ useAlert().success(`${response.provider.name} account connected successfully!`)
+ router.push({ name: "home" })
+ }
+ } else {
+ throw new Error("Unexpected response format from OAuth callback")
+ }
+ } catch (error) {
+ console.error("Social login error:", error)
+ useAlert().error(error.response?._data?.message || "Authentication failed")
+ loading.value = false
+ }
+}
+
+onMounted(() => {
+ // Set a timeout to ensure we don't get stuck in loading state
+ const timeoutId = setTimeout(() => {
+ if (loading.value) {
+ loading.value = false
+ console.error("Social login timed out")
+ }
+ }, 10000) // 10 second timeout
+
+ handleCallback().finally(() => {
+ clearTimeout(timeoutId)
+ })
+})
+</script>
\ No newline at end of file
diff --git a/client/pages/oauth/callback.vue b/client/pages/oauth/callback.vue
deleted file mode 100644
index 3d56ee30b..000000000
--- a/client/pages/oauth/callback.vue
+++ /dev/null
@@ -1,105 +0,0 @@
-<template>
- <div class="flex flex-grow mt-6 mb-10">
- <div class="w-full md:w-2/3 md:mx-auto md:max-w-md px-4">
- <div
- v-if="loading"
- class="m-10"
- >
- <h3 class="my-6 text-center">
- Please wait...
- </h3>
- <Loader class="h-6 w-6 mx-auto m-10" />
- </div>
- <div
- v-else
- class="m-6 flex flex-col items-center space-y-4"
- >
- <p class="text-center">
- Unable to sign in at the moment.
- </p>
- <v-button
- :to="{ name: 'login' }"
- >
- Back to login
- </v-button>
- </div>
- </div>
- </div>
-</template>
-
-<script setup>
-import { useNuxtApp } from "nuxt/app"
-import { WindowMessageTypes } from "~/composables/useWindowMessage"
-
-const { $utm } = useNuxtApp()
-const router = useRouter()
-const route = useRoute()
-const loading = ref(true)
-
-definePageMeta({
- alias: '/oauth/:provider/callback'
-})
-
-const handleCallback = async () => {
- const auth = useAuth()
- const provider = route.params.provider
-
- try {
- const { isNewUser } = await auth.handleSocialCallback(
- provider,
- route.query.code,
- $utm.value
- )
-
- if (!isNewUser) {
- // Handle existing user login
- if (window.opener) {
- try {
- // Use the WindowMessage composable for more reliable communication
- const windowMessage = useWindowMessage(WindowMessageTypes.LOGIN_COMPLETE)
-
- // Send the login-complete message and wait for acknowledgment
- await windowMessage.send(window.opener, {
- waitForAcknowledgment: true,
- timeout: 500
- })
-
- // Now we can safely close the window
- window.close()
-
- // If window doesn't close (some browsers prevent it), show a message
- loading.value = false
- } catch (err) {
- console.error("Error in social callback:", err)
- loading.value = false
- }
- } else {
- // No opener, redirect to home
- router.push({ name: "home" })
- }
- } else {
- // Handle new user registration
- router.push({ name: "forms-create" })
- useAlert().success("Success! You're now registered with your Google account! Welcome to OpnForm.")
- }
- } catch (error) {
- console.error("Social login error:", error)
- useAlert().error(error.response?._data?.message || "Authentication failed")
- loading.value = false
- }
-}
-
-onMounted(() => {
- // Set a timeout to ensure we don't get stuck in loading state
- const timeoutId = setTimeout(() => {
- if (loading.value) {
- loading.value = false
- console.error("Social login timed out")
- }
- }, 10000) // 10 second timeout
-
- handleCallback().finally(() => {
- clearTimeout(timeoutId)
- })
-})
-</script>
\ No newline at end of file
diff --git a/client/pages/password/email.vue b/client/pages/password/email.vue
index db5832ce0..1ebb7926f 100644
--- a/client/pages/password/email.vue
+++ b/client/pages/password/email.vue
@@ -7,11 +7,13 @@
</h1>
<form
@submit.prevent="send"
- @keydown="form.onKeydown($event)"
>
- <alert-success
- :form="form"
- :message="status"
+ <UAlert
+ v-if="status"
+ color="success"
+ variant="subtle"
+ :description="status"
+ icon="i-heroicons-check-circle"
class="mb-4"
/>
@@ -24,12 +26,12 @@
/>
<!-- Submit Button -->
- <v-button
+ <UButton
class="w-full"
:loading="form.busy"
- >
- Send Password Reset Link
- </v-button>
+ type="submit"
+ label="Send Password Reset Link"
+ />
</form>
</div>
</div>
diff --git a/client/pages/password/reset/[token].vue b/client/pages/password/reset/[token].vue
index 3b1ff4aae..859537c40 100644
--- a/client/pages/password/reset/[token].vue
+++ b/client/pages/password/reset/[token].vue
@@ -7,12 +7,14 @@
</h1>
<form
@submit.prevent="reset"
- @keydown="form.onKeydown($event)"
>
- <alert-success
+ <UAlert
+ v-if="status"
+ color="success"
+ variant="subtle"
+ :description="status"
+ icon="i-heroicons-check-circle"
class="mb-4"
- :form="form"
- :message="status"
/>
<!-- Email -->
@@ -43,12 +45,12 @@
/>
<!-- Submit Button -->
- <v-button
+ <UButton
class="w-full"
:loading="form.busy"
- >
- Reset Password
- </v-button>
+ type="submit"
+ label="Reset Password"
+ />
</form>
</div>
</div>
diff --git a/client/pages/pricing.vue b/client/pages/pricing.vue
index 515ba8bed..1c52334bf 100644
--- a/client/pages/pricing.vue
+++ b/client/pages/pricing.vue
@@ -1,17 +1,17 @@
<template>
<div>
<section
- class="relative py-12 bg-gradient-to-b from-white to-gray-100 sm:py-16 lg:py-20 xl:py-24"
+ class="relative py-12 bg-gradient-to-b from-white to-neutral-100 sm:py-16 lg:py-20 xl:py-24"
>
<div class="relative px-4 mx-auto sm:px-6 lg:px-8 max-w-7xl">
<div class="max-w-4xl mx-auto text-center">
<h1
- class="text-4xl font-semibold tracking-tight text-gray-900 sm:text-5xl lg:text-6xl"
+ class="text-4xl font-semibold tracking-tight text-neutral-900 sm:text-5xl lg:text-6xl"
>
Simple, transparent pricing. No surprises.
</h1>
<p
- class="max-w-2xl mx-auto mt-4 text-base font-medium leading-7 text-gray-500 sm:mt-5 sm:text-xl sm:leading-9"
+ class="max-w-2xl mx-auto mt-4 text-base font-medium leading-7 text-neutral-500 sm:mt-5 sm:text-xl sm:leading-9"
>
Just like our codebase, our pricing is 100% transparent. One flat
price for all features. No hidden fees.
@@ -38,7 +38,7 @@
<div class="px-4 mx-auto sm:px-6 lg:px-8 max-w-7xl">
<div class="max-w-2xl mx-auto text-center">
<h2
- class="text-3xl font-semibold tracking-tight text-gray-900 sm:text-4xl lg:leading-tight"
+ class="text-3xl font-semibold tracking-tight text-neutral-900 sm:text-4xl lg:leading-tight"
>
<span class="text-blue-600">99%</span> of features are available to
all users for free and without limits.
@@ -64,7 +64,7 @@
/>
</svg>
<p
- class="text-base font-semibold sm:text-lg lg:text-xl text-gray-950"
+ class="text-base font-semibold sm:text-lg lg:text-xl text-neutral-950"
>
Unlimited forms
</p>
@@ -86,7 +86,7 @@
/>
</svg>
<p
- class="text-base font-semibold sm:text-lg lg:text-xl text-gray-950"
+ class="text-base font-semibold sm:text-lg lg:text-xl text-neutral-950"
>
Unlimited submissions
</p>
@@ -114,7 +114,7 @@
/>
</svg>
<p
- class="text-base font-semibold sm:text-lg lg:text-xl text-gray-950"
+ class="text-base font-semibold sm:text-lg lg:text-xl text-neutral-950"
>
Unlimited fields
</p>
@@ -136,7 +136,7 @@
/>
</svg>
<p
- class="text-base font-semibold sm:text-lg lg:text-xl text-gray-950"
+ class="text-base font-semibold sm:text-lg lg:text-xl text-neutral-950"
>
Multiple input types
</p>
@@ -158,7 +158,7 @@
/>
</svg>
<p
- class="text-base font-semibold sm:text-lg lg:text-xl text-gray-950"
+ class="text-base font-semibold sm:text-lg lg:text-xl text-neutral-950"
>
Form password
</p>
@@ -180,7 +180,7 @@
/>
</svg>
<p
- class="text-base font-semibold sm:text-lg lg:text-xl text-gray-950"
+ class="text-base font-semibold sm:text-lg lg:text-xl text-neutral-950"
>
Webhooks
</p>
@@ -202,7 +202,7 @@
/>
</svg>
<p
- class="text-base font-semibold sm:text-lg lg:text-xl text-gray-950"
+ class="text-base font-semibold sm:text-lg lg:text-xl text-neutral-950"
>
Closing date
</p>
@@ -274,7 +274,7 @@
/>
</svg>
<p
- class="text-base font-semibold sm:text-lg lg:text-xl text-gray-950"
+ class="text-base font-semibold sm:text-lg lg:text-xl text-neutral-950"
>
And much more...
</p>
@@ -282,7 +282,7 @@
</div>
<div
- class="max-w-3xl p-6 mx-auto mt-12 sm:mt-16 bg-yellow-50 ring-1 ring-inset ring-yellow-200 rounded-2xl"
+ class="max-w-3xl p-6 mx-auto mt-12 sm:mt-16 bg-yellow-50 ring ring-inset ring-yellow-200 rounded-2xl"
>
<div class="flex items-start gap-4">
<svg
@@ -304,7 +304,7 @@
Nonprofit & Student Discount — 50%
</p>
<p class="mt-1 text-base font-medium leading-7 text-yellow-600">
- Whether your nonprofit is large or small, OpnForm’s online Form
+ Whether your nonprofit is large or small, OpnForm's online Form
Builder helps your organization help others. It takes just a few
minutes to create and publish your forms online. As an exclusive
benefit, we offer nonprofits & students a 50-percent discount!
@@ -316,17 +316,17 @@
</section>
<section
- class="py-12 bg-gray-50 border-t border-gray-200 sm:py-16 lg:py-20 xl:py-24"
+ class="py-12 bg-neutral-50 border-t border-neutral-200 sm:py-16 lg:py-20 xl:py-24"
>
<div class="px-4 mx-auto sm:px-6 lg:px-8 max-w-7xl">
<div class="max-w-3xl mx-auto text-center">
<h2
- class="text-3xl font-semibold tracking-tight text-gray-900 sm:text-4xl lg:leading-tight"
+ class="text-3xl font-semibold tracking-tight text-neutral-900 sm:text-4xl lg:leading-tight"
>
Got any question?
</h2>
<p
- class="max-w-2xl mx-auto mt-4 text-base font-medium leading-7 text-gray-600 sm:text-lg sm:leading-8"
+ class="max-w-2xl mx-auto mt-4 text-base font-medium leading-7 text-neutral-600 sm:text-lg sm:leading-8"
>
We've compiled a list of the most common questions we get asked.
</p>
@@ -371,18 +371,18 @@
:key="q.question"
>
<dt
- class="text-base font-semibold leading-7 text-gray-950 sm:text-lg sm:leading-8"
+ class="text-base font-semibold leading-7 text-neutral-950 sm:text-lg sm:leading-8"
>
{{ q.question }}
</dt>
- <dd class="mt-2 text-base font-medium leading-7 text-gray-600">
+ <dd class="mt-2 text-base font-medium leading-7 text-neutral-600">
{{ q.answer }}
</dd>
</div>
</dl>
<div class="mt-12 text-center sm:mt-16">
- <p class="text-base font-medium text-gray-950">
+ <p class="text-base font-medium text-neutral-950">
Didn't find the answer?
<a
href="#"
@@ -399,9 +399,8 @@
</template>
<script>
-import {computed} from "vue"
-import {useAuthStore} from "../stores/auth"
import PricingTable from "../components/pages/pricing/PricingTable.vue"
+import { useIsAuthenticated } from '~/composables/useAuthFlow'
export default {
components: {PricingTable},
@@ -420,11 +419,9 @@ export default {
],
})
- const authStore = useAuthStore()
-
+ const { isAuthenticated: authenticated } = useIsAuthenticated()
return {
- user: computed(() => authStore.user),
- authenticated: computed(() => authStore.check),
+ authenticated,
}
},
diff --git a/client/pages/redirect/billing-portal.vue b/client/pages/redirect/billing-portal.vue
index 3bed5632e..d53de7812 100644
--- a/client/pages/redirect/billing-portal.vue
+++ b/client/pages/redirect/billing-portal.vue
@@ -1,20 +1,22 @@
<template>
<div class="flex flex-col items-center justify-center min-h-screen gap-4">
<Loader class="w-8 h-8 text-blue-500" />
- <p class="text-gray-500">
+ <p class="text-neutral-500">
Redirecting to billing portal...
</p>
</div>
</template>
<script setup>
+import { billingApi } from "~/api"
+
definePageMeta({
middleware: 'auth'
})
onMounted(async () => {
try {
- const { portal_url } = await opnFetch('/subscription/billing-portal')
+ const { portal_url } = await billingApi.getBillingPortal()
if (!portal_url) {
throw new Error('No portal URL returned')
}
@@ -22,7 +24,7 @@ onMounted(async () => {
} catch {
useAlert().error('Unable to access billing portal. Please try again or contact support.')
setTimeout(() => {
- navigateTo({ name: 'settings-billing' })
+ navigateTo({name: 'home'})
}, 2000)
}
})
diff --git a/client/pages/redirect/checkout.vue b/client/pages/redirect/checkout.vue
index 449c0359a..eb8877c40 100644
--- a/client/pages/redirect/checkout.vue
+++ b/client/pages/redirect/checkout.vue
@@ -1,13 +1,15 @@
<template>
<div class="flex flex-col items-center justify-center min-h-screen gap-4">
<Loader class="w-8 h-8 text-blue-500" />
- <p class="text-gray-500">
+ <p class="text-neutral-500">
Preparing your checkout...
</p>
</div>
</template>
<script setup>
+import { billingApi } from "~/api"
+
definePageMeta({
middleware: 'auth'
})
@@ -27,7 +29,7 @@ onMounted(async () => {
// Update customer details if provided
if (name && email) {
try {
- await opnFetch('subscription/update-customer-details', {
+ await billingApi.updateCustomerDetails({
method: 'PUT',
body: { name, email }
})
@@ -38,7 +40,7 @@ onMounted(async () => {
// Get checkout URL
const params = { trial_duration, currency }
- const { checkout_url } = await opnFetch(
+ const { checkout_url } = await billingApi.getCheckoutUrl(
`/subscription/new/${plan}/${yearly === 'true' ? 'yearly' : 'monthly'}/checkout/with-trial?${new URLSearchParams(params)}`
)
diff --git a/client/pages/register.vue b/client/pages/register.vue
index 789de5510..b211b0243 100644
--- a/client/pages/register.vue
+++ b/client/pages/register.vue
@@ -4,13 +4,13 @@
<div
class="w-full md:max-w-6xl mx-auto px-4 flex items-center md:flex-row-reverse flex-wrap"
>
- <div class="w-full lg:w-1/2 md:p-6">
+ <div class="w-full max-w-lg lg:max-w-auto mx-auto lg:w-1/2 md:p-6">
<app-sumo-register class="mb-10 p-6 lg:hidden" />
<div class="border rounded-md p-6 shadow-md sticky top-4">
<h2 class="font-semibold text-2xl">
Create an account
</h2>
- <p class="text-gray-500 text-sm">
+ <p class="text-neutral-500 text-sm">
Sign up in less than 2 minutes.
</p>
<template v-if="!useFeatureFlag('self_hosted') || isInvited">
@@ -29,11 +29,11 @@
<h1 class="font-bold">
Create beautiful forms and share them anywhere
</h1>
- <p class="text-gray-900 my-4 text-lg">
+ <p class="text-neutral-900 my-4 text-lg">
It takes seconds, you don't need to know how to code and it's free.
</p>
<div class="flex flex-wrap justify-center">
- <p class="px-3 pb-3 text-sm text-gray-500">
+ <p class="px-3 pb-3 text-sm text-neutral-500">
<svg
xmlns="http://www.w3.org/2000/svg"
class="h-4 w-4 inline"
@@ -50,7 +50,7 @@
</svg>
Unlimited forms
</p>
- <p class="px-3 pb-3 text-sm text-gray-500">
+ <p class="px-3 pb-3 text-sm text-neutral-500">
<svg
xmlns="http://www.w3.org/2000/svg"
class="h-4 w-4 inline"
@@ -67,7 +67,7 @@
</svg>
Unlimited fields
</p>
- <p class="px-3 pb-3 text-sm text-gray-500">
+ <p class="px-3 pb-3 text-sm text-neutral-500">
<svg
xmlns="http://www.w3.org/2000/svg"
class="h-4 w-4 inline"
diff --git a/client/pages/settings.vue b/client/pages/settings.vue
deleted file mode 100644
index a86168f6b..000000000
--- a/client/pages/settings.vue
+++ /dev/null
@@ -1,106 +0,0 @@
-<template>
- <div class="bg-white">
- <div class="flex bg-gray-50">
- <div class="w-full md:w-4/5 md:mx-auto md:max-w-4xl px-4">
- <div class="pt-4 pb-0">
- <div class="flex">
- <h2 class="flex-grow text-gray-900">
- My Account
- </h2>
- </div>
- <ul class="flex text-gray-500">
- <li>{{ user.email }}</li>
- </ul>
-
- <div class="mt-4 border-gray-200 dark:border-gray-700">
- <ul class="flex flex-wrap -mb-px text-sm font-medium text-center">
- <li
- v-for="(tab, i) in tabsList"
- :key="i + 1"
- class="mr-6"
- >
- <nuxt-link
- :to="{ name: tab.route }"
- class="hover:no-underline inline-block py-4 rounded-t-lg border-b-2 text-gray-500 hover:text-gray-600"
- active-class="text-blue-600 hover:text-blue-900 dark:text-blue-500 dark:hover:text-blue-500 border-blue-600 dark:border-blue-500"
- >
- {{ tab.name }}
- </nuxt-link>
- </li>
- </ul>
- </div>
- </div>
- </div>
- </div>
- <div class="flex bg-white">
- <div class="w-full md:w-4/5 md:mx-auto md:max-w-4xl px-4">
- <div class="mt-4 pb-0">
- <NuxtPage />
- </div>
- </div>
- </div>
- </div>
-</template>
-
-<script setup>
-import { computed } from "vue"
-import { useAuthStore } from "../stores/auth"
-
-definePageMeta({
- middleware: ["auth", "self-hosted-credentials"],
-})
-
-useOpnSeoMeta({
- title: "Settings",
-})
-
-const authStore = useAuthStore()
-const user = computed(() => authStore.user)
-const workspace = computed(() => useWorkspacesStore().getCurrent)
-const tabsList = computed(() => {
- const tabs = [
- {
- name: "Profile",
- route: "settings-profile",
- },
- {
- name: "Workspace Settings",
- route: "settings-workspace",
- },
- ...workspace.value.is_readonly ? [] : [
- {
- name: "Access Tokens",
- route: "settings-access-tokens",
- },
- {
- name: "Connections",
- route: "settings-connections",
- },
- ],
- {
- name: "Password",
- route: "settings-password",
- },
- {
- name: "Delete Account",
- route: "settings-account",
- },
- ]
-
- if (user?.value?.has_customer_id) {
- tabs.splice(1, 0, {
- name: "Billing",
- route: "settings-billing",
- })
- }
-
- if (user?.value?.admin) {
- tabs.push({
- name: "Admin",
- route: "settings-admin",
- })
- }
-
- return tabs
-})
-</script>
diff --git a/client/pages/settings/access-tokens.vue b/client/pages/settings/access-tokens.vue
deleted file mode 100644
index 082a95a39..000000000
--- a/client/pages/settings/access-tokens.vue
+++ /dev/null
@@ -1,93 +0,0 @@
-<template>
- <div>
- <div class="flex items-center gap-y-4 flex-wrap-reverse">
- <div class="flex-grow">
- <h3 class="font-semibold text-2xl text-gray-900">
- Access Tokens
- </h3>
- <small class="text-gray-600">Manage your access tokens keys.</small>
- </div>
-
- <UButton
- label="API Docs"
- icon="i-heroicons-book-open"
- variant="ghost"
- :to="opnformConfig.links.api_docs"
- target="_blank"
- class="mr-2"
- />
-
- <UButton
- label="Create new token"
- icon="i-heroicons-plus"
- :loading="loading"
- :disabled="!user.is_pro"
- @click="accessTokenModal = true"
- />
- </div>
-
- <UAlert
- v-if="!user.is_pro"
- icon="i-heroicons-user-group-20-solid"
- class="my-4 !text-orange-500"
- color="orange"
- variant="subtle"
- title="Pro plan required"
- >
- <template #description>
- Please <a
- href="#"
- class="text-orange-500 underline"
- @click.prevent="openSubscriptionModal"
- >
- upgrade your account
- </a> to create and manage access tokens.
- </template>
- </UAlert>
-
- <div
- v-if="loading"
- class="w-full text-blue-500 text-center"
- >
- <Loader class="h-10 w-10 p-5" />
- </div>
-
- <div class="py-6">
- <AccessTokenCard
- v-for="token in tokens"
- :key="token.id"
- :token="token"
- />
- </div>
-
- <AccessTokenModal
- :show="accessTokenModal"
- @close="accessTokenModal = false"
- />
- </div>
-</template>
-
-<script setup>
-import opnformConfig from '~/opnform.config.js'
-useOpnSeoMeta({
- title: "Access Tokens",
-})
-
-const accessTokenModal = ref(false)
-const accessTokenStore = useAccessTokenStore()
-const tokens = computed(() => accessTokenStore.getAll)
-const loading = computed(() => accessTokenStore.loading)
-const user = computed(() => useAuthStore().user)
-const subscriptionModalStore = useSubscriptionModalStore()
-
-const openSubscriptionModal = () => {
- subscriptionModalStore.setModalContent('Upgrade to start using our API')
- subscriptionModalStore.openModal()
-}
-
-onMounted(() => {
- if (user.value.is_pro) {
- accessTokenStore.fetchTokens()
- }
-})
-</script>
diff --git a/client/pages/settings/account.vue b/client/pages/settings/account.vue
deleted file mode 100644
index afb7405a5..000000000
--- a/client/pages/settings/account.vue
+++ /dev/null
@@ -1,58 +0,0 @@
-<template>
- <div>
- <h3 class="font-semibold text-2xl text-gray-900">
- Danger zone
- </h3>
- <p class="text-gray-600 text-sm mt-2">
- This will permanently delete your entire account. All your forms,
- submissions and workspaces will be deleted.
- <span class="text-red-500"> This cannot be undone. </span>
- </p>
-
- <!-- Submit Button -->
- <v-button
- :loading="loading"
- class="mt-4"
- color="red"
- @click="
- useAlert().confirm(
- 'Do you really want to delete your account?',
- deleteAccount,
- )
- "
- >
- Delete account
- </v-button>
- </div>
-</template>
-
-<script setup>
-import { useRouter } from "vue-router"
-
-const router = useRouter()
-const authStore = useAuthStore()
-let loading = false
-
-useOpnSeoMeta({
- title: "Account",
-})
-definePageMeta({
- middleware: "auth",
-})
-
-const deleteAccount = () => {
- loading = true
- opnFetch("/user", { method: "DELETE" })
- .then(async (data) => {
- loading = false
- useAlert().success(data.message)
-
- authStore.logout()
- router.push({ name: "login" })
- })
- .catch((error) => {
- useAlert().error(error.data.message)
- loading = false
- })
-}
-</script>
diff --git a/client/pages/settings/admin.vue b/client/pages/settings/admin.vue
deleted file mode 100644
index df7d9f3a7..000000000
--- a/client/pages/settings/admin.vue
+++ /dev/null
@@ -1,248 +0,0 @@
-<template>
- <div class="mb-8">
- <div
- v-if="userInfo"
- class="flex gap-2 items-center flex-wrap"
- >
- <h1 class="text-xl">
- {{ userInfo.name }}
- </h1>
- <div class="text-xs select-all bg-gray-50 rounded-md px-2 py-1 border">
- {{ userInfo.id }}
- </div>
- <div class="text-xs select-all bg-gray-50 rounded-md px-2 py-1 border">
- {{ userInfo.email }}
- </div>
- <a
- v-if="userInfo.stripe_id"
- :href="'https://dashboard.stripe.com/customers/'+userInfo.stripe_id"
- target="_blank"
- class="text-xs select-all bg-purple-50 border-purple-200 text-purple-500 rounded-md px-2 py-1 border"
- >
- <Icon
- name="bx:bxl-stripe"
- class="h-4 w-4 inline-block"
- />
- {{ userInfo.stripe_id }}
- </a>
- <div
- v-if="userPlan"
- :class="userPlanStyles"
- >
- {{ userPlan }}
- </div>
- </div>
- <h3
- v-else
- class="font-semibold text-2xl text-gray-900 mb-4"
- >
- Admin settings
- </h3>
-
-
- <template v-if="!userInfo">
- <form
- class="pb-8 max-w-lg"
- @submit.prevent="fetchUser"
- @keydown="fetchUserForm.onKeydown($event)"
- >
- <text-input
- name="identifier"
- :form="fetchUserForm"
- label="Identifier"
- :required="true"
- help="User Id, User Email, Form Slug or View Slug"
- />
- <v-button
- :loading="loading"
- type="success"
- color="blue"
- class="mt-4 w-full"
- >
- Fetch User
- </v-button>
- </form>
-
- <form
- class="pb-8 max-w-lg"
- @submit.prevent="createTemplate"
- @keydown="createTemplateForm.onKeydown($event)"
- >
- <text-area-input
- name="template_prompt"
- :form="createTemplateForm"
- label="Template Description"
- :required="true"
- help="Describe the template you want to create"
- />
- <v-button
- :loading="templateLoading"
- type="success"
- color="blue"
- class="mt-4 w-full"
- >
- Create Template
- </v-button>
- </form>
- </template>
-
- <div
- v-else
- class="flex flex-col"
- >
- <div
- id="admin-buttons"
- class="flex gap-1 my-4"
- >
- <impersonate-user :user="userInfo" />
- <send-password-reset-email :user="userInfo" />
- </div>
- <div
- class="w-full grid gap-2 grid-cols-1 lg:grid-cols-2"
- >
- <discount-on-subscription
- :user="userInfo"
- />
- <extend-trial
- :user="userInfo"
- />
- <cancel-subscription
- :user="userInfo"
- />
- <billing-email
- :user="userInfo"
- />
- <user-workspaces
- :user="userInfo"
- />
- <user-subscriptions
- :user="userInfo"
- class="lg:col-span-2"
- />
- <user-payments
- :user="userInfo"
- class="lg:col-span-2"
- />
- <deleted-forms
- :user="userInfo"
- class="lg:col-span-2"
- />
- </div>
- </div>
- </div>
-</template>
-
-<script>
-import { computed } from 'vue'
-
-export default {
- setup() {
- useOpnSeoMeta({
- title: 'Admin'
- })
- definePageMeta({
- middleware: 'moderator'
- })
-
- const authStore = useAuthStore()
- return {
- authStore,
- user: computed(() => authStore.user),
- useAlert: useAlert()
- }
- },
-
- data: () => ({
- userInfo: null,
- userPlan: 'free',
- fetchUserForm: useForm({
- identifier: ''
- }),
- createTemplateForm: useForm({
- template_prompt: ''
- }),
- loading: false,
- templateLoading: false
- }),
-
- computed: {
- userPlanStyles() {
- switch (this.userPlan) {
- case 'pro':
- return 'capitalize text-xs select-all bg-green-50 rounded-md px-2 py-1 border border-green-200 text-green-500'
- case 'enterprise':
- return 'capitalize text-xs select-all bg-blue-50 rounded-md px-2 py-1 border border-blue-200 text-blue-500'
- default:
- return 'capitalize text-xs select-all bg-gray-50 rounded-md px-2 py-1 border'
- }
- }
- },
-
- mounted() {
- // Shortcut link to impersonate users
- const urlSearchParams = new URLSearchParams(window.location.search)
- const params = Object.fromEntries(urlSearchParams.entries())
- if (params.impersonate) {
- this.fetchUserForm.identifier = params.impersonate
- }
- if (params.user_id) {
- this.fetchUserForm.identifier = params.user_id
- }
- if (this.fetchUserForm.identifier) {
- this.fetchUser()
- }
- },
-
- methods: {
- async fetchUser() {
- if (!this.fetchUserForm.identifier) {
- this.useAlert.error('Identifier is required.')
- return
- }
-
- this.loading = true
- opnFetch(`/moderator/fetch-user/${encodeURI(this.fetchUserForm.identifier)}`).then(async (data) => {
- this.loading = false
- this.userInfo = { ...data.user, workspaces: data.workspaces }
- this.getUserPlan(data.workspaces)
- this.useAlert.success(`User Fetched: ${this.userInfo.name}`)
- })
- .catch((error) => {
- this.useAlert.error(error.data.message)
- this.loading = false
- })
- },
-
- getUserPlan(workspaces) {
- if (workspaces.some(w => w.plan === 'enterprise')) {
- this.userPlan = 'enterprise'
- } else if (workspaces.some(w => w.plan === 'pro')) {
- this.userPlan = 'pro'
- }
- },
- async createTemplate() {
- if (!this.createTemplateForm.template_prompt) {
- this.useAlert.error('Template prompt is required.')
- return
- }
-
- this.templateLoading = true
- opnFetch(`/moderator/create-template`, {
- method: 'POST',
- body: {
- template_prompt: this.createTemplateForm.template_prompt
- }
- }).then((data) => {
- this.templateLoading = false
- this.createTemplateForm.reset()
- this.useAlert.success('Template created.')
- useRouter().push({ name: 'templates-slug', params: { slug: data.template_slug } })
- })
- .catch((error) => {
- this.templateLoading = false
- this.useAlert.error(error.data.message)
- })
- }
- }
-}
-</script>
diff --git a/client/pages/settings/billing.vue b/client/pages/settings/billing.vue
deleted file mode 100644
index eac5dc557..000000000
--- a/client/pages/settings/billing.vue
+++ /dev/null
@@ -1,121 +0,0 @@
-<template>
- <div>
- <h3 class="font-semibold text-2xl text-gray-900">
- Billing details
- </h3>
-
- <template v-if="user.has_customer_id">
- <small class="text-gray-600">Manage your billing. Download invoices, update your plan, or cancel it
- at any time.</small>
-
- <div class="mt-4 flex flex-wrap gap-2 w-full border shadow rounded-lg p-4 items-center">
- <p
- v-if="usersCount"
- class="text-gray-500 flex-grow"
- >
- You currently have <span class="font-medium">{{ usersCount }} users</span> in your different workspaces.
- </p>
- <UButton
- color="gray"
- icon="i-heroicons-credit-card"
- :loading="billingLoading"
- :to="{ name: 'redirect-billing-portal' }"
- target="_blank"
- >
- <span v-if="canCancel">Manage Subscription & Invoices</span>
- <span else>Billing & Invoices</span>
- </UButton>
- <br><br>
- <v-button
- v-if="canCancel"
- color="white"
- :loading="cancelLoading"
- @click.prevent="cancelSubscription"
- >
- Cancel Subscription
- </v-button>
- </div>
- </template>
-
- <app-sumo-billing class="mt-4" />
- </div>
-</template>
-
-<script setup>
-import { computed } from "vue"
-import { useAuthStore } from "../../stores/auth"
-import AppSumoBilling from "../../components/vendor/appsumo/AppSumoBilling.vue"
-
-useOpnSeoMeta({
- title: "Billing",
-})
-definePageMeta({
- middleware: "auth",
-})
-
-const authStore = useAuthStore()
-const user = computed(() => authStore.user)
-const billingLoading = ref(false)
-const cancelLoading = ref(false)
-const usersCount = ref(0)
-
-onMounted(() => {
- loadUsersCount()
-})
-
-const loadUsersCount = () => {
- opnFetch("/subscription/users-count")
- .then((data) => {
- usersCount.value = data.count
- })
- .catch((error) => {
- useAlert().error(error.data.message)
- })
-}
-
-const canCancel = computed(() => {
- return user.value.subscriptions.some(sub => (sub.stripe_status === 'active') || (sub.stripe_status === 'trialing' && sub.ends_at == null))
-})
-
-const cancelSubscription = () => {
- cancelLoading.value = true
- opnFetch('/subscription').then((data) => {
- if (data && data.length) {
- window.profitwell('init_cancellation_flow', { subscription_id: data[0].stripe_id }).then(result => {
- // This means the customer either aborted the flow (i.e.
- // they clicked on "never mind, I don't want to cancel"), or
- // accepted a salvage attempt or salvage offer.
- // Thus, do nothing since they won't cancel.
- if (result.status === 'retained' || result.status === 'aborted') {
- console.log('Retained 🥳')
- } else {
- opnFetch('/subscription/' + data[0].id + '/cancel', { method: 'POST' })
- .then(() => {
- useAlert().success('Subscription cancelled. Sorry to see you leave 😢')
- })
- .catch(() => {
- useAlert().error('Sorry to see you leave 😢 We\'re currently having issues with subscriptions. Please ' +
- 'send us a message via the livechat, and we will cancel your subscription.')
- }).finally(() => {
- cancelLoading.value = false
- useAmplitude().logEvent('subscription_cancelled')
- useCrisp().pushEvent('subscription_cancelled')
-
- // Now we need to reload workspace and user
- opnFetch('user').then((userData) => {
- authStore.setUser(userData)
- })
- fetchAllWorkspaces().then((workspaces) => {
- workspacesStore.set(workspaces.data.value)
- })
- })
- }
- })
- }
- }).finally(() => {
- useCrisp().pushEvent('subscription_cancelled')
- cancelLoading.value = false
- })
-}
-
-</script>
diff --git a/client/pages/settings/connections/callback/[service].vue b/client/pages/settings/connections/callback/[service].vue
deleted file mode 100644
index 39ee82bc9..000000000
--- a/client/pages/settings/connections/callback/[service].vue
+++ /dev/null
@@ -1,98 +0,0 @@
-<template>
- <div class="flex flex-col items-center justify-center p-10">
- <template v-if="loading">
- <Loader class="h-6 w-6 mb-4" />
- <p class="text-gray-600">
- Processing your connection...
- </p>
- </template>
- </div>
-</template>
-
-<script setup>
-import { ref, onMounted } from 'vue'
-import { useRoute, useRouter } from 'vue-router'
-import { useAlert } from '~/composables/useAlert'
-import { useWindowMessage, WindowMessageTypes } from "~/composables/useWindowMessage"
-
-// Define meta for auth middleware
-definePageMeta({
- middleware: "auth",
-})
-
-// Use composables
-const route = useRoute()
-const router = useRouter()
-const alert = useAlert()
-
-// State
-const loading = ref(true)
-const errorMessage = ref(null)
-
-async function handleCallback() {
- loading.value = true
- errorMessage.value = null
- const code = route.query.code
- const service = route.params.service
-
- if(!code || !service) {
- errorMessage.value = "Missing code or service parameter."
- alert.error(errorMessage.value)
- router.push('/settings/connections')
- return
- }
-
- try {
- const data = await opnFetch(`/settings/providers/callback/${service}`, {
- method: 'POST',
- params: { code }
- })
-
- if (window.opener && !window.opener.closed) {
- try {
- await useWindowMessage(WindowMessageTypes.OAUTH_PROVIDER_CONNECTED).send(window.opener, {
- eventType: `${WindowMessageTypes.OAUTH_PROVIDER_CONNECTED}:${service}`,
- useMessageChannel: false,
- waitForAcknowledgment: false,
- targetOrigin: window.location.origin
- })
- } catch {
- // Silently handle error when sending window message - continue flow regardless
- }
- }
-
- // Get autoClose preference from the API response data
- const shouldAutoClose = data?.autoClose === true
- alert.success('Account connected successfully.')
-
- // Close window if autoClose is set from API data, otherwise redirect
- if (shouldAutoClose) {
- window.close()
- // Add a fallback check in case window.close is blocked
- setTimeout(() => {
- if (!window.closed) {
- console.warn('[CallbackPage] window.close() did not execute or was blocked.')
- // Optionally, redirect here as a fallback if close fails?
- // router.push('/settings/connections');
- }
- }, 500) // Check after 500ms
- } else {
- router.push('/settings/connections')
- }
-
- } catch (error) {
- try {
- errorMessage.value = error?.data?.message || "An error occurred while connecting the account."
- alert.error(errorMessage.value)
- } catch {
- errorMessage.value = "An unknown error occurred while connecting the account."
- alert.error(errorMessage.value)
- }
- router.push('/settings/connections')
- }
-}
-
-onMounted(() => {
- handleCallback()
-})
-</script>
\ No newline at end of file
diff --git a/client/pages/settings/connections/index.vue b/client/pages/settings/connections/index.vue
deleted file mode 100644
index 32ce176b7..000000000
--- a/client/pages/settings/connections/index.vue
+++ /dev/null
@@ -1,61 +0,0 @@
-<template>
- <div>
- <div class="flex items-center gap-y-4 flex-wrap-reverse">
- <div class="flex-grow">
- <h3 class="font-semibold text-2xl text-gray-900">
- Connections
- </h3>
- <small class="text-gray-600">Manage your external connections.</small>
- </div>
- <UButton
- label="Connect account"
- icon="i-heroicons-plus"
- :loading="loading"
- @click="providerModal = true"
- />
- </div>
-
- <div
- v-if="loading"
- class="w-full text-blue-500 text-center"
- >
- <Loader class="h-10 w-10 p-5" />
- </div>
-
- <div class="py-6">
- <ProviderCard
- v-for="provider in providers"
- :key="provider.id"
- :provider="provider"
- />
- </div>
-
- <ProviderModal
- :show="providerModal"
- @close="providerModal = false"
- />
- </div>
-</template>
-
-<script setup>
-import { computed, ref, onMounted } from 'vue'
-import { useOAuthProvidersStore } from '~/stores/oauth_providers'
-import { useOpnSeoMeta } from '~/composables/useOpnSeoMeta'
-
-useOpnSeoMeta({
- title: "Connections",
-})
-
-definePageMeta({
- middleware: "auth",
-})
-
-const providerModal = ref(false)
-const providersStore = useOAuthProvidersStore()
-const providers = computed(() => providersStore.getAll)
-const loading = computed(() => providersStore.loading)
-
-onMounted(() => {
- providersStore.fetchOAuthProviders()
-})
-</script>
\ No newline at end of file
diff --git a/client/pages/settings/index.vue b/client/pages/settings/index.vue
deleted file mode 100644
index be3048840..000000000
--- a/client/pages/settings/index.vue
+++ /dev/null
@@ -1,7 +0,0 @@
-<script setup>
-definePageMeta({
- redirect: () => {
- return { name: "settings-profile" }
- },
-})
-</script>
diff --git a/client/pages/settings/password.vue b/client/pages/settings/password.vue
deleted file mode 100644
index b81a3a5d5..000000000
--- a/client/pages/settings/password.vue
+++ /dev/null
@@ -1,66 +0,0 @@
-<template>
- <div>
- <h3 class="font-semibold text-2xl text-gray-900">
- Password
- </h3>
- <small class="text-gray-600">Manage your password.</small>
-
- <form
- class="mt-3"
- @submit.prevent="update"
- @keydown="form.onKeydown($event)"
- >
- <!-- Password -->
- <text-input
- native-type="password"
- name="password"
- :form="form"
- label="Password"
- :required="true"
- />
-
- <!-- Password Confirmation-->
- <text-input
- native-type="password"
- name="password_confirmation"
- :form="form"
- label="Confirm Password"
- :required="true"
- />
-
- <!-- Submit Button -->
- <v-button
- :loading="form.busy"
- class="mt-4"
- >
- Update password
- </v-button>
- </form>
- </div>
-</template>
-
-<script setup>
-useOpnSeoMeta({
- title: "Password",
-})
-definePageMeta({
- middleware: "auth",
-})
-
-const form = useForm({
- password: "",
- password_confirmation: "",
-})
-
-const update = () => {
- form
- .patch("/settings/password")
- .then(() => {
- form.reset()
- useAlert().success("Password updated.")
- })
- .catch((error) => {
- console.error(error)
- })
-}
-</script>
diff --git a/client/pages/settings/profile.vue b/client/pages/settings/profile.vue
deleted file mode 100644
index 7c4ebb1b7..000000000
--- a/client/pages/settings/profile.vue
+++ /dev/null
@@ -1,69 +0,0 @@
-<template>
- <div>
- <h3 class="font-semibold text-2xl text-gray-900">
- Profile details
- </h3>
- <small class="text-gray-600">Update your username and manage your account details.</small>
-
- <form
- class="mt-3"
- @submit.prevent="update"
- @keydown="form.onKeydown($event)"
- >
- <!-- Name -->
- <text-input
- name="name"
- :form="form"
- label="Name"
- :required="true"
- />
-
- <!-- Email -->
- <text-input
- name="email"
- :form="form"
- label="Email"
- :required="true"
- />
-
- <!-- Submit Button -->
- <v-button
- :loading="form.busy"
- class="mt-4"
- >
- Save changes
- </v-button>
- </form>
- </div>
-</template>
-
-<script setup>
-const authStore = useAuthStore()
-const user = computed(() => authStore.user)
-
-useOpnSeoMeta({
- title: "Profile",
-})
-definePageMeta({
- middleware: "auth",
-})
-
-const form = useForm({
- name: "",
- email: "",
-})
-
-const update = () => {
- form.patch("/settings/profile").then((response) => {
- authStore.updateUser(response)
- useAlert().success("Your info has been updated!")
- })
-}
-
-onBeforeMount(() => {
- // Fill the form with user data.
- form.keys().forEach((key) => {
- form[key] = user.value[key]
- })
-})
-</script>
diff --git a/client/pages/settings/workspace.vue b/client/pages/settings/workspace.vue
deleted file mode 100644
index 133a508fd..000000000
--- a/client/pages/settings/workspace.vue
+++ /dev/null
@@ -1,159 +0,0 @@
-<template>
- <div>
- <div class="flex flex-wrap items-center gap-y-4">
- <div class="flex-grow">
- <div class="flex items-center gap-2">
- <h3 class="font-semibold text-2xl text-gray-900">
- Workspace settings
- </h3>
- <UTooltip text="Edit workspace">
- <UButton
- v-if="!workspace.is_readonly"
- size="xs"
- color="white"
- icon="i-heroicons-pencil-square"
- @click="editCurrentWorkspace"
- />
- </UTooltip>
- </div>
- <small class="text-gray-500">You're currently editing the settings for the workspace "{{ workspace.name }}".
- You can switch to another workspace in top left corner of the page.</small>
- </div>
- <div class="w-full flex flex-wrap gap-2">
- <template v-if="!workspace.is_readonly">
- <WorkSpaceCustomDomains v-if="useFeatureFlag('custom_domains') && !loading" />
- <WorkSpaceEmailSettings v-if="!loading" />
- </template>
- <UButton
- label="New Workspace"
- icon="i-heroicons-plus"
- :loading="loading"
- @click="workspaceModal = true"
- />
- </div>
- </div>
-
- <div
- v-if="loading"
- class="w-full text-blue-500 text-center"
- >
- <Loader class="h-10 w-10 p-5" />
- </div>
- <div
- v-else-if="workspace"
- class="my-4"
- >
- <WorkSpaceUser />
- </div>
-
- <!-- Workspace modal -->
- <modal
- :show="workspaceModal"
- max-width="lg"
- :compact-header="true"
- @close="workspaceModal = false"
- >
- <template #icon>
- <Icon
- :name="isEditing ? 'heroicons:pencil-square' : 'heroicons:plus-circle'"
- class="w-8 h-8"
- />
- </template>
- <template #title>
- {{ isEditing ? 'Edit' : 'Create' }} Workspace
- </template>
- <div class="px-4">
- <form
- @submit.prevent="isEditing ? updateWorkspace() : createWorkspace()"
- @keydown="form.onKeydown($event)"
- >
- <div>
- <text-input
- name="name"
- class="mt-4"
- :form="form"
- :required="true"
- label="Workspace Name"
- />
- <text-input
- name="emoji"
- class="mt-4"
- :form="form"
- :required="false"
- label="Emoji"
- />
- </div>
-
- <div class="w-full mt-6">
- <v-button
- :loading="form.busy"
- class="w-full my-3"
- >
- Save
- </v-button>
- </div>
- </form>
- </div>
- </modal>
- </div>
-</template>
-
-<script setup>
-import {fetchAllWorkspaces} from "~/stores/workspaces.js"
-
-const workspacesStore = useWorkspacesStore()
-const workspace = computed(() => workspacesStore.getCurrent)
-const loading = computed(() => workspacesStore.loading)
-
-useOpnSeoMeta({
- title: "Workspaces",
-})
-definePageMeta({
- middleware: "auth",
-})
-
-const form = useForm({
- name: "",
- emoji: "",
-})
-const workspaceModal = ref(false)
-const isEditing = ref(false)
-
-onMounted(() => {
- fetchAllWorkspaces()
-})
-
-const editCurrentWorkspace = () => {
- isEditing.value = true
- form.name = workspace.value.name
- form.emoji = workspace.value.icon || ''
- workspaceModal.value = true
-}
-
-const updateWorkspace = () => {
- form.put(`/open/workspaces/${workspace.value.id}/`).then((data) => {
- workspacesStore.save(data.workspace)
- workspaceModal.value = false
- isEditing.value = false
- useAlert().success('Workspace successfully updated!')
- })
-}
-
-const createWorkspace = () => {
- form.post("/open/workspaces/create").then((data) => {
- workspacesStore.save(data.workspace)
- workspacesStore.currentId = data.workspace.id
- workspaceModal.value = false
- useAlert().success(
- "Workspace successfully created! You are now editing settings for your new workspace.",
- )
- })
-}
-
-watch(workspaceModal, (newValue) => {
- if (!newValue) {
- isEditing.value = false
- form.reset()
- }
-})
-</script>
diff --git a/client/pages/subscriptions/success.vue b/client/pages/subscriptions/success.vue
index ea7dc66a7..f1217c344 100644
--- a/client/pages/subscriptions/success.vue
+++ b/client/pages/subscriptions/success.vue
@@ -10,7 +10,7 @@
We're checking the status of your subscription please wait a moment...
</h4>
<div class="text-center">
- <Loader class="h-6 w-6 text-nt-blue mx-auto mt-20" />
+ <Loader class="h-6 w-6 text-blue-500 mx-auto mt-20" />
</div>
</div>
<open-form-footer />
@@ -20,6 +20,7 @@
<script setup>
import { useBroadcastChannel } from '@vueuse/core'
+import { authApi } from "~/api"
definePageMeta({
middleware: 'auth'
@@ -29,9 +30,8 @@ useOpnSeoMeta({
title: 'Subscription Success'
})
-const authStore = useAuthStore()
const confetti = useConfetti()
-const user = computed(() => authStore.user)
+const { data: user } = useAuth().user()
const subscribeBroadcast = useBroadcastChannel('subscribe')
const interval = ref(null)
@@ -44,8 +44,8 @@ const redirectIfSubscribed = () => {
}
const checkSubscription = () => {
// Fetch the user.
- return opnFetch('user').then((data) => {
- authStore.setUser(data)
+ return authApi.user.get().then((_data) => {
+ useAuth().invalidateUser()
redirectIfSubscribed()
}).catch((error) => {
console.error(error)
diff --git a/client/pages/templates/[slug].vue b/client/pages/templates/[slug].vue
index 2de95f509..d07089262 100644
--- a/client/pages/templates/[slug].vue
+++ b/client/pages/templates/[slug].vue
@@ -1,6 +1,6 @@
<template>
<div class="flex flex-col min-h-full">
- <breadcrumb
+ <Breadcrumb
v-if="template"
:path="breadcrumbs"
>
@@ -9,13 +9,12 @@
v-if="canEditTemplate"
class="ml-5"
>
- <v-button
- color="gray"
- size="small"
+ <UButton
+ color="neutral"
+ size="sm"
@click.prevent="showFormTemplateModal = true"
- >
- Edit Template
- </v-button>
+ label="Edit Template"
+ />
<form-template-modal
v-if="form"
:form="form"
@@ -26,26 +25,30 @@
</div>
</template>
<template #right>
- <v-button
+ <TrackClick
v-if="canEditTemplate"
- v-track.copy_template_button_clicked
- size="small"
- color="white"
+ name="copy_template_button_clicked"
class="mr-5"
- @click.prevent="copyTemplateUrl"
>
- Copy Template URL
- </v-button>
- <v-button
- v-track.use_template_button_clicked
- size="small"
+ <UButton
+ size="sm"
+ variant="outline"
+ @click.prevent="copyTemplateUrl"
+ label="Copy Template URL"
+ />
+ </TrackClick>
+ <TrackClick
+ name="use_template_button_clicked"
class="mr-5"
- :to="createFormWithTemplateUrl"
>
- Use this template
- </v-button>
+ <UButton
+ size="sm"
+ :to="createFormWithTemplateUrl"
+ label="Use this template"
+ />
+ </TrackClick>
</template>
- </breadcrumb>
+ </Breadcrumb>
<p
v-if="template === null || !template"
@@ -54,13 +57,13 @@
We could not find this template.
</p>
<template v-else>
- <section class="pt-12 bg-gray-50 sm:pt-16 border-b pb-[250px] relative">
+ <section class="pt-12 bg-neutral-50 sm:pt-16 border-b pb-[250px] relative">
<div class="px-4 mx-auto sm:px-6 lg:px-8 max-w-7xl">
<div
class="flex flex-col items-center justify-center max-w-5xl gap-8 mx-auto md:gap-12 md:flex-row"
>
<div
- class="aspect-[4/3] shrink-0 rounded-lg shadow-sm overflow-hidden group w-full max-w-sm relative"
+ class="aspect-[4/3] shrink-0 rounded-lg shadow-xs overflow-hidden group w-full max-w-sm relative"
>
<img
class="object-cover w-full h-full transition-all duration-200 group-hover:scale-110 absolute inset-0"
@@ -71,11 +74,11 @@
<div class="flex-1 text-center md:text-left relative">
<h1
- class="text-3xl font-bold tracking-tight text-gray-900 sm:text-4xl"
+ class="text-3xl font-bold tracking-tight text-neutral-900 sm:text-4xl"
>
{{ template.name }}
</h1>
- <p class="mt-2 text-lg font-normal text-gray-600">
+ <p class="mt-2 text-lg font-normal text-neutral-600">
{{ cleanQuotes(template.short_description) }}
</p>
<template-tags
@@ -90,32 +93,35 @@
<section class="w-full max-w-4xl relative px-4 mx-auto sm:px-6 lg:px-8 -mt-[210px]">
<div
- class="p-4 mx-auto bg-white shadow-lg sm:p-6 lg:p-8 rounded-xl ring-1 ring-inset ring-gray-200 isolate"
+ class="p-4 mx-auto bg-white shadow-lg sm:p-6 lg:p-8 rounded-xl ring ring-inset ring-neutral-200 isolate"
>
- <p class="text-sm font-medium text-center text-gray-500 -mt-2 mb-2">
+ <p class="text-sm font-medium text-center text-neutral-500 -mt-2 mb-2">
Template Preview
</p>
- <open-complete-form
+ <OpenCompleteForm
ref="open-complete-form"
:form="form"
:mode="FormMode.TEST"
- class="mb-4 p-4 bg-gray-50 border border-gray-200 border-dashed rounded-lg"
+ class="mb-4 p-4 bg-neutral-50 border border-neutral-200 border-dashed rounded-lg"
/>
</div>
<div class="absolute bottom-0 translate-y-full inset-x-0">
<div class="px-4 mx-auto sm:px-6 lg:px-8 max-w-7xl -mt-[20px]">
<div class="flex items-center justify-center">
- <v-button
- v-track.use_template_button_clicked
+ <TrackClick
+ name="use_template_button_clicked"
class="mx-auto w-full max-w-[300px]"
- :to="createFormWithTemplateUrl"
>
- Use this template
- </v-button>
+ <UButton
+ block
+ :to="createFormWithTemplateUrl"
+ label="Use this template"
+ />
+ </TrackClick>
</div>
<div class="flex items-center justify-center">
- <div class="text-left mx-auto text-gray-500 text-xs mt-4">
+ <div class="text-left mx-auto text-neutral-500 text-xs mt-4">
✓ Core features 100% free<br>
✓ No credit card required<br>
✓ No submissions limit on Free plan
@@ -136,15 +142,15 @@
/>
<template v-if="template.questions.length > 0">
- <hr class="mt-12 border-gray-200">
+ <hr class="mt-12 border-neutral-200">
<div>
<div class="text-center">
<h3
- class="text-xl font-bold tracking-tight text-gray-900 sm:text-2xl"
+ class="text-xl font-bold tracking-tight text-neutral-900 sm:text-2xl"
>
Frequently asked questions
</h3>
- <p class="mt-2 text-base font-normal text-gray-600">
+ <p class="mt-2 text-base font-normal text-neutral-600">
Everything you need to know about this template.
</p>
</div>
@@ -154,11 +160,11 @@
:key="ques_key"
class="space-y-4"
>
- <dt class="font-semibold text-gray-900 dark:text-gray-100">
+ <dt class="font-semibold text-neutral-900 dark:text-neutral-100">
{{ ques.question }}
</dt>
<dd
- class="mt-2 leading-6 text-gray-600 dark:text-gray-400"
+ class="mt-2 leading-6 text-neutral-600 dark:text-neutral-400"
v-html="ques.answer"
/>
</div>
@@ -171,23 +177,22 @@
<section
v-if="relatedTemplates && relatedTemplates.length > 0"
- class="py-12 bg-white border-t border-gray-200 sm:py-16"
+ class="py-12 bg-white border-t border-neutral-200 sm:py-16"
>
<div class="px-4 mx-auto sm:px-6 lg:px-8 max-w-7xl">
<div class="flex items-center justify-between">
<h4
- class="text-xl font-bold tracking-tight text-gray-900 sm:text-2xl"
+ class="text-xl font-bold tracking-tight text-neutral-900 sm:text-2xl"
>
Related templates
</h4>
- <v-button
+ <UButton
:to="{ name: 'templates' }"
color="white"
- size="small"
- :arrow="true"
- >
- View All
- </v-button>
+ size="sm"
+ trailing-icon="i-heroicons-arrow-right-20-solid"
+ label="View All"
+ />
</div>
<div
@@ -202,11 +207,11 @@
</div>
</section>
- <section class="py-12 bg-white border-t border-gray-200 sm:py-16">
+ <section class="py-12 bg-white border-t border-neutral-200 sm:py-16">
<div class="px-4 mx-auto sm:px-6 lg:px-8 max-w-7xl">
<div class="text-center">
<h4
- class="text-xl font-bold tracking-tight text-gray-900 sm:text-2xl"
+ class="text-xl font-bold tracking-tight text-neutral-900 sm:text-2xl"
>
How OpnForm works
</h4>
@@ -217,15 +222,15 @@
class="flex flex-col items-center gap-4 text-center lg:items-start sm:text-left sm:items-start xl:flex-row"
>
<div
- class="inline-flex items-center justify-center w-10 h-10 text-base font-bold bg-white rounded-full shadow-sm ring-1 ring-inset ring-gray-200 text-blue-500 shrink-0"
+ class="inline-flex items-center justify-center w-10 h-10 text-base font-bold bg-white rounded-full shadow-xs ring ring-inset ring-neutral-200 text-blue-500 shrink-0"
>
1
</div>
<div>
- <h5 class="text-base font-bold leading-tight text-gray-900">
+ <h5 class="text-base font-bold leading-tight text-neutral-900">
Copy the template and change it the way you like
</h5>
- <p class="mt-2 text-sm font-normal text-gray-600">
+ <p class="mt-2 text-sm font-normal text-neutral-600">
<NuxtLink :to="createFormWithTemplateUrl">
Click here to copy this template
</NuxtLink>
@@ -239,15 +244,15 @@
class="flex flex-col items-center gap-4 text-center lg:items-start sm:text-left sm:items-start xl:flex-row"
>
<div
- class="inline-flex items-center justify-center w-10 h-10 text-base font-bold bg-white rounded-full shadow-sm ring-1 ring-inset ring-gray-200 text-blue-500 shrink-0"
+ class="inline-flex items-center justify-center w-10 h-10 text-base font-bold bg-white rounded-full shadow-xs ring ring-inset ring-neutral-200 text-blue-500 shrink-0"
>
2
</div>
<div>
- <h5 class="text-base font-bold leading-tight text-gray-900">
+ <h5 class="text-base font-bold leading-tight text-neutral-900">
Embed the form or share it via a link
</h5>
- <p class="mt-2 text-sm font-normal text-gray-600">
+ <p class="mt-2 text-sm font-normal text-neutral-600">
You can directly share your form link, or embed the form on
your website. It's magic! 🪄
</p>
@@ -266,127 +271,101 @@
</template>
<script setup>
-import { computed } from "vue"
-import OpenCompleteForm from "../../components/open/forms/OpenCompleteForm.vue"
-import Breadcrumb from "~/components/global/Breadcrumb.vue"
-import SingleTemplate from "../../components/pages/templates/SingleTemplate.vue"
-import { fetchTemplate } from "~/stores/templates.js"
+import { computed, ref } from "vue"
+import { useRoute } from "vue-router"
import FormTemplateModal from "~/components/open/forms/components/templates/FormTemplateModal.vue"
+import TemplateTags from "~/components/pages/templates/TemplateTags.vue"
+import SingleTemplate from "~/components/pages/templates/SingleTemplate.vue"
import { FormMode } from "~/lib/forms/FormModeStrategy.js"
-
-defineRouteRules({
- swr: 3600,
-})
-
-const { copy } = useClipboard()
-const authStore = useAuthStore()
-const templatesStore = useTemplatesStore()
+import { cleanQuotes } from "~/lib/utils"
+import OpenCompleteForm from "~/components/open/forms/OpenCompleteForm.vue"
+import Breadcrumb from "~/components/app/Breadcrumb.vue"
+import TrackClick from "~/components/global/TrackClick.vue"
const route = useRoute()
-const slug = computed(() => route.params.slug)
+const { detail, list } = useTemplates()
-const template = computed(() => templatesStore.getByKey(slug.value))
-const form = computed(() => template.value.structure)
+const { data: template } = detail(route.params.slug)
+const { data: allTemplates } = list()
-// Fetch the template
-if (!template.value) {
- const { data } = await fetchTemplate(slug.value)
- templatesStore.save(data.value)
-}
-
-// Fetch related templates
-const { data: relatedTemplatesData } = await useAsyncData(
- "related-templates",
- () => {
- return Promise.all(
- template.value.related_templates.map((slug) => {
- if (templatesStore.getByKey(slug)) {
- return Promise.resolve(templatesStore.getByKey(slug))
- }
- return fetchTemplate(slug).then((res) => res.data.value)
- }),
- )
- },
-)
-templatesStore.save(relatedTemplatesData.value)
-templatesStore.initTypesAndIndustries()
-
-// State
-const showFormTemplateModal = ref(false)
-
-// Computed
-const breadcrumbs = computed(() => {
+const form = computed(() => {
if (!template.value) {
- return [{ route: { name: "templates" }, label: "Templates" }]
+ return null
}
- return [
- { route: { name: "templates" }, label: "Templates" },
- { label: template.value.name },
- ]
+ return template.value.structure
})
-const relatedTemplates = computed(() =>
- templatesStore.getByKey(template?.value?.related_templates),
-)
+
+const relatedTemplates = computed(() => {
+ if (!template.value?.related_templates || !allTemplates.value) {
+ return []
+ }
+ const relatedSlugs = new Set(template.value.related_templates)
+ return allTemplates.value.filter(
+ (t) => relatedSlugs.has(t.slug) && t.slug !== template.value.slug,
+ )
+})
+
+const showFormTemplateModal = ref(false)
+const { data: user } = useAuth().user()
const canEditTemplate = computed(
- () =>
- authStore.check &&
- template.value &&
- template.value?.from_prod !== true &&
- (authStore.user.admin ||
- authStore.user.template_editor ||
- template.value.creator_id === authStore.user.id),
+ () => user.value && (user.value.admin || user.value.template_editor),
)
+
const createFormWithTemplateUrl = computed(() => {
+ if (!user.value) {
+ return {
+ name: "register",
+ query: {
+ redirect: route.fullPath,
+ template: route.params.slug,
+ },
+ }
+ }
return {
- name: authStore.check ? "forms-create" : "forms-create-guest",
- query: { template: template?.value?.slug },
+ name: "forms-create",
+ query: {
+ template: route.params.slug,
+ },
}
})
-// methods
-const cleanQuotes = (str) => {
- // Remove starting and ending quotes if any
- return str ? str.replace(/^"/, "").replace(/"$/, "") : ""
-}
+const breadcrumbs = computed(() => {
+ if (!template.value) {
+ return []
+ }
+ return [
+ { name: "Templates", to: { name: "templates" } },
+ {
+ name: template.value.name,
+ to: { name: "templates-slug", params: { slug: template.value.slug } },
+ },
+ ]
+})
const copyTemplateUrl = () => {
- copy(template.value.share_url)
- useAlert().success("Copied!")
+ navigator.clipboard.writeText(window.location.href)
+ useAlert().success("URL copied to clipboard!")
}
-useOpnSeoMeta({
- title: () => {
- if (!template.value || !template.value) return "Form Template"
- return template.value.name
- },
- description() {
- if (!template.value || !template.value) return null
- // take the first 140 characters of the description
- return (
- template.value.short_description?.substring(0, 140) +
- "... | Customize any template and create your own form in minutes."
- )
- },
- ogImage() {
- if (!template.value || !template.value) return null
- return template.value.image_url
- },
- robots: () => {
- if (!template.value || !template.value) return null
- return template.value.publicly_listed ? null : "noindex"
- },
-})
+useOpnSeoMeta(
+ computed(() => ({
+ title: template.value?.name,
+ description: template.value?.short_description,
+ })),
+)
</script>
-<style lang="scss">
+<style>
+@reference '~/css/app.css';
+
.nf-text {
@apply space-y-4;
h2 {
- @apply text-sm font-normal tracking-widest text-gray-500 uppercase;
+ @apply text-sm font-normal tracking-widest text-neutral-500 uppercase;
}
p {
- @apply font-normal leading-7 text-gray-900 dark:text-gray-100;
+ @apply font-normal leading-7 text-neutral-900 dark:text-neutral-100;
}
ol {
diff --git a/client/pages/templates/index.vue b/client/pages/templates/index.vue
index 7b9670365..27434a67f 100644
--- a/client/pages/templates/index.vue
+++ b/client/pages/templates/index.vue
@@ -1,14 +1,14 @@
<template>
<div class="flex flex-col min-h-full border-t">
- <section class="py-12 sm:py-16 bg-gray-50 border-b border-gray-200">
+ <section class="py-12 sm:py-16 bg-neutral-50 border-b border-neutral-200">
<div class="px-4 sm:px-6 lg:px-8 max-w-7xl mx-auto">
<div class="text-center max-w-xl mx-auto">
<h1
- class="text-3xl sm:text-4xl lg:text-5xl font-bold tracking-tight text-gray-900"
+ class="text-3xl sm:text-4xl lg:text-5xl font-bold tracking-tight text-neutral-900"
>
Form Templates
</h1>
- <p class="text-gray-600 mt-4 text-lg font-normal">
+ <p class="text-neutral-600 mt-4 text-lg font-normal">
Our collection of beautiful templates to create your own forms!
</p>
</div>
@@ -16,6 +16,7 @@
</section>
<templates-list
+ class="px-4 sm:px-6 lg:px-8 max-w-7xl mx-auto py-12"
:templates="templates"
:loading="loading"
/>
@@ -25,8 +26,6 @@
</template>
<script setup>
-import { loadAllTemplates } from "~/stores/templates.js"
-
defineRouteRules({
swr: 3600,
})
@@ -37,9 +36,5 @@ useOpnSeoMeta({
"Our collection of beautiful templates to create your own forms!",
})
-const templatesStore = useTemplatesStore()
-loadAllTemplates(templatesStore)
-
-const loading = computed(() => templatesStore.loading)
-const templates = computed(() => templatesStore.getAll)
+const { data: templates, isLoading: loading } = useTemplates().list()
</script>
diff --git a/client/pages/templates/industries/[slug].vue b/client/pages/templates/industries/[slug].vue
index 3db6feec9..0d7da84a6 100644
--- a/client/pages/templates/industries/[slug].vue
+++ b/client/pages/templates/industries/[slug].vue
@@ -1,6 +1,6 @@
<template>
<div class="flex flex-col min-h-full">
- <breadcrumb :path="breadcrumbs" />
+ <Breadcrumb :path="breadcrumbs" />
<p
v-if="industry === null || !industry"
@@ -9,18 +9,18 @@
We could not find this industry.
</p>
<template v-else>
- <section class="py-12 sm:py-16 bg-gray-50 border-b border-gray-200">
+ <section class="py-12 sm:py-16 bg-neutral-50 border-b border-neutral-200">
<div class="px-4 sm:px-6 lg:px-8 max-w-7xl mx-auto">
<div class="text-center mx-auto">
<div class="font-semibold sm:w-full text-blue-500 mb-3">
{{ industry.name }}
</div>
<h1
- class="text-3xl sm:text-4xl lg:text-5xl font-bold tracking-tight text-gray-900"
+ class="text-3xl sm:text-4xl lg:text-5xl font-bold tracking-tight text-neutral-900"
>
{{ industry.meta_title }}
</h1>
- <p class="max-w-xl mx-auto text-gray-600 mt-4 text-lg font-normal">
+ <p class="max-w-xl mx-auto text-neutral-600 mt-4 text-lg font-normal">
{{ industry.meta_description }}
</p>
</div>
@@ -29,13 +29,14 @@
<templates-list
:templates="templates"
+ :loading="loading"
:filter-industries="false"
:show-industries="false"
>
<template #before-lists>
- <section class="py-12 bg-white border-t border-gray-200 sm:py-16">
+ <section class="py-12 bg-white border-t border-neutral-200 sm:py-16">
<div class="px-4 mx-auto sm:px-6 lg:px-8 max-w-7xl">
- <p class="text-gray-600 font-normal">
+ <p class="text-neutral-600 font-normal">
{{ industry.description }}
</p>
</div>
@@ -50,26 +51,30 @@
<script setup>
import { computed } from "vue"
-import Breadcrumb from "~/components/global/Breadcrumb.vue"
-import { loadAllTemplates } from "~/stores/templates.js"
+import Breadcrumb from "~/components/app/Breadcrumb.vue"
+import { useTemplateMeta } from "~/composables/data/useTemplateMeta"
defineRouteRules({
swr: 3600,
})
const route = useRoute()
-const templatesStore = useTemplatesStore()
+const { list } = useTemplates()
+const { industries: industriesMap } = useTemplateMeta()
-loadAllTemplates(templatesStore)
+const { data: allTemplates, isLoading: loading } = list()
+
+const industry = computed(() => industriesMap.get(route.params.slug))
// Computed
-const templates = computed(() =>
- templatesStore.getAll.filter((item) => {
+const templates = computed(() => {
+ if (!allTemplates.value) return []
+ return allTemplates.value.filter((item) => {
return item.industries && item.industries.length > 0
? item.industries.includes(route.params.slug)
: false
- }),
-)
+ })
+})
const breadcrumbs = computed(() => {
if (!industry.value) {
return [{ route: { name: "templates" }, label: "Templates" }]
@@ -80,10 +85,6 @@ const breadcrumbs = computed(() => {
]
})
-const industry = computed(() =>
- templatesStore.industries.get(route.params.slug),
-)
-
useOpnSeoMeta({
title: () => {
if (!industry.value) return "Form Templates"
@@ -118,11 +119,11 @@ useHead({
.nf-text {
@apply space-y-4;
h2 {
- @apply text-sm font-normal tracking-widest text-gray-500 uppercase;
+ @apply text-sm font-normal tracking-widest text-neutral-500 uppercase;
}
p {
- @apply font-normal leading-7 text-gray-900 dark:text-gray-100;
+ @apply font-normal leading-7 text-neutral-900 dark:text-neutral-100;
}
ol {
diff --git a/client/pages/templates/my-templates.vue b/client/pages/templates/my-templates.vue
index 901648ed1..1f6528b44 100644
--- a/client/pages/templates/my-templates.vue
+++ b/client/pages/templates/my-templates.vue
@@ -1,32 +1,72 @@
<template>
- <div class="flex flex-col min-h-full border-t">
- <section class="py-12 sm:py-16 bg-gray-50 border-b border-gray-200">
- <div class="px-4 sm:px-6 lg:px-8 max-w-7xl mx-auto">
- <div class="text-center max-w-xl mx-auto">
- <h1
- class="text-3xl sm:text-4xl lg:text-5xl font-bold tracking-tight text-gray-900"
- >
- My Form Templates
- </h1>
- <p class="text-gray-600 mt-4 text-lg font-normal">
- Share your best form as templates so that others can re-use them!
- </p>
- </div>
+ <div class="flex flex-col h-full bg-white">
+ <!-- Top Bar -->
+ <div class="sticky top-0 z-50 bg-white h-[49px] border-b border-neutral-200 p-2 sm:px-4">
+ <div class="max-w-4xl mx-auto flex items-center justify-between flex-shrink-0 gap-2 px-2 sm:px-0">
+ <h1 class="text-lg font-semibold text-neutral-900">My Form Templates</h1>
+ <div class="flex items-center gap-2">
+ <UButton
+ to="/templates"
+ variant="outline"
+ icon="i-heroicons-eye"
+ label="View All Templates"
+ />
+ <UButton
+ @click="openTemplateGuide"
+ variant="outline"
+ color="neutral"
+ icon="i-heroicons-question-mark-circle"
+ label="How to Create"
+ />
+ </div>
</div>
- </section>
-
- <templates-list
- :templates="templates"
- :loading="loading"
- :show-types="false"
- :show-industries="false"
- />
+ </div>
+
+ <!-- Main Content -->
+ <div class="flex-1 overflow-y-auto p-4">
+ <div class="max-w-4xl mx-auto">
+ <VTransition name="fade">
+ <!-- Templates List -->
+
+ <templates-list
+ v-if="loading || templates?.length > 0"
+ grid-classes="grid-cols-1 mt-8 sm:grid-cols-2 lg:grid-cols-3"
+ :templates="templates"
+ :loading="loading"
+ :show-types="false"
+ :show-industries="false"
+ />
+
+ <div v-else class="text-center py-16 px-4">
+ <UIcon name="i-heroicons-document-duplicate" class="h-12 w-12 text-neutral-400 mx-auto" />
+ <h3 class="mt-4 text-lg font-semibold text-neutral-900">
+ No templates yet
+ </h3>
+ <p class="mt-1 text-sm text-neutral-500">
+ You haven't created any templates yet. Create forms and share them as templates!
+ </p>
+ <UButton
+ class="mt-4"
+ @click="openTemplateGuide"
+ variant="outline"
+ color="neutral"
+ icon="i-heroicons-question-mark-circle"
+ label="How to Create"
+ />
+ </div>
+ </VTransition>
+ </div>
+ </div>
</div>
</template>
<script setup>
+import { useCrisp } from '~/composables/useCrisp'
+import { computed } from 'vue'
+
definePageMeta({
middleware: "auth",
+ layout: "dashboard",
})
useOpnSeoMeta({
@@ -35,14 +75,15 @@ useOpnSeoMeta({
"Our collection of beautiful templates to create your own forms!",
})
-const loading = ref(false)
-const templates = ref([])
+const { list } = useTemplates()
+const { openHelpdeskArticle } = useCrisp()
-onMounted(() => {
- loading.value = true
- opnFetch("templates", { query: { onlymy: true } }).then((data) => {
- loading.value = false
- templates.value = data
- })
+const { data: templates, isLoading: loading } = list({
+ params: { onlymy: true },
+ enabled: computed(() => import.meta.client)
})
+
+const openTemplateGuide = () => {
+ openHelpdeskArticle('how-to-create-an-opnform-template-1fn84i4')
+}
</script>
diff --git a/client/pages/templates/types/[slug].vue b/client/pages/templates/types/[slug].vue
index 589cfc47f..25e9bbe0a 100644
--- a/client/pages/templates/types/[slug].vue
+++ b/client/pages/templates/types/[slug].vue
@@ -1,6 +1,6 @@
<template>
<div class="flex flex-col min-h-full">
- <breadcrumb :path="breadcrumbs" />
+ <Breadcrumb :path="breadcrumbs" />
<p
v-if="type === null || !type"
@@ -9,18 +9,18 @@
We could not find this type.
</p>
<template v-else>
- <section class="py-12 sm:py-16 bg-gray-50 border-b border-gray-200">
+ <section class="py-12 sm:py-16 bg-neutral-50 border-b border-neutral-200">
<div class="px-4 sm:px-6 lg:px-8 max-w-7xl mx-auto">
<div class="text-center mx-auto">
<div class="font-semibold sm:w-full text-blue-500 mb-3">
{{ type.name }}
</div>
<h1
- class="text-3xl sm:text-4xl lg:text-5xl font-bold tracking-tight text-gray-900"
+ class="text-3xl sm:text-4xl lg:text-5xl font-bold tracking-tight text-neutral-900"
>
{{ type.meta_title }}
</h1>
- <p class="max-w-xl mx-auto text-gray-600 mt-4 text-lg font-normal">
+ <p class="max-w-xl mx-auto text-neutral-600 mt-4 text-lg font-normal">
{{ type.meta_description }}
</p>
</div>
@@ -29,13 +29,14 @@
<templates-list
:templates="templates"
+ :loading="loading"
:filter-types="false"
:show-industries="false"
>
<template #before-lists>
- <section class="py-12 bg-white border-t border-gray-200 sm:py-16">
+ <section class="py-12 bg-white border-t border-neutral-200 sm:py-16">
<div class="px-4 mx-auto sm:px-6 lg:px-8 max-w-7xl">
- <p class="text-gray-600 font-normal">
+ <p class="text-neutral-600 font-normal">
{{ type.description }}
</p>
</div>
@@ -51,26 +52,30 @@
<script setup>
import { computed } from "vue"
import OpenFormFooter from "../../../components/pages/OpenFormFooter.vue"
-import Breadcrumb from "~/components/global/Breadcrumb.vue"
-import { loadAllTemplates } from "~/stores/templates.js"
+import Breadcrumb from "~/components/app/Breadcrumb.vue"
+import { useTemplateMeta } from "~/composables/data/useTemplateMeta"
defineRouteRules({
swr: 3600,
})
const route = useRoute()
-const templatesStore = useTemplatesStore()
+const { list } = useTemplates()
+const { types: typesMap } = useTemplateMeta()
-loadAllTemplates(templatesStore)
+const { data: allTemplates, isLoading: loading } = list()
+
+const type = computed(() => typesMap.get(route.params.slug))
// Computed
-const templates = computed(() =>
- templatesStore.getAll.filter((item) => {
+const templates = computed(() => {
+ if (!allTemplates.value) return []
+ return allTemplates.value.filter((item) => {
return item.types && item.types.length > 0
? item.types.includes(route.params.slug)
: false
- }),
-)
+ })
+})
const breadcrumbs = computed(() => {
if (!type.value) {
return [{ route: { name: "templates" }, label: "Templates" }]
@@ -81,8 +86,6 @@ const breadcrumbs = computed(() => {
]
})
-const type = computed(() => templatesStore.types.get(route.params.slug))
-
useOpnSeoMeta({
title: () => {
if (!type.value) return "Form Templates"
@@ -117,11 +120,11 @@ useHead({
.nf-text {
@apply space-y-4;
h2 {
- @apply text-sm font-normal tracking-widest text-gray-500 uppercase;
+ @apply text-sm font-normal tracking-widest text-neutral-500 uppercase;
}
p {
- @apply font-normal leading-7 text-gray-900 dark:text-gray-100;
+ @apply font-normal leading-7 text-neutral-900 dark:text-neutral-100;
}
ol {
diff --git a/client/pages/update-credentials.vue b/client/pages/update-credentials.vue
index a5ef86fc6..5d4bb31be 100644
--- a/client/pages/update-credentials.vue
+++ b/client/pages/update-credentials.vue
@@ -1,20 +1,19 @@
<template>
- <div class=" bg-gray-50 flex flex-col justify-center sm:px-6 lg:px-8 py-10 flex-grow">
+ <div class=" bg-neutral-50 flex flex-col justify-center sm:px-6 lg:px-8 py-10 flex-grow">
<div class="sm:mx-auto sm:w-full sm:max-w-md">
- <h2 class="text-center text-3xl font-bold tracking-tight text-gray-900">
+ <h2 class="text-center text-3xl font-bold tracking-tight text-neutral-900">
Welcome to OpnForm!
</h2>
- <p class="mt-2 text-center text-sm text-gray-600">
+ <p class="mt-2 text-center text-sm text-neutral-600">
You're using the self-hosted version of OpnForm and need to set up your account.
Please enter your email and create a password to continue.
</p>
</div>
<div class="mt-8 sm:mx-auto sm:w-full sm:max-w-md">
- <div class="bg-white py-8 px-4 shadow sm:rounded-lg sm:px-10">
+ <div class="bg-white py-8 px-4 shadow-sm sm:rounded-sm sm:px-10">
<form
@submit.prevent="updateCredentials"
- @keydown="form.onKeydown($event)"
>
<!-- Email -->
<text-input
@@ -47,19 +46,19 @@
<!-- Submit Button -->
<div class="mt-6">
- <v-button
+ <UButton
class="w-full justify-center"
:loading="form.busy || loading"
- >
- Update Credentials
- </v-button>
+ type="submit"
+ label="Update Credentials"
+ />
</div>
<!-- Cancel Link -->
<div class="mt-4 text-center">
<button
type="button"
- class="text-sm text-gray-600 hover:text-gray-900"
+ class="text-sm text-neutral-600 hover:text-neutral-900"
@click="logout"
>
Cancel and return to login
@@ -74,12 +73,10 @@
<script setup>
import { onMounted } from "vue"
-const authStore = useAuthStore()
-const workspacesStore = useWorkspacesStore()
-const formsStore = useFormsStore()
-const user = computed(() => authStore.user)
+const { data: user, logout: logoutMutationFactory } = useAuth()
const router = useRouter()
const loading = ref(false)
+const logoutMutation = logoutMutationFactory()
const form = useForm({
name: "",
email: "",
@@ -93,15 +90,18 @@ onMounted(() => {
form.email = user?.value?.email
})
+const { invalidateAll: invalidateWorkspaces } = useWorkspaces()
+const { invalidateAll: invalidateForms } = useForms()
+
const updateCredentials = () => {
loading.value = true
form
.post("update-credentials")
- .then(async (data) => {
- authStore.setUser(data.user)
- const workspaces = await fetchAllWorkspaces()
- workspacesStore.set(workspaces.data.value)
- formsStore.loadAll(workspacesStore.currentId)
+ .then(async (_data) => {
+ useAuth().invalidateUser()
+ // Invalidate all workspace and form queries to refetch fresh data
+ await invalidateWorkspaces()
+ await invalidateForms()
router.push({ name: "home" })
})
.catch((error) => {
@@ -114,7 +114,7 @@ const updateCredentials = () => {
}
const logout = () => {
- authStore.logout()
- router.push({ name: "login" })
+ // Logout mutation handles cache clearing and navigation automatically
+ logoutMutation.mutateAsync()
}
</script>
\ No newline at end of file
diff --git a/client/plugins/01.vue-query.ts b/client/plugins/01.vue-query.ts
new file mode 100644
index 000000000..88feb2a16
--- /dev/null
+++ b/client/plugins/01.vue-query.ts
@@ -0,0 +1,64 @@
+import type {
+ DehydratedState,
+ VueQueryPluginOptions,
+} from '@tanstack/vue-query'
+import {
+ VueQueryPlugin,
+ QueryClient,
+ hydrate,
+ dehydrate,
+} from '@tanstack/vue-query'
+// Nuxt 3 app aliases
+import { useState } from '#app'
+
+export default defineNuxtPlugin((nuxt) => {
+ const vueQueryState = useState<DehydratedState | null>('vue-query')
+
+ // Modify your Vue Query global settings here
+ const queryClient = new QueryClient({
+ defaultOptions: {
+ queries: {
+ staleTime: 5 * 60 * 1000, // 5 minutes
+ gcTime: 10 * 60 * 1000, // 10 minutes (replaces cacheTime)
+ retry: (failureCount, error: any) => {
+ // Don't retry on 4xx errors except 408, 429
+ if (error?.status >= 400 && error?.status < 500 && ![408, 429].includes(error?.status)) {
+ return false
+ }
+ // Retry up to 3 times for other errors
+ return failureCount < 3
+ },
+ refetchOnWindowFocus: false,
+ refetchOnReconnect: 'always'
+ },
+ mutations: {
+ retry: (failureCount, error: any) => {
+ // Don't retry mutations on 4xx errors
+ if (error?.status >= 400 && error?.status < 500) {
+ return false
+ }
+ return failureCount < 1
+ }
+ }
+ },
+ })
+ const options: VueQueryPluginOptions = { queryClient, enableDevtoolsV6Plugin: true }
+
+ nuxt.vueApp.use(VueQueryPlugin, options)
+
+ if (import.meta.server) {
+ nuxt.hooks.hook('app:rendered', () => {
+ vueQueryState.value = dehydrate(queryClient)
+ })
+ }
+
+ if (import.meta.client) {
+ // Hydrate immediately so that route middleware can access cached data
+ hydrate(queryClient, vueQueryState.value)
+
+ // Still keep the hook for safety in case Nuxt re-creates app (e.g., HMR)
+ nuxt.hooks.hook('app:created', () => {
+ hydrate(queryClient, vueQueryState.value)
+ })
+ }
+})
\ No newline at end of file
diff --git a/client/plugins/amplitude.js b/client/plugins/amplitude.js
index 108ed06b0..8943ad269 100644
--- a/client/plugins/amplitude.js
+++ b/client/plugins/amplitude.js
@@ -1,25 +1,66 @@
// Hook function used by event listener
-function hookLogEvent(binding) {
- const modifiers = Object.keys(binding.modifiers)
- if (modifiers.length !== 1) {
- throw new Error(
- "Amplitude directive takes only one modifier which is the event name.",
- )
- }
- const eventName = modifiers[0]
-
- useAmplitude().logEvent(eventName, binding.value)
+function hookLogEvent(eventName, eventData) {
+ useAmplitude().logEvent(eventName, eventData)
}
export default defineNuxtPlugin((nuxtApp) => {
- // Doing something with nuxtApp
- const registeredListeners = {}
+ // New v-track directive that only sets data attributes
nuxtApp.vueApp.directive("track", {
beforeMount(el, binding) {
- registeredListeners[el] = () => {
- hookLogEvent(binding)
+ const modifiers = Object.keys(binding.modifiers)
+ if (modifiers.length !== 1) {
+ throw new Error(
+ "Amplitude directive takes only one modifier which is the event name.",
+ )
+ }
+ const eventName = modifiers[0]
+
+ // Set data attributes instead of adding event listeners
+ el.setAttribute('data-track-event', eventName)
+ if (binding.value) {
+ el.setAttribute('data-track-properties', JSON.stringify(binding.value))
}
- el.addEventListener("click", registeredListeners[el])
},
+ updated(el, binding) {
+ // Update data attributes if the binding changes
+ const modifiers = Object.keys(binding.modifiers)
+ if (modifiers.length !== 1) {
+ throw new Error(
+ "Amplitude directive takes only one modifier which is the event name.",
+ )
+ }
+ const eventName = modifiers[0]
+
+ el.setAttribute('data-track-event', eventName)
+ if (binding.value) {
+ el.setAttribute('data-track-properties', JSON.stringify(binding.value))
+ } else {
+ el.removeAttribute('data-track-properties')
+ }
+ }
})
+
+ // Global click event listener using event delegation
+ if (import.meta.client) {
+ document.addEventListener('click', (event) => {
+ // Find the closest element with tracking data
+ const trackableElement = event.target.closest('[data-track-event]')
+
+ if (trackableElement) {
+ const eventName = trackableElement.getAttribute('data-track-event')
+ const propertiesAttr = trackableElement.getAttribute('data-track-properties')
+
+ let eventData = null
+ if (propertiesAttr) {
+ try {
+ eventData = JSON.parse(propertiesAttr)
+ } catch (e) {
+ console.warn('Failed to parse tracking properties:', propertiesAttr, e)
+ }
+ }
+
+ hookLogEvent(eventName, eventData)
+ }
+ })
+ }
})
diff --git a/client/plugins/app-modals.js b/client/plugins/app-modals.js
new file mode 100644
index 000000000..69f3fc1cf
--- /dev/null
+++ b/client/plugins/app-modals.js
@@ -0,0 +1,12 @@
+export default defineNuxtPlugin(() => {
+ useAppModals()
+
+ return {
+ provide: {
+ // Provide a lazy getter that initializes on first access
+ get appModals() {
+ return useAppModals()
+ }
+ }
+ }
+})
\ No newline at end of file
diff --git a/client/plugins/gtm.client.js b/client/plugins/gtm.client.js
index 206eaa20c..402e110e0 100644
--- a/client/plugins/gtm.client.js
+++ b/client/plugins/gtm.client.js
@@ -9,7 +9,7 @@ export default defineNuxtPlugin(() => {
const gtm = useGtm()
// Only enable GTM if not in a form page (for respondents) and not in an iframe
- if (gtmId && gtm && !isPublicFormPage && !isIframe) {
+ if (gtmId && gtmId !== 'GTM-XXXXXX' && gtm && !isPublicFormPage && !isIframe) {
// Override the enabled setting to true for this session
gtm.enable(true)
@@ -22,10 +22,15 @@ export default defineNuxtPlugin(() => {
gtag('consent', 'default', {
'ad_storage': 'denied',
- 'analytics_storage': 'granted',
+ 'analytics_storage': 'denied',
'functionality_storage': 'granted',
'security_storage': 'granted'
})
+
+ gtag('consent', 'update', {
+ 'ad_storage': 'granted',
+ 'analytics_storage': 'granted',
+ })
// Enable IP anonymization
gtag('set', 'anonymize_ip', true)
diff --git a/client/public/fonts/general-sans/GeneralSans-Bold.eot b/client/public/fonts/general-sans/GeneralSans-Bold.eot
deleted file mode 100644
index 62ff3c8e6..000000000
Binary files a/client/public/fonts/general-sans/GeneralSans-Bold.eot and /dev/null differ
diff --git a/client/public/fonts/general-sans/GeneralSans-Bold.ttf b/client/public/fonts/general-sans/GeneralSans-Bold.ttf
deleted file mode 100644
index 61a5df965..000000000
Binary files a/client/public/fonts/general-sans/GeneralSans-Bold.ttf and /dev/null differ
diff --git a/client/public/fonts/general-sans/GeneralSans-Bold.woff b/client/public/fonts/general-sans/GeneralSans-Bold.woff
deleted file mode 100644
index 4e4fea3af..000000000
Binary files a/client/public/fonts/general-sans/GeneralSans-Bold.woff and /dev/null differ
diff --git a/client/public/fonts/general-sans/GeneralSans-Bold.woff2 b/client/public/fonts/general-sans/GeneralSans-Bold.woff2
deleted file mode 100644
index 65b0b4aa1..000000000
Binary files a/client/public/fonts/general-sans/GeneralSans-Bold.woff2 and /dev/null differ
diff --git a/client/public/fonts/general-sans/GeneralSans-BoldItalic.eot b/client/public/fonts/general-sans/GeneralSans-BoldItalic.eot
deleted file mode 100644
index 3d92525fa..000000000
Binary files a/client/public/fonts/general-sans/GeneralSans-BoldItalic.eot and /dev/null differ
diff --git a/client/public/fonts/general-sans/GeneralSans-BoldItalic.ttf b/client/public/fonts/general-sans/GeneralSans-BoldItalic.ttf
deleted file mode 100644
index d19bbc7c1..000000000
Binary files a/client/public/fonts/general-sans/GeneralSans-BoldItalic.ttf and /dev/null differ
diff --git a/client/public/fonts/general-sans/GeneralSans-BoldItalic.woff b/client/public/fonts/general-sans/GeneralSans-BoldItalic.woff
deleted file mode 100644
index 35a39b62e..000000000
Binary files a/client/public/fonts/general-sans/GeneralSans-BoldItalic.woff and /dev/null differ
diff --git a/client/public/fonts/general-sans/GeneralSans-BoldItalic.woff2 b/client/public/fonts/general-sans/GeneralSans-BoldItalic.woff2
deleted file mode 100644
index d3aed5723..000000000
Binary files a/client/public/fonts/general-sans/GeneralSans-BoldItalic.woff2 and /dev/null differ
diff --git a/client/public/fonts/general-sans/GeneralSans-Extralight.eot b/client/public/fonts/general-sans/GeneralSans-Extralight.eot
deleted file mode 100644
index 9a917c7bb..000000000
Binary files a/client/public/fonts/general-sans/GeneralSans-Extralight.eot and /dev/null differ
diff --git a/client/public/fonts/general-sans/GeneralSans-Extralight.ttf b/client/public/fonts/general-sans/GeneralSans-Extralight.ttf
deleted file mode 100644
index f909f751a..000000000
Binary files a/client/public/fonts/general-sans/GeneralSans-Extralight.ttf and /dev/null differ
diff --git a/client/public/fonts/general-sans/GeneralSans-Extralight.woff b/client/public/fonts/general-sans/GeneralSans-Extralight.woff
deleted file mode 100644
index 3d7033fda..000000000
Binary files a/client/public/fonts/general-sans/GeneralSans-Extralight.woff and /dev/null differ
diff --git a/client/public/fonts/general-sans/GeneralSans-Extralight.woff2 b/client/public/fonts/general-sans/GeneralSans-Extralight.woff2
deleted file mode 100644
index fdae71048..000000000
Binary files a/client/public/fonts/general-sans/GeneralSans-Extralight.woff2 and /dev/null differ
diff --git a/client/public/fonts/general-sans/GeneralSans-ExtralightItalic.eot b/client/public/fonts/general-sans/GeneralSans-ExtralightItalic.eot
deleted file mode 100644
index 995465ff5..000000000
Binary files a/client/public/fonts/general-sans/GeneralSans-ExtralightItalic.eot and /dev/null differ
diff --git a/client/public/fonts/general-sans/GeneralSans-ExtralightItalic.ttf b/client/public/fonts/general-sans/GeneralSans-ExtralightItalic.ttf
deleted file mode 100644
index 6bfe01552..000000000
Binary files a/client/public/fonts/general-sans/GeneralSans-ExtralightItalic.ttf and /dev/null differ
diff --git a/client/public/fonts/general-sans/GeneralSans-ExtralightItalic.woff b/client/public/fonts/general-sans/GeneralSans-ExtralightItalic.woff
deleted file mode 100644
index fed48b27d..000000000
Binary files a/client/public/fonts/general-sans/GeneralSans-ExtralightItalic.woff and /dev/null differ
diff --git a/client/public/fonts/general-sans/GeneralSans-ExtralightItalic.woff2 b/client/public/fonts/general-sans/GeneralSans-ExtralightItalic.woff2
deleted file mode 100644
index e38db3147..000000000
Binary files a/client/public/fonts/general-sans/GeneralSans-ExtralightItalic.woff2 and /dev/null differ
diff --git a/client/public/fonts/general-sans/GeneralSans-Italic.eot b/client/public/fonts/general-sans/GeneralSans-Italic.eot
deleted file mode 100644
index da48c6387..000000000
Binary files a/client/public/fonts/general-sans/GeneralSans-Italic.eot and /dev/null differ
diff --git a/client/public/fonts/general-sans/GeneralSans-Italic.ttf b/client/public/fonts/general-sans/GeneralSans-Italic.ttf
deleted file mode 100644
index 4d6f0c26f..000000000
Binary files a/client/public/fonts/general-sans/GeneralSans-Italic.ttf and /dev/null differ
diff --git a/client/public/fonts/general-sans/GeneralSans-Italic.woff b/client/public/fonts/general-sans/GeneralSans-Italic.woff
deleted file mode 100644
index a42ca2ad6..000000000
Binary files a/client/public/fonts/general-sans/GeneralSans-Italic.woff and /dev/null differ
diff --git a/client/public/fonts/general-sans/GeneralSans-Italic.woff2 b/client/public/fonts/general-sans/GeneralSans-Italic.woff2
deleted file mode 100644
index b5e4795c1..000000000
Binary files a/client/public/fonts/general-sans/GeneralSans-Italic.woff2 and /dev/null differ
diff --git a/client/public/fonts/general-sans/GeneralSans-Light.eot b/client/public/fonts/general-sans/GeneralSans-Light.eot
deleted file mode 100644
index 86e8d4310..000000000
Binary files a/client/public/fonts/general-sans/GeneralSans-Light.eot and /dev/null differ
diff --git a/client/public/fonts/general-sans/GeneralSans-Light.ttf b/client/public/fonts/general-sans/GeneralSans-Light.ttf
deleted file mode 100644
index 66f6e42bd..000000000
Binary files a/client/public/fonts/general-sans/GeneralSans-Light.ttf and /dev/null differ
diff --git a/client/public/fonts/general-sans/GeneralSans-Light.woff b/client/public/fonts/general-sans/GeneralSans-Light.woff
deleted file mode 100644
index e7828dfe4..000000000
Binary files a/client/public/fonts/general-sans/GeneralSans-Light.woff and /dev/null differ
diff --git a/client/public/fonts/general-sans/GeneralSans-Light.woff2 b/client/public/fonts/general-sans/GeneralSans-Light.woff2
deleted file mode 100644
index e000d4375..000000000
Binary files a/client/public/fonts/general-sans/GeneralSans-Light.woff2 and /dev/null differ
diff --git a/client/public/fonts/general-sans/GeneralSans-LightItalic.eot b/client/public/fonts/general-sans/GeneralSans-LightItalic.eot
deleted file mode 100644
index f3b42050d..000000000
Binary files a/client/public/fonts/general-sans/GeneralSans-LightItalic.eot and /dev/null differ
diff --git a/client/public/fonts/general-sans/GeneralSans-LightItalic.ttf b/client/public/fonts/general-sans/GeneralSans-LightItalic.ttf
deleted file mode 100644
index 92d54c6ff..000000000
Binary files a/client/public/fonts/general-sans/GeneralSans-LightItalic.ttf and /dev/null differ
diff --git a/client/public/fonts/general-sans/GeneralSans-LightItalic.woff b/client/public/fonts/general-sans/GeneralSans-LightItalic.woff
deleted file mode 100644
index 95347bc89..000000000
Binary files a/client/public/fonts/general-sans/GeneralSans-LightItalic.woff and /dev/null differ
diff --git a/client/public/fonts/general-sans/GeneralSans-LightItalic.woff2 b/client/public/fonts/general-sans/GeneralSans-LightItalic.woff2
deleted file mode 100644
index 21d8f377a..000000000
Binary files a/client/public/fonts/general-sans/GeneralSans-LightItalic.woff2 and /dev/null differ
diff --git a/client/public/fonts/general-sans/GeneralSans-Medium.eot b/client/public/fonts/general-sans/GeneralSans-Medium.eot
deleted file mode 100644
index 51c580ca3..000000000
Binary files a/client/public/fonts/general-sans/GeneralSans-Medium.eot and /dev/null differ
diff --git a/client/public/fonts/general-sans/GeneralSans-Medium.ttf b/client/public/fonts/general-sans/GeneralSans-Medium.ttf
deleted file mode 100644
index e072c8373..000000000
Binary files a/client/public/fonts/general-sans/GeneralSans-Medium.ttf and /dev/null differ
diff --git a/client/public/fonts/general-sans/GeneralSans-Medium.woff b/client/public/fonts/general-sans/GeneralSans-Medium.woff
deleted file mode 100644
index 9ebd45a54..000000000
Binary files a/client/public/fonts/general-sans/GeneralSans-Medium.woff and /dev/null differ
diff --git a/client/public/fonts/general-sans/GeneralSans-Medium.woff2 b/client/public/fonts/general-sans/GeneralSans-Medium.woff2
deleted file mode 100644
index c90195fa2..000000000
Binary files a/client/public/fonts/general-sans/GeneralSans-Medium.woff2 and /dev/null differ
diff --git a/client/public/fonts/general-sans/GeneralSans-MediumItalic.eot b/client/public/fonts/general-sans/GeneralSans-MediumItalic.eot
deleted file mode 100644
index 26d153117..000000000
Binary files a/client/public/fonts/general-sans/GeneralSans-MediumItalic.eot and /dev/null differ
diff --git a/client/public/fonts/general-sans/GeneralSans-MediumItalic.ttf b/client/public/fonts/general-sans/GeneralSans-MediumItalic.ttf
deleted file mode 100644
index f8becf054..000000000
Binary files a/client/public/fonts/general-sans/GeneralSans-MediumItalic.ttf and /dev/null differ
diff --git a/client/public/fonts/general-sans/GeneralSans-MediumItalic.woff b/client/public/fonts/general-sans/GeneralSans-MediumItalic.woff
deleted file mode 100644
index 98b86ec02..000000000
Binary files a/client/public/fonts/general-sans/GeneralSans-MediumItalic.woff and /dev/null differ
diff --git a/client/public/fonts/general-sans/GeneralSans-MediumItalic.woff2 b/client/public/fonts/general-sans/GeneralSans-MediumItalic.woff2
deleted file mode 100644
index c97d31c24..000000000
Binary files a/client/public/fonts/general-sans/GeneralSans-MediumItalic.woff2 and /dev/null differ
diff --git a/client/public/fonts/general-sans/GeneralSans-Regular.eot b/client/public/fonts/general-sans/GeneralSans-Regular.eot
deleted file mode 100644
index a1269ddae..000000000
Binary files a/client/public/fonts/general-sans/GeneralSans-Regular.eot and /dev/null differ
diff --git a/client/public/fonts/general-sans/GeneralSans-Regular.ttf b/client/public/fonts/general-sans/GeneralSans-Regular.ttf
deleted file mode 100644
index d970a994e..000000000
Binary files a/client/public/fonts/general-sans/GeneralSans-Regular.ttf and /dev/null differ
diff --git a/client/public/fonts/general-sans/GeneralSans-Regular.woff b/client/public/fonts/general-sans/GeneralSans-Regular.woff
deleted file mode 100644
index 0dbc271b8..000000000
Binary files a/client/public/fonts/general-sans/GeneralSans-Regular.woff and /dev/null differ
diff --git a/client/public/fonts/general-sans/GeneralSans-Regular.woff2 b/client/public/fonts/general-sans/GeneralSans-Regular.woff2
deleted file mode 100644
index 2bc4672a7..000000000
Binary files a/client/public/fonts/general-sans/GeneralSans-Regular.woff2 and /dev/null differ
diff --git a/client/public/fonts/general-sans/GeneralSans-Semibold.eot b/client/public/fonts/general-sans/GeneralSans-Semibold.eot
deleted file mode 100644
index ca2dadf0b..000000000
Binary files a/client/public/fonts/general-sans/GeneralSans-Semibold.eot and /dev/null differ
diff --git a/client/public/fonts/general-sans/GeneralSans-Semibold.ttf b/client/public/fonts/general-sans/GeneralSans-Semibold.ttf
deleted file mode 100644
index 916b8091a..000000000
Binary files a/client/public/fonts/general-sans/GeneralSans-Semibold.ttf and /dev/null differ
diff --git a/client/public/fonts/general-sans/GeneralSans-Semibold.woff b/client/public/fonts/general-sans/GeneralSans-Semibold.woff
deleted file mode 100644
index 9c0ac3868..000000000
Binary files a/client/public/fonts/general-sans/GeneralSans-Semibold.woff and /dev/null differ
diff --git a/client/public/fonts/general-sans/GeneralSans-Semibold.woff2 b/client/public/fonts/general-sans/GeneralSans-Semibold.woff2
deleted file mode 100644
index b17a037e3..000000000
Binary files a/client/public/fonts/general-sans/GeneralSans-Semibold.woff2 and /dev/null differ
diff --git a/client/public/fonts/general-sans/GeneralSans-SemiboldItalic.eot b/client/public/fonts/general-sans/GeneralSans-SemiboldItalic.eot
deleted file mode 100644
index 4d61cdb75..000000000
Binary files a/client/public/fonts/general-sans/GeneralSans-SemiboldItalic.eot and /dev/null differ
diff --git a/client/public/fonts/general-sans/GeneralSans-SemiboldItalic.ttf b/client/public/fonts/general-sans/GeneralSans-SemiboldItalic.ttf
deleted file mode 100644
index 6180bd760..000000000
Binary files a/client/public/fonts/general-sans/GeneralSans-SemiboldItalic.ttf and /dev/null differ
diff --git a/client/public/fonts/general-sans/GeneralSans-SemiboldItalic.woff b/client/public/fonts/general-sans/GeneralSans-SemiboldItalic.woff
deleted file mode 100644
index 74b711387..000000000
Binary files a/client/public/fonts/general-sans/GeneralSans-SemiboldItalic.woff and /dev/null differ
diff --git a/client/public/fonts/general-sans/GeneralSans-SemiboldItalic.woff2 b/client/public/fonts/general-sans/GeneralSans-SemiboldItalic.woff2
deleted file mode 100644
index 4518fe97e..000000000
Binary files a/client/public/fonts/general-sans/GeneralSans-SemiboldItalic.woff2 and /dev/null differ
diff --git a/client/public/fonts/general-sans/GeneralSans-Variable.eot b/client/public/fonts/general-sans/GeneralSans-Variable.eot
deleted file mode 100644
index 9763a2159..000000000
Binary files a/client/public/fonts/general-sans/GeneralSans-Variable.eot and /dev/null differ
diff --git a/client/public/fonts/general-sans/GeneralSans-Variable.ttf b/client/public/fonts/general-sans/GeneralSans-Variable.ttf
deleted file mode 100644
index 65b0dabc1..000000000
Binary files a/client/public/fonts/general-sans/GeneralSans-Variable.ttf and /dev/null differ
diff --git a/client/public/fonts/general-sans/GeneralSans-Variable.woff b/client/public/fonts/general-sans/GeneralSans-Variable.woff
deleted file mode 100644
index 8e56437f9..000000000
Binary files a/client/public/fonts/general-sans/GeneralSans-Variable.woff and /dev/null differ
diff --git a/client/public/fonts/general-sans/GeneralSans-Variable.woff2 b/client/public/fonts/general-sans/GeneralSans-Variable.woff2
deleted file mode 100644
index 55e906ba3..000000000
Binary files a/client/public/fonts/general-sans/GeneralSans-Variable.woff2 and /dev/null differ
diff --git a/client/public/fonts/general-sans/GeneralSans-VariableItalic.eot b/client/public/fonts/general-sans/GeneralSans-VariableItalic.eot
deleted file mode 100644
index 2d83e7482..000000000
Binary files a/client/public/fonts/general-sans/GeneralSans-VariableItalic.eot and /dev/null differ
diff --git a/client/public/fonts/general-sans/GeneralSans-VariableItalic.ttf b/client/public/fonts/general-sans/GeneralSans-VariableItalic.ttf
deleted file mode 100644
index e9450be74..000000000
Binary files a/client/public/fonts/general-sans/GeneralSans-VariableItalic.ttf and /dev/null differ
diff --git a/client/public/fonts/general-sans/GeneralSans-VariableItalic.woff b/client/public/fonts/general-sans/GeneralSans-VariableItalic.woff
deleted file mode 100644
index 81d8a5ad8..000000000
Binary files a/client/public/fonts/general-sans/GeneralSans-VariableItalic.woff and /dev/null differ
diff --git a/client/public/fonts/general-sans/GeneralSans-VariableItalic.woff2 b/client/public/fonts/general-sans/GeneralSans-VariableItalic.woff2
deleted file mode 100644
index 770170a83..000000000
Binary files a/client/public/fonts/general-sans/GeneralSans-VariableItalic.woff2 and /dev/null differ
diff --git a/client/public/fonts/inter/Inter-Italic-VariableFont_opsz,wght.ttf b/client/public/fonts/inter/Inter-Italic-VariableFont_opsz,wght.ttf
new file mode 100644
index 000000000..43ed4f5ee
Binary files /dev/null and b/client/public/fonts/inter/Inter-Italic-VariableFont_opsz,wght.ttf differ
diff --git a/client/public/fonts/inter/Inter-VariableFont_opsz,wght.ttf b/client/public/fonts/inter/Inter-VariableFont_opsz,wght.ttf
new file mode 100644
index 000000000..e31b51e3e
Binary files /dev/null and b/client/public/fonts/inter/Inter-VariableFont_opsz,wght.ttf differ
diff --git a/client/runtimeConfig.js b/client/runtimeConfig.js
index 3b8a902b8..209072943 100644
--- a/client/runtimeConfig.js
+++ b/client/runtimeConfig.js
@@ -7,7 +7,7 @@ export default {
// Keys within public, will be also exposed to the client-side
public: {
gtm: {
- id: process.env.NUXT_PUBLIC_GTM_CODE || null,
+ id: process.env.NUXT_PUBLIC_GTM_CODE || 'GTM-XXXXXX',
enabled: false,
},
apiBase: process.env.NUXT_PUBLIC_API_BASE || '',
diff --git a/client/scss/app.scss b/client/scss/app.scss
deleted file mode 100644
index 044a142f6..000000000
--- a/client/scss/app.scss
+++ /dev/null
@@ -1,72 +0,0 @@
-@tailwind base;
-@tailwind components;
-@tailwind utilities;
-
-@import 'fonts';
-
-body.dark * {
- @apply border-gray-600
-}
-
-* {
- font-family: GeneralSans, sans-serif !important;
-}
-
-#app {
- @apply min-h-screen;
-}
-
-@layer base {
-
- :root {
- --bg-form-color: #2563eb;
- }
-
- h1 {
- @apply text-2xl sm:text-3xl font-extrabold;
- }
-
- h2 {
- @apply text-3xl font-semibold;
- }
-
- p, div {
- @apply text-gray-900 dark:text-white text-inherit;
- }
-
- h1, h2, h3, h4, h5, h6 {
- @apply text-gray-900 dark:text-white text-inherit;
- }
-
- a {
- @apply text-blue-600 hover:underline text-inherit;
- }
-}
-
-.bg-white {
- @apply dark:bg-notion-dark;
-}
-
-.bg-gray-50 {
- @apply dark:bg-notion-dark-light;
-}
-
-.field-help {
- p, ol, ul, li {
- @apply text-gray-400 dark:text-gray-500;
- }
-
- ol {
- @apply list-decimal list-inside;
- }
-
- ul {
- @apply list-disc list-inside;
- }
-}
-
-.public-page {
- .fb-feedback-widget-feedback-button-container {
- display: none;
- }
-}
diff --git a/client/scss/fonts.scss b/client/scss/fonts.scss
deleted file mode 100644
index ca61bbefc..000000000
--- a/client/scss/fonts.scss
+++ /dev/null
@@ -1,202 +0,0 @@
-/**
- * @license
- *
- * Font Family: General Sans
- * Designed by: Frode Helland
- * URL: https://www.fontshare.com/fonts/general-sans/general-sans
- * © 2022 Indian Type Foundry
- *
- * Font Styles:
- * General Sans Variable(Variable font)
- * General Sans Variable Italic(Variable font)
- * General Sans Extralight
- * General Sans Extralight Italic
- * General Sans Light
- * General Sans Light Italic
- * General Sans Regular
- * General Sans Italic
- * General Sans Medium
- * General Sans Medium Italic
- * General Sans Semibold
- * General Sans Semibold Italic
- * General Sans Bold
- * General Sans Bold Italic
- *
-*/
-
-
-/**
-* This is a variable font
-* You can controll variable axes as shown below:
-* font-variation-settings: 'wght' 700.0;
-*
-* available axes:
-
-* 'wght' (range from 200.0 to 700.0)
-
-*/
-
-@font-face {
- font-family: 'GeneralSans-Variable';
- src: url('/fonts/general-sans/GeneralSans-Variable.woff2') format('woff2'),
- url('/fonts/general-sans/GeneralSans-Variable.woff') format('woff'),
- url('/fonts/general-sans/GeneralSans-Variable.ttf') format('truetype');
- font-weight: 200 700;
- font-display: swap;
- font-style: normal;
-}
-
-
-/**
-* This is a variable font
-* You can controll variable axes as shown below:
-* font-variation-settings: 'wght' 700.0;
-*
-* available axes:
-
-* 'wght' (range from 200.0 to 700.0)
-
-*/
-
-@font-face {
- font-family: 'GeneralSans';
- src: url('/fonts/general-sans/GeneralSans-VariableItalic.woff2') format('woff2'),
- url('/fonts/general-sans/GeneralSans-VariableItalic.woff') format('woff'),
- url('/fonts/general-sans/GeneralSans-VariableItalic.ttf') format('truetype');
- font-weight: 200 700;
- font-display: swap;
- font-style: italic;
-}
-
-
-@font-face {
- font-family: 'GeneralSans';
- src: url('/fonts/general-sans/GeneralSans-Extralight.woff2') format('woff2'),
- url('/fonts/general-sans/GeneralSans-Extralight.woff') format('woff'),
- url('/fonts/general-sans/GeneralSans-Extralight.ttf') format('truetype');
- font-weight: 200;
- font-display: swap;
- font-style: normal;
-}
-
-
-@font-face {
- font-family: 'GeneralSans';
- src: url('/fonts/general-sans/GeneralSans-ExtralightItalic.woff2') format('woff2'),
- url('/fonts/general-sans/GeneralSans-ExtralightItalic.woff') format('woff'),
- url('/fonts/general-sans/GeneralSans-ExtralightItalic.ttf') format('truetype');
- font-weight: 200;
- font-display: swap;
- font-style: italic;
-}
-
-
-@font-face {
- font-family: 'GeneralSans';
- src: url('/fonts/general-sans/GeneralSans-Light.woff2') format('woff2'),
- url('/fonts/general-sans/GeneralSans-Light.woff') format('woff'),
- url('/fonts/general-sans/GeneralSans-Light.ttf') format('truetype');
- font-weight: 300;
- font-display: swap;
- font-style: normal;
-}
-
-
-@font-face {
- font-family: 'GeneralSans';
- src: url('/fonts/general-sans/GeneralSans-LightItalic.woff2') format('woff2'),
- url('/fonts/general-sans/GeneralSans-LightItalic.woff') format('woff'),
- url('/fonts/general-sans/GeneralSans-LightItalic.ttf') format('truetype');
- font-weight: 300;
- font-display: swap;
- font-style: italic;
-}
-
-
-@font-face {
- font-family: 'GeneralSans';
- src: url('/fonts/general-sans/GeneralSans-Regular.woff2') format('woff2'),
- url('/fonts/general-sans/GeneralSans-Regular.woff') format('woff'),
- url('/fonts/general-sans/GeneralSans-Regular.ttf') format('truetype');
- font-weight: 400;
- font-display: swap;
- font-style: normal;
-}
-
-
-@font-face {
- font-family: 'GeneralSans';
- src: url('/fonts/general-sans/GeneralSans-Italic.woff2') format('woff2'),
- url('/fonts/general-sans/GeneralSans-Italic.woff') format('woff'),
- url('/fonts/general-sans/GeneralSans-Italic.ttf') format('truetype');
- font-weight: 400;
- font-display: swap;
- font-style: italic;
-}
-
-
-@font-face {
- font-family: 'GeneralSans';
- src: url('/fonts/general-sans/GeneralSans-Medium.woff2') format('woff2'),
- url('/fonts/general-sans/GeneralSans-Medium.woff') format('woff'),
- url('/fonts/general-sans/GeneralSans-Medium.ttf') format('truetype');
- font-weight: 500;
- font-display: swap;
- font-style: normal;
-}
-
-
-@font-face {
- font-family: 'GeneralSans';
- src: url('/fonts/general-sans/GeneralSans-MediumItalic.woff2') format('woff2'),
- url('/fonts/general-sans/GeneralSans-MediumItalic.woff') format('woff'),
- url('/fonts/general-sans/GeneralSans-MediumItalic.ttf') format('truetype');
- font-weight: 500;
- font-display: swap;
- font-style: italic;
-}
-
-
-@font-face {
- font-family: 'GeneralSans';
- src: url('/fonts/general-sans/GeneralSans-Semibold.woff2') format('woff2'),
- url('/fonts/general-sans/GeneralSans-Semibold.woff') format('woff'),
- url('/fonts/general-sans/GeneralSans-Semibold.ttf') format('truetype');
- font-weight: 600;
- font-display: swap;
- font-style: normal;
-}
-
-
-@font-face {
- font-family: 'GeneralSans';
- src: url('/fonts/general-sans/GeneralSans-SemiboldItalic.woff2') format('woff2'),
- url('/fonts/general-sans/GeneralSans-SemiboldItalic.woff') format('woff'),
- url('/fonts/general-sans/GeneralSans-SemiboldItalic.ttf') format('truetype');
- font-weight: 600;
- font-display: swap;
- font-style: italic;
-}
-
-
-@font-face {
- font-family: 'GeneralSans';
- src: url('/fonts/general-sans/GeneralSans-Bold.woff2') format('woff2'),
- url('/fonts/general-sans/GeneralSans-Bold.woff') format('woff'),
- url('/fonts/general-sans/GeneralSans-Bold.ttf') format('truetype');
- font-weight: 700;
- font-display: swap;
- font-style: normal;
-}
-
-
-@font-face {
- font-family: 'GeneralSans';
- src: url('/fonts/general-sans/GeneralSans-BoldItalic.woff2') format('woff2'),
- url('/fonts/general-sans/GeneralSans-BoldItalic.woff') format('woff'),
- url('/fonts/general-sans/GeneralSans-BoldItalic.ttf') format('truetype');
- font-weight: 700;
- font-display: swap;
- font-style: italic;
-}
-
diff --git a/client/sentry.client.config.ts b/client/sentry.client.config.ts
index 4ace92179..a5a154b32 100644
--- a/client/sentry.client.config.ts
+++ b/client/sentry.client.config.ts
@@ -45,17 +45,16 @@ Sentry.init({
}
}
- const authStore = useAuthStore()
- if (authStore.check) {
- const user = authStore.user as { id?: string; email?: string } | null
+ const { isAuthenticated } = useIsAuthenticated()
+ const { user } = useAuth()
+ const { data: userData } = user()
+
+ if (isAuthenticated.value) {
+ const userValue = userData.value as { id?: string; email?: string } | null
Sentry.setUser({
- id: user?.id,
- email: user?.email
+ id: userValue?.id,
+ email: userValue?.email
})
- event.user = {
- id: user?.id,
- email: user?.email
- }
}
return event
}
diff --git a/client/sitemap.js b/client/sitemap.js
index f943ffdeb..6fde1a18e 100644
--- a/client/sitemap.js
+++ b/client/sitemap.js
@@ -3,7 +3,7 @@ import templateTypes from './data/forms/templates/types.json'
import opnformConfig from './opnform.config.js'
export default {
- exclude: ['/settings/**', '/subscriptions/**', '/templates/my-templates'],
+ exclude: ['/subscriptions/**', '/templates/my-templates'],
sources: [`${process.env.NUXT_PUBLIC_API_BASE}sitemap-urls`],
cacheMaxAgeSeconds: 60 * 60 * 2, // 2 hours
xslColumns: [
diff --git a/client/stores/access_tokens.js b/client/stores/access_tokens.js
deleted file mode 100644
index 5a7635a86..000000000
--- a/client/stores/access_tokens.js
+++ /dev/null
@@ -1,66 +0,0 @@
-import { defineStore } from "pinia"
-import { useContentStore } from "~/composables/stores/useContentStore.js"
-
-export const useAccessTokenStore = defineStore("access_tokens", () => {
- const contentStore = useContentStore()
-
- const abilities = [
- {
- title: 'Manage integrations',
- name: 'manage-integrations',
- },
- {
- title: 'Forms – Read',
- name: 'forms-read',
- },
- {
- title: 'Forms – Write',
- name: 'forms-write',
- },
- {
- title: 'Workspaces – Read',
- name: 'workspaces-read',
- },
- {
- title: 'Workspaces – Write',
- name: 'workspaces-write',
- },
- {
- title: 'Workspace Users – Read',
- name: 'workspace-users-read',
- },
- {
- title: 'Workspace Users – Write',
- name: 'workspace-users-write',
- },
- ]
-
- const fetchTokens = () => {
- contentStore.resetState()
- contentStore.startLoading()
-
- return opnFetch('/settings/tokens').then(
- (data) => {
- contentStore.save(data)
- contentStore.stopLoading()
- },
- )
- }
-
- const tokens = computed(() => contentStore.getAll.value)
-
- const getAbility = (name) => {
- return abilities.find((ability) => ability.name === name) ?? {
- name,
- title: name,
- }
- }
-
- return {
- ...contentStore,
- fetchTokens,
- tokens,
- abilities,
- getAbility
- }
-})
diff --git a/client/stores/app.js b/client/stores/app.js
index 457bf0200..dab29d053 100644
--- a/client/stores/app.js
+++ b/client/stores/app.js
@@ -1,90 +1,52 @@
import { defineStore } from "pinia"
-import { nextTick } from "vue"
+import { ref, reactive, computed } from "vue"
-export const useAppStore = defineStore("app", {
- state: () => ({
- layout: "default",
- navbarHidden: false,
- crisp: {
- chatOpened: false,
- hidden: false
- },
- isUnauthorizedError: false,
- quickLoginModal: false,
- quickRegisterModal: false,
-
- // App Loader
- loader: {
- percent: 0,
- show: false,
- canSuccess: true,
- duration: 3000,
- _timer: null,
- _cut: null,
- },
- }),
- getters: {
- featureBaseEnabled: () => useRuntimeConfig().public.featureBaseOrganization !== null,
- crispEnabled: () => useRuntimeConfig().public.crispWebsiteId !== null && useRuntimeConfig().public.crispWebsiteId !== '',
- },
- actions: {
- hideNavbar() {
- this.navbarHidden = true
- },
- showNavbar() {
- this.navbarHidden = false
- },
- setLayout(layout) {
- this.layout = layout ?? "default"
- },
- loaderIncrease(num) {
- this.loader.percent = this.loader.percent + Math.floor(num)
- },
- loaderDecrease(num) {
- this.loader.percent = this.loader.percent - Math.floor(num)
- },
- loaderFinish() {
- this.loader.percent = 100
- this.loaderHide()
- },
- loaderSetTimer(timerVal) {
- this.loader._timer = timerVal
- },
- loaderPause() {
- clearInterval(this.loader._timer)
- },
- loaderHide() {
- this.loaderPause()
- this.loader._timer = null
- setTimeout(() => {
- this.loader.show = false
- nextTick(() => {
- setTimeout(() => {
- this.loader.percent = 0
- }, 200)
- })
- }, 500)
- },
- loaderFail() {
- this.loader.canSuccess = false
- },
- loaderStart() {
- this.loader.show = true
- this.loader.canSuccess = true
- if (this.loader._timer) {
- clearInterval(this.loader._timer)
- this.loader.percent = 0
- }
- this.loader._cut = 10000 / Math.floor(this.loader.duration)
+export const useAppStore = defineStore("app", () => {
+ const crisp = reactive({
+ chatOpened: false,
+ hidden: false
+ })
+ const isUnauthorizedError = ref(false)
+ const quickLoginModal = ref(false)
+ const quickRegisterModal = ref(false)
- this.loaderSetTimer(
- setInterval(() => {
- this.loaderIncrease(this.loader._cut * Math.random())
- if (this.loader.percent > 95) {
- this.loaderFinish()
- }
- }, 100),
- )
- },
- },
+ const featureBaseEnabled = computed(() => useRuntimeConfig().public.featureBaseOrganization !== null)
+ const crispEnabled = computed(() => useRuntimeConfig().public.crispWebsiteId !== null && useRuntimeConfig().public.crispWebsiteId !== '')
+
+ // FeatureBase custom button state
+ const featureBaseButtonVisible = ref(true)
+
+ // Workspace
+ const currentId = useCookie("currentWorkspace")
+
+ const setCurrentId = (id) => {
+ currentId.value = id
+ }
+
+ // FeatureBase button controls
+ const showFeatureBaseButton = () => {
+ featureBaseButtonVisible.value = true
+ }
+
+ const hideFeatureBaseButton = () => {
+ featureBaseButtonVisible.value = false
+ }
+
+ return {
+ crisp,
+ isUnauthorizedError,
+ quickLoginModal,
+ quickRegisterModal,
+ featureBaseEnabled,
+ crispEnabled,
+
+ // FeatureBase
+ featureBaseButtonVisible,
+ showFeatureBaseButton,
+ hideFeatureBaseButton,
+
+ // Workspace
+ currentId,
+ setCurrentId,
+ }
})
diff --git a/client/stores/auth.js b/client/stores/auth.js
index 8a987164d..ecff73d23 100644
--- a/client/stores/auth.js
+++ b/client/stores/auth.js
@@ -1,4 +1,6 @@
import { defineStore } from "pinia"
+import { authApi } from "~/api"
+import { initServiceClients } from '~/composables/useAuthFlow'
export const useAuthStore = defineStore("auth", {
state: () => {
@@ -64,35 +66,30 @@ export const useAuthStore = defineStore("auth", {
}
this.user = user
- this.initServiceClients()
+ initServiceClients(user)
},
updateUser(payload) {
this.user = payload
- this.initServiceClients()
- },
-
- initServiceClients() {
- if (!this.user) return
- useAmplitude().setUser(this.user)
- useCrisp().setUser(this.user)
-
- // todo: set sentry user
+ initServiceClients(payload)
},
logout() {
- opnFetch("logout", { method: "POST" }).catch(() => {})
+ authApi.logout().catch(() => {})
this.user = null
- // Clear the token cookie by setting maxAge to 0
+ this.clearToken()
+ },
+
+ clearToken(){
this.setCookie("token", null, { maxAge: 0 })
this.token = null
},
- // async fetchOauthUrl() {
- // const {data} = await axios.post(`/api/oauth/${provider}`)
- // return data.url
- // },
+ clearTokens(){
+ this.clearToken()
+ this.setAdminToken(null)
+ },
},
})
diff --git a/client/stores/errors.js b/client/stores/errors.js
deleted file mode 100644
index 32ed20093..000000000
--- a/client/stores/errors.js
+++ /dev/null
@@ -1,15 +0,0 @@
-import { defineStore } from "pinia"
-
-export const useErrorsStore = defineStore("errors", {
- state: () => ({
- content: null,
- }),
- actions: {
- set(error) {
- this.content = error
- },
- clear() {
- this.content = null
- },
- },
-})
diff --git a/client/stores/form_integrations.js b/client/stores/form_integrations.js
deleted file mode 100644
index 3b749861f..000000000
--- a/client/stores/form_integrations.js
+++ /dev/null
@@ -1,77 +0,0 @@
-import { defineStore } from "pinia"
-import { useContentStore } from "~/composables/stores/useContentStore.js"
-import integrationsList from "~/data/forms/integrations.json"
-
-export const formIntegrationsEndpoint = "/open/forms/{formid}/integrations"
-
-export const useFormIntegrationsStore = defineStore("form_integrations", () => {
- const contentStore = useContentStore()
- const integrations = ref(new Map())
-
- const availableIntegrations = computed(() => {
- const user = useAuthStore().user
- const featureFlagsStore = useFeatureFlagsStore()
- if (!user) return integrations.value
-
- const enrichedIntegrations = new Map()
- for (const [key, integration] of integrations.value.entries()) {
- if (featureFlagsStore.getFlag(`integrations.${key}`, true)) {
- enrichedIntegrations.set(key, {
- ...integration,
- id: key,
- requires_subscription: !user.is_subscribed && integration.is_pro,
- })
- }
- }
-
- return enrichedIntegrations
- })
-
- const integrationsBySection = computed(() => {
- const groupedObject = {}
- for (const [key, integration] of availableIntegrations.value.entries()) {
- const sectionName = integration.section_name
- if (!groupedObject[sectionName]) {
- groupedObject[sectionName] = {}
- }
- groupedObject[sectionName][key] = integration
- }
- return groupedObject
- })
-
- const fetchFormIntegrations = (formId, refresh=true) => {
- if (refresh) {
- contentStore.resetState()
- contentStore.startLoading()
- }
- return useOpnApi(formIntegrationsEndpoint.replace("{formid}", formId)).then(
- (response) => {
- contentStore.save(response.data.value)
- contentStore.stopLoading()
- },
- )
- }
-
- const getAllByFormId = (formId) => {
- return contentStore.getAll.value.filter((item) => {
- return item.form_id ? item.form_id === formId : false
- })
- }
-
- const initIntegrations = () => {
- if (integrations.value.size === 0) {
- integrations.value = new Map(Object.entries(integrationsList))
- }
- }
-
- initIntegrations()
-
- return {
- ...contentStore,
- initIntegrations,
- availableIntegrations,
- integrationsBySection,
- fetchFormIntegrations,
- getAllByFormId,
- }
-})
diff --git a/client/stores/forms.js b/client/stores/forms.js
deleted file mode 100644
index 7e3005adc..000000000
--- a/client/stores/forms.js
+++ /dev/null
@@ -1,119 +0,0 @@
-import { defineStore } from "pinia"
-import { useContentStore } from "~/composables/stores/useContentStore.js"
-
-export const formsEndpoint = "/open/workspaces/{workspaceId}/forms"
-export const singleFormEndpoint = "/open/forms/{slug}"
-
-export const useFormsStore = defineStore("forms", () => {
- const contentStore = useContentStore("slug")
- const allLoaded = ref(false)
- const loadAllRequest = ref(null)
-
- const loadAll = (workspaceId) => {
- if (loadAllRequest.value) {
- return loadAllRequest.value
- }
- if (!workspaceId) {
- return
- }
- contentStore.startLoading()
-
- loadAllRequest.value = new Promise((resolve, reject) => {
- opnFetch(formsEndpoint.replace('{workspaceId}', workspaceId), { query: { page: 1 } })
- .then(firstResponse => {
- contentStore.resetState()
- contentStore.save(firstResponse.data)
-
- const lastPage = firstResponse.meta.last_page
-
- if (lastPage > 1) {
- // Create an array of promises for remaining pages
- const remainingPages = Array.from({ length: lastPage - 1 }, (_, i) => {
- const page = i + 2 // Start from page 2
- return opnFetch(formsEndpoint.replace('{workspaceId}', workspaceId), { query: { page } })
- })
-
- // Fetch all remaining pages in parallel
- return Promise.all(remainingPages)
- }
- return []
- })
- .then(responses => {
- // Save all responses data
- responses.forEach(response => {
- contentStore.save(response.data)
- })
-
- allLoaded.value = true
- contentStore.stopLoading()
- loadAllRequest.value = null
- resolve()
- })
- .catch(err => {
- contentStore.stopLoading()
- loadAllRequest.value = null
- reject(err)
- })
- })
-
- return loadAllRequest.value
- }
-
- const loadForm = (slug) => {
- contentStore.startLoading()
- return opnFetch(singleFormEndpoint.replace("{slug}", slug))
- .then((response) => {
- contentStore.save(response)
- })
- .finally(() => {
- contentStore.stopLoading()
- })
- }
-
- const load = (workspaceId, slug) => {
- contentStore.startLoading()
- return opnFetch(
- formsEndpoint.replace("{workspaceId}", workspaceId) + "/" + slug,
- ).finally(() => {
- contentStore.stopLoading()
- })
- }
-
- /**
- * Load a form from the public API
- */
- const publicLoad = (slug) => {
- contentStore.startLoading()
- return useOpnApi("/forms/" + slug)
- }
-
- const publicFetch = (slug) => {
- contentStore.startLoading()
- return opnFetch("/forms/" + slug)
- }
-
- const allTags = computed(() => {
- let tags = []
- contentStore.getAll.value.forEach((form) => {
- if (form.tags && form.tags.length) {
- if (typeof form.tags === "string" || form.tags instanceof String) {
- tags = tags.concat(form.tags.split(","))
- } else if (Array.isArray(form.tags)) {
- tags = tags.concat(form.tags)
- }
- }
- })
- return [...new Set(tags)]
- })
-
- return {
- ...contentStore,
- allLoaded,
- allTags,
- publicLoad,
- publicFetch,
- loadAll,
- loadForm,
- load,
- }
-})
diff --git a/client/stores/oauth_providers.js b/client/stores/oauth_providers.js
deleted file mode 100644
index e3da43c0b..000000000
--- a/client/stores/oauth_providers.js
+++ /dev/null
@@ -1,133 +0,0 @@
-import { defineStore } from "pinia"
-import { useContentStore } from "~/composables/stores/useContentStore.js"
-import { useFeatureFlagsStore } from '~/stores/featureFlags'
-
-export const providersEndpoint = "/open/providers"
-
-export const useOAuthProvidersStore = defineStore("oauth_providers", () => {
- const contentStore = useContentStore()
- const featureFlagsStore = useFeatureFlagsStore()
- const alert = useAlert()
-
- const googleDrivePermission = 'https://www.googleapis.com/auth/drive.file'
-
- const services = computed(() => {
- return [
- {
- name: 'google',
- title: 'Google',
- icon: 'mdi:google',
- enabled: featureFlagsStore.getFlag('services.google.auth', false),
- auth_type: 'redirect'
- },
- {
- name: 'stripe',
- title: 'Stripe',
- icon: 'cib:stripe',
- enabled: featureFlagsStore.getFlag('billing.stripe_publishable_key', false),
- auth_type: 'redirect'
- },
- {
- name: 'telegram',
- title: 'Telegram',
- icon: 'mdi:telegram',
- enabled: featureFlagsStore.getFlag('services.telegram.bot_id', false),
- auth_type: 'widget',
- widget_file: 'TelegramWidget'
- }
- ]
- })
-
- const getService = (service) => {
- return services.value.find((item) => item.name === service)
- }
-
- const fetchOAuthProviders = () => {
- contentStore.resetState()
- contentStore.startLoading()
-
- return opnFetch(providersEndpoint).then(
- (data) => {
- contentStore.save(data)
- contentStore.stopLoading()
- },
- )
- }
-
- const connect = (service, redirect = false, newtab = false, autoClose = false) => {
- contentStore.resetState()
-
- const serviceConfig = getService(service)
- if (serviceConfig && serviceConfig.auth_type && serviceConfig.auth_type !== 'redirect') {
- return
- }
-
- contentStore.startLoading()
- const intention = redirect ? new URL(window.location.href).pathname : undefined
-
- opnFetch(`/settings/providers/connect/${service}`, {
- method: 'POST',
- body: {
- ...(intention && { intention }),
- autoClose: autoClose
- }
- })
- .then((data) => {
- if (newtab) {
- window.open(data.url, '_blank')
- } else {
- window.location.href = data.url
- }
- })
- .catch((error) => {
- try {
- alert.error(error.data.message)
- } catch {
- alert.error("An error occurred while connecting an account")
- }
- })
- .finally(() => {
- contentStore.stopLoading()
- })
- }
-
- const guestConnect = (service, redirect = false) => {
- contentStore.resetState()
- contentStore.startLoading()
-
- const intention = new URL(window.location.href).pathname
-
- opnFetch(`/oauth/connect/${service}`, {
- method: 'POST',
- body: {
- ...redirect ? { intention } : {},
- }
- })
- .then((data) => {
- window.open(data.url, '_blank')
- })
- .catch((error) => {
- try {
- alert.error(error.data.message)
- } catch {
- alert.error("An error occurred while connecting an account")
- }
- })
- .finally(() => {
- contentStore.stopLoading()
- })
- }
-
- const providers = computed(() => contentStore.getAll.value)
-
- return {
- ...contentStore,
- googleDrivePermission,
- services,
- getService,
- fetchOAuthProviders,
- providers,
- connect,
- guestConnect
- }
-})
diff --git a/client/stores/subscription_modal.js b/client/stores/subscription_modal.js
deleted file mode 100644
index 0dc42dfde..000000000
--- a/client/stores/subscription_modal.js
+++ /dev/null
@@ -1,31 +0,0 @@
-import { defineStore } from 'pinia'
-
-const DEFAULT_MODAL_TITLE = 'Upgrade and take your forms to the next level'
-const DEFAULT_MODAL_DESCRIPTION = 'On the Free plan, you can try out all paid features only within the form editor. Upgrade your plan to gain full access to all features.'
-
-export const useSubscriptionModalStore = defineStore('subscription_modal', {
- state: () => ({
- show: false,
- plan: null,
- yearly: true,
- modal_title: DEFAULT_MODAL_TITLE,
- modal_description: DEFAULT_MODAL_DESCRIPTION
- }),
- actions: {
- openModal (planName = undefined, isYearly = undefined) {
- this.plan = (planName !== undefined) ? planName : null
- this.yearly = (isYearly !== undefined) ? isYearly : true
- this.show = true
- },
- setModalContent (title = null, description = null) {
- this.modal_title = title || DEFAULT_MODAL_TITLE
- this.modal_description = description || DEFAULT_MODAL_DESCRIPTION
- },
- closeModal () {
- this.show = false
- this.plan = null
- this.modal_title = DEFAULT_MODAL_TITLE
- this.modal_description = DEFAULT_MODAL_DESCRIPTION
- }
- }
-})
diff --git a/client/stores/templates.js b/client/stores/templates.js
deleted file mode 100644
index 7fa9ab2c9..000000000
--- a/client/stores/templates.js
+++ /dev/null
@@ -1,68 +0,0 @@
-import { defineStore } from "pinia"
-import { useContentStore } from "~/composables/stores/useContentStore.js"
-import templateTypes from "~/data/forms/templates/types.json"
-import industryTypes from "~/data/forms/templates/industries.json"
-
-const templatesEndpoint = "templates"
-export const useTemplatesStore = defineStore("templates", () => {
- const contentStore = useContentStore("slug")
-
- const allLoaded = ref(false)
- const industries = ref(new Map())
- const types = ref(new Map())
-
- const getTemplateTypes = (slugs) => {
- if (!slugs) return []
- return slugs
- .map((slug) => {
- return types.value.get(slug)
- })
- .filter((item) => item !== undefined)
- }
- const getTemplateIndustries = (slugs) => {
- if (!slugs) return []
- return slugs
- .map((slug) => {
- return industries.value.get(slug)
- })
- .filter((item) => item !== undefined)
- }
-
- const initTypesAndIndustries = () => {
- if (types.value.size === 0) {
- types.value = new Map(Object.entries(templateTypes))
- }
- if (industries.value.size === 0) {
- industries.value = new Map(Object.entries(industryTypes))
- }
- }
-
- return {
- ...contentStore,
- industries,
- types,
- allLoaded,
- getTemplateTypes,
- getTemplateIndustries,
- initTypesAndIndustries,
- }
-})
-
-export const fetchTemplate = (slug, options = {}) => {
- return useOpnApi(templatesEndpoint + "/" + slug, options)
-}
-
-export const fetchAllTemplates = (options = {}) => {
- return useOpnApi(templatesEndpoint, options)
-}
-
-export const loadAllTemplates = async (store, options = {}) => {
- if (!store.allLoaded) {
- store.startLoading()
- store.initTypesAndIndustries()
- const { data } = await fetchAllTemplates(options)
- store.set(data.value)
- store.stopLoading()
- store.allLoaded = true
- }
-}
diff --git a/client/stores/working_form.js b/client/stores/working_form.js
index 47e3c2468..63b658253 100644
--- a/client/stores/working_form.js
+++ b/client/stores/working_form.js
@@ -3,13 +3,14 @@ import clonedeep from "clone-deep"
import { generateUUID } from "~/lib/utils.js"
import blocksTypes from "~/data/blocks_types.json"
import { useAlert } from '~/composables/useAlert'
-import { useAuthStore } from '~/stores/auth'
+import { useIsAuthenticated } from '~/composables/useAuthFlow'
+
import { useForm } from '~/composables/useForm'
export const useWorkingFormStore = defineStore("working_form", {
state: () => ({
content: null,
- activeTab: 0,
+ activeTab: 'build',
// Field being edited
selectedFieldIndex: null,
@@ -120,13 +121,14 @@ export const useWorkingFormStore = defineStore("working_form", {
* @param {number|null} explicitIndex - Optional explicit index to insert at
* @returns {number} The index where the block should be inserted relative to all properties
*/
- determineInsertIndex(explicitIndex) {
+ determineInsertIndex(explicitIndex, insertOnSamePage = false) {
// If we have a structure service, use its method
if (this.structureService) {
return this.structureService.determineInsertIndex(
this.selectedFieldIndex,
this.formPageIndex,
- explicitIndex
+ explicitIndex,
+ insertOnSamePage
)
}
@@ -183,8 +185,8 @@ export const useWorkingFormStore = defineStore("working_form", {
useAlert().error(block?.title + ' is not allowed on self hosted. Please use our hosted version.')
return
}
- if (originalBlockDefinition?.auth_required && !useAuthStore().check) {
- useAlert().error('Please login first to add this block')
+ if (originalBlockDefinition?.auth_required && !useIsAuthenticated().isAuthenticated.value) {
+ useAlert().error('Please login to add this block.')
return
}
@@ -224,6 +226,15 @@ export const useWorkingFormStore = defineStore("working_form", {
this.openSettingsForField(insertIndex)
}
},
+ addGeneratedFields(fields) {
+ if (!this.content) return
+
+ const insertIndex = this.determineInsertIndex(null, true)
+
+ const newFields = clonedeep(this.content.properties || [])
+ newFields.splice(insertIndex, 0, ...fields)
+ this.setProperties(newFields)
+ },
removeField(field) {
this.internalRemoveField(field)
},
@@ -236,7 +247,7 @@ export const useWorkingFormStore = defineStore("working_form", {
actions: [{
label: 'Undo',
icon:"i-material-symbols-undo",
- click: () => {
+ onclick: () => {
this.undo()
}
}]
diff --git a/client/stores/workspaces.js b/client/stores/workspaces.js
deleted file mode 100644
index 72e3f29e0..000000000
--- a/client/stores/workspaces.js
+++ /dev/null
@@ -1,65 +0,0 @@
-import { defineStore } from "pinia"
-import { useContentStore } from "~/composables/stores/useContentStore.js"
-
-export const workspaceEndpoint = "open/workspaces/"
-
-export const useWorkspacesStore = defineStore("workspaces", () => {
- const storedWorkspaceId = useCookie("currentWorkspace")
-
- const contentStore = useContentStore()
- const currentId = ref(storedWorkspaceId)
-
- const getCurrent = computed(() => {
- return contentStore.getByKey(currentId.value)
- })
-
- const setCurrentId = (id) => {
- currentId.value = id
- storedWorkspaceId.value = id
- }
-
- const set = (items) => {
- contentStore.content.value = new Map()
- save(items)
- }
-
- const save = (items) => {
- contentStore.save(items)
- if (getCurrent.value == null && contentStore.length.value) {
- setCurrentId(items[0].id)
- }
- }
-
- const remove = (itemId) => {
- contentStore.remove(itemId)
- if (currentId.value === itemId) {
- setCurrentId(
- contentStore.length.value > 0 ? contentStore.getAll.value[0].id : null,
- )
- }
- }
-
- const getWorkspaceUsers = async() => {
- return await opnFetch(`${workspaceEndpoint}${currentId.value}/users/`)
- }
-
- const getWorkspaceInvites = async() => {
- return await opnFetch(`${workspaceEndpoint}${currentId.value}/invites/`)
- }
-
- return {
- ...contentStore,
- currentId,
- getCurrent,
- setCurrentId,
- set,
- save,
- remove,
- getWorkspaceUsers,
- getWorkspaceInvites,
- }
-})
-
-export const fetchAllWorkspaces = (options = {}) => {
- return useOpnApi(workspaceEndpoint, options)
-}
diff --git a/client/tailwind.config.js b/client/tailwind.config.js
deleted file mode 100644
index ee5d89dd4..000000000
--- a/client/tailwind.config.js
+++ /dev/null
@@ -1,102 +0,0 @@
-const colors = require("tailwindcss/colors")
-const plugin = require("tailwindcss/plugin")
-
-module.exports = {
- content: [
- "./components/**/*.{js,vue,ts}",
- "./layouts/**/*.vue",
- "./pages/**/*.vue",
- "./plugins/**/*.{js,ts}",
- "./app.vue",
- "./error.vue",
- "./lib/forms/themes/form-themes.js",
- "./lib/forms/themes/ThemeBuilder.js",
- './data/**/*.json'
- ],
- safelist: [
- {
- pattern: /.*bg-(blue|gray|red|yellow|green).*/,
- },
- ...["green", "red", "blue", "yellow"]
- .map((color) => ["bg-" + color + "-100", "border-" + color + "-500"])
- .flat(), // Alerts
- ...["dark:hover:bg-notion-dark-light"],
- ],
- darkMode: "class", // or 'media' or 'class'
- theme: {
- extend: {
- keyframes: {
- "bonce-slow": {
- "0%, 20%": { transform: "translateY(0)" },
- "8%": { transform: "translateY(-25%)" },
- "16%": { transform: "translateY(+10%)" },
- },
- "infinite-scroll": {
- from: { transform: "translateX(0)" },
- to: { transform: "translateX(-100%)" },
- },
- },
- animation: {
- "bounce-slow": "bonce-slow 3s ease-in-out infinite",
- "infinite-scroll": "infinite-scroll 50s linear infinite",
- },
- maxHeight: {
- 42: "10.5rem",
- },
- minHeight: {
- 6: "1.5rem",
- 8: "2rem",
- },
- maxWidth: {
- 15: "15rem",
- 10: "10rem",
- 8: "2rem",
- },
- translate: {
- 5.5: "1.4rem",
- },
- boxShadow: {
- 'custom-shadow':'0px 25px 75px 0px #5353531A'
- },
- colors: {
- gray: colors.slate,
- "nt-blue": {
- lighter: colors.blue["100"],
- light: colors.blue["300"],
- default: colors.blue["600"],
- DEFAULT: colors.blue["600"],
- dark: colors.blue["800"],
- },
- "notion-dark": {
- DEFAULT: "#191919",
- light: "#2e2e2e",
- },
- "notion-input": {
- background: "#F7F6F3",
- backgroundDark: "#272B2C",
- help: "#37352f99",
- helpDark: "#fff9",
- border: 'rgba(15, 15, 15, 0.1)',
- borderDark: 'rgba(255, 255, 255, 0.1)'
- },
- 'form': 'rgb(from var(--form-color, var(--bg-form-color)) r g b / <alpha-value>)',
- 'form-color': 'rgb(from var(--form-color, var(--bg-form-color)) r g b / <alpha-value>)'
- },
- transitionProperty: {
- height: "height",
- width: "width",
- maxWidth: "max-width",
- spacing: "margin, padding",
- },
- },
- },
- plugins: [
- require("@tailwindcss/aspect-ratio"),
- plugin(function ({ addVariant }) {
- addVariant("between", "&:not(:first-child):not(:last-child)")
- addVariant("hocus", ["&:hover", "&:focus"])
- // Add a new variant that only applies when there's no RTL parent
- addVariant('ltr-only', '&:where(:not([dir="rtl"] *))')
- }),
- ],
-}
diff --git a/docs.json b/docs.json
deleted file mode 100644
index 0519ecba6..000000000
--- a/docs.json
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/docs/api-reference/api-keys.mdx b/docs/api-reference/api-keys.mdx
index 7ae2a689d..1d3920eb3 100644
--- a/docs/api-reference/api-keys.mdx
+++ b/docs/api-reference/api-keys.mdx
@@ -8,26 +8,26 @@ Personal Access Tokens are the credentials you'll use to authenticate with the O
## Creating a token
1. Sign in to your OpnForm account.
-2. Open **Settings → Access Tokens** (`/settings/access-tokens`).
+2. Open **Settings → Access Tokens** (`/home?user-settings=access-tokens`).
3. Click **Create new token**.
4. Pick a descriptive name (e.g. "Zapier Integration").
5. Select the abilities you want to grant (see the table below).
6. Click **Create** and copy the token value – you **won't** be able to see it again after closing the dialog.
<Frame>
- <img src="/api-reference/images/create-token.png" alt="Create token" />
+ <img src="/api-reference/images/create-token.png" alt="Create token" />
</Frame>
## Abilities
-| Ability | Grants |
-|---------|--------|
-| workspaces-read | List workspaces |
-| workspaces-write | Create, update or delete workspaces |
-| workspace-users-read | List members and invites |
-| workspace-users-write | Manage members and invites |
-| forms-read | List forms and submissions |
-| forms-write | Create or modify forms and submissions |
+| Ability | Grants |
+| --------------------- | -------------------------------------- |
+| workspaces-read | List workspaces |
+| workspaces-write | Create, update or delete workspaces |
+| workspace-users-read | List members and invites |
+| workspace-users-write | Manage members and invites |
+| forms-read | List forms and submissions |
+| forms-write | Create or modify forms and submissions |
You can combine abilities as needed – choose the minimum set your integration requires.
@@ -49,7 +49,7 @@ If a token is leaked or no longer needed:
## Best practices
-* Store tokens securely (environment variables, secret managers, CI secrets).
-* Use a dedicated token per integration – easier to revoke individually.
-* Avoid committing tokens to version control.
-* Rotate tokens periodically.
\ No newline at end of file
+- Store tokens securely (environment variables, secret managers, CI secrets).
+- Use a dedicated token per integration – easier to revoke individually.
+- Avoid committing tokens to version control.
+- Rotate tokens periodically.
diff --git a/docs/api-reference/documentation-checklist.md b/docs/api-reference/documentation-checklist.md
deleted file mode 100644
index f3170b4ac..000000000
--- a/docs/api-reference/documentation-checklist.md
+++ /dev/null
@@ -1,29 +0,0 @@
-- [x] open.forms.index-all
-- [x] open.forms.store
-- [x] open.forms.show
-- [x] open.forms.update
-- [x] open.forms.destroy
-- [x] open.forms.submissions.index
-- [x] open.forms.submissions.update
-- [x] open.forms.submissions.export
-- [x] open.forms.submissions.destroy
-- [x] open.workspaces.index
-- [x] open.workspaces.create
-- [x] open.workspaces.update
-- [x] open.workspaces.delete
-- [x] open.workspaces.users.index
-- [x] open.workspaces.users.add
-- [x] open.workspaces.users.remove
-- [x] open.workspaces.users.update-role
-- [x] open.workspaces.leave
-- [x] open.workspaces.invites.index
-- [x] open.workspaces.invites.resend
-- [x] open.workspaces.invites.cancel
-
----
-
-Additional tasks:
-
-- [x] Create an Introduction page for the API (similar to Tally's) under `/api-reference` and add it to `docs.json` navigation.
-- [x] Create an API Keys page (similar to Tally's) explaining token management (referencing `access-tokens.vue`) and add it to `docs.json` navigation.
-- [x] Create a Changelog page with an initial entry for "API creation" and link it in the navigation.
\ No newline at end of file
diff --git a/docs/configuration/environment-variables.mdx b/docs/configuration/environment-variables.mdx
index 13526ad74..0db549c7f 100644
--- a/docs/configuration/environment-variables.mdx
+++ b/docs/configuration/environment-variables.mdx
@@ -13,6 +13,7 @@ The following environment variables are used to [configure the Laravel](https://
There are dedicated configuration pages available for more detailed setup instructions on specific topics:
+- [OAuth Integration Setup](../configuration/oauth-setup)
- [File Storage (S3)](../configuration/aws-s3)
- [Email Configuration (SMTP)](../configuration/email-setup)
- [Custom Domain](../configuration/custom-domain)
@@ -29,19 +30,29 @@ There are dedicated configuration pages available for more detailed setup instru
| `OPEN_AI_API_KEY` | API key for accessing OpenAI services. |
| `UNSPLASH_ACCESS_KEY` | Access key for Unsplash API. |
| `UNSPLASH_SECRET_KEY` | Secret key for Unsplash API. |
-| `GOOGLE_CLIENT_ID` | Client ID for Google OAuth. |
-| `GOOGLE_CLIENT_SECRET` | Client secret for Google OAuth. |
-| `GOOGLE_REDIRECT_URL` | Redirect URL for Google OAuth. |
-| `GOOGLE_AUTH_REDIRECT_URL` | Authentication redirect URL for Google OAuth. |
-| `GOOGLE_FONTS_API_KEY` | API key for accessing Google Fonts. |
| `FRONT_URL` | Public facing URL of the front-end. |
| `FRONT_API_SECRET` | Shared secret with the front-end. |
-| `TELEGRAM_BOT_ID` | ID of your Telegram bot for notifications. |
-| `TELEGRAM_BOT_TOKEN` | Authentication token for your Telegram bot. |
| `JWT_TTL` | Time to live for JSON Web Tokens (JWT). |
| `JWT_SECRET` | Secret key used to sign JWTs. |
| `JWT_SKIP_IP_UA_VALIDATION` | Set to `true` to disable JWT IP and User Agent validation (defaults to `false`). Useful for dynamic IPs. |
+### OAuth Integration Environment Variables
+
+OAuth integrations enable user authentication and third-party service connections. OpnForm automatically handles OAuth redirect URLs - you don't need to manually configure redirect URIs in your OAuth applications.
+
+<Info>
+For detailed setup instructions for each OAuth provider, see the [OAuth Integration Setup](../configuration/oauth-setup) guide.
+</Info>
+
+| Variable Name | Description |
+| ----------------------- | --------------------------------------------------------------------------------------------------------- |
+| `GOOGLE_CLIENT_ID` | Client ID for Google OAuth authentication and Google Sheets integration. |
+| `GOOGLE_CLIENT_SECRET` | Client secret for Google OAuth authentication and Google Sheets integration. |
+| `GOOGLE_FONTS_API_KEY` | API key for accessing Google Fonts (optional). |
+| `STRIPE_CLIENT_ID` | Client ID for Stripe Connect OAuth integration for payment processing. |
+| `STRIPE_CLIENT_SECRET` | Client secret for Stripe Connect OAuth integration. |
+| `TELEGRAM_BOT_TOKEN` | Authentication token for your Telegram bot notifications (bot ID is extracted automatically). |
+
### User Options Environment Variables
| Variable Name | Description |
diff --git a/docs/configuration/oauth-setup.mdx b/docs/configuration/oauth-setup.mdx
new file mode 100644
index 000000000..00e54e3aa
--- /dev/null
+++ b/docs/configuration/oauth-setup.mdx
@@ -0,0 +1,281 @@
+---
+title: OAuth Integration Setup
+description: Complete guide to configuring OAuth integrations for Google, Stripe, and Telegram in OpnForm
+---
+
+OpnForm supports several OAuth integrations that enable users to connect external services for enhanced functionality. This guide covers setting up Google, Stripe, and Telegram OAuth integrations.
+
+<Info>
+OpnForm handles OAuth redirect URLs automatically. You don't need to manually configure redirect URLs in your OAuth applications - the system generates them dynamically based on your domain configuration.
+</Info>
+
+<Card title="Developer Guide" icon="code" href="/contributing/new-integration">
+If you're looking to add a new OAuth integration to OpnForm, check out the complete developer guide with architecture overview and implementation steps.
+</Card>
+
+## Available OAuth Integrations
+
+<CardGroup cols={2}>
+<Card title="Google OAuth" icon="google" href="#google-oauth">
+ Authentication, Google One Tap, and Google Sheets integration for form data export
+</Card>
+
+<Card title="Stripe OAuth" icon="stripe" href="#stripe-oauth">
+ Payment processing integration for collecting payments through forms
+</Card>
+
+<Card title="Telegram OAuth" icon="telegram" href="#telegram-oauth">
+ Notification integration for form submission alerts via Telegram
+</Card>
+</CardGroup>
+
+## Google OAuth
+
+Google OAuth enables user authentication and integrates with Google Sheets for exporting form submissions.
+
+### Features
+- **User Authentication**: Allow users to sign up and log in with their Google accounts
+- **Google One Tap**: Seamless authentication with Google's One Tap sign-in widget
+- **Google Sheets Integration**: Export form submissions directly to Google Sheets
+- **Automatic Scope Management**: OpnForm requests appropriate permissions based on usage
+
+### Setup Steps
+
+<Steps>
+<Step title="Create Google Cloud Project">
+ Navigate to the [Google Cloud Console](https://console.cloud.google.com/) and create a new project or select an existing one.
+</Step>
+
+<Step title="Enable APIs">
+ Enable the following APIs for your project:
+ - Google+ API (for authentication)
+ - Google Drive API (for Sheets integration)
+ - Google Sheets API (for spreadsheet access)
+</Step>
+
+<Step title="Configure OAuth Consent Screen">
+ 1. Go to **APIs & Services > OAuth consent screen**
+ 2. Choose **External** user type (unless using Google Workspace)
+ 3. Fill in the required information:
+ - **App name**: Your application name
+ - **User support email**: Your contact email
+ - **Developer contact information**: Your email address
+ 4. Add scopes if needed (OpnForm handles this automatically)
+ 5. Add test users if your app is in testing mode
+</Step>
+
+<Step title="Create OAuth Credentials">
+ 1. Go to **APIs & Services > Credentials**
+ 2. Click **Create Credentials > OAuth 2.0 Client IDs**
+ 3. Select **Web application** as the application type
+ 4. Add authorized origins:
+ ```
+ https://yourdomain.com
+ ```
+ 5. Leave redirect URIs empty - OpnForm handles these automatically
+
+ <Info>
+ For Google One Tap to work, ensure your domain is added to the authorized origins. This enables the seamless authentication widget to function properly.
+ </Info>
+
+ <Check>
+ Save the **Client ID** and **Client Secret** for environment configuration.
+ </Check>
+</Step>
+
+<Step title="Configure Environment Variables">
+ Add the following variables to your backend `.env` file:
+
+ ```bash
+ GOOGLE_CLIENT_ID=your_google_client_id
+ GOOGLE_CLIENT_SECRET=your_google_client_secret
+ GOOGLE_FONTS_API_KEY=your_google_fonts_api_key (optional)
+ ```
+
+ <Note>
+ The Google Fonts API key is optional and only needed if you want to use Google Fonts in your forms.
+ </Note>
+</Step>
+</Steps>
+
+## Stripe OAuth
+
+Stripe OAuth enables payment processing capabilities within OpnForm, allowing you to collect payments through your forms.
+
+### Features
+- **Payment Collection**: Accept payments directly through forms
+- **Multiple Accounts**: Connect multiple Stripe accounts for different forms
+- **Automatic Processing**: Handle payment intents and confirmations seamlessly
+
+### Setup Steps
+
+<Steps>
+<Step title="Create Stripe Application">
+ 1. Log into your [Stripe Dashboard](https://dashboard.stripe.com/)
+ 2. Navigate to **Settings > Connect > Platform settings**
+ 3. Click **Get started** to enable Stripe Connect
+</Step>
+
+<Step title="Configure Platform Settings">
+ 1. Set your **Platform name** and **Support email**
+ 2. Add your website URL in **Brand settings**
+ 3. Configure **Redirect URIs** (OpnForm handles these automatically)
+ 4. Save your settings
+</Step>
+
+<Step title="Get OAuth Credentials">
+ 1. In **Settings > Connect > Platform settings**
+ 2. Find your **Platform client ID** in the OAuth settings section
+ 3. Note your **Client secret** (you may need to generate one)
+
+ <Check>
+ Save the **Client ID** and **Client Secret** for environment configuration.
+ </Check>
+</Step>
+
+<Step title="Configure Environment Variables">
+ Add the following variables to your backend `.env` file:
+
+ ```bash
+ STRIPE_CLIENT_ID=your_stripe_client_id
+ STRIPE_CLIENT_SECRET=your_stripe_client_secret
+ ```
+
+ <Note>
+ These OAuth credentials are separate from your regular Stripe API keys. The OAuth credentials enable connecting multiple Stripe accounts, while regular API keys are for direct payment processing.
+ </Note>
+</Step>
+</Steps>
+
+## Telegram OAuth
+
+Telegram OAuth enables notification integration, allowing OpnForm to send form submission alerts to Telegram chats.
+
+### Features
+- **Form Notifications**: Receive instant notifications when forms are submitted
+- **Rich Messages**: Formatted messages with form data and submission details
+- **Multiple Chats**: Connect different Telegram accounts for various forms
+
+<Warning>
+**Domain Requirement**: Telegram requires that your bot is linked to a valid domain with HTTPS. Localhost URLs are not supported. For development, consider using a tunneling service like [localtunnel](https://theboroer.github.io/localtunnel-www/) to expose your local development server with a public HTTPS URL.
+</Warning>
+
+### Setup Steps
+
+<Steps>
+<Step title="Create Telegram Bot">
+ 1. Open Telegram and search for [@BotFather](https://t.me/botfather)
+ 2. Start a conversation and send `/newbot`
+ 3. Follow the prompts to name your bot and choose a username
+ 4. Save the **Bot Token** provided by BotFather
+
+ <Check>
+ Your bot token will look like: `123456789:ABCdefGHIjklMNOpqrsTUVwxyz`
+ </Check>
+</Step>
+
+<Step title="Link Domain to Bot">
+ 1. Send `/setdomain` to [@BotFather](https://t.me/botfather)
+ 2. Select your bot from the list
+ 3. Enter your domain (e.g., `yourdomain.com` or for development: `abc123.loca.lt`)
+ 4. BotFather will confirm the domain has been linked
+
+ <Note>
+ **For Development**: If you're developing locally, use [localtunnel](https://theboroer.github.io/localtunnel-www/) to get a public HTTPS URL:
+ ```bash
+ npm install -g localtunnel
+ lt --port 3000 # Replace 3000 with your local port
+ ```
+ Use the provided `.loca.lt` URL as your domain with BotFather.
+ </Note>
+</Step>
+
+<Step title="Configure Environment Variables">
+ Add the following variable to your backend `.env` file:
+
+ ```bash
+ TELEGRAM_BOT_TOKEN=your_bot_token # format: 1234567890:ABCdefGHIjklMNOpqrsTUVwxyz
+ ```
+
+ <Note>
+ The bot ID is automatically extracted from the bot token (the numeric part before the colon), so you don't need to configure it separately.
+ </Note>
+</Step>
+
+<Step title="Test Your Bot">
+ 1. Start a conversation with your bot in Telegram
+ 2. Connect the bot in OpnForm's integration settings
+ 3. Submit a test form to verify notifications work
+
+ <Check>
+ You should receive a formatted message with form submission details.
+ </Check>
+</Step>
+</Steps>
+
+## Security Considerations
+
+<Warning>
+**Important Security Notes:**
+- Never commit OAuth credentials to version control
+- Use environment variables for all sensitive configuration
+- Regularly rotate your OAuth secrets and API keys
+- Monitor OAuth application usage in your provider dashboards
+</Warning>
+
+## Troubleshooting
+
+<AccordionGroup>
+<Accordion title="Google OAuth Issues">
+ **Common problems and solutions:**
+
+ - **"OAuth app blocked"**: Ensure your OAuth consent screen is properly configured
+ - **"Invalid redirect URI"**: OpnForm handles redirects automatically - don't manually configure them
+ - **"Insufficient permissions"**: Check that required APIs are enabled in Google Cloud Console
+ - **"Quota exceeded"**: Monitor your API usage in Google Cloud Console
+</Accordion>
+
+<Accordion title="Stripe OAuth Issues">
+ **Common problems and solutions:**
+
+ - **"Invalid client ID"**: Verify your Stripe Connect platform is properly set up
+ - **"Webhook failures"**: Ensure your domain is accessible and SSL is configured
+ - **"Payment processing errors"**: Check your Stripe account status and verification
+ - **"Connect account creation failed"**: Verify platform settings and business details
+</Accordion>
+
+<Accordion title="Telegram OAuth Issues">
+ **Common problems and solutions:**
+
+ - **"Bot not responding"**: Ensure your bot token is correct and the bot is not disabled
+ - **"Message delivery failed"**: Check that users have started a conversation with your bot
+ - **"Formatting errors"**: Telegram uses MarkdownV2 formatting for rich messages
+ - **"Rate limiting"**: Telegram has message rate limits - avoid sending too many messages quickly
+</Accordion>
+</AccordionGroup>
+
+## Testing Your Integration
+
+<Steps>
+<Step title="Verify Configuration">
+ Check that all environment variables are set correctly and restart your application.
+</Step>
+
+<Step title="Test Authentication">
+ Try logging in with each OAuth provider to ensure the authentication flow works.
+</Step>
+
+<Step title="Test Integrations">
+ - **Google**: Create a form and test exporting to Google Sheets
+ - **Stripe**: Set up a payment form and process a test transaction
+ - **Telegram**: Configure notifications and submit a test form
+</Step>
+
+<Step title="Monitor Logs">
+ Check your application logs for any OAuth-related errors or warnings.
+</Step>
+</Steps>
+
+<Check>
+With properly configured OAuth integrations, your OpnForm installation will support seamless user authentication and powerful third-party service integrations.
+</Check>
\ No newline at end of file
diff --git a/docs/contributing/new-integration.mdx b/docs/contributing/new-integration.mdx
index 87c048e05..e27c15e91 100644
--- a/docs/contributing/new-integration.mdx
+++ b/docs/contributing/new-integration.mdx
@@ -1,6 +1,917 @@
---
-title: "Adding a New Integration"
-description: "Learn how to add a new integration to OpnForm"
+title: "Adding a New OAuth Integration"
+description: "Complete guide to implementing OAuth integrations in OpnForm with architecture overview, flow diagrams, and step-by-step implementation"
---
-<Warning>Whoops not ready yet! This page is still to be written.</Warning>
\ No newline at end of file
+This guide covers how to add new OAuth integrations to OpnForm. The system uses a modern, service-oriented architecture with intent-based OAuth flows to handle different authentication scenarios including user authentication, account integrations, and widget-based providers.
+
+<Card title="Configuration Guide" icon="gear" href="/configuration/oauth-setup">
+Before implementing a new integration, you may want to review the OAuth configuration guide to understand how to set up the existing Google, Stripe, and Telegram integrations.
+</Card>
+
+## System Architecture Overview
+
+OpnForm's OAuth system is built around several key architectural patterns:
+
+- **Intent-based Flows**: Different OAuth scopes and handling based on auth vs integration intents
+- **Driver Pattern**: Abstracted OAuth provider implementations with support for redirect and widget flows
+- **Service Layer**: Centralized user and provider management through dedicated services
+- **Message-based Communication**: Cross-window communication for OAuth callbacks
+
+```mermaid
+graph TB
+ subgraph "Frontend (Nuxt/Vue)"
+ UI[User Interface]
+ useOAuth[useOAuth Composable]
+ useWindowMessage[useWindowMessage Composable]
+ useAuthFlow[useAuthFlow Composable]
+ TanStackQuery[TanStack Query Cache]
+ end
+
+ subgraph "Backend API (Laravel)"
+ OAuthController[OAuthController]
+ OAuthUserService[OAuthUserService]
+ OAuthProviderService[OAuthProviderService]
+
+ subgraph "OAuth Drivers"
+ GoogleDriver[OAuthGoogleDriver]
+ GoogleOneTapDriver[OAuthGoogleOneTapDriver]
+ StripeDriver[OAuthStripeDriver]
+ TelegramDriver[OAuthTelegramDriver]
+ NewDriver[OAuthNewProviderDriver]
+ end
+
+ subgraph "Data Layer"
+ UserModel[User Model]
+ OAuthProviderModel[OAuthProvider Model]
+ Cache[Laravel Cache]
+ end
+ end
+
+ subgraph "External Services"
+ GoogleOAuth[Google OAuth]
+ StripeOAuth[Stripe Connect]
+ TelegramWidget[Telegram Widget]
+ NewProviderOAuth[New Provider OAuth]
+ end
+
+ %% Frontend to Backend API calls
+ UI --> useOAuth
+ useOAuth --> OAuthController
+ useAuthFlow --> OAuthController
+
+ %% OAuth Controller orchestration
+ OAuthController --> OAuthUserService
+ OAuthController --> OAuthProviderService
+ OAuthController --> Cache
+
+ %% Service to Drivers
+ OAuthUserService --> GoogleDriver
+ OAuthUserService --> GoogleOneTapDriver
+ OAuthUserService --> StripeDriver
+ OAuthProviderService --> GoogleDriver
+ OAuthProviderService --> GoogleOneTapDriver
+ OAuthProviderService --> StripeDriver
+ OAuthProviderService --> TelegramDriver
+
+ %% Drivers to External Services
+ GoogleDriver --> GoogleOAuth
+ GoogleOneTapDriver --> GoogleOAuth
+ StripeDriver --> StripeOAuth
+ TelegramDriver --> TelegramWidget
+ NewDriver --> NewProviderOAuth
+
+ %% Data persistence
+ OAuthUserService --> UserModel
+ OAuthProviderService --> OAuthProviderModel
+
+ %% Cross-window communication
+ useWindowMessage -.->|"OAuth Callbacks"| useOAuth
+ useWindowMessage -.->|"Cache Invalidation"| TanStackQuery
+
+ %% Cache invalidation
+ TanStackQuery -.->|"Refetch on Changes"| useOAuth
+
+ classDef frontend fill:#e1f5fe
+ classDef backend fill:#f3e5f5
+ classDef external fill:#fff3e0
+ classDef data fill:#e8f5e8
+
+ class UI,useOAuth,useWindowMessage,useAuthFlow,TanStackQuery frontend
+ class OAuthController,OAuthUserService,OAuthProviderService,GoogleDriver,GoogleOneTapDriver,StripeDriver,TelegramDriver,NewDriver backend
+ class GoogleOAuth,StripeOAuth,TelegramWidget,NewProviderOAuth external
+ class UserModel,OAuthProviderModel,Cache data
+```
+
+## Core Components
+
+### 1. OAuthController (`api/app/Http/Controllers/Auth/OAuthController.php`)
+
+The main controller that orchestrates OAuth flows:
+
+```php
+class OAuthController extends Controller
+{
+ public function __construct(
+ private OAuthUserService $oauthUserService,
+ private OAuthProviderService $oauthProviderService
+ ) {}
+
+ // Initiates OAuth flow with intent-based scoping
+ public function redirect(Request $request, string $provider)
+
+ // Handles standard OAuth callbacks
+ public function callback(string $provider)
+
+ // Handles widget-based OAuth (e.g., Telegram, Google One Tap)
+ public function handleWidgetCallback(string $service, Request $request)
+}
+```
+
+**Key Features:**
+- **Intent-based scoping**: Different OAuth scopes for `auth` vs `integration` flows
+- **Context caching**: Stores integration context for callback handling
+- **Flow determination**: Automatically chooses authentication vs integration flow based on user state
+
+### 2. OAuthUserService (`api/app/Service/OAuth/OAuthUserService.php`)
+
+Service that handles user-related OAuth operations:
+
+```php
+class OAuthUserService
+{
+ // Handles user authentication and registration flow
+ public function handleAuthenticationFlow(OAuthProviderService $provider, SocialiteUser $socialiteUser): JsonResponse
+
+ // Finds or creates user from OAuth provider data
+ public function findOrCreateUser(OAuthProviderService $provider, SocialiteUser $socialiteUser): User
+}
+```
+
+### 3. OAuthProviderService (`api/app/Service/OAuth/OAuthProviderService.php`)
+
+Service that handles provider-related OAuth operations:
+
+```php
+class OAuthProviderService
+{
+ // Handles provider connection and integration flow
+ public function handleIntegrationFlow(OAuthProviderService $provider, SocialiteUser $socialiteUser): JsonResponse
+
+ // Creates or updates OAuth provider records
+ public function createOrUpdateProvider(OAuthProviderService $provider, SocialiteUser $socialiteUser): OAuthProvider
+}
+```
+
+### 4. Intent-based Flow Handling
+
+The system uses intent-based flow handling instead of strategies:
+
+#### Authentication Flow
+For user login/registration when user is not authenticated:
+
+```php
+// In OAuthController::callback()
+if (!Auth::check()) {
+ // User not authenticated - handle auth flow
+ return $this->oauthUserService->handleAuthenticationFlow($providerService, $socialiteUser);
+}
+```
+
+#### Integration Flow
+For connecting OAuth accounts when user is already logged in:
+
+```php
+// In OAuthController::callback()
+if (Auth::check()) {
+ // User authenticated - handle integration flow
+ return $this->oauthProviderService->handleIntegrationFlow($providerService, $socialiteUser);
+}
+```
+
+#### Widget Flow
+For widget-based authentication (like Telegram Login Widget, Google One Tap):
+
+```php
+// In OAuthController::handleWidgetCallback()
+if ($request->input('intent') === 'auth') {
+ return $this->oauthUserService->handleWidgetAuthFlow($providerService, $request);
+} else {
+ return $this->oauthProviderService->handleWidgetIntegrationFlow($providerService, $request);
+}
+```
+
+### 5. OAuth Drivers
+
+Each provider implements the `OAuthDriver` interface:
+
+```php
+interface OAuthDriver
+{
+ public function getRedirectUrl(): string;
+ public function getUser(): User;
+ public function canCreateUser(): bool;
+ public function getScopesForIntent(string $intent): array;
+}
+```
+
+For widget-based providers, implement `WidgetOAuthDriver`:
+
+```php
+interface WidgetOAuthDriver extends OAuthDriver
+{
+ public function verifyWidgetData(array $data): bool;
+ public function getUserFromWidgetData(array $data): array;
+ public function isWidgetBased(): bool;
+}
+```
+
+## OAuth Flow Types
+
+### Authentication Flow (User Login/Registration)
+
+```mermaid
+flowchart TD
+ A["User clicks 'Sign in with Provider'"] --> B["Frontend: useOAuth.guestConnect()"]
+ B --> C["API: POST /oauth/connect/provider?intent=auth"]
+ C --> D{Provider can create users?}
+ D -->|No| E["Return 422 Error"]
+ D -->|Yes| F["Get auth scopes for provider"]
+ F --> G["Generate OAuth redirect URL"]
+ G --> H["Open OAuth provider window"]
+ H --> I["User authorizes at provider"]
+ I --> J["Provider redirects to callback"]
+ J --> K["API: POST /oauth/provider/callback"]
+ K --> L{User authenticated?}
+ L -->|No| M["Use Authentication Flow"]
+ L -->|Yes| N["Use Integration Flow"]
+ M --> O["Find or create user"]
+ O --> P["Create workspace if new user"]
+ P --> Q["Generate JWT token"]
+ Q --> R["Return token response"]
+ R --> S["Frontend: Store token"]
+ S --> T["Send LOGIN_COMPLETE message"]
+ T --> U["Close OAuth window"]
+ U --> V["Redirect to dashboard"]
+
+ E --> W["Show error message"]
+
+ subgraph "Window Communication"
+ X["OAuth Callback Window"] --> Y["useWindowMessage.send()"]
+ Y --> Z["Parent Window Listener"]
+ Z --> AA["Cache invalidation"]
+ AA --> BB["UI updates"]
+ end
+
+ classDef process fill:#e3f2fd
+ classDef decision fill:#fff3e0
+ classDef error fill:#ffebee
+ classDef communication fill:#f3e5f5
+
+ class A,B,C,F,G,H,I,J,K,O,P,Q,R,S,T,U,V process
+ class D,L decision
+ class E,W error
+ class X,Y,Z,AA,BB communication
+```
+
+```mermaid
+sequenceDiagram
+ participant U as User
+ participant F as Frontend
+ participant API as OAuthController
+ participant P as OAuth Provider
+ participant US as OAuthUserService
+
+ U->>F: Click "Sign in with Provider"
+ F->>API: POST /oauth/connect/{provider}?intent=auth
+ API->>P: Redirect to provider OAuth
+ P->>U: User authorizes app
+ P->>API: Callback with authorization code
+ API->>US: Execute authentication flow
+ US->>US: Create/find user, generate JWT
+ US->>F: Return JWT token
+ F->>F: Store token, redirect to dashboard
+```
+
+**Key Steps:**
+1. Frontend calls `/oauth/connect/{provider}` with `intent=auth`
+2. Controller validates provider can create users
+3. User redirected to OAuth provider with basic scopes
+4. Provider callbacks to `/oauth/{provider}/callback`
+5. `AuthenticationStrategy` handles user creation/login
+6. JWT token returned for client-side authentication
+
+### Integration Flow (Connect Account)
+
+```mermaid
+sequenceDiagram
+ participant U as Logged User
+ participant F as Frontend
+ participant API as OAuthController
+ participant P as OAuth Provider
+ participant PS as OAuthProviderService
+ participant C as Cache
+
+ U->>F: Click "Connect Account"
+ F->>API: POST /oauth/connect/{provider}?intent=integration
+ API->>C: Store integration context
+ API->>P: Redirect with full permission scopes
+ P->>U: User authorizes extended permissions
+ P->>API: Callback with authorization code
+ API->>PS: Execute integration flow
+ PS->>PS: Create/update OAuthProvider record
+ PS->>C: Retrieve integration context
+ PS->>F: Return provider details + context
+ F->>F: Update UI, invalidate cache
+```
+
+**Key Features:**
+- **Enhanced scopes**: Requests full permissions needed for integrations
+- **Context preservation**: Stores `intention` and `autoClose` settings in cache
+- **Provider management**: Creates/updates `OAuthProvider` records
+
+### Widget Flow (e.g., Telegram)
+
+```mermaid
+sequenceDiagram
+ participant U as User
+ participant W as Widget
+ participant F as Frontend
+ participant API as OAuthController
+ participant US as OAuthUserService
+
+ U->>W: Authenticate with provider widget
+ W->>F: Widget callback with auth data
+ F->>API: POST /oauth/widget-callback/{provider}
+ API->>US: Execute widget flow
+ US->>US: Verify widget data signature
+ US->>US: Extract user data
+ US->>US: Create user or OAuthProvider record
+ US->>F: Return auth token or provider details
+ F->>F: Update UI, show success
+```
+
+**Widget Authentication Features:**
+- **No redirect flow**: Authentication happens in-place via widget
+- **Data verification**: Cryptographic verification of widget data
+- **Direct provider creation**: Immediately creates provider records
+
+## Frontend Integration
+
+### Window Message Communication
+
+The frontend uses `useWindowMessage` composable for cross-window communication:
+
+```javascript
+// WindowMessageTypes for consistent messaging
+export const WindowMessageTypes = {
+ LOGIN_COMPLETE: 'login-complete',
+ AFTER_LOGIN: 'after-login',
+ OAUTH_PROVIDER_CONNECTED: 'oauth-provider-connected'
+}
+
+// Usage in OAuth callback
+const { send } = useWindowMessage(WindowMessageTypes.LOGIN_COMPLETE)
+send(window.opener, {
+ eventType: WindowMessageTypes.LOGIN_COMPLETE,
+ useMessageChannel: false,
+ waitForAcknowledgment: false
+})
+```
+
+### OAuth Composable (`useOAuth`)
+
+Centralized OAuth operations with TanStack Query integration:
+
+```javascript
+const { connect, connectMutation, services } = useOAuth()
+
+// Connect to OAuth provider
+await connect('google', false, true, true) // service, redirect, newtab, autoClose
+
+// Service definitions with auth types
+const services = [
+ {
+ name: 'google',
+ title: 'Google',
+ auth_type: 'redirect' // Standard OAuth redirect flow
+ },
+ {
+ name: 'telegram',
+ title: 'Telegram',
+ auth_type: 'widget', // Widget-based authentication
+ widget_file: 'TelegramWidget'
+ }
+]
+```
+
+### Cache Management
+
+The system automatically invalidates TanStack Query cache when OAuth connections change:
+
+```javascript
+// Listen for OAuth provider connections
+windowMessage.listen((_event) => {
+ invalidateProviders() // Refresh OAuth providers list
+}, {
+ useMessageChannel: false,
+ acknowledge: false
+})
+```
+
+## Adding a New Integration
+
+Follow these steps to add a new OAuth provider to OpnForm:
+
+<Steps>
+<Step title="Create OAuth Driver">
+Implement the OAuth driver class:
+
+```php
+// api/app/Integrations/OAuth/Drivers/OAuthNewProviderDriver.php
+<?php
+
+namespace App\Integrations\OAuth\Drivers;
+
+use App\Http\Controllers\Auth\OAuthController;
+use App\Integrations\OAuth\Drivers\Contracts\OAuthDriver;
+use Laravel\Socialite\Contracts\User;
+use Laravel\Socialite\Facades\Socialite;
+
+class OAuthNewProviderDriver implements OAuthDriver
+{
+ private ?string $redirectUrl = null;
+ private ?array $scopes = [];
+ protected $provider;
+
+ public function __construct()
+ {
+ $this->provider = Socialite::driver('newprovider');
+ }
+
+ public function getRedirectUrl(): string
+ {
+ return $this->provider
+ ->scopes($this->scopes ?? [])
+ ->stateless()
+ ->redirectUrl($this->redirectUrl ?? config('services.newprovider.redirect'))
+ ->redirect()
+ ->getTargetUrl();
+ }
+
+ public function getUser(): User
+ {
+ return $this->provider
+ ->stateless()
+ ->redirectUrl($this->redirectUrl ?? config('services.newprovider.redirect'))
+ ->user();
+ }
+
+ public function canCreateUser(): bool
+ {
+ return true; // Set false if provider can't be used for user registration
+ }
+
+ public function setRedirectUrl(string $url): OAuthDriver
+ {
+ $this->redirectUrl = $url;
+ return $this;
+ }
+
+ public function setScopes(array $scopes): OAuthDriver
+ {
+ $this->scopes = $scopes;
+ return $this;
+ }
+
+ public function getScopesForIntent(string $intent): array
+ {
+ return match ($intent) {
+ OAuthController::INTENT_AUTH => ['user:email', 'read:user'],
+ OAuthController::INTENT_INTEGRATION => ['user:email', 'read:user', 'write:data'],
+ default => ['user:email', 'read:user'],
+ };
+ }
+}
+```
+
+<Tip>
+Configure different scopes for `auth` vs `integration` intents using the `OAuthController::INTENT_AUTH` and `OAuthController::INTENT_INTEGRATION` constants. Auth scopes should be minimal (just enough for user identification), while integration scopes should include all permissions needed for the provider's functionality.
+</Tip>
+</Step>
+
+<Step title="Register in Provider Service">
+Add your new provider to the enum:
+
+```php
+// api/app/Integrations/OAuth/OAuthProviderService.php
+enum OAuthProviderService: string
+{
+ case Google = 'google';
+ case GoogleOneTap = 'google_one_tap';
+ case Stripe = 'stripe';
+ case Telegram = 'telegram';
+ case NewProvider = 'newprovider'; // Add your provider
+
+ public function getDriver(): OAuthDriver
+ {
+ return match ($this) {
+ self::Google => new OAuthGoogleDriver(),
+ self::GoogleOneTap => new OAuthGoogleOneTapDriver(),
+ self::Stripe => new OAuthStripeDriver(),
+ self::Telegram => new OAuthTelegramDriver(),
+ self::NewProvider => new OAuthNewProviderDriver(), // Add mapping
+ };
+ }
+
+ public function getDatabaseProvider(): string
+ {
+ return match ($this) {
+ self::Google => 'google',
+ self::GoogleOneTap => 'google', // Normalize to 'google'
+ self::Stripe => 'stripe',
+ self::Telegram => 'telegram',
+ self::NewProvider => 'newprovider',
+ };
+ }
+}
+```
+</Step>
+
+<Step title="Configure Services">
+Add configuration to `api/config/services.php`:
+
+```php
+// api/config/services.php
+'newprovider' => [
+ 'client_id' => env('NEWPROVIDER_CLIENT_ID'),
+ 'client_secret' => env('NEWPROVIDER_CLIENT_SECRET'),
+ 'redirect' => env('APP_URL') . '/oauth/newprovider/callback',
+],
+```
+
+Add environment variables to `.env.example`:
+
+```bash
+# New Provider OAuth
+NEWPROVIDER_CLIENT_ID=
+NEWPROVIDER_CLIENT_SECRET=
+```
+</Step>
+
+<Step title="Install Socialite Provider">
+If using a community Socialite provider, add it to `composer.json`:
+
+```bash
+cd api && composer require socialiteproviders/newprovider
+```
+
+Register in `api/app/Providers/EventServiceProvider.php`:
+
+```php
+protected $listen = [
+ \SocialiteProviders\Manager\SocialiteWasCalled::class => [
+ 'SocialiteProviders\\NewProvider\\NewProviderExtendSocialite@handle',
+ ],
+];
+```
+</Step>
+
+<Step title="Add Frontend Service Definition">
+Update the frontend service configuration:
+
+```javascript
+// client/composables/query/useOAuth.js
+const services = computed(() => {
+ return [
+ // ... existing services
+ {
+ name: 'newprovider',
+ title: 'New Provider',
+ icon: 'mdi:newprovider', // Use appropriate icon
+ enabled: useFeatureFlag('services.newprovider.client_id', false),
+ auth_type: 'redirect'
+ }
+ ]
+})
+```
+</Step>
+
+<Step title="Add Feature Flag">
+Update feature flags controller to expose the provider:
+
+```php
+// api/app/Http/Controllers/Content/FeatureFlagsController.php
+public function index(): JsonResponse
+{
+ return response()->json([
+ // ... existing flags
+ 'services' => [
+ // ... existing services
+ 'newprovider' => [
+ 'client_id' => !!config('services.newprovider.client_id'),
+ ],
+ ],
+ ]);
+}
+```
+</Step>
+
+<Step title="Test the Integration">
+Test both authentication and integration flows:
+
+**Authentication Test:**
+1. Start fresh (logged out)
+2. Click "Sign in with New Provider"
+3. Complete OAuth flow
+4. Verify user creation and login
+
+**Integration Test:**
+1. Log in with existing account
+2. Go to Settings → Connections
+3. Click "Connect New Provider"
+4. Complete OAuth flow
+5. Verify provider appears in connected accounts
+
+<Check>
+Verify both flows work correctly and check that appropriate scopes are requested for each intent.
+</Check>
+</Step>
+
+<Step title="Add Integration Handler (Optional)">
+If your provider will be used for form integrations, create an integration handler:
+
+```php
+// api/app/Integrations/Handlers/NewProviderIntegration.php
+<?php
+
+namespace App\Integrations\Handlers;
+
+use App\Integrations\Handlers\AbstractIntegrationHandler;
+
+class NewProviderIntegration extends AbstractIntegrationHandler
+{
+ public static function getValidationRules(): array
+ {
+ return [
+ 'oauth_id' => 'required|exists:oauth_providers,id',
+ 'settings' => 'required|array'
+ ];
+ }
+
+ public function handle(array $data): bool
+ {
+ // Implement integration logic here
+ // e.g., send data to external API, create records, etc.
+
+ return true;
+ }
+}
+```
+
+Register the handler and add frontend integration components as needed.
+</Step>
+</Steps>
+
+## Provider Normalization
+
+<Info>
+**Important**: When creating providers that represent the same OAuth service but with different authentication methods (like Google OAuth vs Google One Tap), they should be normalized to the same provider name in the database.
+</Info>
+
+OpnForm handles provider normalization through the `getDatabaseProvider()` method in the enum:
+
+```php
+public function getDatabaseProvider(): string
+{
+ return match ($this) {
+ self::Google => 'google',
+ self::GoogleOneTap => 'google', // Both normalize to 'google'
+ self::Stripe => 'stripe',
+ self::Telegram => 'telegram',
+ };
+}
+```
+
+This ensures that:
+- Users can't connect multiple "Google" accounts (regular OAuth + One Tap)
+- Provider scopes and permissions are properly merged
+- The same OAuth provider record is updated regardless of authentication method
+- Integration handlers work consistently with the normalized provider name
+
+When adding new providers, consider if they should be normalized:
+- **Same OAuth service, different auth methods**: Normalize (like Google/GoogleOneTap)
+- **Different OAuth services**: Don't normalize (like Google/GitHub)
+
+## Widget-Based Providers
+
+For providers that use widget authentication (like Telegram), implement `WidgetOAuthDriver`:
+
+<Tabs>
+<Tab title="Driver Implementation">
+```php
+<?php
+
+namespace App\Integrations\OAuth\Drivers;
+
+use App\Integrations\OAuth\Drivers\Contracts\WidgetOAuthDriver;
+
+class OAuthWidgetProviderDriver implements WidgetOAuthDriver
+{
+ public function verifyWidgetData(array $data): bool
+ {
+ // Implement cryptographic verification of widget data
+ // e.g., HMAC signature verification
+
+ $expectedHash = hash_hmac('sha256', $dataString, $secretKey);
+ return hash_equals($expectedHash, $data['hash']);
+ }
+
+ public function getUserFromWidgetData(array $data): array
+ {
+ return [
+ 'id' => $data['user_id'],
+ 'name' => $data['name'],
+ 'email' => $data['email'] ?? null,
+ 'provider_user_id' => $data['user_id'],
+ 'access_token' => $data['auth_token'],
+ 'scopes' => []
+ ];
+ }
+
+ public function isWidgetBased(): bool
+ {
+ return true;
+ }
+
+ // Standard OAuthDriver methods...
+ public function getRedirectUrl(): string
+ {
+ return ''; // Not used for widget auth
+ }
+}
+```
+</Tab>
+
+<Tab title="Frontend Widget Component">
+```vue
+<!-- client/components/settings/widgets/WidgetProviderWidget.vue -->
+<template>
+ <div class="widget-provider-container">
+ <div
+ id="widget-provider-login"
+ @click="initializeWidget"
+ >
+ Connect Widget Provider
+ </div>
+ </div>
+</template>
+
+<script setup>
+const emit = defineEmits(['auth-data'])
+
+const initializeWidget = () => {
+ // Initialize provider widget
+ // Handle widget callback and emit auth data
+
+ window.WidgetProvider.init({
+ onAuth: (authData) => {
+ emit('auth-data', authData)
+ }
+ })
+}
+</script>
+```
+</Tab>
+
+<Tab title="Frontend Service Config">
+```javascript
+// Update service definition for widget providers
+{
+ name: 'widgetprovider',
+ title: 'Widget Provider',
+ icon: 'mdi:widget',
+ enabled: useFeatureFlag('services.widgetprovider.enabled', false),
+ auth_type: 'widget',
+ widget_file: 'WidgetProviderWidget'
+}
+```
+</Tab>
+</Tabs>
+
+## Advanced Configuration
+
+### Custom Scopes and Parameters
+
+OAuth drivers can customize the authorization request:
+
+```php
+public function getRedirectUrl(): string
+{
+ return $this->provider
+ ->scopes($this->scopes)
+ ->stateless()
+ ->redirectUrl($this->redirectUrl)
+ ->with([
+ 'access_type' => 'offline',
+ 'prompt' => 'consent',
+ 'custom_param' => 'value'
+ ])
+ ->redirect()
+ ->getTargetUrl();
+}
+```
+
+### Error Handling
+
+The system includes comprehensive error handling:
+
+```php
+// In OAuthConnectionService
+public function handleCallback(OAuthProviderService $provider, OAuthCompletionStrategy $strategy): JsonResponse
+{
+ try {
+ $driverUser = $provider->getDriver()->getUser();
+ return $strategy->execute($provider, $driverUser);
+ } catch (\Exception $e) {
+ report($e);
+ return response()->json(['message' => 'Failed to authenticate with the provider. Please try again.'], 400);
+ }
+}
+```
+
+### Intent-Based Flow Control
+
+The controller automatically selects the appropriate flow based on user authentication state:
+
+```php
+public function callback(string $provider)
+{
+ $providerService = OAuthProviderService::from($provider);
+ $socialiteUser = $providerService->getDriver()->getUser();
+
+ // Flow is determined by the user's authentication state
+ if (Auth::check()) {
+ // User logged in = integration flow
+ return $this->oauthProviderService->handleIntegrationFlow($providerService, $socialiteUser);
+ } else {
+ // User not logged in = authentication flow
+ return $this->oauthUserService->handleAuthenticationFlow($providerService, $socialiteUser);
+ }
+}
+```
+
+## Troubleshooting
+
+<AccordionGroup>
+<Accordion title="Provider not appearing in frontend">
+- Check feature flag configuration in `FeatureFlagsController`
+- Verify environment variables are set
+- Ensure service is added to `useOAuth` services list
+- Check browser console for JavaScript errors
+</Accordion>
+
+<Accordion title="OAuth redirect URL mismatch">
+- Verify `redirect` URL in `config/services.php` matches provider configuration
+- Check that `APP_URL` environment variable is correct
+- Ensure provider OAuth app is configured with correct callback URL
+</Accordion>
+
+<Accordion title="Scopes not working correctly">
+- Check `getScopesForIntent()` method returns correct scopes
+- Verify provider OAuth app has necessary permissions enabled
+- Test with minimal scopes first, then add additional ones
+</Accordion>
+
+<Accordion title="Widget authentication failing">
+- Verify widget data signature verification logic
+- Check that widget script is loaded correctly
+- Ensure widget callback URL is accessible and correct
+- Test widget data extraction and user creation flow
+</Accordion>
+</AccordionGroup>
+
+## Best Practices
+
+<Card title="Security" icon="shield-check">
+- Always verify widget data signatures cryptographically
+- Use minimal scopes for authentication flows
+- Validate all OAuth provider responses
+- Implement proper error handling and logging
+</Card>
+
+<Card title="User Experience" icon="heart">
+- Provide clear loading states during OAuth flows
+- Handle popup blockers gracefully
+- Show appropriate error messages for OAuth failures
+- Auto-close OAuth windows when appropriate
+</Card>
+
+<Card title="Performance" icon="bolt">
+- Cache OAuth provider configurations
+- Use TanStack Query for efficient data fetching
+- Implement proper cleanup for event listeners
+- Minimize API calls during OAuth flows
+</Card>
+
+This comprehensive architecture allows OpnForm to support any OAuth provider with a consistent, maintainable codebase that handles all the complexities of modern OAuth flows.
\ No newline at end of file
diff --git a/docs/docs.json b/docs/docs.json
index 0b524fefc..746e8d80a 100644
--- a/docs/docs.json
+++ b/docs/docs.json
@@ -33,6 +33,7 @@
"group": "Configuration",
"pages": [
"configuration/environment-variables",
+ "configuration/oauth-setup",
"configuration/aws-s3",
"configuration/email-setup",
"configuration/custom-domain",
@@ -115,6 +116,13 @@
"contributing/new-form-block",
"contributing/new-integration"
]
+ },
+ {
+ "group": "Front-end",
+ "pages": [
+ "front-end/data-fetching",
+ "front-end/forms"
+ ]
}
]
}
diff --git a/docs/front-end/data-fetching.mdx b/docs/front-end/data-fetching.mdx
new file mode 100644
index 000000000..9d6dc0e5f
--- /dev/null
+++ b/docs/front-end/data-fetching.mdx
@@ -0,0 +1,111 @@
+---
+title: "Data Fetching"
+description: "How we fetch and mutate server data in the front-end with TanStack Query."
+---
+
+<Info>
+Authentication tokens are stored in **cookies** after login. `client/composables/useOpnApi.js` automatically injects the
+`Authorization: Bearer <token>` header on every request, and the global middleware
+`client/middleware/01.check-auth.global.js` pre-loads the current user & workspaces during navigation.<br/>
+If you need to generate new tokens (e.g. for external scripts) see the [Authentication](../api-reference/introduction#authentication) docs.
+</Info>
+
+## Why TanStack Query?
+We use [TanStack Query](https://tanstack.com/query/latest) to handle **server state**—data that lives in the database and is accessed through our API. It gives us:
+
+- Automatic caching & background refetching
+- Declarative loading / error states
+- Built-in mutations with optimistic updates
+- DevTools for debugging
+
+For purely **client-side UI state** (theme, modals, etc.) we still rely on [Pinia](https://pinia.vuejs.org/) – see `client/stores/app.js` for an example.
+
+## Reading data
+```vue
+<script setup>
+// 1️⃣ Grab the query factory from the composable
+const { list } = useWorkspaces()
+
+// 2️⃣ Call it to register the query
+const {
+ data: workspaces,
+ isLoading,
+ isError,
+ error
+} = list()
+</script>
+
+<template>
+ <div v-if="isLoading">Loading…</div>
+ <div v-else-if="isError">{{ error.message }}</div>
+ <ul v-else>
+ <li v-for="ws in workspaces" :key="ws.id">{{ ws.name }}</li>
+ </ul>
+</template>
+```
+
+A query composable always returns a function (e.g. `list`) that you **call** to register the query. The options object you pass is forwarded directly to TanStack Query in case you need `staleTime`, `enabled`, etc.
+
+## Mutating data
+`mutateAsync` returns a Promise, so we recommend chaining handlers with `.then().catch()` to keep control flow explicit:
+
+```vue
+<script setup>
+const { create } = useWorkspaces()
+const createWorkspace = create() // register the mutation
+
+const onSubmit = (form) => {
+ createWorkspace
+ .mutateAsync(form)
+ .then(() => useAlert().success('Workspace created!'))
+ .catch((err) => useAlert().error(err.message))
+}
+</script>
+```
+
+### Optimistic updates & cache layer
+All mutations live in their composable (`client/composables/query/*`). After a successful API call they update the cache **manually** using `queryClient.setQueryData` so the UI reflects changes instantly *without* needing an extra network round-trip.
+
+If you need to invalidate and refetch, every composable exposes `invalidate()` which calls `queryClient.invalidateQueries` for its namespace:
+
+```js
+import { useWorkspaces } from '@/composables/query'
+
+useWorkspaces().invalidate() // refetch every workspace query
+```
+
+## Anatomy of a composable (quick tour)
+Take `useWorkspaces.js` as an example:
+
+1. **Queries** – `list()`, `detail(id)`
+2. **Mutations** – `create()`, `update()`, `remove()`
+3. **Utilities** – `invalidate()`
+
+Each query/mutation is a thin wrapper around `workspaceApi.*`, keeps its own `queryKey`, and touches only the part of the cache it owns. This isolation makes cache behaviour predictable and prevents accidental over-fetching.
+
+### Waiting for completion with `suspense()`
+Every query instance exposes a `suspense()` method that returns a Promise resolving once the data is loaded. Our auth middleware uses it to block navigation until the user and workspace lists are ready:
+
+```js
+// client/middleware/01.check-auth.global.js (excerpt)
+const userQuery = useAuth().user()
+const workspacesQuery = useWorkspaces().list()
+
+await Promise.all([
+ userQuery.suspense(),
+ workspacesQuery.suspense(),
+])
+```
+
+## Loading & error states
+Every query exposes booleans such as `isLoading`, `isFetching`, `isError`. Mutations expose `isPending`. Use them to drive spinners, disabled states, or retry logic.
+
+<Tip>
+`isFetching && data` is perfect for subtle "background update" indicators.
+</Tip>
+
+## TL;DR
+- Use **TanStack Query composables** for anything that comes from the API.
+- Use **Pinia** only for UI or session state.
+- Mutate with `mutateAsync().then().catch()`.
+- Call `invalidate()` when you really need a refetch—otherwise rely on optimistic updates.
\ No newline at end of file
diff --git a/docs/front-end/forms.mdx b/docs/front-end/forms.mdx
new file mode 100644
index 000000000..a3bed4be5
--- /dev/null
+++ b/docs/front-end/forms.mdx
@@ -0,0 +1,385 @@
+---
+title: "Forms & Validation"
+description: "How to build forms with validation, error handling, and API integration using our form system."
+---
+
+<Info>
+Forms in OpnForm handle both client-side validation and server-side API integration. They work seamlessly with [TanStack Query mutations](./data-fetching#mutating-data) for optimal user experience.
+</Info>
+
+## Form System Overview
+
+Our form system consists of three main parts:
+
+1. **Form Class** (`client/composables/lib/vForm/Form.js`) - Core form state management
+2. **useFormInput Composable** (`client/components/forms/useFormInput.js`) - Input component logic
+3. **Form Components** (`client/components/forms/`) - Reusable input components
+
+## Creating a Basic Form
+
+### 1. Initialize the Form
+
+```vue
+<script setup>
+const form = useForm({
+ email: '',
+ password: '',
+ remember: false
+})
+</script>
+```
+
+The `useForm` composable creates a reactive form instance with:
+- **Data binding** - automatic two-way data binding
+- **Validation state** - tracks errors and validation status
+- **Loading state** - busy/successful flags for UI feedback
+- **Error handling** - automatic error extraction from API responses
+
+### 2. Create the Form Template
+
+```vue
+<template>
+ <form @submit.prevent="handleSubmit">
+ <TextInput
+ name="email"
+ :form="form"
+ label="Email"
+ :required="true"
+ placeholder="Your email address"
+ />
+
+ <TextInput
+ native-type="password"
+ name="password"
+ :form="form"
+ label="Password"
+ :required="true"
+ placeholder="Your password"
+ />
+
+ <CheckboxInput
+ :form="form"
+ name="remember"
+ label="Remember me"
+ />
+
+ <UButton
+ type="submit"
+ :loading="form.busy"
+ :disabled="form.busy"
+ label="Submit"
+ />
+ </form>
+</template>
+```
+
+### 3. Handle Form Submission
+
+```vue
+<script setup>
+const { login } = useAuth()
+const loginMutation = login()
+
+const handleSubmit = () => {
+ // Using TanStack Query mutation
+ form.mutate(loginMutation)
+ .then(() => {
+ useAlert().success('Login successful!')
+ // Handle success
+ })
+ .catch((error) => {
+ // Errors are automatically handled by the form
+ console.log('Login failed:', error)
+ })
+}
+</script>
+```
+
+## Form Input Components
+
+### Using Form Inputs
+
+All form inputs accept a common set of props through the `useFormInput` composable:
+
+```vue
+<TextInput
+ name="email" <!-- Required: field name -->
+ :form="form" <!-- Required: form instance -->
+ label="Email Address" <!-- Optional: field label -->
+ :required="true" <!-- Optional: required validation -->
+ placeholder="Enter your email"
+ help="We'll never share your email"
+ :disabled="form.busy"
+/>
+```
+
+### Available Input Components
+
+- `<TextInput>` - Text, email, password, etc.
+- `<TextareaInput>` - Multi-line text
+- `<CheckboxInput>` - Checkboxes
+- `<SelectInput>` - Dropdown selects
+- ... and more!
+
+### Custom Input Components
+
+Create custom inputs using the `useFormInput` composable:
+
+```vue
+<script setup>
+import { useFormInput, inputProps } from '@/components/forms/useFormInput.js'
+
+const props = defineProps({
+ ...inputProps,
+ // Add custom props here
+})
+
+const emit = defineEmits(['update:modelValue'])
+
+const { compVal, hasError, hasValidation } = useFormInput(props, { emit })
+</script>
+
+<template>
+ <div>
+ <label>{{ props.label }}</label>
+ <input
+ v-model="compVal"
+ :class="{ 'error': hasError }"
+ :disabled="props.disabled"
+ />
+ <span v-if="hasError" class="error-message">
+ {{ props.form.errors.get(props.name) }}
+ </span>
+ </div>
+</template>
+```
+
+## Validation & Error Handling
+
+### Client-Side Validation
+
+Form validation happens automatically:
+
+```vue
+<TextInput
+ name="email"
+ :form="form"
+ :required="true"
+ type="email"
+/>
+```
+
+### Server-Side Validation
+
+The form automatically handles API validation errors:
+
+```javascript
+// API returns validation errors like:
+{
+ "errors": {
+ "email": ["The email field is required."],
+ "password": ["The password must be at least 8 characters."]
+ }
+}
+
+// Form automatically displays these errors on the respective inputs
+```
+
+### Precognition (Live Validation)
+
+Use real-time server validation as users type with [Laravel Precognition](https://laravel.com/docs/12.x/precognition).
+
+```vue
+<script setup>
+const form = useForm({ email: '', password: '' })
+
+const validateField = (fieldName) => {
+ form.validate('post', '/api/auth/login', {}, new Set([fieldName]))
+}
+</script>
+
+<template>
+ <TextInput
+ name="email"
+ :form="form"
+ @blur="validateField('email')"
+ />
+</template>
+```
+
+### Error States
+
+Access validation state programmatically:
+
+```vue
+<script setup>
+const form = useForm({ email: '' })
+
+// Check if form has any errors
+const hasErrors = computed(() => form.errors.any())
+
+// Check specific field errors
+const emailError = computed(() => form.errors.get('email'))
+
+// Form state
+const isSubmitting = computed(() => form.busy)
+const wasSuccessful = computed(() => form.successful)
+</script>
+```
+
+## Integration with TanStack Query
+
+Forms integrate seamlessly with TanStack Query mutations for optimal caching and state management:
+
+```vue
+<script setup>
+const { create } = useWorkspaces()
+const createMutation = create()
+
+const form = useForm({
+ name: '',
+ description: ''
+})
+
+const handleSubmit = () => {
+ form.mutate(createMutation)
+ .then((newWorkspace) => {
+ // Cache is automatically updated by the mutation
+ useAlert().success('Workspace created!')
+ router.push(`/workspaces/${newWorkspace.id}`)
+ })
+ .catch((error) => {
+ // Form errors are automatically handled
+ useAlert().error('Failed to create workspace')
+ })
+}
+</script>
+```
+
+<Note>
+See [Data Fetching](./data-fetching#mutating-data) for more details on how mutations work with caching and optimistic updates.
+</Note>
+
+## Form State Management
+
+### Form Methods
+
+```javascript
+const form = useForm({ name: 'John', email: '[email protected]' })
+
+// Get form data
+const data = form.data() // { name: 'John', email: '[email protected]' }
+
+// Reset form to original state
+form.reset()
+
+// Clear form and set new data
+form.resetAndFill({ name: 'Jane', email: '[email protected]' })
+
+// Clear errors and state
+form.clear()
+
+// Fill form with partial data
+form.fill({ name: 'Updated Name' })
+```
+
+### Form State Properties
+
+```javascript
+// Loading state
+form.busy // Currently submitting
+form.successful // Last submission was successful
+form.recentlySuccessful // Recently successful (with timeout)
+
+// Error state
+form.errors.any() // Has any errors
+form.errors.get('field') // Get specific field error
+form.errors.has('field') // Check if field has error
+```
+
+## Complete Example
+
+Here's a complete working example based on the LoginForm component:
+
+<CodeGroup>
+```vue LoginForm.vue
+<template>
+ <form @submit.prevent="handleLogin">
+ <TextInput
+ name="email"
+ :form="form"
+ label="Email"
+ :required="true"
+ placeholder="Your email address"
+ />
+
+ <TextInput
+ native-type="password"
+ name="password"
+ :form="form"
+ label="Password"
+ :required="true"
+ placeholder="Your password"
+ />
+
+ <CheckboxInput
+ :form="form"
+ name="remember"
+ label="Remember me"
+ />
+
+ <UButton
+ type="submit"
+ :loading="form.busy"
+ :disabled="form.busy"
+ label="Log in to continue"
+ />
+ </form>
+</template>
+
+<script setup>
+const { login } = useAuth()
+const loginMutation = login()
+
+const form = useForm({
+ email: '',
+ password: '',
+ remember: false
+})
+
+const handleLogin = () => {
+ form.mutate(loginMutation)
+ .then(() => {
+ useAlert().success('Login successful!')
+ // Handle redirect
+ })
+ .catch((error) => {
+ if (error.response?.status === 422) {
+ // Validation errors are automatically handled
+ useAlert().error('Please check your credentials')
+ } else {
+ useAlert().error('Login failed. Please try again.')
+ }
+ })
+}
+</script>
+```
+</CodeGroup>
+
+## Best Practices
+
+<Tip>
+**Form State Management**: Always use the `useForm` composable rather than managing form state manually. It handles validation, errors, and loading states automatically.
+</Tip>
+
+<Tip>
+**Error Handling**: Let the form handle API validation errors automatically. Only add custom error handling for specific business logic.
+</Tip>
+
+<Warning>
+**File Uploads**: When handling file uploads, the form will automatically serialize data as `FormData`. Make sure your API endpoint accepts `multipart/form-data`.
+</Warning>
+
+<Check>
+**Validation**: Combine client-side validation (required, email, etc.) with server-side validation for the best user experience.
+</Check>
\ No newline at end of file
diff --git a/integrations/zapier/ZAPIER.md b/integrations/zapier/ZAPIER.md
index cada942d3..a4122db7b 100644
--- a/integrations/zapier/ZAPIER.md
+++ b/integrations/zapier/ZAPIER.md
@@ -39,7 +39,7 @@ zapier env:set [VERSION] BASE_URL=[BASE_URL]
## Testing
-- Create an access token: http://localhost:3000/settings/access-tokens
+- Create an access token: http://localhost:3000/home?user-settings=access-tokens
- Create a Zap
- Authenticate using your token
- Submit a form
diff --git a/integrations/zapier/authentication.js b/integrations/zapier/authentication.js
index bb5e4f34b..4e69a28ef 100644
--- a/integrations/zapier/authentication.js
+++ b/integrations/zapier/authentication.js
@@ -7,7 +7,7 @@ module.exports = {
fields: [
{
helpText:
- 'Enter your API key, located at https://opnform.com/settings/access-tokens',
+ 'Enter your API key, located at https://opnform.com/home?user-settings=access-tokens',
computed: false,
key: 'api_key',
required: true,
diff --git a/package-lock.json b/package-lock.json
new file mode 100644
index 000000000..bbc177bf1
--- /dev/null
+++ b/package-lock.json
@@ -0,0 +1,6 @@
+{
+ "name": "OpnForm",
+ "lockfileVersion": 3,
+ "requires": true,
+ "packages": {}
+}
diff --git a/public_api_dual_auth_progress.md b/public_api_dual_auth_progress.md
deleted file mode 100644
index 943343a7f..000000000
--- a/public_api_dual_auth_progress.md
+++ /dev/null
@@ -1,48 +0,0 @@
-# Public API Dual Authentication Implementation Progress
-
-_Last updated: 2025-06-17 00:05 UTC_
-_Last updated: 2025-06-17 00:08 UTC_
-_Last updated: 2025-06-17 00:11 UTC_
-_Last updated: 2025-06-17 00:25 UTC_
-_Last updated: 2025-06-17 00:32 UTC_
-_Last updated: 2025-06-17 00:38 UTC_
-_Last updated: 2025-06-17 00:43 UTC_
-_Last updated: 2025-06-17 00:47 UTC_
-_Last updated: 2025-06-17 00:52 UTC_
-_Last updated: 2025-06-17 00:57 UTC_
-_Last updated: 2025-06-17 01:02 UTC_
-
-## Overview
-This document tracks the implementation progress for introducing a dual-authentication layer (JWT & Sanctum) to expose a public API while reusing existing endpoints. All updates to this file should refresh the **Last updated** timestamp and append a brief note to the **Progress log**.
-
----
-
-## Task Checklist
-- [x] Create `api/config/sanctum_routes.php` with the full list of whitelisted route names.
-- [x] Update `api/app/Enums/AccessTokenAbility.php` with `read`/`write` cases for all resources.
-- [x] Create the `api/app/Http/Middleware/AuthenticateWithJwtOrSanctum.php` middleware class.
-- [x] Register the middleware alias `auth.multi` in `api/app/Http/Kernel.php`.
-- [x] Change `auth:api` to `auth.multi` in `api/routes/api.php`.
-- [x] Create/Update `FormPolicy` with Sanctum ability checks.
-- [x] Create/Update Policy for Submissions with Sanctum ability checks.
-- [x] Create/Update `WorkspacePolicy` with Sanctum ability checks.
-- [x] Create/Update Policy for Workspace Users with Sanctum ability checks.
-- [x] Update `client/components/AccessTokenModal.vue` (or similar) to display new abilities.
-- [ ] Run all tests described in the "Testing Instructions" section.
-- [x] Document all newly exposed endpoints in `openapi.json` and the Mintlify markdown files.
-
----
-
-## Progress Log
-- 2025-06-17 00:00 UTC – Initialized progress tracking file.
-- 2025-06-17 00:05 UTC – Created `api/config/sanctum_routes.php` whitelist configuration.
-- 2025-06-17 00:08 UTC – Added granular read/write abilities to `AccessTokenAbility` enum.
-- 2025-06-17 00:11 UTC – Implemented `AuthenticateWithJwtOrSanctum` middleware.
-- 2025-06-17 00:25 UTC – Added `auth.multi` alias to Kernel and updated routes to use new middleware.
-- 2025-06-17 00:32 UTC – Added Sanctum ability checks to `FormPolicy`.
-- 2025-06-17 00:38 UTC – Added `SubmissionPolicy` with Sanctum read/write checks and registered it.
-- 2025-06-17 00:43 UTC – Added Sanctum ability checks to `WorkspacePolicy`.
-- 2025-06-17 00:47 UTC – Added Sanctum write ability enforcement to workspace admin actions.
-- 2025-06-17 00:52 UTC – Updated token modal and store to include granular abilities and enable selection.
-- 2025-06-17 00:57 UTC – Added new paths to `openapi.json` and created markdown doc `open-forms-list.mdx`.
-- 2025-06-17 01:02 UTC – Completed docs for Submissions, Workspaces, Workspace Users and updated OpenAPI accordingly.
\ No newline at end of file