Remove appconfig in favor of runtimeconfig

client/app.config.ts

@@ -1,7 +0,0 @@
-// https://nuxt.com/docs/guide/directory-structure/app-config
-
-import opnformConfig from "~/opnform.config.js";
-
-export default defineAppConfig({
-    ...opnformConfig
-})

client/components/global/Navbar.vue

@@ -3,7 +3,8 @@
     <div class="max-w-7xl mx-auto px-8">
       <div class="flex items-center justify-between h-16">
         <div class="flex items-center">
-          <NuxtLink :to="{ name: user ? 'home' : 'index' }" class="flex-shrink-0 font-semibold hover:no-underline flex items-center">
+          <NuxtLink :to="{ name: user ? 'home' : 'index' }"
+                    class="flex-shrink-0 font-semibold hover:no-underline flex items-center">
             <img src="/img/logo.svg" alt="notion tools logo" class="w-8 h-8">
 
             <span
@@ -11,7 +12,7 @@
             >
               OpnForm</span>
           </NuxtLink>
-          <workspace-dropdown class="ml-6" />
+          <workspace-dropdown class="ml-6"/>
         </div>
         <div v-if="showAuth" class="hidden md:block ml-auto relative">
           <NuxtLink v-if="$route.name !== 'templates'" :to="{name:'templates'}"
@@ -24,24 +25,28 @@
           >
             AI Form Builder
           </NuxtLink>
-          <NuxtLink v-if="paidPlansEnabled && (user===null || (user && workspace && !workspace.is_pro)) && $route.name !== 'pricing'" :to="{name:'pricing'}"
+          <NuxtLink
+            v-if="paidPlansEnabled && (user===null || (user && workspace && !workspace.is_pro)) && $route.name !== 'pricing'"
+            :to="{name:'pricing'}"
             class="text-sm text-gray-600 dark:text-white hover:text-gray-800 cursor-pointer mt-1 mr-8"
           >
             <span v-if="user">Upgrade</span>
             <span v-else>Pricing</span>
           </NuxtLink>
           <a v-if="hasCrisp" href="#"
-             class="text-sm text-gray-600 dark:text-white hover:text-gray-800 cursor-pointer mt-1" @click.prevent="openCrisp"
+             class="text-sm text-gray-600 dark:text-white hover:text-gray-800 cursor-pointer mt-1"
+             @click.prevent="openCrisp"
           >
             Help
           </a>
           <NuxtLink v-else :href="helpUrl"
-             class="text-sm text-gray-600 dark:text-white hover:text-gray-800 cursor-pointer mt-1" target="_blank"
+                    class="text-sm text-gray-600 dark:text-white hover:text-gray-800 cursor-pointer mt-1"
+                    target="_blank"
           >
             Help
           </NuxtLink>
         </div>
-        <div v-if="showAuth" class="hidden md:block pl-5 border-gray-300 border-r h-5" />
+        <div v-if="showAuth" class="hidden md:block pl-5 border-gray-300 border-r h-5"/>
         <div v-if="showAuth" class="block">
           <div class="flex items-center">
             <div class="ml-3 mr-4 relative">
@@ -75,8 +80,10 @@
                   <NuxtLink v-if="userOnboarded" :to="{ name: 'templates-my-templates' }"
                             class="block block px-4 py-2 text-md text-gray-700 hover:bg-gray-100 hover:text-gray-900 dark:text-gray-100 dark:hover:text-white dark:hover:bg-gray-600 flex items-center"
                   >
-                    <svg xmlns="http://www.w3.org/2000/svg" class="w-4 h-4 mr-2" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor">
-                      <path stroke-linecap="round" stroke-linejoin="round" d="M19.5 14.25v-2.625a3.375 3.375 0 00-3.375-3.375h-1.5A1.125 1.125 0 0113.5 7.125v-1.5a3.375 3.375 0 00-3.375-3.375H8.25m0 12.75h7.5m-7.5 3H12M10.5 2.25H5.625c-.621 0-1.125.504-1.125 1.125v17.25c0 .621.504 1.125 1.125 1.125h12.75c.621 0 1.125-.504 1.125-1.125V11.25a9 9 0 00-9-9z" />
+                    <svg xmlns="http://www.w3.org/2000/svg" class="w-4 h-4 mr-2" fill="none" viewBox="0 0 24 24"
+                         stroke-width="1.5" stroke="currentColor">
+                      <path stroke-linecap="round" stroke-linejoin="round"
+                            d="M19.5 14.25v-2.625a3.375 3.375 0 00-3.375-3.375h-1.5A1.125 1.125 0 0113.5 7.125v-1.5a3.375 3.375 0 00-3.375-3.375H8.25m0 12.75h7.5m-7.5 3H12M10.5 2.25H5.625c-.621 0-1.125.504-1.125 1.125v17.25c0 .621.504 1.125 1.125 1.125h12.75c.621 0 1.125-.504 1.125-1.125V11.25a9 9 0 00-9-9z"/>
                     </svg>
                     My Templates
                   </NuxtLink>
@@ -119,7 +126,8 @@
                     Login
                   </NuxtLink>
 
-                  <v-button v-track.nav_create_form_click size="small" :to="{ name: 'forms-create-guest' }" color="outline-blue" :arrow="true">
+                  <v-button v-track.nav_create_form_click size="small" :to="{ name: 'forms-create-guest' }"
+                            color="outline-blue" :arrow="true">
                     Create a form
                   </v-button>
                 </div>
@@ -133,9 +141,10 @@
 </template>
 
 <script>
-import { computed } from 'vue'
+import {computed} from 'vue'
 import Dropdown from '~/components/global/Dropdown.vue'
 import WorkspaceDropdown from './WorkspaceDropdown.vue'
+import opnformConfig from "~/opnform.config.js";
 
 export default {
   components: {
@@ -143,39 +152,42 @@ export default {
     Dropdown
   },
 
-  setup () {
+  async setup() {
     const {openCrisp} = useCrisp()
     const authStore = useAuthStore()
     return {
       authStore,
       openCrisp,
+      opnformConfig,
       appStore: useAppStore(),
       formsStore: useFormsStore(),
       workspacesStore: useWorkspacesStore(),
-      config: useAppConfig(),
+      config: useRuntimeConfig(),
       user: computed(() => authStore.user),
       isIframe: useIsIframe(),
     }
   },
 
   computed: {
-    helpUrl: () => this.config.links.help_url,
-    form () {
+    helpUrl() {
+      return this.opnformConfig.links.help_url
+    },
+    form() {
       if (this.$route.name && this.$route.name.startsWith('forms.show_public')) {
         return this.formsStore.getByKey(this.$route.params.slug)
       }
       return null
     },
-    workspace () {
+    workspace() {
       return this.workspacesStore.getCurrent
     },
-    paidPlansEnabled () {
-      return this.config.paid_plans_enabled
+    paidPlansEnabled() {
+      return this.config.public.paidPlansEnabled
     },
-    showAuth () {
+    showAuth() {
       return this.$route.name && !this.$route.name.startsWith('forms.show_public')
     },
-    hasNavbar () {
+    hasNavbar() {
       if (this.isIframe) return false
 
       if (this.$route.name && this.$route.name.startsWith('forms.show_public')) {
@@ -190,16 +202,16 @@ export default {
       }
       return !this.appStore.navbarHidden
     },
-    userOnboarded () {
+    userOnboarded() {
       return this.user && this.user.workspaces_count > 0
     },
-    hasCrisp () {
-      return this.config.crisp_website_id
+    hasCrisp() {
+      return this.config.crispWebsiteId
     }
   },
 
   methods: {
-    async logout () {
+    async logout() {
       // Log out the user.
       await this.authStore.logout()
 
@@ -209,7 +221,7 @@ export default {
 
       // Redirect to login.
       const router = useRouter()
-      router.push({ name: 'login' })
+      router.push({name: 'login'})
     },
   }
 }

client/components/open/forms/OpenForm.vue

@@ -124,7 +124,9 @@ export default {
   },
 
   computed: {
-    hCaptchaSiteKey: () => useAppConfig().hCaptchaSiteKey,
+    hCaptchaSiteKey () {
+      return useRuntimeConfig().public.hCaptchaSiteKey
+    },
     /**
      * Create field groups (or Page) using page breaks if any
      */

client/components/open/forms/components/FormEditor.vue

@@ -96,6 +96,7 @@ import FormSecurityPrivacy from './form-components/FormSecurityPrivacy.vue'
 import FormCustomSeo from './form-components/FormCustomSeo.vue'
 import FormAccess from './form-components/FormAccess.vue'
 import {validatePropertiesLogic} from "~/composables/forms/validatePropertiesLogic.js"
+import opnformConfig from "~/opnform.config.js";
 
 export default {
   name: 'FormEditor',
@@ -145,10 +146,11 @@ export default {
       appStore: useAppStore(),
       crisp: useCrisp(),
       amplitude: useAmplitude(),
+      opnformConfig,
       workspace,
       formsStore,
       form,
-      user,
+      user
     }
   },
 
@@ -200,7 +202,9 @@ export default {
         }
       ]
     },
-    helpUrl: () => useAppConfig().links.help
+    helpUrl () {
+      return this.opnformConfig.links.help
+    }
   },
 
   watch: {},

client/components/open/forms/components/form-components/FormNotifications.vue

@@ -31,13 +31,13 @@
 </template>
 
 <script>
-import { useWorkingFormStore } from '../../../../../stores/working_form'
 import EditorOptionsPanel from '../../../editors/EditorOptionsPanel.vue'
 import FormNotificationsOption from './components/FormNotificationsOption.vue'
 import FormNotificationsSlack from './components/FormNotificationsSlack.vue'
 import FormNotificationsDiscord from './components/FormNotificationsDiscord.vue'
 import FormNotificationsSubmissionConfirmation from './components/FormNotificationsSubmissionConfirmation.vue'
 import FormNotificationsWebhook from './components/FormNotificationsWebhook.vue'
+import opnformConfig from "~/opnform.config.js";
 
 export default {
   components: { FormNotificationsSubmissionConfirmation, FormNotificationsSlack, FormNotificationsDiscord, FormNotificationsOption, EditorOptionsPanel, FormNotificationsWebhook },
@@ -47,22 +47,15 @@ export default {
     const {content: form} = storeToRefs(workingFormStore)
     return {
       workingFormStore,
-      form
-    }
-  },
-  data () {
-    return {
+      form,
+      opnformConfig
     }
   },
 
   computed: {
-    zapierUrl: () => useAppConfig().links.zapier_integration
-  },
-
-  watch: {
-  },
-
-  mounted () {
+    zapierUrl () {
+      opnformConfig.links.zapier_integration
+    }
   },
 }
 </script>

client/components/pages/forms/create/CreateFormBaseModal.vue

@@ -91,14 +91,14 @@
 </template>
 
 <script>
-
 export default {
   props: {
     show: { type: Boolean, required: true }
   },
   setup () {
     return {
-      useAlert: useAlert()
+      useAlert: useAlert(),
+      runtimeConfig: useRuntimeConfig()
     }
   },
   data: () => ({
@@ -111,7 +111,7 @@ export default {
 
   computed: {
     aiFeaturesEnabled () {
-      return useAppConfig().ai_features_enabled
+      return this.runtimeConfig.public.aiFeaturesEnabled
     }
   },
 

client/composables/useAmplitude.js

@@ -1,10 +1,10 @@
 import amplitude from 'amplitude-js'
-import config from '~/opnform.config.js'
 
-export default () => {
-  const amplitudeClient = config.amplitude_code ? amplitude.getInstance() : null;
+export const useAmplitude = () => {
+  const amplitudeCode = useRuntimeConfig().public.amplitudeCode
+  const amplitudeClient = amplitudeCode ? amplitude.getInstance() : null;
   if (amplitudeClient) {
-    amplitudeClient.init(config.amplitude_code)
+    amplitudeClient.init(amplitudeCode)
   }
 
   const logEvent = function (eventName, eventData) {

client/composables/useOpnApi.js

@@ -1,4 +1,3 @@
-import config from "~/opnform.config.js";
 
 function addAuthHeader(request, options) {
   const authStore = useAuthStore()
@@ -24,8 +23,10 @@ export function getOpnRequestsOptions(request, opts) {
   addAuthHeader(request, opts)
   addPasswordToFormRequest(request, opts)
 
+  const config = useRuntimeConfig()
+
   return {
-    baseURL: config.api_url,
+    baseURL: config.public.apiBase,
     onResponseError({response}) {
       const authStore = useAuthStore()
       const {status} = response

client/nuxt.config.ts

@@ -1,4 +1,5 @@
 // https://nuxt.com/docs/api/configuration/nuxt-config
+import runtimeConfig from "./runtimeConfig";
 import opnformConfig from "./opnform.config";
 import sitemap from "./sitemap";
 
@@ -49,5 +50,6 @@ export default defineNuxtConfig({
         },
         '~/components',
     ],
-    sitemap
+    sitemap,
+    runtimeConfig
 })

client/opnform.config.js

@@ -1,7 +1,6 @@
+
 export default {
   "app_ame": "OpnForm",
-  "app_url": "http://localhost:3000/",
-  "api_url": "https://opnform.test/api",
   "locale": "en",
   "locales": {"en": "EN"},
   "githubAuth": null,
@@ -18,14 +17,5 @@ export default {
     "book_onboarding": "https://zcal.co/i/YQVGEULQ",
     "feature_requests": "https://opnform.canny.io/feature-requests"
   },
-  "production": false,
-  "hCaptchaSiteKey": "4ee2dabb-4012-477e-8eb6-8017355f07cd",
-  "google_analytics_code": "",
-  "amplitude_code": "9952c8b914ce3f2bd494fce2dba18243",
-  "sentry_dsn": "https://f1829a9d456704e776eccc73e1b30369@o4504910866612224.ingest.sentry.io/4506014678646784",
-  "crisp_website_id": "94219d77-06ff-4aec-b07a-5bf26ec8fde1",
-  "ai_features_enabled": true,
-  "s3_enabled": false,
-  "paid_plans_enabled": true,
-  "custom_domains_enabled": false
+  "production": false
 }

client/pages/index.vue

@@ -192,6 +192,7 @@ import AiFeature from '~/components/pages/welcome/AiFeature.vue'
 import Testimonials from '../components/pages/welcome/Testimonials.vue'
 import TemplatesSlider from '../components/pages/welcome/TemplatesSlider.vue'
 import SeoMeta from '../mixins/seo-meta.js'
+import opnformConfig from "~/opnform.config.js";
 
 export default {
   components: {Testimonials, Features, MoreFeatures, PricingTable, AiFeature, TemplatesSlider},
@@ -206,7 +207,8 @@ export default {
 
     return {
       authenticated: computed(() => authStore.check),
-      config: useAppConfig()
+      config: opnformConfig,
+      runtimeConfig: useRuntimeConfig()
     }
   },
 
@@ -220,7 +222,7 @@ export default {
       return this.config.links
     },
     paidPlansEnabled() {
-      return this.config.paid_plans_enabled
+      return this.runtimeConfig.public.paidPlansEnabled
     },
   }
 }

client/pages/pricing.vue

@@ -249,7 +249,7 @@ export default {
       middleware: [
         function (to, from) {
           // Custom inline middleware
-          if (!useAppConfig().paid_plans_enabled) {  // If no paid plan so no need this page
+          if (!useRuntimeConfig().public.paidPlansEnabled) {  // If no paid plan so no need this page
             return navigateTo('/', { redirectCode: 301 })
           }
         },

client/pages/settings/workspace.vue

@@ -116,7 +116,6 @@
 
 <script setup>
 import {watch} from "vue";
-import opnformConfig from "~/opnform.config.js";
 import {fetchAllWorkspaces} from "~/stores/workspaces.js";
 
 const crisp = useCrisp()
@@ -133,7 +132,7 @@ let customDomains = ''
 let customDomainsLoading = ref(false)
 
 let workspace = computed(() => workspacesStore.getCurrent)
-let customDomainsEnabled = computed(() => opnformConfig.custom_domains_enabled)
+let customDomainsEnabled = computed(() => useRuntimeConfig().public.customDomainsEnabled)
 
 watch(() => workspace, () => {
   initCustomDomains()

client/plugins/amplitude.js

@@ -1,6 +1,4 @@
 
-const {logEvent} = useAmplitude()
-
 // Hook function used by event listener
 function hookLogEvent (binding) {
   const modifiers = Object.keys(binding.modifiers)
@@ -9,7 +7,7 @@ function hookLogEvent (binding) {
   }
   const eventName = modifiers[0]
 
-  logEvent(eventName, binding.value)
+  useAmplitude().logEvent(eventName, binding.value)
 }
 
 export default defineNuxtPlugin(nuxtApp => {

client/plugins/crisp.client.js

@@ -3,8 +3,9 @@ import config from "~/opnform.config.js";
 
 export default defineNuxtPlugin(nuxtApp => {
   const isIframe = useIsIframe()
-  if (config.crisp_website_id && !isIframe) {
-    Crisp.configure(config.crisp_website_id)
+  const crispWebsiteId = useRuntimeConfig().public.crispWebsiteId
+  if (crispWebsiteId && !isIframe) {
+    Crisp.configure(crispWebsiteId)
     window.Crisp = Crisp
   }
 });

client/runtimeConfig.js

@@ -0,0 +1,16 @@
+export default {
+  // Keys within public, will be also exposed to the client-side
+  public: {
+    apiBase: '',
+    appUrl: '',
+    hCaptchaSiteKey: null,
+    googleAnalyticsCode: null,
+    amplitudeCode: null,
+    sentryDsn: null,
+    crispWebsiteId: null,
+    aiFeaturesEnabled: false,
+    s3Enabled: false,
+    paidPlansEnabled: false,
+    customDomainsEnabled: false
+  }
+}

client/sitemap.js

@@ -1,5 +1,5 @@
+import opnformConfig from "./opnform.config.js";
 
-import opnformConfig from "../opnform.config.js";
 export default {
   // exclude all URLs that start with /secret
   exclude: ['/settings/**', '/subscriptions/**', '/templates/my-templates'],

client/stores/notion_pages.js

@@ -1,6 +1,6 @@
 import {defineStore} from 'pinia'
 import {useContentStore} from "~/composables/stores/useContentStore.js";
-
+import opnformConfig from "~/opnform.config.js";
 export const useNotionPagesStore = defineStore('notion_pages', () => {
 
   const contentStore = useContentStore()
@@ -8,7 +8,7 @@ export const useNotionPagesStore = defineStore('notion_pages', () => {
   const load = (pageId) => {
     contentStore.startLoading()
 
-    const apiUrl = useAppConfig().notion.worker
+    const apiUrl = opnformConfig.notion.worker
     return useOpnApi(`${apiUrl}/page/${pageId}`)
       .then(({data})=> {
         const val = data.value