Beautiful Open-Source Form Builder
Cleaning up
Julien Nahum70abfe45f517
diff --git a/.github/workflows/laravel.yml b/.github/workflows/laravel.ymlindex deaff2d07..08c36c04a 100644--- a/.github/workflows/laravel.yml+++ b/.github/workflows/laravel.yml@@ -212,6 +212,6 @@ jobs:SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}- name: Deploy to production- run: php vendor/bin/vapor deploy production --commit="${GITHUB_SHA}" --message="${GITHUB_REF}"+ run: php vendor/bin/vapor deploy api-production --commit="${GITHUB_SHA}" --message="${GITHUB_REF}"env:VAPOR_API_TOKEN: ${{ secrets.VAPOR_API_TOKEN }}diff --git a/.gitignore b/.gitignoreindex 798f45634..bb797f82d 100644--- a/.gitignore+++ b/.gitignore@@ -6,6 +6,7 @@/vendor.env.env.production+.env.api-production.env.backup.env.testing.env.dusk.localdiff --git a/client/sitemap.js b/client/sitemap.jsindex 4591fb230..6dc540573 100644--- a/client/sitemap.js+++ b/client/sitemap.js@@ -1,7 +1,6 @@import opnformConfig from "./opnform.config.js";export default {- // exclude all URLs that start with /secretexclude: ['/settings/**', '/subscriptions/**', '/templates/my-templates'],sources: [opnformConfig.api_url + '/sitemap-urls'diff --git a/config/services.php b/config/services.phpindex 7e2b9d165..ad73b8b0d 100644--- a/config/services.php+++ b/config/services.php@@ -63,8 +63,5 @@ return ['api_key' => env('APPSUMO_API_KEY'),],- 'google_analytics_code' => env('GOOGLE_ANALYTICS_CODE'),- 'amplitude_code' => env('AMPLITUDE_CODE'),'crisp_website_id' => env('CRISP_WEBSITE_ID'),- 'sentry_vue_dsn' => env('SENTRY_VUE_DSN'),];diff --git a/resources/views/spa.blade.php b/resources/views/spa.blade.phpdeleted file mode 100644index 98e8f7820..000000000--- a/resources/views/spa.blade.php+++ /dev/null@@ -1,74 +0,0 @@-@php- $config = [- 'appName' => config('app.name'),- 'app_url' => config('app.url'),- 'locale' => $locale = app()->getLocale(),- 'locales' => config('app.locales'),- 'githubAuth' => config('services.github.client_id'),- 'notion' => [- 'worker' => config('services.notion.worker'),- ],- 'links' => config('links'),- 'production' => App::isProduction(),- 'hCaptchaSiteKey' => config('services.h_captcha.site_key'),- 'google_analytics_code' => config('services.google_analytics_code'),- 'amplitude_code' => config('services.amplitude_code'),- 'sentry_dsn' => config('services.sentry_vue_dsn'),- 'crisp_website_id' => config('services.crisp_website_id'),- 'ai_features_enabled' => !is_null(config('services.openai.api_key')),- 's3_enabled' => config('filesystems.default') === 's3',- 'paid_plans_enabled' => !is_null(config('cashier.key')),- 'custom_domains_enabled' => config('custom-domains.enabled'),- ];-@endphp- <!DOCTYPE html>-<html lang="{{ app()->getLocale() }}">-<head>- <meta charset="utf-8">- <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">-- @vite('resources/js/app.js')-- <link rel="icon" href="{{asset('/img/logo.svg')}}">-- @if($meta)- <title>{{$meta['title']}}</title>- <meta name='description' content='{{$meta['description']}}'>-- <meta name='og:title' content='{{$meta['title']}}'>- <meta name='og:description' content='{{$meta['description']}}'>- <meta name='og:image' content='{{$meta['image']}}'>- <meta name='og:site_name' content='OpenForm'>-- <meta name="twitter:title" content="{{$meta['title']}}">- <meta name="twitter:description" content="{{$meta['description']}}">- <meta name="twitter:image" content="{{$meta['image']}}">- @endif--</head>-<body>-<div id="app"></div>--{{-- Global configuration object --}}-<script>- window.config = @json($config);- window.$crisp = []-</script>---@if($config['google_analytics_code'])-<!-- Global site tag (gtag.js) - Google Analytics -->-<script defer src="https://www.googletagmanager.com/gtag/js?id={{ $config['google_analytics_code'] }}"></script>-<script defer>- window.dataLayer = window.dataLayer || []-- function gtag () {dataLayer.push(arguments)}-- gtag('js', new Date())-- gtag('config', "{{ $config['google_analytics_code'] }}" {{ \Illuminate\Support\Facades\App::isProduction() ? '' : ', { send_page_view: false, debug_mode:true }' }})-</script>-@endif--</body>-</html>diff --git a/vapor.yml b/vapor.ymlindex 4da98f9a8..c699ce244 100644--- a/vapor.yml+++ b/vapor.yml@@ -5,7 +5,7 @@ ignore:- storage/logs- clientenvironments:- production:+ api-production:warm: 5memory: 1024cli-memory: 512@@ -23,20 +23,20 @@ environments:firewall:rate-limit: 1000timeout: 30- staging:- memory: 1024- cli-memory: 512- cli-timeout: 900- runtime: 'php-8.2:al2-arm'- storage: opnforms-staging- database: JuPersoDb- domain: stg.opnform.com- build:- - 'COMPOSER_MIRROR_PATH_REPOS=1 composer install --no-dev'- - 'php artisan event:cache'- - 'php artisan disposable:update'- deploy:- - 'php artisan migrate --force'- firewall:- rate-limit: 1000- timeout: 30+ api-staging:+ memory: 1024+ cli-memory: 512+ cli-timeout: 900+ runtime: 'php-8.2:al2-arm'+ storage: opnforms-staging+ database: JuPersoDb+ domain: api.stg.opnform.com+ build:+ - 'COMPOSER_MIRROR_PATH_REPOS=1 composer install --no-dev'+ - 'php artisan event:cache'+ - 'php artisan disposable:update'+ deploy:+ - 'php artisan migrate --force'+ firewall:+ rate-limit: 1000+ timeout: 30