Cleaning up

This commit is contained in:
Julien Nahum 2024-01-15 12:26:22 +01:00
parent e889d68e9f
commit 70abfe45f5
6 changed files with 20 additions and 97 deletions

View File

@ -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 }}

1
.gitignore vendored
View File

@ -6,6 +6,7 @@
/vendor
.env
.env.production
.env.api-production
.env.backup
.env.testing
.env.dusk.local

1
client/sitemap.js vendored
View File

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

View File

@ -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'),
];

View File

@ -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>

View File

@ -5,7 +5,7 @@ ignore:
- storage/logs
- client
environments:
production:
api-production:
warm: 5
memory: 1024
cli-memory: 512
@ -23,14 +23,14 @@ environments:
firewall:
rate-limit: 1000
timeout: 30
staging:
api-staging:
memory: 1024
cli-memory: 512
cli-timeout: 900
runtime: 'php-8.2:al2-arm'
storage: opnforms-staging
database: JuPersoDb
domain: stg.opnform.com
domain: api.stg.opnform.com
build:
- 'COMPOSER_MIRROR_PATH_REPOS=1 composer install --no-dev'
- 'php artisan event:cache'