From 29fdc961fc391c7a7e88003f5a7f0f68f9b4decc Mon Sep 17 00:00:00 2001 From: Favour Olayinka Date: Tue, 12 Mar 2024 17:55:19 +0100 Subject: [PATCH 1/4] move form to another workspace (#339) * move form to another workspace * style: apply lint * fix typo error --------- Co-authored-by: Julien Nahum --- app/Http/Controllers/Forms/FormController.php | 20 ++++ .../forms/components/FormWorkspaceModal.vue | 103 ++++++++++++++++++ .../components/pages/forms/show/ExtraMenu.vue | 15 +++ routes/api.php | 1 + 4 files changed, 139 insertions(+) create mode 100644 client/components/open/forms/components/FormWorkspaceModal.vue diff --git a/app/Http/Controllers/Forms/FormController.php b/app/Http/Controllers/Forms/FormController.php index 8b29d6e0..9c268c5f 100644 --- a/app/Http/Controllers/Forms/FormController.php +++ b/app/Http/Controllers/Forms/FormController.php @@ -218,4 +218,24 @@ class FormController extends Controller return redirect()->to(Storage::temporaryUrl($path, now()->addMinutes(5))); } + + /** + * Updates a form's workspace + */ + public function updateWorkspace($id, $workspace_id) + { + $form = Form::findOrFail($id); + $workspace = Workspace::findOrFail($workspace_id); + + $this->authorize('update', $form); + $this->authorize('view', $workspace); + + $form->workspace_id = $workspace_id; + $form->creator_id = auth()->user()->id; + $form->save(); + + return $this->success([ + 'message' => 'Form workspace updated successfully.', + ]); + } } diff --git a/client/components/open/forms/components/FormWorkspaceModal.vue b/client/components/open/forms/components/FormWorkspaceModal.vue new file mode 100644 index 00000000..d4528530 --- /dev/null +++ b/client/components/open/forms/components/FormWorkspaceModal.vue @@ -0,0 +1,103 @@ + + + \ No newline at end of file diff --git a/client/components/pages/forms/show/ExtraMenu.vue b/client/components/pages/forms/show/ExtraMenu.vue index f6aca7fc..9e6b10c3 100644 --- a/client/components/pages/forms/show/ExtraMenu.vue +++ b/client/components/pages/forms/show/ExtraMenu.vue @@ -107,6 +107,17 @@ Create Template + + + + + + + Change workspace + + + @@ -159,6 +172,7 @@ 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' const { copy } = useClipboard() const router = useRouter() @@ -177,6 +191,7 @@ let loadingDuplicate = ref(false) let loadingDelete = ref(false) let showDeleteFormModal = ref(false) let showFormTemplateModal = ref(false) +let showFormWorkspaceModal = ref(false) const copyLink = () => { copy(props.form.share_url) diff --git a/routes/api.php b/routes/api.php index bb27a16c..33885bb6 100644 --- a/routes/api.php +++ b/routes/api.php @@ -89,6 +89,7 @@ Route::group(['middleware' => 'auth:api'], function () { Route::prefix('forms')->name('forms.')->group(function () { Route::post('/', [FormController::class, 'store'])->name('store'); + Route::post('/{id}/workspace/{workspace_id}', [FormController::class, 'updateWorkspace'])->name('workspace.update'); Route::put('/{id}', [FormController::class, 'update'])->name('update'); Route::delete('/{id}', [FormController::class, 'destroy'])->name('destroy'); From d395439c70a2a77c76b90815dad84d070857e21d Mon Sep 17 00:00:00 2001 From: Favour Olayinka Date: Tue, 12 Mar 2024 18:01:06 +0100 Subject: [PATCH 2/4] fix form logo size (#345) Co-authored-by: Julien Nahum --- .../open/forms/components/form-components/FormEditorPreview.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/components/open/forms/components/form-components/FormEditorPreview.vue b/client/components/open/forms/components/form-components/FormEditorPreview.vue index b10ba5bd..b0d7fb84 100644 --- a/client/components/open/forms/components/form-components/FormEditorPreview.vue +++ b/client/components/open/forms/components/form-components/FormEditorPreview.vue @@ -24,7 +24,7 @@ > Logo Picture From bf95096bfe4c5eee3fe8d5a55dc885d9752b5bab Mon Sep 17 00:00:00 2001 From: Favour Olayinka Date: Tue, 12 Mar 2024 18:16:37 +0100 Subject: [PATCH 3/4] fix: hide border on error (#330) Co-authored-by: Julien Nahum --- client/components/forms/CodeInput.client.vue | 2 +- client/components/forms/FlatSelectInput.vue | 2 +- client/components/forms/PhoneInput.vue | 2 +- client/components/forms/RichTextAreaInput.client.vue | 2 +- client/components/forms/SignatureInput.vue | 2 +- client/components/forms/TextAreaInput.vue | 2 +- client/components/forms/TextInput.vue | 2 +- client/components/forms/components/VSelect.vue | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/client/components/forms/CodeInput.client.vue b/client/components/forms/CodeInput.client.vue index 4d4a0090..50704574 100644 --- a/client/components/forms/CodeInput.client.vue +++ b/client/components/forms/CodeInput.client.vue @@ -11,7 +11,7 @@

diff --git a/client/components/forms/PhoneInput.vue b/client/components/forms/PhoneInput.vue index ddd7f006..ca53d898 100644 --- a/client/components/forms/PhoneInput.vue +++ b/client/components/forms/PhoneInput.vue @@ -28,7 +28,7 @@

diff --git a/client/components/forms/RichTextAreaInput.client.vue b/client/components/forms/RichTextAreaInput.client.vue index ccd1d0c0..e3b609c4 100644 --- a/client/components/forms/RichTextAreaInput.client.vue +++ b/client/components/forms/RichTextAreaInput.client.vue @@ -7,7 +7,7 @@ diff --git a/client/components/forms/SignatureInput.vue b/client/components/forms/SignatureInput.vue index c213a9dd..cda0ca9d 100644 --- a/client/components/forms/SignatureInput.vue +++ b/client/components/forms/SignatureInput.vue @@ -7,7 +7,7 @@