Merge branch 'main' into vue-3

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],

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,

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()) {

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,

resources/js/components/open/forms/components/form-components/FormCustomSeo.vue

@@ -56,6 +56,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,

resources/js/components/open/forms/components/form-components/FormCustomization.vue

@@ -70,8 +70,8 @@
                          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"
-                         @update:model-value="onChangeConfettiOnSubmission"
+                         @input="onChangeConfettiOnSubmission"
     />
     <toggle-switch-input name="auto_save" :form="form"
                          label="Auto save form response"

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,18 +14,31 @@
           </span>
         </router-link>
       </div>
-      <ul class="flex justify-center mt-5 md:mt-1">
+      <div class="flex justify-center mt-5 md:mt-0">
-          <li class="mr-10">
+        <div class="grid grid-cols-1 lg:grid-cols-2 gap-x-4 gap-y-2">
-            <router-link :to="{name:'privacy-policy'}" class="text-gray-600 dark:text-gray-400 transition-colors duration-300 hover:text-nt-blue">
+          <a href="https://opnform.featurebase.app/" target="_blank"
-              Privacy Policy
+             class="text-gray-600 dark:text-gray-400 transition-colors duration-300 hover:text-nt-blue">
-            </router-link>
+            Feature Requests
-          </li>
+          </a>
-          <li class="list-disc pl-3">
+          <a href="https://opnform.featurebase.app/roadmap" target="_blank"
-            <router-link :to="{name:'terms-conditions'}" class="text-gray-600 dark:text-gray-400 transition-colors duration-300 hover:text-nt-blue">
+             class="text-gray-600 dark:text-gray-400 transition-colors duration-300 hover:text-nt-blue">
-              Terms & Conditions
+            Roadmap
-            </router-link>
+          </a>
-          </li>
+          <a href="www.facebook.com/groups/opnform" target="_blank"
-        </ul>
+             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
+          </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>
@@ -57,7 +70,8 @@ export default {
     featureRequestsUrl: () => window.config.links.feature_requests
   },
 
-  mounted () {},
+  mounted() {
+  },
 
   methods: {}
 }

resources/js/pages/auth/login.vue

@@ -56,22 +56,17 @@
 </template>
 
 <script>
-import OpenFormFooter from '../../components/pages/OpenFormFooter.vue'
+import OpenFormFooter from '~/components/pages/OpenFormFooter.vue'
-import Testimonials from '../../components/pages/welcome/Testimonials.vue'
+import LoginForm from "./components/LoginForm.vue";
-import LoginForm from './components/LoginForm.vue'
-import SeoMeta from '../../mixins/seo-meta.js'
 
 export default {
   components: {
     OpenFormFooter,
-    Testimonials,
     LoginForm
   },
 
   middleware: 'guest',
 
-  mixins: [SeoMeta],
-
   data: () => ({
     metaTitle: 'Login',
   }),