From dcc8b9fa6297e751bd51b63eedd522c25a0efab8 Mon Sep 17 00:00:00 2001
From: Julien Nahum <julien@nahum.net>
Date: Mon, 11 Dec 2023 12:35:46 +0100
Subject: [PATCH 1/5] Add roadmap and feature requests

---
 .../form-components/FormCustomSeo.vue         |  3 ++
 .../js/components/pages/OpenFormFooter.vue    | 40 ++++++++++++-------
 resources/js/pages/auth/login.vue             |  9 +----
 3 files changed, 30 insertions(+), 22 deletions(-)

diff --git a/resources/js/components/open/forms/components/form-components/FormCustomSeo.vue b/resources/js/components/open/forms/components/form-components/FormCustomSeo.vue
index feed7f6..bd29227 100644
--- a/resources/js/components/open/forms/components/form-components/FormCustomSeo.vue
+++ b/resources/js/components/open/forms/components/form-components/FormCustomSeo.vue
@@ -49,6 +49,9 @@ export default {
       return this.$store.getters['open/workspaces/getCurrent']()
     },
     customDomainOptions () {
+      if (!this.workspace || !this.workspace.custom_domains) {
+        return []
+      }
       return this.workspace.custom_domains.map((domain) => {
         return {
           name: domain,
diff --git a/resources/js/components/pages/OpenFormFooter.vue b/resources/js/components/pages/OpenFormFooter.vue
index 6bfd698..7901397 100644
--- a/resources/js/components/pages/OpenFormFooter.vue
+++ b/resources/js/components/pages/OpenFormFooter.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="w-full">
     <div class="grid md:grid-cols-3 my-8">
-      <div class="flex mt-2">
+      <div class="flex mt-2 items-center">
         <p class="text-sm text-gray-600 dark:text-gray-400 text-center w-full">
           © Copyright {{ currYear }}. All Rights Reserved
         </p>
@@ -14,24 +14,33 @@
           </span>
         </router-link>
       </div>
-      <ul class="flex justify-center mt-5 md:mt-1">
-          <li class="mr-10">
-            <router-link :to="{name:'privacy-policy'}" class="text-gray-600 dark:text-gray-400 transition-colors duration-300 hover:text-nt-blue">
-              Privacy Policy
-            </router-link>
-          </li>
-          <li class="list-disc pl-3">
-            <router-link :to="{name:'terms-conditions'}" class="text-gray-600 dark:text-gray-400 transition-colors duration-300 hover:text-nt-blue">
-              Terms & Conditions
-            </router-link>
-          </li>
-        </ul>
+      <div class="flex justify-center mt-5 md:mt-0">
+        <div class="grid grid-cols-1 lg:grid-cols-2 gap-x-4 gap-y-2">
+          <a href="https://opnform.featurebase.app/" target="_blank"
+             class="text-gray-600 dark:text-gray-400 transition-colors duration-300 hover:text-nt-blue">
+            Feature Requests
+          </a>
+          <a href="https://opnform.featurebase.app/roadmap" target="_blank"
+             class="text-gray-600 dark:text-gray-400 transition-colors duration-300 hover:text-nt-blue">
+            Roadmap
+          </a>
+          <router-link :to="{name:'privacy-policy'}"
+                       class="text-gray-600 dark:text-gray-400 transition-colors duration-300 hover:text-nt-blue">
+            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">
+            Terms & Conditions
+          </router-link>
+        </div>
+      </div>
     </div>
   </div>
 </template>
 
 <script>
-import { mapGetters } from 'vuex'
+import {mapGetters} from 'vuex'
 
 export default {
   data: () => ({
@@ -52,7 +61,8 @@ export default {
     featureRequestsUrl: () => window.config.links.feature_requests
   },
 
-  mounted () {},
+  mounted() {
+  },
 
   methods: {}
 }
diff --git a/resources/js/pages/auth/login.vue b/resources/js/pages/auth/login.vue
index 2ca55f4..1506c12 100644
--- a/resources/js/pages/auth/login.vue
+++ b/resources/js/pages/auth/login.vue
@@ -56,22 +56,17 @@
 </template>
 
 <script>
-import OpenFormFooter from '../../components/pages/OpenFormFooter.vue'
-import Testimonials from '../../components/pages/welcome/Testimonials.vue'
-import LoginForm from './components/LoginForm.vue'
-import SeoMeta from '../../mixins/seo-meta.js'
+import OpenFormFooter from '~/components/pages/OpenFormFooter.vue'
+import LoginForm from "./components/LoginForm.vue";
 
 export default {
   components: {
     OpenFormFooter,
-    Testimonials,
     LoginForm
   },
 
   middleware: 'guest',
 
-  mixins: [SeoMeta],
-
   data: () => ({
     metaTitle: 'Login',
   }),

From 3eed35e4c6c8712543bf687ec43006da02b65328 Mon Sep 17 00:00:00 2001
From: Julien Nahum <julien@nahum.net>
Date: Mon, 11 Dec 2023 14:00:42 +0100
Subject: [PATCH 2/5] Add gb group link, pricing to sitemap

---
 app/Http/Controllers/SitemapController.php       | 1 +
 app/Service/Forms/Webhooks/DiscordHandler.php    | 2 +-
 resources/js/components/pages/OpenFormFooter.vue | 4 ++++
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/Http/Controllers/SitemapController.php b/app/Http/Controllers/SitemapController.php
index 7dca3e1..1c624e0 100644
--- a/app/Http/Controllers/SitemapController.php
+++ b/app/Http/Controllers/SitemapController.php
@@ -16,6 +16,7 @@ class SitemapController extends Controller
      */
     protected $urls = [
         ['/', 1],
+        ['/pricing', 0.9],
         ['/privacy-policy', 0.5],
         ['/terms-conditions', 0.5],
         ['/login', 0.4],
diff --git a/app/Service/Forms/Webhooks/DiscordHandler.php b/app/Service/Forms/Webhooks/DiscordHandler.php
index 55ebf2d..559de29 100644
--- a/app/Service/Forms/Webhooks/DiscordHandler.php
+++ b/app/Service/Forms/Webhooks/DiscordHandler.php
@@ -68,7 +68,7 @@ class DiscordHandler extends AbstractWebhookHandler
                 "description" => implode(' - ', $externalLinks)
             ];
         }
-        
+
         return [
             'content' => 'New submission for your form **' . $this->form->title . '**',
             'tts' => false,
diff --git a/resources/js/components/pages/OpenFormFooter.vue b/resources/js/components/pages/OpenFormFooter.vue
index 7901397..0161240 100644
--- a/resources/js/components/pages/OpenFormFooter.vue
+++ b/resources/js/components/pages/OpenFormFooter.vue
@@ -24,6 +24,10 @@
              class="text-gray-600 dark:text-gray-400 transition-colors duration-300 hover:text-nt-blue">
             Roadmap
           </a>
+          <a href="www.facebook.com/groups/opnform" target="_blank"
+             class="text-gray-600 dark:text-gray-400 transition-colors duration-300 hover:text-nt-blue">
+            Facebook Group
+          </a>
           <router-link :to="{name:'privacy-policy'}"
                        class="text-gray-600 dark:text-gray-400 transition-colors duration-300 hover:text-nt-blue">
             Privacy Policy

From 7f632b9cb83685aa97ccc6e8bde9bd2bb49ed665 Mon Sep 17 00:00:00 2001
From: Julien Nahum <julien@nahum.net>
Date: Mon, 11 Dec 2023 15:23:17 +0100
Subject: [PATCH 3/5] Fix typo

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

diff --git a/resources/js/components/open/forms/components/form-components/FormCustomization.vue b/resources/js/components/open/forms/components/form-components/FormCustomization.vue
index fc2b129..83d53d8 100644
--- a/resources/js/components/open/forms/components/form-components/FormCustomization.vue
+++ b/resources/js/components/open/forms/components/form-components/FormCustomization.vue
@@ -70,7 +70,7 @@
                     label="Transparent Background" help="Only applies when form is embedded"
     />
     <toggle-switch-input name="confetti_on_submission" :form="form" class="mt-4"
-                         label="Confetti on successful submisison"
+                         label="Confetti on successful submission"
                          @input="onChangeConfettiOnSubmission"
     />
     <toggle-switch-input name="auto_save" :form="form"

From 77ff8637b3f060a4898f5833874bb2bc89adb751 Mon Sep 17 00:00:00 2001
From: Julien Nahum <julien@nahum.net>
Date: Tue, 12 Dec 2023 11:57:13 +0100
Subject: [PATCH 4/5] Fix domain limit count caching

---
 app/Models/License.php   | 4 ++--
 app/Models/Workspace.php | 3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/app/Models/License.php b/app/Models/License.php
index 87252eb..0e087c3 100644
--- a/app/Models/License.php
+++ b/app/Models/License.php
@@ -34,7 +34,7 @@ class License extends Model
         return $query->where('status', self::STATUS_ACTIVE);
     }
 
-    public function getMaxFileSizeAttribute()
+    public function getMaxFileSizeAttribute(): int
     {
         return [
             1 => 25000000, // 25 MB,
@@ -43,7 +43,7 @@ class License extends Model
         ][$this->meta['tier']];
     }
 
-    public function getCustomDomainLimitCountAttribute()
+    public function getCustomDomainLimitCountAttribute(): ?int
     {
         return [
             1 => 1,
diff --git a/app/Models/Workspace.php b/app/Models/Workspace.php
index f97f4a5..6543dc9 100644
--- a/app/Models/Workspace.php
+++ b/app/Models/Workspace.php
@@ -2,7 +2,6 @@
 
 namespace App\Models;
 
-use App\Http\Requests\AnswerFormRequest;
 use App\Models\Forms\Form;
 use App\Models\Traits\CachableAttributes;
 use App\Models\Traits\CachesAttributes;
@@ -71,7 +70,7 @@ class Workspace extends Model implements CachableAttributes
             return null;
         }
 
-        return $this->remember('custom_domain_count', 15 * 60, function(): int {
+        return $this->remember('custom_domain_count', 15 * 60, function(): ?int {
             foreach ($this->owners as $owner) {
                 if ($owner->is_subscribed) {
                     if ($license = $owner->activeLicense()) {

From 71121361f2116850afea12e3243b0bc77ac8a99c Mon Sep 17 00:00:00 2001
From: formsdev <136701234+formsdev@users.noreply.github.com>
Date: Tue, 12 Dec 2023 19:10:08 +0530
Subject: [PATCH 5/5] vue3-scroll-shadow-fixes (#260)

---
 resources/js/components/common/ScrollShadow.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/resources/js/components/common/ScrollShadow.vue b/resources/js/components/common/ScrollShadow.vue
index bbf8234..98c0115 100644
--- a/resources/js/components/common/ScrollShadow.vue
+++ b/resources/js/components/common/ScrollShadow.vue
@@ -59,9 +59,9 @@ export default {
     window.addEventListener('resize', this.calcDimensions)
 
     // Check if shadows are necessary after the element is resized.
-    const scrollContainerObserver = newResizeObserver(this.toggleShadow)
-    if (scrollContainerObserver) {
-      scrollContainerObserver.observe(this.$refs.scrollContainer)
+    this.scrollContainerObserver = newResizeObserver(this.toggleShadow)
+    if (this.scrollContainerObserver) {
+      this.scrollContainerObserver.observe(this.$refs.scrollContainer)
     }
 
     // Recalculate the container dimensions when the wrapper is resized.