Skip to content

Beautiful Open-Source Form Builder

Add client linting to GitHub Actions workflow

Julien Nahum4a2adcf8f746
diff --git a/.github/workflows/laravel.yml b/.github/workflows/laravel.yml
index 7d9a99483..ed8286e52 100644
--- a/.github/workflows/laravel.yml
+++ b/.github/workflows/laravel.yml
@@ -50,6 +50,35 @@ jobs:
working-directory: ./api
run: ./vendor/bin/pint --test
+ client_lint:
+ runs-on: ubuntu-latest
+ name: Run client linters
+ defaults:
+ run:
+ working-directory: ./client
+
+ steps:
+ - name: Checkout code
+ uses: actions/checkout@v2
+
+ - name: Set up Node.js
+ uses: actions/setup-node@v1
+ with:
+ node-version: "20"
+
+ - uses: actions/cache@v2
+ with:
+ path: ~/.npm
+ key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
+ restore-keys: |
+ ${{ runner.os }}-node-
+
+ - name: Install npm dependencies
+ run: npm ci --no-audit --no-progress --silent
+
+ - name: Run ESLint
+ run: npm run lint
+
tests:
runs-on: ubuntu-latest
@@ -199,7 +228,7 @@ jobs:
SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
production-deploy:
- needs: [code_lint, tests, build-nuxt-app]
+ needs: [code_lint, client_lint, tests, build-nuxt-app]
if: success() && github.ref == 'refs/heads/main' && github.event_name == 'push'
runs-on: ubuntu-latest
name: Triggers Deployment (Vapor & Amplify)
diff --git a/client/components/forms/FileInput.vue b/client/components/forms/FileInput.vue
index 8615f2215..913eadbd3 100644
--- a/client/components/forms/FileInput.vue
+++ b/client/components/forms/FileInput.vue
@@ -285,7 +285,7 @@ export default {
src: this.getFileSrc(file)
})
this.loading = false
- }).catch((error) => {
+ }).catch(() => {
this.loading = false
})
} else {
@@ -297,7 +297,7 @@ export default {
this.loading = false
}
})
- .catch((error) => {
+ .catch(() => {
this.clearAll()
this.loading = false
})
diff --git a/client/components/forms/MentionInput.vue b/client/components/forms/MentionInput.vue
index 57cc1607d..287b47082 100644
--- a/client/components/forms/MentionInput.vue
+++ b/client/components/forms/MentionInput.vue
@@ -56,7 +56,7 @@
</template>
<script setup>
- import { ref, onMounted, watch, computed } from 'vue'
+ import { ref, onMounted, watch } from 'vue'
import { inputProps, useFormInput } from './useFormInput.js'
import InputWrapper from './components/InputWrapper.vue'
import MentionDropdown from './components/MentionDropdown.vue'
@@ -66,7 +66,7 @@
disableMention: { type: Boolean, default: false },
})
const emit = defineEmits(['update:modelValue'])
- const { compVal, inputStyle, hasValidation, hasError, inputWrapperProps } = useFormInput(props, { emit })
+ const { compVal, inputStyle, hasError, inputWrapperProps } = useFormInput(props, { emit })
const editableDiv = ref(null)
const savedRange = ref(null)
const subscriptionModalStore = useSubscriptionModalStore()
diff --git a/client/components/forms/SignatureInput.vue b/client/components/forms/SignatureInput.vue
index 7d4578dd3..17a1acce6 100644
--- a/client/components/forms/SignatureInput.vue
+++ b/client/components/forms/SignatureInput.vue
@@ -169,7 +169,7 @@ export default {
}
this.loading = false
})
- .catch((error) => {
+ .catch(() => {
this.loading = false
this.file = null
})
diff --git a/client/components/forms/TextBlock.vue b/client/components/forms/TextBlock.vue
index 8a2c7c641..5400af894 100644
--- a/client/components/forms/TextBlock.vue
+++ b/client/components/forms/TextBlock.vue
@@ -1,8 +1,8 @@
<template>
- <div
- v-html="processedContent"
- />
- </template>
+ <div
+ v-html="processedContent"
+ />
+</template>
<script setup>
const props = defineProps({
diff --git a/client/components/forms/components/CheckboxIcon.vue b/client/components/forms/components/CheckboxIcon.vue
index 7296be854..43428690a 100644
--- a/client/components/forms/components/CheckboxIcon.vue
+++ b/client/components/forms/components/CheckboxIcon.vue
@@ -22,7 +22,7 @@
</template>
<script setup>
-const props = defineProps({
+defineProps({
isChecked: {
type: Boolean,
required: true
diff --git a/client/components/forms/components/MentionDropdown.vue b/client/components/forms/components/MentionDropdown.vue
index 1e7b116cc..7ce580b5f 100644
--- a/client/components/forms/components/MentionDropdown.vue
+++ b/client/components/forms/components/MentionDropdown.vue
@@ -1,71 +1,71 @@
<template>
- <UPopover
- ref="popover"
- v-model:open="open"
- class="h-0"
- @close="cancel"
- >
- <span class="hidden" />
- <template #panel>
- <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">
- Insert Mention
- </div>
- <input
- v-model="fallbackValue"
- class="p-1 mb-2 text-sm w-1/2 border rounded-md hover:bg-gray-50"
- placeholder="Fallback value"
- >
+ <UPopover
+ ref="popover"
+ v-model:open="open"
+ class="h-0"
+ @close="cancel"
+ >
+ <span class="hidden" />
+ <template #panel>
+ <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">
+ Insert Mention
</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">
- 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="{ '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)"
- >
- <BlockTypeIcon
- :type="field.type"
- class="mr-2"
- />
- <p class="text-sm text-gray-700 truncate">
- {{ field.name }}
- </p>
- </div>
+ <input
+ v-model="fallbackValue"
+ class="p-1 mb-2 text-sm w-1/2 border rounded-md hover:bg-gray-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">
+ 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="{ '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)"
+ >
+ <BlockTypeIcon
+ :type="field.type"
+ class="mr-2"
+ />
+ <p class="text-sm text-gray-700 truncate">
+ {{ field.name }}
+ </p>
</div>
</div>
</div>
+ </div>
- <div class="flex border-t pt-2 -mx-2 px-2 justify-end space-x-2">
- <UButton
- size="sm"
- color="primary"
- class="px-6"
- :disabled="!selectedField"
- @click="insertMention"
- >
- Insert
- </UButton>
- <UButton
- size="sm"
- color="gray"
- @click="cancel"
- >
- Cancel
- </UButton>
- </div>
+ <div class="flex border-t pt-2 -mx-2 px-2 justify-end space-x-2">
+ <UButton
+ size="sm"
+ color="primary"
+ class="px-6"
+ :disabled="!selectedField"
+ @click="insertMention"
+ >
+ Insert
+ </UButton>
+ <UButton
+ size="sm"
+ color="gray"
+ @click="cancel"
+ >
+ Cancel
+ </UButton>
</div>
- </template>
- </UPopover>
- </template>
+ </div>
+ </template>
+ </UPopover>
+</template>
<script setup>
import { ref, toRefs } from 'vue'
diff --git a/client/components/forms/components/QuillyEditor.vue b/client/components/forms/components/QuillyEditor.vue
index 854cb714c..c0cdb084c 100644
--- a/client/components/forms/components/QuillyEditor.vue
+++ b/client/components/forms/components/QuillyEditor.vue
@@ -1,9 +1,9 @@
<template>
- <div
- ref="container"
- class="quilly-editor"
- />
- </template>
+ <div
+ ref="container"
+ class="quilly-editor"
+ />
+</template>
<script setup>
import Quill from 'quill'
diff --git a/client/components/forms/components/RadioButtonIcon.vue b/client/components/forms/components/RadioButtonIcon.vue
index 92f2a3c58..112bcaf26 100644
--- a/client/components/forms/components/RadioButtonIcon.vue
+++ b/client/components/forms/components/RadioButtonIcon.vue
@@ -22,7 +22,7 @@
</template>
<script setup>
-const props = defineProps({
+defineProps({
isChecked: {
type: Boolean,
required: true
diff --git a/client/components/global/ErrorBoundary.vue b/client/components/global/ErrorBoundary.vue
index 39adbf885..f1f105ef2 100644
--- a/client/components/global/ErrorBoundary.vue
+++ b/client/components/global/ErrorBoundary.vue
@@ -1,12 +1,12 @@
<template>
- <slot v-if="!error" />
- <slot
- v-else
- name="error"
- :error="error"
- :clear-error="clearError"
- />
- </template>
+ <slot v-if="!error" />
+ <slot
+ v-else
+ name="error"
+ :error="error"
+ :clear-error="clearError"
+ />
+</template>
<script setup>
const error = ref()
diff --git a/client/components/global/transitions/VTransition.vue b/client/components/global/transitions/VTransition.vue
index a0282cf13..7fbafa303 100644
--- a/client/components/global/transitions/VTransition.vue
+++ b/client/components/global/transitions/VTransition.vue
@@ -25,7 +25,7 @@
</template>
<script setup>
-const props = defineProps({
+defineProps({
name: {
type: String,
default: "slideInUp"
diff --git a/client/components/open/editors/FontCard.vue b/client/components/open/editors/FontCard.vue
index 09a5c67be..3c186c888 100644
--- a/client/components/open/editors/FontCard.vue
+++ b/client/components/open/editors/FontCard.vue
@@ -59,7 +59,7 @@ const props = defineProps({
}
})
-const emit = defineEmits(['select-font'])
+defineEmits(['select-font'])
const getFontUrl = computed(() => {
const family = props.fontName.replace(/ /g, '+')
diff --git a/client/components/open/editors/GoogleFontPicker.vue b/client/components/open/editors/GoogleFontPicker.vue
index 61d784bc0..0a1b7a21b 100644
--- a/client/components/open/editors/GoogleFontPicker.vue
+++ b/client/components/open/editors/GoogleFontPicker.vue
@@ -80,7 +80,7 @@ const props = defineProps({
},
})
-const emit = defineEmits(['close','apply'])
+defineEmits(['close','apply'])
const loading = ref(false)
const fonts = ref([])
const selectedFont = ref(props.font || null)
diff --git a/client/components/open/forms/OpenCompleteForm.vue b/client/components/open/forms/OpenCompleteForm.vue
index d80f83540..2a8fd8f23 100644
--- a/client/components/open/forms/OpenCompleteForm.vue
+++ b/client/components/open/forms/OpenCompleteForm.vue
@@ -117,14 +117,14 @@
:admin-preview="adminPreview"
@submit="submitForm"
>
- <template #submit-btn="{submitForm}">
+ <template #submit-btn="{rootSubmitForm}">
<open-form-button
:loading="loading"
:theme="theme"
:color="form.color"
class="mt-2 px-8 mx-1"
:class="submitButtonClass"
- @click.prevent="submitForm"
+ @click.prevent="rootSubmitForm"
>
{{ form.submit_button_text }}
</open-form-button>
@@ -223,6 +223,8 @@ export default {
}
},
+ emits: ['submitted', 'password-entered', 'restarted'],
+
setup(props) {
const { setLocale } = useI18n()
const authStore = useAuthStore()
diff --git a/client/components/open/forms/OpenFormField.vue b/client/components/open/forms/OpenFormField.vue
index 8dbb4ad7d..c7db21cd6 100644
--- a/client/components/open/forms/OpenFormField.vue
+++ b/client/components/open/forms/OpenFormField.vue
@@ -174,7 +174,7 @@ export default {
adminPreview: {type: Boolean, default: false} // If used in FormEditorPreview
},
- setup(props) {
+ setup() {
const workingFormStore = useWorkingFormStore()
return {
workingFormStore,
diff --git a/client/components/open/forms/components/FirstSubmissionModal.vue b/client/components/open/forms/components/FirstSubmissionModal.vue
index 619d63947..51844cd24 100644
--- a/client/components/open/forms/components/FirstSubmissionModal.vue
+++ b/client/components/open/forms/components/FirstSubmissionModal.vue
@@ -74,7 +74,7 @@ const props = defineProps({
show: { type: Boolean, required: true },
form: { type: Object, required: true }
})
-const emit = defineEmits(['close'])
+defineEmits(['close'])
const confetti = useConfetti()
const crisp = useCrisp()
const amplitude = useAmplitude()
diff --git a/client/components/open/forms/components/FormEditorErrorHandler.vue b/client/components/open/forms/components/FormEditorErrorHandler.vue
index ab09bae5f..fcf1d27a9 100644
--- a/client/components/open/forms/components/FormEditorErrorHandler.vue
+++ b/client/components/open/forms/components/FormEditorErrorHandler.vue
@@ -33,47 +33,45 @@
</ErrorBoundary>
</template>
- <script setup>
- import { computed } from 'vue'
- const crisp = useCrisp()
- const workingFormStore = useWorkingFormStore()
- const authStore = useAuthStore()
- const form = storeToRefs(workingFormStore).content
- const user = computed(() => authStore.user)
- // Clear error and go back 1 step in history
- const clearEditorError = (error, clearError) => {
- crisp.enableChatbot()
- workingFormStore.undo()
- clearError()
+<script setup>
+const crisp = useCrisp()
+const workingFormStore = useWorkingFormStore()
+const form = storeToRefs(workingFormStore).content
+
+// Clear error and go back 1 step in history
+const clearEditorError = (error, clearError) => {
+ crisp.enableChatbot()
+ workingFormStore.undo()
+ clearError()
+}
+const onFormEditorError = (error) => {
+ console.error('Form Editor Error Handled', error)
+ crisp.pauseChatBot()
+ const eventData = {
+ message: error.message,
+ // take first 200 characters
+ stack: error.stack.substring(0, 100)
}
- const onFormEditorError = (error) => {
- console.error('Form Editor Error Handled', error)
- crisp.pauseChatBot()
- const eventData = {
- message: error.message,
- // take first 200 characters
- stack: error.stack.substring(0, 100)
- }
- try {
- crisp.pushEvent('form-editor-error', eventData)
- } catch (e) {
- console.error('Failed to send event to crisp', e, eventData)
- }
+ try {
+ crisp.pushEvent('form-editor-error', eventData)
+ } catch (e) {
+ console.error('Failed to send event to crisp', e, eventData)
}
- const onErrorContact = (error) => {
- crisp.pauseChatBot()
- let errorReport = 'Hi there, I have a technical issue with the form editor.'
- if (form.value.slug) {
- errorReport += ` The form I am editing is: \`${form.value.slug}\`.`
- }
- errorReport += ` And here are technical details about the error: \`\`\`${error.stack}\`\`\``
- try {
- crisp.openAndShowChat(errorReport)
- crisp.showMessage(`Hi there, we're very sorry to hear you experienced an issue with OpnForm.
- We'll be in touch about it very soon! In the meantime, I recommend that you try going back one step, and save your changes.`, 2000)
- } catch (e) {
- console.error('Crisp error', e)
- }
+}
+const onErrorContact = (error) => {
+ crisp.pauseChatBot()
+ let errorReport = 'Hi there, I have a technical issue with the form editor.'
+ if (form.value.slug) {
+ errorReport += ` The form I am editing is: \`${form.value.slug}\`.`
}
- </script>
+ errorReport += ` And here are technical details about the error: \`\`\`${error.stack}\`\`\``
+ try {
+ crisp.openAndShowChat(errorReport)
+ crisp.showMessage(`Hi there, we're very sorry to hear you experienced an issue with OpnForm.
+ We'll be in touch about it very soon! In the meantime, I recommend that you try going back one step, and save your changes.`, 2000)
+ } catch (e) {
+ console.error('Crisp error', e)
+ }
+}
+</script>
\ No newline at end of file
diff --git a/client/components/open/forms/components/FormWorkspaceModal.vue b/client/components/open/forms/components/FormWorkspaceModal.vue
index 5e487a688..6fc263785 100644
--- a/client/components/open/forms/components/FormWorkspaceModal.vue
+++ b/client/components/open/forms/components/FormWorkspaceModal.vue
@@ -118,13 +118,4 @@ const onSubmit = () => {
loading.value = false
})
}
-
-const isUrl = (str) => {
- try {
- new URL(str)
- } catch (_) {
- return false
- }
- return true
-}
</script>
diff --git a/client/components/open/forms/components/ShareFormUrl.vue b/client/components/open/forms/components/ShareFormUrl.vue
index 4205fabbe..5fa50ebe3 100644
--- a/client/components/open/forms/components/ShareFormUrl.vue
+++ b/client/components/open/forms/components/ShareFormUrl.vue
@@ -1,30 +1,30 @@
<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
+ 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>
- </template>
+ </div>
+</template>
<script setup>
import { computed, defineProps } from 'vue'
diff --git a/client/components/open/forms/fields/components/HiddenRequiredDisabled.vue b/client/components/open/forms/fields/components/HiddenRequiredDisabled.vue
index 31d19991a..68c4beada 100644
--- a/client/components/open/forms/fields/components/HiddenRequiredDisabled.vue
+++ b/client/components/open/forms/fields/components/HiddenRequiredDisabled.vue
@@ -56,7 +56,7 @@ const props = defineProps({
}
})
-const emit = defineEmits(['update:field'])
+defineEmits(['update:field'])
const options = ref([
{
diff --git a/client/components/open/forms/fields/components/MatrixPrefilledValues.vue b/client/components/open/forms/fields/components/MatrixPrefilledValues.vue
index 11bf47f11..0343f5449 100644
--- a/client/components/open/forms/fields/components/MatrixPrefilledValues.vue
+++ b/client/components/open/forms/fields/components/MatrixPrefilledValues.vue
@@ -1,15 +1,17 @@
<template>
- <p class="font-semibold">Prefilled values</p>
- <select-input
- v-for="row in matrixData"
- :key="row.label"
- name="prefill"
- class="mt-3"
- :options="row.options"
- :label="row.label"
- v-model="selection[row.label]"
- @update:model-value="onSelection"
- />
+ <p class="font-semibold">
+ Prefilled values
+ </p>
+ <select-input
+ v-for="row in matrixData"
+ :key="row.label"
+ v-model="selection[row.label]"
+ name="prefill"
+ class="mt-3"
+ :options="row.options"
+ :label="row.label"
+ @update:model-value="onSelection"
+ />
</template>
<script>
export default {
diff --git a/client/components/open/tables/components/OpenDate.vue b/client/components/open/tables/components/OpenDate.vue
index 0d48c7dea..5e9f7b39f 100644
--- a/client/components/open/tables/components/OpenDate.vue
+++ b/client/components/open/tables/components/OpenDate.vue
@@ -15,9 +15,11 @@ import { default as _has } from 'lodash/has'
export default {
components: {},
props: {
+ // eslint-disable-next-line vue/require-prop-types
property: {
required: true
},
+ // eslint-disable-next-line vue/require-prop-types
value: {
required: true
}
diff --git a/client/components/pages/admin/AddUserToWorkspace.vue b/client/components/pages/admin/AddUserToWorkspace.vue
index 09424bf35..28f411489 100644
--- a/client/components/pages/admin/AddUserToWorkspace.vue
+++ b/client/components/pages/admin/AddUserToWorkspace.vue
@@ -35,8 +35,8 @@
</template>
<script setup>
-const props = defineProps({
- isWorkspaceAdmin: {},
+defineProps({
+ isWorkspaceAdmin: { type: Boolean, default: false },
disabled: {
type: Boolean,
default: false,
diff --git a/client/components/pages/admin/BillingEmail.vue b/client/components/pages/admin/BillingEmail.vue
index 11216ca28..412eca511 100644
--- a/client/components/pages/admin/BillingEmail.vue
+++ b/client/components/pages/admin/BillingEmail.vue
@@ -63,7 +63,7 @@ onMounted(() => {
loadingBillingEmail.value = false
userCreated.value = true
form.billing_email = data.billing_email
- }).catch(error => {
+ }).catch(() => {
loadingBillingEmail.value = false
userCreated.value = false
})
diff --git a/client/components/pages/admin/DeletedForms.vue b/client/components/pages/admin/DeletedForms.vue
index 3015421d9..6d9afcb6d 100644
--- a/client/components/pages/admin/DeletedForms.vue
+++ b/client/components/pages/admin/DeletedForms.vue
@@ -26,7 +26,8 @@
</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-gray-200 dark:border-gray-700"
+ >
<UPagination
v-model="page"
:page-count="pageCount"
diff --git a/client/components/pages/admin/EditWorkSpaceUser.vue b/client/components/pages/admin/EditWorkSpaceUser.vue
index 145f5bd28..fbcc235fa 100644
--- a/client/components/pages/admin/EditWorkSpaceUser.vue
+++ b/client/components/pages/admin/EditWorkSpaceUser.vue
@@ -42,6 +42,7 @@
<script setup>
import {watch, ref} from "vue"
+// eslint-disable-next-line vue/require-prop-types
const props = defineProps(['user', 'showEditUserModal'])
const emit = defineEmits(['close', 'fetchUsers'])
@@ -73,7 +74,7 @@ const updateUserRole = () => {
useAlert().success("User role updated.")
emit('fetchUsers')
emit('close')
- }).catch((error) => {
+ }).catch(() => {
useAlert().error("There was an error updating user role")
}).finally(() => {
updatingUserRoleState.value = false
diff --git a/client/components/pages/admin/ImpersonateUser.vue b/client/components/pages/admin/ImpersonateUser.vue
index f1c6d1582..c85ed9bb1 100644
--- a/client/components/pages/admin/ImpersonateUser.vue
+++ b/client/components/pages/admin/ImpersonateUser.vue
@@ -3,6 +3,7 @@
size="sm"
color="white"
icon="i-heroicons-eye-16-solid"
+ :loading="loading"
@click="impersonate"
>
Impersonate User
@@ -18,13 +19,13 @@ const authStore = useAuthStore()
const formsStore = useFormsStore()
const workspacesStore = useWorkspacesStore()
-let loading = ref(false)
+const loading = ref(false)
const impersonate = () => {
- loading = true
+ loading.value = true
authStore.startImpersonating()
opnFetch(`/moderator/impersonate/${props.user.id}`).then(async (data) => {
- loading = false
+ loading.value = false
// Save the token.
authStore.setToken(data.token, false)
@@ -47,7 +48,7 @@ const impersonate = () => {
})
.catch((error) => {
useAlert().error(error.data.message)
- loading = false
+ loading.value = false
})
}
</script>
diff --git a/client/components/pages/admin/UserWorkspaces.vue b/client/components/pages/admin/UserWorkspaces.vue
index 00f58b161..96ad4541a 100644
--- a/client/components/pages/admin/UserWorkspaces.vue
+++ b/client/components/pages/admin/UserWorkspaces.vue
@@ -1,16 +1,16 @@
<template>
- <AdminCard
- title="Workspaces"
- icon="heroicons:globe-alt"
+ <AdminCard
+ title="Workspaces"
+ icon="heroicons:globe-alt"
+ >
+ <UTable
+ :loading-state="{ icon: 'i-heroicons-arrow-path-20-solid', label: 'Loading...' }"
+ :progress="{ color: 'primary', animation: 'carousel' }"
+ :empty-state="{ icon: 'i-heroicons-circle-stack-20-solid', label: 'No items.' }"
+ :columns="columns"
+ :rows="rows"
+ class="-mx-6"
>
- <UTable
- :loading-state="{ icon: 'i-heroicons-arrow-path-20-solid', label: 'Loading...' }"
- :progress="{ color: 'primary', animation: 'carousel' }"
- :empty-state="{ icon: 'i-heroicons-circle-stack-20-solid', label: 'No items.' }"
- :columns="columns"
- :rows="rows"
- class="-mx-6"
- >
<template #plan-data="{ row }">
<span
class="text-xs select-all rounded-md px-2 py-1 border"
@@ -19,18 +19,19 @@
{{ row.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">
- <UPagination
- v-model="page"
- :page-count="pageCount"
- :total="workspaces?.length"
- />
- </div>
- </AdminCard>
- </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"
+ >
+ <UPagination
+ v-model="page"
+ :page-count="pageCount"
+ :total="workspaces?.length"
+ />
+ </div>
+ </AdminCard>
+</template>
<script setup>
diff --git a/client/components/pages/forms/show/ExtraMenu.vue b/client/components/pages/forms/show/ExtraMenu.vue
index 64049f87e..403a709f3 100644
--- a/client/components/pages/forms/show/ExtraMenu.vue
+++ b/client/components/pages/forms/show/ExtraMenu.vue
@@ -84,7 +84,6 @@
<script setup>
import { ref, defineProps, computed } from "vue"
-import Dropdown from "~/components/global/Dropdown.vue"
import FormTemplateModal from "../../../open/forms/components/templates/FormTemplateModal.vue"
import FormWorkspaceModal from "../../../open/forms/components/FormWorkspaceModal.vue"
diff --git a/client/components/pages/settings/WorkSpaceCustomDomains.vue b/client/components/pages/settings/WorkSpaceCustomDomains.vue
index 5899f9f87..aa5bd9187 100644
--- a/client/components/pages/settings/WorkSpaceCustomDomains.vue
+++ b/client/components/pages/settings/WorkSpaceCustomDomains.vue
@@ -74,7 +74,6 @@ import {watch} from "vue"
const crisp = useCrisp()
const workspacesStore = useWorkspacesStore()
const workspace = computed(() => workspacesStore.getCurrent)
-const loading = computed(() => workspacesStore.loading)
const customDomainsForm = useForm({
custom_domain: "",
diff --git a/client/components/pages/settings/WorkSpaceUser.vue b/client/components/pages/settings/WorkSpaceUser.vue
index 916616b87..7024dc2d2 100644
--- a/client/components/pages/settings/WorkSpaceUser.vue
+++ b/client/components/pages/settings/WorkSpaceUser.vue
@@ -281,7 +281,7 @@ const removeUser = (index) => {
).then(() => {
useAlert().success("User successfully removed.")
getWorkspaceUsers()
- }).catch((error) => {
+ }).catch(() => {
useAlert().error("There was an error removing user")
}).finally(() => {
loadingUsers.value = false
@@ -319,7 +319,7 @@ const leaveWorkSpace = (workspaceId) => {
useAlert().success("You have left the workspace.")
workspacesStore.remove(workspaceId)
getWorkspaceUsers()
- }).catch((error) => {
+ }).catch(() => {
useAlert().error("There was an error leaving the workspace.")
}).finally(() => {
leaveWorkspaceLoadingState.value = false
diff --git a/client/middleware/custom-domain.global.js b/client/middleware/custom-domain.global.js
index 952bee505..713567477 100644
--- a/client/middleware/custom-domain.global.js
+++ b/client/middleware/custom-domain.global.js
@@ -32,8 +32,6 @@ function redirectToMainDomain(details = {}) {
export default defineNuxtRouteMiddleware((to) => {
if (!customDomainUsed()) return
- const config = useRuntimeConfig()
-
const customDomainHeaderValue = useRequestHeaders()[customDomainHeaderName]
if (
import.meta.server &&
diff --git a/client/middleware/self-hosted-credentials.js b/client/middleware/self-hosted-credentials.js
index 7fbc7a0df..ab0a7e47d 100644
--- a/client/middleware/self-hosted-credentials.js
+++ b/client/middleware/self-hosted-credentials.js
@@ -1,6 +1,5 @@
export default defineNuxtRouteMiddleware(() => {
const authStore = useAuthStore()
- const runtimeConfig = useRuntimeConfig()
if (useFeatureFlag('self_hosted')) {
if (authStore.check && authStore.user?.email === '[email protected]') {
diff --git a/client/pages/forms/[slug]/show.vue b/client/pages/forms/[slug]/show.vue
index 39ba10456..3d4d6c24d 100644
--- a/client/pages/forms/[slug]/show.vue
+++ b/client/pages/forms/[slug]/show.vue
@@ -179,7 +179,6 @@
<script setup>
import { computed } from "vue"
-import VButton from "~/components/global/VButton.vue"
import ExtraMenu from "../../../components/pages/forms/show/ExtraMenu.vue"
import FormCleanings from "../../../components/pages/forms/show/FormCleanings.vue"
diff --git a/client/pages/oauth/callback.vue b/client/pages/oauth/callback.vue
index d270359d8..71940130c 100644
--- a/client/pages/oauth/callback.vue
+++ b/client/pages/oauth/callback.vue
@@ -1,38 +1,36 @@
<template>
- <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"
+ <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 it at the moment.
+ </p>
+ <v-button
+ :to="{ name: 'login' }"
>
- <p class="text-center">
- Unable to sign it at the moment.
- </p>
- <v-button
- :to="{ name: 'login' }"
- >
- Back to login
- </v-button>
- </div>
+ Back to login
+ </v-button>
</div>
</div>
- </template>
+ </div>
</template>
<script setup>
-import { useNuxtApp } from "nuxt/app";
+import { useNuxtApp } from "nuxt/app"
-const { $utm } = useNuxtApp();
+const { $utm } = useNuxtApp()
const router = useRouter()
const route = useRoute()
diff --git a/client/pages/update-credentials.vue b/client/pages/update-credentials.vue
index 197319b40..939e52b1d 100644
--- a/client/pages/update-credentials.vue
+++ b/client/pages/update-credentials.vue
@@ -1,7 +1,13 @@
<template>
- <modal :show="showModal" @close="logout" max-width="lg">
+ <modal
+ :show="showModal"
+ max-width="lg"
+ @close="logout"
+ >
<div class="">
- <h2 class="font-medium text-3xl mb-3">Welcome to OpnForm!</h2>
+ <h2 class="font-medium text-3xl mb-3">
+ Welcome to OpnForm!
+ </h2>
<p class="text-sm text-gray-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.
@@ -43,7 +49,10 @@
/>
<!-- Submit Button -->
- <v-button class="mx-auto" :loading="form.busy || loading">
+ <v-button
+ class="mx-auto"
+ :loading="form.busy || loading"
+ >
Update Credentials
</v-button>
</form>
@@ -51,14 +60,14 @@
</template>
<script setup>
-import { onMounted } from "vue";
+import { onMounted } from "vue"
-const authStore = useAuthStore();
-const workspacesStore = useWorkspacesStore();
-const formsStore = useFormsStore();
-const user = computed(() => authStore.user);
-const router = useRouter();
-const showModal = ref(true);
+const authStore = useAuthStore()
+const workspacesStore = useWorkspacesStore()
+const formsStore = useFormsStore()
+const user = computed(() => authStore.user)
+const router = useRouter()
+const showModal = ref(true)
const form = useForm({
name: "",
email: "",
@@ -66,31 +75,31 @@ const form = useForm({
password_confirmation: "",
agree_terms: false,
appsumo_license: null,
-});
+})
onMounted(() => {
- form.email = user?.value?.email;
-});
+ form.email = user?.value?.email
+})
const updateCredentials = () => {
form
.post("update-credentials")
.then(async (data) => {
- authStore.setUser(data.user);
- const workspaces = await fetchAllWorkspaces();
- workspacesStore.set(workspaces.data.value);
- formsStore.loadAll(workspacesStore.currentId);
- router.push({ name: "home" });
+ authStore.setUser(data.user)
+ const workspaces = await fetchAllWorkspaces()
+ workspacesStore.set(workspaces.data.value)
+ formsStore.loadAll(workspacesStore.currentId)
+ router.push({ name: "home" })
})
.catch((error) => {
- console.error(error);
- useAlert().error(error.response._data.message);
- });
-};
+ console.error(error)
+ useAlert().error(error.response._data.message)
+ })
+}
const logout = () => {
- authStore.logout();
- showModal.value = false;
- router.push({ name: "login" });
-};
+ authStore.logout()
+ showModal.value = false
+ router.push({ name: "login" })
+}
</script>
\ No newline at end of file
diff --git a/client/runtimeConfig.js b/client/runtimeConfig.js
index d094fb68e..273442863 100644
--- a/client/runtimeConfig.js
+++ b/client/runtimeConfig.js
@@ -1,11 +1,3 @@
-function parseBoolean(value, defaultValue = false) {
- if (typeof value === 'string') {
- value = value.toLowerCase().trim()
- if (value === 'true' || value === '1') return true
- if (value === 'false' || value === '0') return false
- }
- return defaultValue
-}
function parseNumber(value, defaultValue = 0) {
const parsedValue = parseFloat(value)
diff --git a/client/stores/working_form.js b/client/stores/working_form.js
index 9a3b2bfba..59f811a95 100644
--- a/client/stores/working_form.js
+++ b/client/stores/working_form.js
@@ -160,27 +160,6 @@ export const useWorkingFormStore = defineStore("working_form", {
this.content.properties.splice(index, 1)
}
},
- removeField(field) {
- this.internalRemoveField(field)
- },
- internalRemoveField(field) {
- const index = this.objectToIndex(field)
-
- if (index !== -1) {
- useAlert().success('Ctrl + Z to undo',10000,{
- title: 'Field removed',
- actions: [{
- label: 'Undo',
- icon:"i-material-symbols-undo",
- click: () => {
- this.undo()
- }
- }]
- })
- this.content.properties.splice(index, 1)
- }
- },
-
moveField(oldIndex, newIndex) {
const newFields = clonedeep(this.content.properties)
const field = newFields.splice(oldIndex, 1)[0]