From aea4c7e0635821d670bcd9540fa3a1caac96acb3 Mon Sep 17 00:00:00 2001
From: Favour Olayinka <csskfaves@gmail.com>
Date: Mon, 11 Mar 2024 15:49:36 +0100
Subject: [PATCH 1/3] fix zappier button link (#342)

---
 .../open/forms/components/form-components/FormNotifications.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/components/open/forms/components/form-components/FormNotifications.vue b/client/components/open/forms/components/form-components/FormNotifications.vue
index 176bc63b..32fd16e4 100644
--- a/client/components/open/forms/components/form-components/FormNotifications.vue
+++ b/client/components/open/forms/components/form-components/FormNotifications.vue
@@ -54,7 +54,7 @@ export default {
 
   computed: {
     zapierUrl () {
-      opnformConfig.links.zapier_integration
+      return opnformConfig.links.zapier_integration
     }
   },
 }

From 299e1e677abd887f732c65a5e600f54c12f9aad9 Mon Sep 17 00:00:00 2001
From: Favour Olayinka <csskfaves@gmail.com>
Date: Tue, 12 Mar 2024 10:06:20 +0100
Subject: [PATCH 2/3] fix: null message on input help (#343)

* fix: null message on input help

* fix null message
---
 client/components/forms/components/InputHelp.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/components/forms/components/InputHelp.vue b/client/components/forms/components/InputHelp.vue
index 51d9c03e..1e3a064e 100644
--- a/client/components/forms/components/InputHelp.vue
+++ b/client/components/forms/components/InputHelp.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="flex mb-1 input-help">
     <small :class="theme.default.help" class="grow flex">
-      <slot name="help"><span class="field-help" v-html="help" /></slot>
+      <slot name="help"><span v-if="help" class="field-help" v-html="help" /></slot>
     </small>
     <slot name="after-help">
       <small class="flex-grow"  />

From 98836049412ae5e9aafcfdffb4c7b5cfb1178489 Mon Sep 17 00:00:00 2001
From: christianWilling <christianWilling@users.noreply.github.com>
Date: Tue, 12 Mar 2024 12:29:34 +0100
Subject: [PATCH 3/3] fix local files in docker (#338)

* fix local files in docker

Response::make diesnt exist anymore and the nginx.conf didnt allow the needed paths

* fix import in api.php

---------

Co-authored-by: Christian Willing <cw@c2c-erp.de>
Co-authored-by: Julien Nahum <julien@nahum.net>
---
 docker/nginx.conf | 10 ++++++++++
 routes/api.php    |  5 +----
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/docker/nginx.conf b/docker/nginx.conf
index ad6000d0..31b28ed2 100644
--- a/docker/nginx.conf
+++ b/docker/nginx.conf
@@ -25,6 +25,16 @@ server {
               try_files $uri $uri/ /index.php$is_args$args;
          }
 
+         location /local/temp/ {
+              set $original_uri $uri;
+              try_files $uri $uri/ /index.php$is_args$args;
+         }
+
+         location /forms/assets/ {
+              set $original_uri $uri;
+              try_files $uri $uri/ /index.php$is_args$args;
+         }
+
          location ~ \.php$ {
             fastcgi_split_path_info ^(.+\.php)(/.+)$;
             fastcgi_pass unix:/var/run/php-fpm-opnform-site.sock;
diff --git a/routes/api.php b/routes/api.php
index d084d040..bb27a16c 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -20,7 +20,6 @@ use App\Http\Controllers\TemplateController;
 use App\Http\Controllers\WorkspaceController;
 use App\Http\Middleware\Form\ResolveFormMiddleware;
 use Illuminate\Http\Request;
-use Illuminate\Http\Response;
 use Illuminate\Support\Facades\Route;
 use Illuminate\Support\Facades\Storage;
 
@@ -227,10 +226,8 @@ Route::get('local/temp/{path}', function (Request $request, string $path) {
     if (! $request->hasValidSignature()) {
         abort(401);
     }
-    $response = Response::make(Storage::get($path), 200);
-    $response->header('Content-Type', Storage::mimeType($path));
 
-    return $response;
+    return response()->file(Storage::path($path), ['Content-Type' => Storage::mimeType($path)]);
 })->where('path', '(.*)')->name('local.temp');
 
 Route::get('caddy/ask-certificate/{secret?}', [\App\Http\Controllers\CaddyController::class, 'ask'])