Merge remote-tracking branch 'upstream/next' into feature/glitchtip-service

# Conflicts:
#	README.md
#	apps/api/src/routes/api/v1/services/handlers.ts
#	apps/ui/src/lib/components/svg/services/index.ts

apps/api/prisma/migrations/20220816133447_bot_deployments/migration.sql

@@ -0,0 +1,20 @@
+-- RedefineTables
+PRAGMA foreign_keys=OFF;
+CREATE TABLE "new_ApplicationSettings" (
+    "id" TEXT NOT NULL PRIMARY KEY,
+    "applicationId" TEXT NOT NULL,
+    "dualCerts" BOOLEAN NOT NULL DEFAULT false,
+    "debug" BOOLEAN NOT NULL DEFAULT false,
+    "previews" BOOLEAN NOT NULL DEFAULT false,
+    "autodeploy" BOOLEAN NOT NULL DEFAULT true,
+    "isBot" BOOLEAN NOT NULL DEFAULT false,
+    "createdAt" DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt" DATETIME NOT NULL,
+    CONSTRAINT "ApplicationSettings_applicationId_fkey" FOREIGN KEY ("applicationId") REFERENCES "Application" ("id") ON DELETE RESTRICT ON UPDATE CASCADE
+);
+INSERT INTO "new_ApplicationSettings" ("applicationId", "autodeploy", "createdAt", "debug", "dualCerts", "id", "previews", "updatedAt") SELECT "applicationId", "autodeploy", "createdAt", "debug", "dualCerts", "id", "previews", "updatedAt" FROM "ApplicationSettings";
+DROP TABLE "ApplicationSettings";
+ALTER TABLE "new_ApplicationSettings" RENAME TO "ApplicationSettings";
+CREATE UNIQUE INDEX "ApplicationSettings_applicationId_key" ON "ApplicationSettings"("applicationId");
+PRAGMA foreign_key_check;
+PRAGMA foreign_keys=ON;

apps/api/prisma/schema.prisma

@@ -124,6 +124,7 @@ model ApplicationSettings {
   debug         Boolean     @default(false)
   previews      Boolean     @default(false)
   autodeploy    Boolean     @default(true)
+  isBot         Boolean     @default(false)
   createdAt     DateTime    @default(now())
   updatedAt     DateTime    @updatedAt
   application   Application @relation(fields: [applicationId], references: [id])

apps/api/src/jobs/deployApplication.ts

@@ -152,6 +152,13 @@ import * as buildpacks from '../lib/buildPacks';
 									.createHash('sha256')
 									.update(
 										JSON.stringify({
+											pythonWSGI,
+											pythonModule,
+											pythonVariable,
+											deploymentType,
+											denoOptions, 
+											baseImage,
+											baseBuildImage,
 											buildPack,
 											port,
 											exposePort,

apps/api/src/lib/buildPacks/common.ts

@@ -252,6 +252,20 @@ export function setDefaultBaseImage(buildPack: string | null, deploymentType: st
 			label: 'python:3.7-slim-bullseye'
 		}
 	];
+	const herokuVersions = [
+		{
+			value: 'heroku/builder:22',
+			label: 'heroku/builder:22'
+		},
+		{
+			value: 'heroku/buildpacks:20',
+			label: 'heroku/buildpacks:20'
+		},
+		{
+			value: 'heroku/builder-classic:22',
+			label: 'heroku/builder-classic:22'
+		},
+	]
 	let payload: any = {
 		baseImage: null,
 		baseBuildImage: null,
@@ -299,6 +313,11 @@ export function setDefaultBaseImage(buildPack: string | null, deploymentType: st
 		payload.baseBuildImage = 'node:18';
 		payload.baseBuildImages = nodeVersions;
 	}
+	if (buildPack === 'heroku') {
+		payload.baseImage = 'heroku/buildpacks:20';
+		payload.baseImages = herokuVersions;
+
+	}
 	return payload;
 }
 

apps/api/src/lib/common.ts

@@ -17,7 +17,7 @@ import { checkContainer, removeContainer } from './docker';
 import { day } from './dayjs';
 import * as serviceFields from './serviceFields'
 
-export const version = '3.4.0';
+export const version = '3.5.0';
 export const isDev = process.env.NODE_ENV === 'development';
 
 const algorithm = 'aes-256-ctr';
@@ -261,8 +261,8 @@ export const supportedServiceTypesAndVersions = [
 		fancyName: 'Hasura',
 		baseImage: 'hasura/graphql-engine',
 		images: ['postgres:12-alpine'],
-		versions: ['latest', 'v2.8.4', 'v2.5.1'],
-		recommendedVersion: 'v2.8.4',
+		versions: ['latest', 'v2.10.0', 'v2.5.1'],
+		recommendedVersion: 'v2.10.0',
 		ports: {
 			main: 8080
 		}

apps/api/src/lib/docker.ts

@@ -16,7 +16,6 @@ export function formatLabelsOnDocker(data) {
 export async function checkContainer({ dockerId, container, remove = false }: { dockerId: string, container: string, remove?: boolean }): Promise<boolean> {
 	let containerFound = false;
 	try {
-		console.log('checking ', container)
 		const { stdout } = await executeDockerCmd({
 			dockerId,
 			command:

apps/api/src/lib/services.ts

@@ -13,13 +13,13 @@ export async function defaultServiceConfigurations({ id, teamId }) {
     let secrets = [];
     if (serviceSecret.length > 0) {
         serviceSecret.forEach((secret) => {
-            secrets.push([secret.name]=secret.value);
+            secrets.push(`${secret.name}=${secret.value}`);
         });
     }
     return { ...service, network, port, workdir, image, secrets }
 }
 
-export function defaultServiceComposeConfiguration(network: string) {
+export function defaultServiceComposeConfiguration(network: string): any {
     return {
         networks: [network],
         restart: 'always',

apps/api/src/routes/api/v1/applications/handlers.ts

@@ -5,7 +5,7 @@ import axios from 'axios';
 import { FastifyReply } from 'fastify';
 import { day } from '../../../../lib/dayjs';
 import { setDefaultBaseImage, setDefaultConfiguration } from '../../../../lib/buildPacks/common';
-import { checkDomainsIsValidInDNS, checkDoubleBranch, decrypt, encrypt, errorHandler, executeDockerCmd, generateSshKeyPair, getContainerUsage, getDomain, getFreeExposedPort, isDev, isDomainConfigured, prisma, stopBuild, uniqueName } from '../../../../lib/common';
+import { checkDomainsIsValidInDNS, checkDoubleBranch, decrypt, encrypt, errorHandler, executeDockerCmd, generateSshKeyPair, getContainerUsage, getDomain, getFreeExposedPort, isDev, isDomainConfigured, listSettings, prisma, stopBuild, uniqueName } from '../../../../lib/common';
 import { checkContainer, formatLabelsOnDocker, isContainerExited, removeContainer } from '../../../../lib/docker';
 import { scheduler } from '../../../../lib/scheduler';
 
@@ -90,10 +90,11 @@ export async function getApplication(request: FastifyRequest<OnlyId>) {
         const { teamId } = request.user
         const appId = process.env['COOLIFY_APP_ID'];
         const application: any = await getApplicationFromDB(id, teamId);
-
+        const settings = await listSettings();
         return {
             application,
-            appId
+            appId,
+            settings
         };
 
     } catch ({ status, message }) {
@@ -275,7 +276,7 @@ export async function saveApplication(request: FastifyRequest<SaveApplication>,
 export async function saveApplicationSettings(request: FastifyRequest<SaveApplicationSettings>, reply: FastifyReply) {
     try {
         const { id } = request.params
-        const { debug, previews, dualCerts, autodeploy, branch, projectId } = request.body
+        const { debug, previews, dualCerts, autodeploy, branch, projectId, isBot } = request.body
         const isDouble = await checkDoubleBranch(branch, projectId);
         if (isDouble && autodeploy) {
             await prisma.applicationSettings.updateMany({ where: { application: { branch, projectId } }, data: { autodeploy: false } })
@@ -283,7 +284,7 @@ export async function saveApplicationSettings(request: FastifyRequest<SaveApplic
         }
         await prisma.application.update({
             where: { id },
-            data: { settings: { update: { debug, previews, dualCerts, autodeploy } } },
+            data: { fqdn: isBot ? null : undefined, settings: { update: { debug, previews, dualCerts, autodeploy, isBot } } },
             include: { destinationDocker: true }
         });
         return reply.code(201).send();

apps/api/src/routes/api/v1/applications/types.ts

@@ -25,7 +25,7 @@ export interface SaveApplication extends OnlyId {
 }
 export interface SaveApplicationSettings extends OnlyId {
     Querystring: { domain: string; };
-    Body: { debug: boolean; previews: boolean; dualCerts: boolean; autodeploy: boolean; branch: string; projectId: number; };
+    Body: { debug: boolean; previews: boolean; dualCerts: boolean; autodeploy: boolean; branch: string; projectId: number; isBot: boolean; };
 }
 export interface DeleteApplication extends OnlyId {
     Querystring: { domain: string; };

apps/api/src/routes/api/v1/databases/handlers.ts

@@ -3,8 +3,7 @@ import type { FastifyRequest } from 'fastify';
 import { FastifyReply } from 'fastify';
 import yaml from 'js-yaml';
 import fs from 'fs/promises';
-import { ComposeFile, createDirectories, decrypt, encrypt, errorHandler, executeDockerCmd, generateDatabaseConfiguration, generatePassword, getContainerUsage, getDatabaseImage, getDatabaseVersions, getFreePublicPort, isARM, listSettings, makeLabelForStandaloneDatabase, prisma, startTraefikTCPProxy, stopDatabaseContainer, stopTcpHttpProxy, supportedDatabaseTypesAndVersions, uniqueName, updatePasswordInDb } from '../../../../lib/common';
-import { checkContainer } from '../../../../lib/docker';
+import { ComposeFile, createDirectories, decrypt, encrypt, errorHandler, executeDockerCmd, generateDatabaseConfiguration, generatePassword, getContainerUsage, getDatabaseImage, getDatabaseVersions, getFreePublicPort, listSettings, makeLabelForStandaloneDatabase, prisma, startTraefikTCPProxy, stopDatabaseContainer, stopTcpHttpProxy, supportedDatabaseTypesAndVersions, uniqueName, updatePasswordInDb } from '../../../../lib/common';
 import { day } from '../../../../lib/dayjs';
 
 import { GetDatabaseLogs, OnlyId, SaveDatabase, SaveDatabaseDestination, SaveDatabaseSettings, SaveVersion } from '../../../../types';

apps/ui/src/lib/common.ts

@@ -131,8 +131,8 @@ export const supportedServiceTypesAndVersions = [
 		fancyName: 'Hasura',
 		baseImage: 'hasura/graphql-engine',
 		images: ['postgres:12-alpine'],
-		versions: ['latest', 'v2.5.1'],
-		recommendedVersion: 'v2.5.1',
+		versions: ['latest', 'v2.10.0', 'v2.5.1'],
+		recommendedVersion: 'v2.10.0',
 		ports: {
 			main: 8080
 		}
@@ -240,7 +240,7 @@ export const staticDeployments = [
 	'astro',
 	'eleventy'
 ];
-export const notNodeDeployments = ['php', 'docker', 'rust', 'python', 'deno', 'laravel'];
+export const notNodeDeployments = ['php', 'docker', 'rust', 'python', 'deno', 'laravel', 'heroku'];
 
 
 export function generateRemoteEngine(destination: any) {

apps/ui/src/lib/components/Toast.svelte

@@ -5,16 +5,17 @@
 </script>
 
 <div
+	on:click={() => dispatch('click')}
 	on:mouseover={() => dispatch('pause')}
 	on:focus={() => dispatch('pause')}
 	on:mouseout={() => dispatch('resume')}
 	on:blur={() => dispatch('resume')}
-	class="alert shadow-lg text-white rounded"
+	class="alert shadow-lg text-white rounded hover:scale-105 transition-all duration-100 cursor-pointer"
 	class:bg-coollabs={type === 'success'}
 	class:alert-error={type === 'error'}
 	class:alert-info={type === 'info'}
 >
-	<!-- {#if type === 'success'}
+	{#if type === 'success'}
 		<svg
 			xmlns="http://www.w3.org/2000/svg"
 			class="stroke-current flex-shrink-0 h-6 w-6"
@@ -53,6 +54,6 @@
 				d="M13 16h-1v-4h-1m1-4h.01M21 12a9 9 0 11-18 0 9 9 0 0118 0z"
 			/></svg
 		>
-	{/if} -->
+	{/if}
 	<slot />
 </div>

apps/ui/src/lib/components/Toasts.svelte

@@ -2,7 +2,7 @@
 	import { fade } from 'svelte/transition';
 	import Toast from './Toast.svelte';
 
-	import { pauseToast, resumeToast, toasts } from '$lib/store';
+	import { dismissToast, pauseToast, resumeToast, toasts } from '$lib/store';
 </script>
 
 {#if $toasts}
@@ -12,7 +12,8 @@
 				<Toast
 					type={toast.type}
 					on:resume={() => resumeToast(toast.id)}
-					on:pause={() => pauseToast(toast.id)}>{@html toast.message}</Toast
+					on:pause={() => pauseToast(toast.id)}
+					on:click={() => dismissToast(toast.id)}>{@html toast.message}</Toast
 				>
 			{/each}
 		</article>

apps/ui/src/lib/components/svg/applications/ApplicationIcons.svelte

@@ -38,4 +38,6 @@
 	<Icons.Deno {isAbsolute} />
 {:else if application.buildPack?.toLowerCase() === 'laravel'}
 	<Icons.Laravel {isAbsolute} />
+{:else if application.buildPack?.toLowerCase() === 'heroku'}
+	<Icons.Heroku {isAbsolute} />
 {/if}

apps/ui/src/lib/components/svg/applications/Heroku.svelte

@@ -0,0 +1,15 @@
+<script lang="ts">
+	export let isAbsolute = true;
+</script>
+
+<svg
+	xmlns="http://www.w3.org/2000/svg"
+	class={isAbsolute ? 'absolute top-0 left-0 -m-4 h-10 w-10' : 'mx-auto w-8 h-8 '}
+	viewBox="0 0 72 80"
+>
+	<path
+		xmlns="http://www.w3.org/2000/svg"
+		fill="#430098"
+		d="M64.8,0 L7.2,0 C3.224,0 0,3.224 0,7.2 L0,72.8 C0,76.776 3.224,80 7.2,80 L64.8,80 C68.776,80 72,76.776 72,72.8 L72,7.2 C72,3.224 68.776,0 64.8,0 Z M18,68 L18,52 L27,60 L18,68 Z M46,68 L46,44.11 C45.961,42.243 45.062,40 41,40 C32.866,40 23.742,44.091 23.651,44.132 L18,46.692 L18,12 L26,12 L26,34.711 C29.994,33.411 35.577,32 41,32 C45.945,32 48.905,33.944 50.517,35.575 C53.958,39.055 54.005,43.488 54.0002258,44 L54.0002258,68 L46,68 Z M48,25 L40,25 C43.144,20.875 45.118,16.534 46,12 L54,12 C53.46,16.544 51.618,20.9 48,25 Z"
+	/>
+</svg>

apps/ui/src/lib/components/svg/applications/index.ts

@@ -16,4 +16,4 @@ export { default as Astro } from './Astro.svelte';
 export { default as Eleventy } from './Eleventy.svelte';
 export { default as Deno } from './Deno.svelte';
 export { default as Laravel } from './Laravel.svelte';
-
+export { default as Heroku } from './Heroku.svelte';

apps/ui/src/lib/components/svg/services/ServiceIcons.svelte

@@ -32,6 +32,8 @@
 	<Icons.Hasura {isAbsolute} />
 {:else if type === 'fider'}
 	<Icons.Fider {isAbsolute} />
+{:else if type === 'appwrite'}
+	<Icons.Appwrite {isAbsolute} />
 {:else if type === 'moodle'}
 	<Icons.Moodle {isAbsolute} />
 {:else if type === 'glitchTip'}

apps/ui/src/lib/components/svg/services/index.ts

@@ -1,18 +1,18 @@
 //@ts-nocheck
 export { default as PlausibleAnalytics } from './PlausibleAnalytics.svelte';
-export { default as NocoDb }  from './NocoDB.svelte';
-export { default as MinIo }  from './MinIO.svelte';
-export { default as VsCodeServer }  from './VSCodeServer.svelte';
-export { default as Wordpress }  from './Wordpress.svelte';
-export { default as VaultWarden }  from './VaultWarden.svelte';
-export { default as LanguageTool }  from './LanguageTool.svelte';
-export { default as N8n }  from './N8n.svelte';
-export { default as UptimeKuma }  from './UptimeKuma.svelte';
-export { default as Ghost }  from './Ghost.svelte';
-export { default as MeiliSearch }  from './MeiliSearch.svelte';
-export { default as Umami }  from './Umami.svelte';
-export { default as Hasura }  from './Hasura.svelte';
-export { default as Fider }  from './Fider.svelte';
-export { default as Appwrite }  from './Moodle.svelte';
-export { default as Moodle }  from './Moodle.svelte';
+export { default as NocoDb } from './NocoDB.svelte';
+export { default as MinIo } from './MinIO.svelte';
+export { default as VsCodeServer } from './VSCodeServer.svelte';
+export { default as Wordpress } from './Wordpress.svelte';
+export { default as VaultWarden } from './VaultWarden.svelte';
+export { default as LanguageTool } from './LanguageTool.svelte';
+export { default as N8n } from './N8n.svelte';
+export { default as UptimeKuma } from './UptimeKuma.svelte';
+export { default as Ghost } from './Ghost.svelte';
+export { default as MeiliSearch } from './MeiliSearch.svelte';
+export { default as Umami } from './Umami.svelte';
+export { default as Hasura } from './Hasura.svelte';
+export { default as Fider } from './Fider.svelte';
+export { default as Appwrite } from './Appwrite.svelte';
+export { default as Moodle } from './Moodle.svelte';
 export { default as GlitchTip }  from './GlitchTip.svelte';

apps/ui/src/lib/locales/en.json

@@ -144,8 +144,8 @@
 		},
 		"preview": {
 			"need_during_buildtime": "Need during buildtime?",
-			"setup_secret_app_first": "You can add secrets to PR/MR deployments. Please add secrets to the application first. <br>Useful for creating <span class='text-applications font-bold'>staging</span> environments.",
-			"values_overwriting_app_secrets": "These values overwrite application secrets in PR/MR deployments. Useful for creating <span class='text-applications font-bold'>staging</span> environments.",
+			"setup_secret_app_first": "You can add secrets to PR/MR deployments. Please add secrets to the application first. <br>Useful for creating <span class='text-green-500 font-bold'>staging</span> environments.",
+			"values_overwriting_app_secrets": "These values overwrite application secrets in PR/MR deployments. Useful for creating <span class='text-green-500 font-bold'>staging</span> environments.",
 			"redeploy": "Redeploy",
 			"no_previews_available": "No previews available"
 		},
@@ -194,14 +194,14 @@
 		"application": "Application",
 		"url_fqdn": "URL (FQDN)",
 		"domain_fqdn": "Domain (FQDN)",
-		"https_explainer": "If you specify <span class='text-applications font-bold'>https</span>, the application will be accessible only over https. SSL certificate will be generated for you.<br>If you specify <span class='text-applications font-bold'>www</span>, the application will be redirected (302) from non-www and vice versa.<br><br>To modify the domain, you must first stop the application.<br><br><span class='text-white font-bold'>You must set your DNS to point to the server IP in advance.</span>",
+		"https_explainer": "If you specify <span class='text-green-500 font-bold'>https</span>, the application will be accessible only over https. SSL certificate will be generated for you.<br>If you specify <span class='text-green-500 font-bold'>www</span>, the application will be redirected (302) from non-www and vice versa.<br><br>To modify the domain, you must first stop the application.<br><br><span class='text-white font-bold'>You must set your DNS to point to the server IP in advance.</span>",
 		"ssl_www_and_non_www": "Generate SSL for www and non-www?",
-		"ssl_explainer": "It will generate certificates for both www and non-www. <br>You need to have <span class='font-bold text-applications'>both DNS entries</span> set in advance.<br><br>Useful if you expect to have visitors on both.",
+		"ssl_explainer": "It will generate certificates for both www and non-www. <br>You need to have <span class='font-bold text-green-500'>both DNS entries</span> set in advance.<br><br>Useful if you expect to have visitors on both.",
 		"install_command": "Install Command",
 		"build_command": "Build Command",
 		"start_command": "Start Command",
-		"directory_to_use_explainer": "Directory to use as the base for all commands.<br>Could be useful with <span class='text-applications font-bold'>monorepos</span>.",
-		"publish_directory_explainer": "Directory containing all the assets for deployment. <br> For example: <span class='text-applications font-bold'>dist</span>,<span class='text-applications font-bold'>_site</span> or <span class='text-applications font-bold'>public</span>.",
+		"directory_to_use_explainer": "Directory to use as the base for all commands.<br>Could be useful with <span class='text-green-500 font-bold'>monorepos</span>.",
+		"publish_directory_explainer": "Directory containing all the assets for deployment. <br> For example: <span class='text-green-500 font-bold'>dist</span>,<span class='text-green-500 font-bold'>_site</span> or <span class='text-green-500 font-bold'>public</span>.",
 		"features": "Features",
 		"enable_automatic_deployment": "Enable Automatic Deployment",
 		"enable_auto_deploy_webhooks": "Enable automatic deployment through webhooks.",

apps/ui/src/lib/locales/fr.json

@@ -65,7 +65,7 @@
 		"features": "Caractéristiques",
 		"git_repository": "Dépôt Git",
 		"git_source": "Source Git",
-		"https_explainer": "Si vous spécifiez <span class='text-applications font-bold'>https</span>, l'application sera accessible uniquement via https. \nUn certificat SSL sera généré pour vous.<br>Si vous spécifiez <span class='text-applications font-bold'>www</span>, l'application sera redirigée (302) à partir de non-www et vice versa \n.<br><br>Pour modifier le domaine, vous devez d'abord arrêter l'application.<br><br><span class='text-white font-bold'>Vous devez configurer, en avance, votre DNS pour pointer vers l'IP du serveur.</span>",
+		"https_explainer": "Si vous spécifiez <span class='text-green-500 font-bold'>https</span>, l'application sera accessible uniquement via https. \nUn certificat SSL sera généré pour vous.<br>Si vous spécifiez <span class='text-green-500 font-bold'>www</span>, l'application sera redirigée (302) à partir de non-www et vice versa \n.<br><br>Pour modifier le domaine, vous devez d'abord arrêter l'application.<br><br><span class='text-white font-bold'>Vous devez configurer, en avance, votre DNS pour pointer vers l'IP du serveur.</span>",
 		"install_command": "Commande d'installation",
 		"logs": "Journaux des applications",
 		"no_applications_found": "Aucune application trouvée",
@@ -78,11 +78,11 @@
 			"need_during_buildtime": "Besoin pendant la build ?",
 			"no_previews_available": "Aucun aperçu disponible",
 			"redeploy": "Redéployer",
-			"setup_secret_app_first": "Vous pouvez ajouter des secrets aux déploiements PR/MR. \nVeuillez d'abord ajouter des secrets à l'application. \n<br>Utile pour créer des environnements <span class='text-applications font-bold'>de mise en scène</span>.",
-			"values_overwriting_app_secrets": "Ces valeurs remplacent les secrets d'application dans les déploiements PR/MR. \nUtile pour créer des environnements <span class='text-applications font-bold'>de mise en scène</span>."
+			"setup_secret_app_first": "Vous pouvez ajouter des secrets aux déploiements PR/MR. \nVeuillez d'abord ajouter des secrets à l'application. \n<br>Utile pour créer des environnements <span class='text-green-500 font-bold'>de mise en scène</span>.",
+			"values_overwriting_app_secrets": "Ces valeurs remplacent les secrets d'application dans les déploiements PR/MR. \nUtile pour créer des environnements <span class='text-green-500 font-bold'>de mise en scène</span>."
 		},
 		"previews": "Aperçus",
-		"publish_directory_explainer": "Répertoire contenant tous les actifs à déployer. \n<br> Par exemple : <span class='text-applications font-bold'>dist</span>,<span class='text-applications font-bold'>_site</span> ou <span \nclass='text-applications font-bold'>public</span>.",
+		"publish_directory_explainer": "Répertoire contenant tous les actifs à déployer. \n<br> Par exemple : <span class='text-green-500 font-bold'>dist</span>,<span class='text-green-500 font-bold'>_site</span> ou <span \nclass='text-green-500 font-bold'>public</span>.",
 		"rebuild_application": "Re-build l'application",
 		"secret": "secrets",
 		"secrets": {
@@ -91,7 +91,7 @@
 			"use_isbuildsecret": "Utiliser isBuildSecret"
 		},
 		"settings_saved": "Paramètres sauvegardés.",
-		"ssl_explainer": "Il générera des certificats pour www et non-www. \n<br>Vous devez avoir <span class='font-bold text-applications'>les deux entrées DNS</span> définies à l'avance.<br><br>Utile si vous prévoyez d'avoir des visiteurs sur les deux.",
+		"ssl_explainer": "Il générera des certificats pour www et non-www. \n<br>Vous devez avoir <span class='font-bold text-green-500'>les deux entrées DNS</span> définies à l'avance.<br><br>Utile si vous prévoyez d'avoir des visiteurs sur les deux.",
 		"ssl_www_and_non_www": "Générer SSL pour www et non-www ?",
 		"start_command": "Démarrer la commande",
 		"stop_application": "Arrêter l'application",

apps/ui/src/lib/store.ts

@@ -70,7 +70,10 @@ export const features = readable({
 });
 
 export const location: Writable<null | string> = writable(null)
-export const setLocation = (resource: any) => {
+export const setLocation = (resource: any, settings?: any) => {
+    if (resource.settings.isBot) {
+        return location.set(`http://${settings.ipv4}:${resource.exposePort}`)
+    }
     if (GITPOD_WORKSPACE_URL && resource.exposePort) {
         const { href } = new URL(GITPOD_WORKSPACE_URL);
         const newURL = href

apps/ui/src/lib/templates.ts

@@ -170,6 +170,16 @@ export function findBuildPack(pack: string, packageManager = 'npm') {
 			port: 80
 		};
 	}
+	if (pack === 'heroku') {
+		return {
+			...metaData,
+			installCommand: null,
+			buildCommand: null,
+			startCommand: null,
+			publishDirectory: null,
+			port: 5000
+		};
+	}
 	return {
 		name: 'node',
 		fancyName: 'Node.js',
@@ -187,118 +197,137 @@ export const buildPacks = [
 		name: 'node',
 		fancyName: 'Node.js',
 		hoverColor: 'hover:bg-green-700',
-		color: 'bg-green-700'
+		color: 'bg-green-700',
+		isCoolifyBuildPack: true,
 	},
 	{
 		name: 'static',
 		fancyName: 'Static',
 		hoverColor: 'hover:bg-orange-700',
-		color: 'bg-orange-700'
+		color: 'bg-orange-700',
+		isCoolifyBuildPack: true,
 	},
 
 	{
 		name: 'php',
 		fancyName: 'PHP',
 		hoverColor: 'hover:bg-indigo-700',
-		color: 'bg-indigo-700'
+		color: 'bg-indigo-700',
+		isCoolifyBuildPack: true,
 	},
 	{
 		name: 'laravel',
 		fancyName: 'Laravel',
 		hoverColor: 'hover:bg-indigo-700',
-		color: 'bg-indigo-700'
+		color: 'bg-indigo-700',
+		isCoolifyBuildPack: true,
 	},
 	{
 		name: 'docker',
 		fancyName: 'Docker',
 		hoverColor: 'hover:bg-sky-700',
-		color: 'bg-sky-700'
+		color: 'bg-sky-700',
+		isCoolifyBuildPack: true,
 	},
 	{
 		name: 'svelte',
 		fancyName: 'Svelte',
 		hoverColor: 'hover:bg-orange-700',
-		color: 'bg-orange-700'
+		color: 'bg-orange-700',
+		isCoolifyBuildPack: true,
 	},
 	{
 		name: 'vuejs',
 		fancyName: 'VueJS',
 		hoverColor: 'hover:bg-green-700',
-		color: 'bg-green-700'
+		color: 'bg-green-700',
+		isCoolifyBuildPack: true,
 	},
 	{
 		name: 'nuxtjs',
 		fancyName: 'NuxtJS',
 		hoverColor: 'hover:bg-green-700',
-		color: 'bg-green-700'
+		color: 'bg-green-700',
+		isCoolifyBuildPack: true,
 	},
 	{
 		name: 'gatsby',
 		fancyName: 'Gatsby',
 		hoverColor: 'hover:bg-blue-700',
-		color: 'bg-blue-700'
+		color: 'bg-blue-700',
+		isCoolifyBuildPack: true,
 	},
 	{
 		name: 'astro',
 		fancyName: 'Astro',
 		hoverColor: 'hover:bg-pink-700',
-		color: 'bg-pink-700'
+		color: 'bg-pink-700',
+		isCoolifyBuildPack: true,
 	},
 	{
 		name: 'eleventy',
 		fancyName: 'Eleventy',
 		hoverColor: 'hover:bg-red-700',
-		color: 'bg-red-700'
+		color: 'bg-red-700',
+		isCoolifyBuildPack: true,
 	},
 
 	{
 		name: 'react',
 		fancyName: 'React',
 		hoverColor: 'hover:bg-blue-700',
-		color: 'bg-blue-700'
+		color: 'bg-blue-700',
+		isCoolifyBuildPack: true,
 	},
 	{
 		name: 'preact',
 		fancyName: 'Preact',
 		hoverColor: 'hover:bg-blue-700',
-		color: 'bg-blue-700'
+		color: 'bg-blue-700',
+		isCoolifyBuildPack: true,
 	},
 	{
 		name: 'nextjs',
 		fancyName: 'NextJS',
 		hoverColor: 'hover:bg-blue-700',
-		color: 'bg-blue-700'
+		color: 'bg-blue-700',
+		isCoolifyBuildPack: true,
 	},
 	{
 		name: 'nestjs',
 		fancyName: 'NestJS',
 		hoverColor: 'hover:bg-red-700',
-		color: 'bg-red-700'
+		color: 'bg-red-700',
+		isCoolifyBuildPack: true,
 	},
 	{
 		name: 'rust',
 		fancyName: 'Rust',
 		hoverColor: 'hover:bg-pink-700',
-		color: 'bg-pink-700'
+		color: 'bg-pink-700',
+		isCoolifyBuildPack: true,
 	},
 	{
 		name: 'python',
 		fancyName: 'Python',
 		hoverColor: 'hover:bg-green-700',
-		color: 'bg-green-700'
+		color: 'bg-green-700',
+		isCoolifyBuildPack: true,
 	},
 	{
 		name: 'deno',
 		fancyName: 'Deno',
 		hoverColor: 'hover:bg-green-700',
-		color: 'bg-green-700'
+		color: 'bg-green-700',
+		isCoolifyBuildPack: true,
 	},
-    // {
-    //     name: 'heroku',
-	// 	fancyName: 'Heroku Buildpack',
-	// 	hoverColor: 'hover:bg-indigo-700',
-	// 	color: 'bg-indigo-700'
-    // }
+    {
+        name: 'heroku',
+		fancyName: 'Heroku',
+		hoverColor: 'hover:bg-purple-700',
+		color: 'bg-purple-700',
+		isHerokuBuildPack: true,
+    }
 ];
 export const scanningTemplates = {
 	'@sveltejs/kit': {

apps/ui/src/routes/applications/[id]/__layout.svelte

@@ -16,7 +16,7 @@
 	export const load: Load = async ({ fetch, url, params }) => {
 		try {
 			const response = await get(`/applications/${params.id}`);
-			let { application, appId, settings, isQueueActive } = response;
+			let { application, appId, settings } = response;
 			if (!application || Object.entries(application).length === 0) {
 				return {
 					status: 302,
@@ -36,7 +36,8 @@
 
 			return {
 				props: {
-					application
+					application,
+					settings
 				},
 				stuff: {
 					application,
@@ -52,7 +53,7 @@
 
 <script lang="ts">
 	export let application: any;
-
+	export let settings: any;
 	import { page } from '$app/stores';
 	import DeleteIcon from '$lib/components/DeleteIcon.svelte';
 	import { del, get, post } from '$lib/api';
@@ -65,10 +66,10 @@
 
 	let loading = false;
 	let statusInterval: any;
-	let isQueueActive= false;
+	let isQueueActive = false;
 	$disabledButton =
 		!$appSession.isAdmin ||
-		!application.fqdn ||
+		(!application.fqdn && !application.settings.isBot) ||
 		!application.gitSource ||
 		!application.repository ||
 		!application.destinationDocker ||
@@ -80,9 +81,9 @@
 		try {
 			const { buildId } = await post(`/applications/${id}/deploy`, { ...application });
 			addToast({
-					message: $t('application.deployment_queued'),
-					type: 'success'
-				});
+				message: $t('application.deployment_queued'),
+				type: 'success'
+			});
 			if ($page.url.pathname.startsWith(`/applications/${id}/logs/build`)) {
 				return window.location.assign(`/applications/${id}/logs/build?buildId=${buildId}`);
 			} else {
@@ -114,7 +115,7 @@
 			return window.location.reload();
 		} catch (error) {
 			return errorNotification(error);
-		} 
+		}
 	}
 	async function getStatus() {
 		if ($status.application.loading) return;
@@ -126,18 +127,23 @@
 		$status.application.loading = false;
 		$status.application.initialLoading = false;
 	}
+
 	onDestroy(() => {
 		$status.application.initialLoading = true;
 		$location = null;
 		clearInterval(statusInterval);
 	});
 	onMount(async () => {
-		setLocation(application);
-
+		setLocation(application, settings);
 		$status.application.isRunning = false;
 		$status.application.isExited = false;
 		$status.application.loading = false;
-		if (application.gitSourceId && application.destinationDockerId && application.fqdn) {
+		if (
+			application.gitSourceId &&
+			application.destinationDockerId &&
+			application.fqdn &&
+			!application.settings.isBot
+		) {
 			await getStatus();
 			statusInterval = setInterval(async () => {
 				await getStatus();

apps/ui/src/routes/applications/[id]/configuration/buildpack.svelte

@@ -30,7 +30,6 @@
 	import { page } from '$app/stores';
 	import { get } from '$lib/api';
 	import { appSession } from '$lib/store';
-	import { browser } from '$app/env';
 	import { t } from '$lib/translations';
 	import { buildPacks, findBuildPack, scanningTemplates } from '$lib/templates';
 	import { errorNotification } from '$lib/common';
@@ -263,11 +262,27 @@
 		</div>
 	</div>
 {:else}
-	<div class="max-w-7xl mx-auto flex flex-wrap justify-center">
-		{#each buildPacks as buildPack}
+
+
+	<div class="max-w-7xl mx-auto ">
+		<div class="title pb-2">Coolify Buildpacks</div>
+		<div class="flex flex-wrap justify-center">
+		{#each buildPacks.filter(bp => bp.isCoolifyBuildPack === true) as buildPack}
+			<div class="p-2">
+				<BuildPack {packageManager} {buildPack} {scanning} bind:foundConfig />
+			</div>
+		{/each}
+		</div>
+	</div>
+
+	<div class="max-w-7xl mx-auto ">
+		<div class="title pb-2">Heroku</div>
+		<div class="flex flex-wrap justify-center">
+		{#each buildPacks.filter(bp => bp.isHerokuBuildPack === true) as buildPack}
 			<div class="p-2">
 				<BuildPack {packageManager} {buildPack} {scanning} bind:foundConfig />
 			</div>
 		{/each}
 	</div>
+	</div>
 {/if}

apps/ui/src/routes/applications/[id]/configuration/destination.svelte

@@ -31,6 +31,7 @@
 	import { t } from '$lib/translations';
 	import { appSession } from '$lib/store';
 	import { errorNotification } from '$lib/common';
+	import { onMount } from 'svelte';
 
 	const { id } = $page.params;
 	const from = $page.url.searchParams.get('from');
@@ -55,6 +56,11 @@
 			return errorNotification(error);
 		}
 	}
+	onMount(async () => {
+		if (destinations.length === 1) {
+			await handleSubmit(destinations[0].id);
+		}
+	});
 </script>
 
 <div class="flex space-x-1 p-6 font-bold">
@@ -65,7 +71,9 @@
 <div class="flex flex-col justify-center">
 	{#if !destinations || ownDestinations.length === 0}
 		<div class="flex-col">
-			<div class="pb-2 text-center font-bold">{$t('application.configuration.no_configurable_destination')}</div>
+			<div class="pb-2 text-center font-bold">
+				{$t('application.configuration.no_configurable_destination')}
+			</div>
 			<div class="flex justify-center">
 				<a href="/new/destination" sveltekit:prefetch class="add-icon bg-sky-600 hover:bg-sky-500">
 					<svg

apps/ui/src/routes/applications/[id]/index.svelte

@@ -5,7 +5,8 @@
 			if (stuff?.application?.id) {
 				return {
 					props: {
-						application: stuff.application
+						application: stuff.application,
+						settings: stuff.settings
 					}
 				};
 			}
@@ -26,6 +27,7 @@
 
 <script lang="ts">
 	export let application: any;
+	export let settings: any;
 	import { page } from '$app/stores';
 	import { onDestroy, onMount } from 'svelte';
 	import Select from 'svelte-select';
@@ -60,6 +62,7 @@
 	let previews = application.settings.previews;
 	let dualCerts = application.settings.dualCerts;
 	let autodeploy = application.settings.autodeploy;
+	let isBot = application.settings.isBot;
 
 	let nonWWWDomain = application.fqdn && getDomain(application.fqdn).replace(/^www\./, '');
 	let isNonWWWDomainOK = false;
@@ -99,7 +102,7 @@
 			application.fqdn = `http://${cuid()}.demo.coolify.io`;
 			await handleSubmit();
 		}
-		domainEl.focus();
+		// !isBot && domainEl.focus();
 		await getUsage();
 		usageInterval = setInterval(async () => {
 			await getUsage();
@@ -129,11 +132,16 @@
 		if (name === 'autodeploy') {
 			autodeploy = !autodeploy;
 		}
+		if (name === 'isBot') {
+			isBot = !isBot;
+			setLocation(application, settings);
+		}
 		try {
 			await post(`/applications/${id}/settings`, {
 				previews,
 				debug,
 				dualCerts,
+				isBot,
 				autodeploy,
 				branch: application.branch,
 				projectId: application.projectId
@@ -155,24 +163,28 @@
 			if (name === 'autodeploy') {
 				autodeploy = !autodeploy;
 			}
+			if (name === 'isBot') {
+				isBot = !isBot;
+			}
 			return errorNotification(error);
 		}
 	}
 	async function handleSubmit() {
-		if (loading || !application.fqdn) return;
+		if (loading || (!application.fqdn && !isBot)) return;
 		loading = true;
 		try {
 			nonWWWDomain = application.fqdn && getDomain(application.fqdn).replace(/^www\./, '');
 			if (application.deploymentType)
 				application.deploymentType = application.deploymentType.toLowerCase();
-			await post(`/applications/${id}/check`, {
-				fqdn: application.fqdn,
-				forceSave,
-				dualCerts,
-				exposePort: application.exposePort
-			});
+			!isBot &&
+				(await post(`/applications/${id}/check`, {
+					fqdn: application.fqdn,
+					forceSave,
+					dualCerts,
+					exposePort: application.exposePort
+				}));
 			await post(`/applications/${id}`, { ...application });
-			setLocation(application);
+			setLocation(application, settings);
 			$disabledButton = false;
 			forceSave = false;
 			addToast({
@@ -332,53 +344,56 @@
 				<label for="gitSource" class="text-base font-bold text-stone-100"
 					>{$t('application.git_source')}</label
 				>
-				<a
-					href={!isDisabled
-						? `/applications/${id}/configuration/source?from=/applications/${id}`
-						: ''}
-					class="no-underline"
-					><input
-						value={application.gitSource.name}
-						id="gitSource"
-						disabled
-						class="cursor-pointer hover:bg-coolgray-500"
-					/></a
-				>
+				{#if isDisabled}
+					<input disabled={isDisabled} value={application.gitSource.name} />
+				{:else}
+					<a
+						href={`/applications/${id}/configuration/source?from=/applications/${id}`}
+						class="no-underline"
+						><input
+							value={application.gitSource.name}
+							id="gitSource"
+							class="cursor-pointer hover:bg-coolgray-500"
+						/></a
+					>
+				{/if}
 			</div>
 			<div class="grid grid-cols-2 items-center">
 				<label for="repository" class="text-base font-bold text-stone-100"
 					>{$t('application.git_repository')}</label
 				>
-				<a
-					href={!isDisabled
-						? `/applications/${id}/configuration/repository?from=/applications/${id}&to=/applications/${id}/configuration/buildpack`
-						: ''}
-					class="no-underline"
-					><input
-						value="{application.repository}/{application.branch}"
-						id="repository"
-						disabled
-						class="cursor-pointer hover:bg-coolgray-500"
-					/></a
-				>
+				{#if isDisabled}
+					<input disabled={isDisabled} value="{application.repository}/{application.branch}" />
+				{:else}
+					<a
+						href={`/applications/${id}/configuration/repository?from=/applications/${id}&to=/applications/${id}/configuration/buildpack`}
+						class="no-underline"
+						><input
+							value="{application.repository}/{application.branch}"
+							id="repository"
+							class="cursor-pointer hover:bg-coolgray-500"
+						/></a
+					>
+				{/if}
 			</div>
 			<div class="grid grid-cols-2 items-center">
 				<label for="buildPack" class="text-base font-bold text-stone-100"
 					>{$t('application.build_pack')}</label
 				>
-				<a
-					href={!isDisabled
-						? `/applications/${id}/configuration/buildpack?from=/applications/${id}`
-						: ''}
-					class="no-underline "
-				>
-					<input
-						value={application.buildPack}
-						id="buildPack"
-						disabled
-						class="cursor-pointer hover:bg-coolgray-500"
-					/></a
-				>
+				{#if isDisabled}
+					<input class="capitalize" disabled={isDisabled} value={application.buildPack} />
+				{:else}
+					<a
+						href={`/applications/${id}/configuration/buildpack?from=/applications/${id}`}
+						class="no-underline "
+					>
+						<input
+							value={application.buildPack}
+							id="buildPack"
+							class="cursor-pointer hover:bg-coolgray-500 capitalize"
+						/></a
+					>
+				{/if}
 			</div>
 			<div class="grid grid-cols-2 items-center pb-8">
 				<label for="destination" class="text-base font-bold text-stone-100"
@@ -465,77 +480,88 @@
 			<div class="title">{$t('application.application')}</div>
 		</div>
 		<div class="grid grid-flow-row gap-2 px-10">
-			<div class="grid grid-cols-2">
-				<div class="flex-col">
-					<label for="fqdn" class="pt-2 text-base font-bold text-stone-100"
-						>{$t('application.url_fqdn')}</label
-					>
-					{#if browser && window.location.hostname === 'demo.coolify.io'}
-						<Explainer
-							text="<span class='text-white font-bold'>You can use the predefined random url name or enter your own domain name.</span>"
+			<div class="grid grid-cols-2 items-center">
+				<Setting
+					isCenter={false}
+					bind:setting={isBot}
+					on:click={() => changeSettings('isBot')}
+					title="Is your application a bot?"
+					description="You can deploy applications without domains. <br>They will listen on <span class='text-green-500 font-bold'>IP:PORT</span> instead.<br></Setting><br>Useful for <span class='text-green-500 font-bold'>example bots.</span>"
+				/>
+			</div>
+			{#if !isBot}
+				<div class="grid grid-cols-2">
+					<div class="flex-col">
+						<label for="fqdn" class="pt-2 text-base font-bold text-stone-100"
+							>{$t('application.url_fqdn')}</label
+						>
+						{#if browser && window.location.hostname === 'demo.coolify.io'}
+							<Explainer
+								text="<span class='text-white font-bold'>You can use the predefined random url name or enter your own domain name.</span>"
+							/>
+						{/if}
+						<Explainer text={$t('application.https_explainer')} />
+					</div>
+					<div>
+						<input
+							readonly={isDisabled}
+							disabled={isDisabled}
+							bind:this={domainEl}
+							name="fqdn"
+							id="fqdn"
+							required
+							bind:value={application.fqdn}
+							pattern="^https?://([a-z0-9]+(-[a-z0-9]+)*\.)+[a-z]{'{'}2,{'}'}$"
+							placeholder="eg: https://coollabs.io"
 						/>
-					{/if}
-					<Explainer text={$t('application.https_explainer')} />
-				</div>
-				<div>
-					<input
-						readonly={isDisabled}
-						disabled={isDisabled}
-						bind:this={domainEl}
-						name="fqdn"
-						id="fqdn"
-						required
-						bind:value={application.fqdn}
-						pattern="^https?://([a-z0-9]+(-[a-z0-9]+)*\.)+[a-z]{'{'}2,{'}'}$"
-						placeholder="eg: https://coollabs.io"
-					/>
-					{#if forceSave}
-						<div class="flex-col space-y-2 pt-4 text-center">
-							{#if isNonWWWDomainOK}
-								<button
-									class="bg-green-600 hover:bg-green-500"
-									on:click|preventDefault={() => isDNSValid(getDomain(nonWWWDomain), false)}
-									>DNS settings for {nonWWWDomain} is OK, click to recheck.</button
-								>
-							{:else}
-								<button
-									class="bg-red-600 hover:bg-red-500"
-									on:click|preventDefault={() => isDNSValid(getDomain(nonWWWDomain), false)}
-									>DNS settings for {nonWWWDomain} is invalid, click to recheck.</button
-								>
-							{/if}
-							{#if dualCerts}
-								{#if isWWWDomainOK}
+						{#if forceSave}
+							<div class="flex-col space-y-2 pt-4 text-center">
+								{#if isNonWWWDomainOK}
 									<button
-										class="bg-green-600 hover:bg-green-500"
-										on:click|preventDefault={() =>
-											isDNSValid(getDomain(`www.${nonWWWDomain}`), true)}
-										>DNS settings for www.{nonWWWDomain} is OK, click to recheck.</button
+										class="btn btn-sm bg-green-600 hover:bg-green-500"
+										on:click|preventDefault={() => isDNSValid(getDomain(nonWWWDomain), false)}
+										>DNS settings for {nonWWWDomain} is OK, click to recheck.</button
 									>
 								{:else}
 									<button
-										class="bg-red-600 hover:bg-red-500"
-										on:click|preventDefault={() =>
-											isDNSValid(getDomain(`www.${nonWWWDomain}`), true)}
-										>DNS settings for www.{nonWWWDomain} is invalid, click to recheck.</button
+										class="btn btn-sm bg-red-600 hover:bg-red-500"
+										on:click|preventDefault={() => isDNSValid(getDomain(nonWWWDomain), false)}
+										>DNS settings for {nonWWWDomain} is invalid, click to recheck.</button
 									>
 								{/if}
-							{/if}
-						</div>
-					{/if}
+								{#if dualCerts}
+									{#if isWWWDomainOK}
+										<button
+											class="btn btn-sm bg-green-600 hover:bg-green-500"
+											on:click|preventDefault={() =>
+												isDNSValid(getDomain(`www.${nonWWWDomain}`), true)}
+											>DNS settings for www.{nonWWWDomain} is OK, click to recheck.</button
+										>
+									{:else}
+										<button
+											class="btn btn-sm bg-red-600 hover:bg-red-500"
+											on:click|preventDefault={() =>
+												isDNSValid(getDomain(`www.${nonWWWDomain}`), true)}
+											>DNS settings for www.{nonWWWDomain} is invalid, click to recheck.</button
+										>
+									{/if}
+								{/if}
+							</div>
+						{/if}
+					</div>
 				</div>
-			</div>
-			<div class="grid grid-cols-2 items-center pb-8">
-				<Setting
-					dataTooltip={$t('forms.must_be_stopped_to_modify')}
-					disabled={$status.application.isRunning}
-					isCenter={false}
-					bind:setting={dualCerts}
-					title={$t('application.ssl_www_and_non_www')}
-					description={$t('application.ssl_explainer')}
-					on:click={() => !$status.application.isRunning && changeSettings('dualCerts')}
-				/>
-			</div>
+				<div class="grid grid-cols-2 items-center pb-8">
+					<Setting
+						dataTooltip={$t('forms.must_be_stopped_to_modify')}
+						disabled={$status.application.isRunning}
+						isCenter={false}
+						bind:setting={dualCerts}
+						title={$t('application.ssl_www_and_non_www')}
+						description={$t('application.ssl_explainer')}
+						on:click={() => !$status.application.isRunning && changeSettings('dualCerts')}
+					/>
+				</div>
+			{/if}
 			{#if application.buildPack === 'python'}
 				<div class="grid grid-cols-2 items-center">
 					<label for="pythonModule" class="text-base font-bold text-stone-100">WSGI / ASGI</label>
@@ -585,7 +611,7 @@
 					</div>
 				{/if}
 			{/if}
-			{#if !staticDeployments.includes(application.buildPack)}
+			{#if !staticDeployments.includes(application.buildPack) && !isBot}
 				<div class="grid grid-cols-2 items-center">
 					<label for="port" class="text-base font-bold text-stone-100">{$t('forms.port')}</label>
 					<input
@@ -606,6 +632,7 @@
 					name="exposePort"
 					id="exposePort"
 					bind:value={application.exposePort}
+					required={isBot}
 					placeholder="12345"
 				/>
 				<Explainer
@@ -698,7 +725,7 @@
 					/>
 				</div>
 			{/if}
-			{#if application.buildPack !== 'laravel'}
+			{#if application.buildPack !== 'laravel' && application.buildPack !== 'heroku'}
 				<div class="grid grid-cols-2 items-center">
 					<div class="flex-col">
 						<label for="baseDirectory" class="pt-2 text-base font-bold text-stone-100"

apps/ui/src/routes/databases/[id]/configuration/destination.svelte

@@ -30,6 +30,7 @@
 	import { get, post } from '$lib/api';
 	import { t } from '$lib/translations';
 	import { errorNotification } from '$lib/common';
+	import { onMount } from 'svelte';
 
 	const { id } = $page.params;
 	const from = $page.url.searchParams.get('from');
@@ -45,6 +46,11 @@
 			return errorNotification(error);
 		}
 	}
+	onMount(async () => {
+		if (destinations.length === 1) {
+			await handleSubmit(destinations[0].id);
+		}
+	});
 </script>
 
 <div class="flex space-x-1 p-6 font-bold">
@@ -55,7 +61,9 @@
 <div class="flex justify-center">
 	{#if !destinations || destinations.length === 0}
 		<div class="flex-col">
-			<div class="pb-2 text-center font-bold">{$t('application.configuration.no_configurable_destination')}</div>
+			<div class="pb-2 text-center font-bold">
+				{$t('application.configuration.no_configurable_destination')}
+			</div>
 			<div class="flex justify-center">
 				<a href="/new/destination" sveltekit:prefetch class="add-icon bg-sky-600 hover:bg-sky-500">
 					<svg

apps/ui/src/routes/index.svelte

@@ -39,7 +39,7 @@
 	export let services: any;
     let numberOfGetStatus = 0;
     
-    function getRndInteger(min, max) {
+    function getRndInteger(min: number, max: number) {
         return Math.floor(Math.random() * (max - min + 1) ) + min;
     }
 

apps/ui/src/routes/services/[id]/_ServiceLinks.svelte

@@ -55,7 +55,7 @@
 	<a href="https://fider.io" target="_blank">
 		<Icons.Fider />
 	</a>
-{:else if service.type === 'appwrote'}
+{:else if service.type === 'appwrite'}
 	<a href="https://appwrite.io" target="_blank">
 		<Icons.Appwrite/>
 	</a>

apps/ui/src/routes/services/[id]/_Services/_Services.svelte

@@ -323,13 +323,13 @@
 				<div class="flex-col space-y-2 pt-4 text-center">
 					{#if isNonWWWDomainOK}
 						<button
-							class="bg-green-600 hover:bg-green-500"
+							class="btn btn-sm bg-green-600 hover:bg-green-500"
 							on:click|preventDefault={() => isDNSValid(getDomain(nonWWWDomain), false)}
 							>DNS settings for {nonWWWDomain} is OK, click to recheck.</button
 						>
 					{:else}
 						<button
-							class="bg-red-600 hover:bg-red-500"
+							class="btn btn-sm bg-red-600 hover:bg-red-500"
 							on:click|preventDefault={() => isDNSValid(getDomain(nonWWWDomain), false)}
 							>DNS settings for {nonWWWDomain} is invalid, click to recheck.</button
 						>
@@ -337,13 +337,13 @@
 					{#if dualCerts}
 						{#if isWWWDomainOK}
 							<button
-								class="bg-green-600 hover:bg-green-500"
+								class="btn btn-sm bg-green-600 hover:bg-green-500"
 								on:click|preventDefault={() => isDNSValid(getDomain(`www.${nonWWWDomain}`), true)}
 								>DNS settings for www.{nonWWWDomain} is OK, click to recheck.</button
 							>
 						{:else}
 							<button
-								class="bg-red-600 hover:bg-red-500"
+								class="btn btn-sm bg-red-600 hover:bg-red-500"
 								on:click|preventDefault={() => isDNSValid(getDomain(`www.${nonWWWDomain}`), true)}
 								>DNS settings for www.{nonWWWDomain} is invalid, click to recheck.</button
 							>

apps/ui/src/routes/services/[id]/_Services/_Wordpress.svelte

@@ -22,7 +22,7 @@
 	function generateUrl(publicPort: any) {
 		return browser
 			? `sftp://${
-					settings.fqdn ? getDomain(settings.fqdn) : window.location.hostname
+					settings?.fqdn ? getDomain(settings.fqdn) : window.location.hostname
 			  }:${publicPort}`
 			: 'Loading...';
 	}

apps/ui/src/routes/services/[id]/__layout.svelte

@@ -110,7 +110,6 @@
 		loading = true;
 		try {
 			await post(`/services/${service.id}/${service.type}/start`, {});
-			return window.location.reload();
 		} catch (error) {
 			return errorNotification(error);
 		} finally {

apps/ui/src/routes/services/[id]/configuration/destination.svelte

@@ -32,10 +32,16 @@
 	import { get, post } from '$lib/api';
 	import { t } from '$lib/translations';
 	import { errorNotification } from '$lib/common';
+	import { onMount } from 'svelte';
 
 	const { id } = $page.params;
 	const from = $page.url.searchParams.get('from');
 
+	onMount(async () => {
+		if (destinations.length === 1) {
+			await handleSubmit(destinations[0].id);
+		}
+	});
 	async function handleSubmit(destinationId: any) {
 		try {
 			await post(`/services/${id}/configuration/destination`, { destinationId });
@@ -54,7 +60,9 @@
 <div class="flex justify-center">
 	{#if !destinations || destinations.length === 0}
 		<div class="flex-col">
-			<div class="pb-2 text-center font-bold">{$t('application.configuration.no_configurable_destination')}</div>
+			<div class="pb-2 text-center font-bold">
+				{$t('application.configuration.no_configurable_destination')}
+			</div>
 			<div class="flex justify-center">
 				<a href="/new/destination" sveltekit:prefetch class="add-icon bg-sky-600 hover:bg-sky-500">
 					<svg

apps/ui/src/routes/services/[id]/configuration/version.svelte

@@ -32,12 +32,20 @@
 	import { get, post } from '$lib/api';
 	import { t } from '$lib/translations';
 	import { errorNotification, supportedServiceTypesAndVersions } from '$lib/common';
+	import { onMount } from 'svelte';
 
 	const { id } = $page.params;
 	const from = $page.url.searchParams.get('from');
 	let recommendedVersion = supportedServiceTypesAndVersions.find(
 		({ name }) => name === type
 	)?.recommendedVersion;
+
+	onMount(async () => {
+		if (versions.length === 1) {
+			await handleSubmit(versions[0]);
+		}
+	});
+
 	async function handleSubmit(version: any) {
 		try {
 			await post(`/services/${id}/configuration/version`, { version });

apps/ui/src/routes/services/index.svelte

@@ -102,7 +102,7 @@
 					{#each otherServices as service}
 						<a href="/services/{service.id}" class="p-2 no-underline">
 							<div class="box-selection group relative hover:bg-pink-600">
-								<Services type={service.type} />
+								<ServiceIcons type={service.type} />
 								<div class="truncate text-center text-xl font-bold">
 									{service.name}
 								</div>

apps/ui/src/tailwind.css

@@ -46,7 +46,7 @@ textarea {
 }
 
 #svelte .custom-select-wrapper .selectContainer {
-	@apply h-12 w-96 rounded border-none bg-coolgray-200 p-2 px-0 text-xs  tracking-tight  outline-none transition duration-150 hover:bg-coolgray-500 focus:bg-coolgray-500 md:text-sm;
+	@apply h-12 w-96 rounded border border-coolgray-300 border-dashed  bg-coolgray-200 p-2 px-0 text-xs tracking-tight outline-none transition duration-150 hover:bg-coolgray-500 focus:bg-coolgray-500 md:text-sm;
 }
 
 #svelte .listContainer {