diff --git a/client/.eslintrc.cjs b/client/.eslintrc.cjs new file mode 100644 index 00000000..bae28628 --- /dev/null +++ b/client/.eslintrc.cjs @@ -0,0 +1,19 @@ +module.exports = { + root: true, + extends: ['@nuxt/eslint-config'], + parser: 'vue-eslint-parser', + env: { + browser: true, + node: true, + }, + extends: ['@nuxt/eslint-config'], + rules: { + 'vue/require-default-prop': 'off', + 'vue/no-mutating-props': 'off', + semi: ['error', 'never'], + 'vue/no-v-html': 'off', + 'prefer-rest-params': 'off', + 'vue/valid-template-root': 'off', + 'no-undef': 'off', + }, +} \ No newline at end of file diff --git a/client/app.vue b/client/app.vue index 558d33ad..f3a3ec6a 100644 --- a/client/app.vue +++ b/client/app.vue @@ -1,103 +1,123 @@ diff --git a/client/components/forms/CheckboxInput.vue b/client/components/forms/CheckboxInput.vue index 42f40933..bec30455 100644 --- a/client/components/forms/CheckboxInput.vue +++ b/client/components/forms/CheckboxInput.vue @@ -4,9 +4,18 @@ - + - {{ label }} * + {{ label }} + * @@ -21,28 +30,28 @@ diff --git a/client/components/forms/CodeInput.client.vue b/client/components/forms/CodeInput.client.vue index 50704574..75e4189b 100644 --- a/client/components/forms/CodeInput.client.vue +++ b/client/components/forms/CodeInput.client.vue @@ -1,7 +1,5 @@
-
@@ -27,25 +36,25 @@ diff --git a/client/components/forms/ColorInput.vue b/client/components/forms/ColorInput.vue index 3bfa0e8f..491afd28 100644 --- a/client/components/forms/ColorInput.vue +++ b/client/components/forms/ColorInput.vue @@ -5,12 +5,20 @@
- - {{ label }} * + {{ label }} + *
@@ -25,21 +33,21 @@ diff --git a/client/components/forms/FileInput.vue b/client/components/forms/FileInput.vue index bb78f505..45e7f368 100644 --- a/client/components/forms/FileInput.vue +++ b/client/components/forms/FileInput.vue @@ -3,60 +3,117 @@ - -
-
-
- -

- Uploading your file... -

-
- +
+
+
+
+ +

+ Uploading your file... +

+
+ +
@@ -134,14 +191,14 @@ export default { deep: true, handler(newVal, oldVal) { if (!oldVal) { - this.handleCompValChange(); + this.handleCompValChange() } } } }, mounted() { - this.handleCompValChange(); + this.handleCompValChange() }, methods: { @@ -199,13 +256,13 @@ export default { }, openWebcam(){ if(!this.cameraUpload){ - return; + return } - this.isInWebcam = true; + this.isInWebcam = true }, cameraFileUpload(file){ this.isInWebcam = false - this.isUploading = false; + this.isUploading = false this.uploadFileToServer(file) }, uploadFileToServer(file) { @@ -254,7 +311,7 @@ export default { } const response = await fetch(url) const data = await response.blob() - const name = url.replace(/^.*(\\|\/|\:)/, '') + const name = url.replace(/^.*(\\|\/|:)/, '') return new File([data], name, { type: data.type || defaultType }) diff --git a/client/components/forms/FlatSelectInput.vue b/client/components/forms/FlatSelectInput.vue index 1e645390..bf4c175d 100644 --- a/client/components/forms/FlatSelectInput.vue +++ b/client/components/forms/FlatSelectInput.vue @@ -1,22 +1,49 @@ diff --git a/client/components/forms/ImageInput.vue b/client/components/forms/ImageInput.vue index 8ab9e408..77c504d2 100644 --- a/client/components/forms/ImageInput.vue +++ b/client/components/forms/ImageInput.vue @@ -1,37 +1,68 @@ - +

Upload an image

-
+
-
+

Uploading your file... @@ -69,18 +108,30 @@ 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 + 'opacity-0': !uploadDragoverTracking, }" />

- - -

@@ -107,22 +158,22 @@ diff --git a/client/components/forms/PhoneInput.vue b/client/components/forms/PhoneInput.vue index dccb6853..54418a43 100644 --- a/client/components/forms/PhoneInput.vue +++ b/client/components/forms/PhoneInput.vue @@ -1,77 +1,110 @@ diff --git a/client/components/forms/RatingInput.vue b/client/components/forms/RatingInput.vue index 564da2d3..a8f507f5 100644 --- a/client/components/forms/RatingInput.vue +++ b/client/components/forms/RatingInput.vue @@ -1,20 +1,31 @@ diff --git a/client/components/forms/RichTextAreaInput.client.vue b/client/components/forms/RichTextAreaInput.client.vue index e3b609c4..78730ce2 100644 --- a/client/components/forms/RichTextAreaInput.client.vue +++ b/client/components/forms/RichTextAreaInput.client.vue @@ -1,15 +1,25 @@

-
{{ compVal }}
+ >
{{ i.label }}
@@ -46,8 +44,8 @@ diff --git a/client/components/forms/TextAreaInput.vue b/client/components/forms/TextAreaInput.vue index 8cc5f177..4105ebd2 100644 --- a/client/components/forms/TextAreaInput.vue +++ b/client/components/forms/TextAreaInput.vue @@ -1,20 +1,31 @@