diff --git a/app/Http/Controllers/SitemapController.php b/app/Http/Controllers/SitemapController.php index 7dca3e16..1c624e0f 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/Models/License.php b/app/Models/License.php index 87252eb3..0e087c34 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 f97f4a5f..6543dc96 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()) { diff --git a/app/Service/Forms/Webhooks/DiscordHandler.php b/app/Service/Forms/Webhooks/DiscordHandler.php index 55ebf2d8..559de29c 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/common/ScrollShadow.vue b/resources/js/components/common/ScrollShadow.vue index bbf82348..98c01159 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. 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 f7fe1847..e68b4be1 100644 --- a/resources/js/components/open/forms/components/form-components/FormCustomSeo.vue +++ b/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, 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 15e10d71..e29811e7 100644 --- a/resources/js/components/open/forms/components/form-components/FormCustomization.vue +++ b/resources/js/components/open/forms/components/form-components/FormCustomization.vue @@ -70,8 +70,8 @@ label="Transparent Background" help="Only applies when form is embedded" />
-
+

© Copyright {{ currYear }}. All Rights Reserved

@@ -14,18 +14,31 @@
-
    -
  • - - Privacy Policy - -
    • -
  • - - Terms & Conditions - -
    • -
+
+
+ + Feature Requests + + + Roadmap + + + Facebook Group + + + Privacy Policy + + + + Terms & Conditions + +
+
@@ -57,7 +70,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 2ca55f43..1506c12c 100644 --- a/resources/js/pages/auth/login.vue +++ b/resources/js/pages/auth/login.vue @@ -56,22 +56,17 @@