From aa38aac626d5c48f74975cd5492169435e8dfdf8 Mon Sep 17 00:00:00 2001
From: Forms Dev
Date: Thu, 21 Dec 2023 16:08:05 +0530
Subject: [PATCH 1/2] fix custom domain warning
---
client/nuxt.config.ts | 5 +----
composer.json | 6 ------
config/custom-domains.php | 2 +-
3 files changed, 2 insertions(+), 11 deletions(-)
diff --git a/client/nuxt.config.ts b/client/nuxt.config.ts
index 03cd222..c509daa 100644
--- a/client/nuxt.config.ts
+++ b/client/nuxt.config.ts
@@ -55,8 +55,5 @@ export default defineNuxtConfig({
},
'~/components',
],
- routeRules: { ... cachedRoutes},
- devServer: {
- https: true,
- }
+ routeRules: { ... cachedRoutes}
})
diff --git a/composer.json b/composer.json
index c4ea8ca..f3f87b9 100644
--- a/composer.json
+++ b/composer.json
@@ -11,12 +11,6 @@
],
"license": "MIT",
"type": "project",
- "repositories": [
- {
- "type": "vcs",
- "url": "https://github.com/JhumanJ/laravel-notion-api.git"
- }
- ],
"require": {
"php": "^8.2",
"ext-json": "*",
diff --git a/config/custom-domains.php b/config/custom-domains.php
index 17c3a53..3dcd3b9 100644
--- a/config/custom-domains.php
+++ b/config/custom-domains.php
@@ -4,6 +4,6 @@ return [
'enabled' => !empty(env('CADDY_SECRET')) && !empty(env('CADDY_AUTHORIZED_IPS', [])),
'caddy_secret' => env('CADDY_SECRET'),
- 'authorized_ips' => explode(',', env('CADDY_AUTHORIZED_IPS')),
+ 'authorized_ips' => explode(',', env('CADDY_AUTHORIZED_IPS','')),
];
From 3d92637ef5018321771430c72c64da48d470c846 Mon Sep 17 00:00:00 2001
From: Chirag Chhatrala <60499540+chiragchhatrala@users.noreply.github.com>
Date: Fri, 22 Dec 2023 14:54:51 +0530
Subject: [PATCH 2/2] NuxtLink migration (#262)
Co-authored-by: Forms Dev
---
.../pages/auth/components/LoginForm.vue | 4 ++--
.../pages/auth/components/RegisterForm.vue | 10 +++++-----
.../pages/forms/create/CreateFormBaseModal.vue | 2 +-
.../pages/forms/show/FormCleanings.vue | 4 ++--
.../pages/templates/SingleTemplate.vue | 4 ++--
.../components/pages/templates/TemplatesList.vue | 8 ++++----
.../components/pages/welcome/TemplatesSlider.vue | 4 ++--
client/pages/auth/verification/verify.vue | 8 ++++----
client/pages/errors/404.vue | 4 ++--
client/pages/forms/show-public.vue | 4 ++--
client/pages/index.vue | 4 ++--
client/pages/settings/index.vue | 16 ++++++++--------
client/pages/templates/[slug].vue | 4 ++--
13 files changed, 38 insertions(+), 38 deletions(-)
diff --git a/client/components/pages/auth/components/LoginForm.vue b/client/components/pages/auth/components/LoginForm.vue
index ff7a456..9656887 100644
--- a/client/components/pages/auth/components/LoginForm.vue
+++ b/client/components/pages/auth/components/LoginForm.vue
@@ -32,9 +32,9 @@
Don't have an account?
Sign Up
-
+
Sign Up
-
+
diff --git a/client/components/pages/auth/components/RegisterForm.vue b/client/components/pages/auth/components/RegisterForm.vue
index 441b632..5e0c672 100644
--- a/client/components/pages/auth/components/RegisterForm.vue
+++ b/client/components/pages/auth/components/RegisterForm.vue
@@ -23,11 +23,11 @@
- I agree with the
+ I agree with the
Terms and conditions
- and
+ and
Privacy policy
- of the website and I accept them.
+ of the website and I accept them.
@@ -39,9 +39,9 @@
Already have an account?
Log In
-
+
Log In
-
+
diff --git a/client/components/pages/forms/create/CreateFormBaseModal.vue b/client/components/pages/forms/create/CreateFormBaseModal.vue
index e46f1b2..c6ddc91 100644
--- a/client/components/pages/forms/create/CreateFormBaseModal.vue
+++ b/client/components/pages/forms/create/CreateFormBaseModal.vue
@@ -67,7 +67,7 @@
Start from a template
-
+
diff --git a/client/components/pages/forms/show/FormCleanings.vue b/client/components/pages/forms/show/FormCleanings.vue
index be3afc8..29def81 100644
--- a/client/components/pages/forms/show/FormCleanings.vue
+++ b/client/components/pages/forms/show/FormCleanings.vue
@@ -21,9 +21,9 @@
-
+
{{ form.is_pro ? 'Upgrade your OpnForms plan today' : 'Start your free OpnForms trial' }}
-
+
to unlock all of our features and build powerful forms.
diff --git a/client/components/pages/templates/SingleTemplate.vue b/client/components/pages/templates/SingleTemplate.vue
index d44b7b8..9706c4f 100644
--- a/client/components/pages/templates/SingleTemplate.vue
+++ b/client/components/pages/templates/SingleTemplate.vue
@@ -32,9 +32,9 @@
-
+
-
+
diff --git a/client/components/pages/templates/TemplatesList.vue b/client/components/pages/templates/TemplatesList.vue
index 99aa1d2..5bc346b 100644
--- a/client/components/pages/templates/TemplatesList.vue
+++ b/client/components/pages/templates/TemplatesList.vue
@@ -48,13 +48,13 @@
-
{{ row.name }}
-
+
@@ -71,13 +71,13 @@
-
{{ row.name }}
-
+
diff --git a/client/components/pages/welcome/TemplatesSlider.vue b/client/components/pages/welcome/TemplatesSlider.vue
index 5e1b375..62f0b4e 100644
--- a/client/components/pages/welcome/TemplatesSlider.vue
+++ b/client/components/pages/welcome/TemplatesSlider.vue
@@ -12,7 +12,7 @@
-
+
See all templates
-
+
-
+
Login
-
+
{{ error || 'Failed to verify email.' }}
-
+
Resend Verification Link?
-
+
diff --git a/client/pages/errors/404.vue b/client/pages/errors/404.vue
index 942b34a..45ac678 100644
--- a/client/pages/errors/404.vue
+++ b/client/pages/errors/404.vue
@@ -9,9 +9,9 @@
-
+
Go Home
-
+
diff --git a/client/pages/forms/show-public.vue b/client/pages/forms/show-public.vue
index 330e636..cdbc626 100644
--- a/client/pages/forms/show-public.vue
+++ b/client/pages/forms/show-public.vue
@@ -24,9 +24,9 @@
Unfortunately we could not find this form. It may have been deleted by it's author.
-
+
Create your form for free with OpnForm
-
+
diff --git a/client/pages/index.vue b/client/pages/index.vue
index 5337f65..bd25de4 100644
--- a/client/pages/index.vue
+++ b/client/pages/index.vue
@@ -110,10 +110,10 @@
-
+
Read more about our pricing
-
+
diff --git a/client/pages/settings/index.vue b/client/pages/settings/index.vue
index 218d4ce..947e5ae 100644
--- a/client/pages/settings/index.vue
+++ b/client/pages/settings/index.vue
@@ -15,12 +15,12 @@
@@ -65,33 +65,33 @@ export default {
const tabs = [
{
name: 'Profile',
- route: 'settings.profile'
+ route: 'settings-profile'
},
{
name: 'Workspace Settings',
- route: 'settings.workspaces'
+ route: 'settings-workspace'
},
{
name: 'Password',
- route: 'settings.password'
+ route: 'settings-password'
},
{
name: 'Delete Account',
- route: 'settings.account'
+ route: 'settings-account'
}
]
if (this.user.is_subscribed) {
tabs.splice(1, 0, {
name: 'Billing',
- route: 'settings.billing'
+ route: 'settings-billing'
})
}
if (this.user.admin) {
tabs.push({
name: 'Admin',
- route: 'settings.admin'
+ route: 'settings-admin'
})
}
diff --git a/client/pages/templates/[slug].vue b/client/pages/templates/[slug].vue
index d879588..d930c25 100644
--- a/client/pages/templates/[slug].vue
+++ b/client/pages/templates/[slug].vue
@@ -156,9 +156,9 @@
Copy the template and change it the way you like
-
+
Click here to copy this template
-
+
and start customizing it. Change the questions, add new ones, choose colors and
more.