fix: new resource selection view

andrasbacsai · andrasbacsai · commit 1c10a43321b3 · 2024-10-07T11:19:14.000+02:00
fix: new services
diff --git a/app/Console/Commands/ServicesGenerate.php b/app/Console/Commands/ServicesGenerate.php
@@ -78,7 +78,7 @@ private function process_file($file)
         if ($logo->count() > 0) {
             $logo = str($logo[0])->after('# logo:')->trim()->value();
         } else {
-            $logo = 'svgs/unknown.svg';
+            $logo = 'svgs/coolify.png';
         }
         $minversion = collect(preg_grep('/^# minversion:/', explode("\n", $content)))->values();
         if ($minversion->count() > 0) {
diff --git a/app/Livewire/Project/New/Select.php b/app/Livewire/Project/New/Select.php
@@ -94,10 +94,10 @@ public function loadServices2()
     {
         $services = get_service_templates(true);
         $services = collect($services)->map(function ($service, $key) {
-            return array_merge($service, [
+            return [
                 'name' => str($key)->headline(),
-                'logo' => asset($service['logo']),
-            ]);
+                'logo' => asset(data_get($service, 'logo', 'svgs/unknown.svg')),
+            ] + (array) $service;
         })->all();
         $gitBasedApplications = [
             [
@@ -256,6 +256,7 @@ public function instantSave()
 
     public function setType(string $type)
     {
+        $type = str($type)->lower()->value();
         if ($this->loading) {
             return;
         }
diff --git a/app/Models/Service.php b/app/Models/Service.php
diff --git a/public/svgs/coolify.png b/public/svgs/coolify.png
diff --git a/public/svgs/tolgee.svg b/public/svgs/tolgee.svg
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="100%" height="100%" viewBox="0 0 200 200" version="1.1" xmlns="http://www.w3.org/2000/svg"
+     style="fill:#EC407A;fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
+    <path d="M97.16,7.27a16.94,16.94,0,0,0-1.9,24.47,16.36,16.36,0,0,0,5,3.83,3.23,3.23,0,0,1-2.9,5.77,23.14,23.14,0,0,1-11.41-13C73.83,31.1,63.46,37.09,52.82,46.51c-27.44,24.3-34.35,61.74-16.38,85.26-4.57,5.79-8,12.22-8.9,18.69a20.88,20.88,0,0,0,5.62,18c9.18,9.61,21.42,7.13,31.26,5.14,6.58-1.34,12.8-2.6,16.5-.23,3.22,2.07,3.47,3.87,3.61,4.45,2.1,9.32-5.79,13.89-7.67,16.27a1.48,1.48,0,0,0,1.13,2.4c3.48,0,9-1.18,12.34-4.08s7.16-7.9,5.89-16.32c-.08-.5-.18-1-.32-1.58-.86-3.35-3.1-7.57-8.61-11.09-7.72-4.95-17-3.07-25.22-1.41-9.76,2-16,2.85-20.37-1.71a9.13,9.13,0,0,1-2.46-8.19c.54-3.77,2.65-7.89,5.62-11.86,21.71,16.89,56.87,13.47,82.67-9.39a75.34,75.34,0,0,0,20.81-28.09A23.14,23.14,0,0,1,134.8,89a3.23,3.23,0,0,1,6.08-2.19,16.37,16.37,0,0,0,3.2,5.39,16.85,16.85,0,1,0,11.48-28,3.23,3.23,0,0,1-.51-6.44,23.41,23.41,0,0,1,12.88,2.69c2.6-14.08,3.34-31.41-2.06-37.51-4.08-4.61-20.62-8-35.18-7.76A23.48,23.48,0,0,1,130.8,25a3.23,3.23,0,0,1-6.33-1.28A16.94,16.94,0,0,0,97.16,7.27Zm63.25,21a5.29,5.29,0,0,1-.57,6.19c-1.29,1.14-2.72-.51-4.1-2.06s-3.1-3.42-1.81-4.56A5.74,5.74,0,0,1,160.41,28.27Z"/>
+</svg>
diff --git a/resources/views/components/resource-view.blade.php b/resources/views/components/resource-view.blade.php
@@ -4,7 +4,6 @@
     'hover:border-l-red-500 cursor-not-allowed' => $upgrade,
 ])>
     <div class="flex items-center">
-
         {{ $logo }}
         <div class="flex flex-col pl-2 ">
             <div class="dark:text-white text-md">
@@ -19,4 +18,8 @@
             @endif
         </div>
     </div>
+    @isset($documentation)
+        <div class="flex-1"></div>
+        {{ $documentation }}
+    @endisset
 </div>
diff --git a/resources/views/livewire/project/new/select.blade.php b/resources/views/livewire/project/new/select.blade.php
@@ -48,7 +48,6 @@ class="w-[4.5rem]
                     </div>
                 </template>
             </div>
-
             <h2 x-show="filteredDatabases.length > 0" class="py-4"> Databases </h2>
             <div class="grid justify-start grid-cols-1 gap-4 text-left xl:grid-cols-2">
                 <template x-for="database in filteredDatabases" :key="database.id">
@@ -78,41 +77,44 @@ class="dark:text-white underline" target="_blank"
 
                 <div class="grid justify-start grid-cols-1 gap-4 text-left xl:grid-cols-2">
                     <template x-for="service in filteredServices" :key="service.name">
-                        <x-resource-view @click="setType('one-click-service-' + service.name)">
-                            <x-slot:title>
-                                <template x-if="service.name">
-                                    <span x-text="service.name"></span>
-                                </template>
-                            </x-slot>
-                            <x-slot:description>
-                                <template x-if="service.slogan">
-                                    <span x-text="service.slogan"></span>
-                                </template>
-                            </x-slot>
-                            <x-slot:logo>
-                                <template x-if="service.logo">
-                                    <img class="w-[4.5rem] aspect-square h-[4.5rem] p-2 transition-all duration-200 opacity-30 grayscale group-hover:grayscale-0 group-hover:opacity-100"
-                                        :src='service.logo'>
-                                </template>
-                            </x-slot:logo>
-                            <x-slot:documentation>
-                                <template x-show="service.documentation">
-                                    <div>
-                                        <div class="flex-1"></div>
-                                        <div class="flex items-center px-2 " title="Read the documentation.">
+                        <div x-on:click="setType('one-click-service-' + service.name)">
+                            <x-resource-view>
+                                <x-slot:title>
+                                    <template x-if="service.name">
+                                        <span x-text="service.name"></span>
+                                    </template>
+                                </x-slot>
+                                <x-slot:description>
+                                    <template x-if="service.slogan">
+                                        <span x-text="service.slogan"></span>
+                                    </template>
+                                </x-slot>
+                                <x-slot:logo>
+                                    <template x-if="service.logo">
+                                        <img class="w-[4.5rem] aspect-square h-[4.5rem] p-2 transition-all duration-200 opacity-30 grayscale group-hover:grayscale-0 group-hover:opacity-100"
+                                            :src='service.logo'>
+                                    </template>
+                                </x-slot:logo>
+                                <x-slot:documentation>
+                                    <template x-if="service.documentation">
+                                        <div class="flex items-center px-2" title="Read the documentation.">
                                             <a class="p-2 rounded hover:bg-coolgray-200 hover:no-underline group-hover:dark:text-white text-neutral-600"
                                                 onclick="event.stopPropagation()" :href="service.documentation"
                                                 target="_blank">
                                                 Docs
                                             </a>
                                         </div>
-                                    </div>
-                                </template>
-                            </x-slot:documentation>
-                        </x-resource-view>
+                                    </template>
+                                </x-slot:documentation>
+                            </x-resource-view>
+                        </div>
                     </template>
                 </div>
             </div>
+            <div
+                x-show="filteredGitBasedApplications.length === 0 && filteredDockerBasedApplications.length === 0 && filteredDatabases.length === 0 && filteredServices.length === 0 && loading === false">
+                <div>No resources found.</div>
+            </div>
             <script>
                 function sortFn(a, b) {
                     return a.name.localeCompare(b.name)
diff --git a/templates/compose/langfuse.yaml b/templates/compose/langfuse.yaml
@@ -4,15 +4,9 @@
 # logo: svgs/langfuse.png
 # port: 3000
 
-version: "3"
-
-volumes:
-  pg_data: null
-
 services:
   langfuse:
     image: langfuse/langfuse:2
-    restart: always
     environment:
       - SERVICE_FQDN_LANGFUSE_3000
       - DATABASE_URL=postgresql://${SERVICE_USER_POSTGRES}:${SERVICE_PASSWORD_POSTGRES}@postgres:5432/${POSTGRES_DB:-langfuse}
@@ -23,7 +17,14 @@ services:
       - NEXTAUTH_SECRET=${SERVICE_BASE64_64_NEXTAUTHSECRET}
       - TELEMETRY_ENABLED=${TELEMETRY_ENABLED:-false}
       - LANGFUSE_ENABLE_EXPERIMENTAL_FEATURES=${LANGFUSE_ENABLE_EXPERIMENTAL_FEATURES:-false}
-      - HOSTNAME=0.0.0.0
+      - HOSTNAME=${HOSTNAME:-0.0.0.0}
+      - LANGFUSE_INIT_USER_NAME=${LANGFUSE_INIT_USER_NAME:-Admin}
+      - LANGFUSE_INIT_USER_EMAIL=${LANGFUSE_INIT_USER_EMAIL:-admin@example.com}
+      - LANGFUSE_INIT_USER_PASSWORD=${SERVICE_PASSWORD_LANGFUSE}
+      - LANGFUSE_INIT_ORG_ID=${LANGFUSE_INIT_ORG_ID:-my-org}
+      - LANGFUSE_INIT_ORG_NAME=${LANGFUSE_INIT_ORG_NAME:-My Org}
+      - LANGFUSE_INIT_PROJECT_ID=${LANGFUSE_INIT_PROJECT_ID:-my-project}
+      - LANGFUSE_INIT_PROJECT_NAME=${LANGFUSE_INIT_PROJECT_NAME:-My Project}
     healthcheck:
       test:
         - CMD
@@ -44,7 +45,7 @@ services:
       - POSTGRES_PASSWORD=$SERVICE_PASSWORD_POSTGRES
       - POSTGRES_USER=$SERVICE_USER_POSTGRES
     volumes:
-      - "pg_data:/var/lib/postgresql/data"
+      - "pg-data:/var/lib/postgresql/data"
     healthcheck:
       test:
         - CMD-SHELL
diff --git a/templates/compose/litellm.yaml b/templates/compose/litellm.yaml
@@ -4,40 +4,33 @@
 # logo: svgs/litellm.svg
 # port: 4000
 
-version: "3"
-
-volumes:
-  pg_data: null
-  redis_data: null
-
 services:
   litellm:
     image: "ghcr.io/berriai/litellm-database:main-stable"
-    restart: always
     depends_on:
       postgres:
         condition: service_healthy
       redis:
         condition: service_healthy
     environment:
       - SERVICE_FQDN_LITELLM_4000
-      - LITELLM_LOG=ERROR
-      - LITELLM_MODE=PRODUCTION
-      - "LITELLM_MASTER_KEY=${SERVICE_PASSWORD_MASTERKEY}"
-      - "UI_USERNAME=${SERVICE_USER_UI}"
-      - "UI_PASSWORD=${SERVICE_PASSWORD_UI}"
-      - "DATABASE_URL=postgresql://${SERVICE_USER_POSTGRES}:${SERVICE_PASSWORD_POSTGRES}@postgres:5432/${POSTGRES_DB:-litellm}"
-      - REDIS_HOST=redis
-      - REDIS_PORT=6379
-      - "POSTGRES_USER=${SERVICE_USER_POSTGRES}"
-      - "POSTGRES_PASSWORD=${SERVICE_PASSWORD_POSTGRES}"
-      - "POSTGRES_DB=${POSTGRES_DB:-litellm}"
-      - "OPENAI_API_KEY=${OPENAI_API_KEY}"
-      - "OPENAI_API_BASE=${OPENAI_API_BASE}"
-      - "ANTHROPIC_API_KEY=${ANTHROPIC_API_KEY}"
-      - "ANTHROPIC_API_BASE=${ANTHROPIC_API_BASE}"
-      - "VOYAGE_API_KEY=${VOYAGE_API_KEY}"
-      - "VOYAGE_API_BASE=${VOYAGE_API_BASE}"
+      - LITELLM_LOG=${LITELLM_LOG:-ERROR}
+      - LITELLM_MODE=${LITELLM_MODE:-PRODUCTION}
+      - LITELLM_MASTER_KEY=${SERVICE_PASSWORD_MASTERKEY}
+      - UI_USERNAME=${SERVICE_USER_UI}
+      - UI_PASSWORD=${SERVICE_PASSWORD_UI}
+      - DATABASE_URL=postgresql://${SERVICE_USER_POSTGRES}:${SERVICE_PASSWORD_POSTGRES}@postgres:5432/${POSTGRES_DB:-litellm}
+      - REDIS_HOST=${REDIS_HOST:-redis}
+      - REDIS_PORT=${REDIS_PORT:-6379}
+      - POSTGRES_USER=${SERVICE_USER_POSTGRES}
+      - POSTGRES_PASSWORD=${SERVICE_PASSWORD_POSTGRES}
+      - POSTGRES_DB=${POSTGRES_DB:-litellm}
+      - OPENAI_API_KEY=${OPENAI_API_KEY}
+      - OPENAI_API_BASE=${OPENAI_API_BASE}
+      - ANTHROPIC_API_KEY=${ANTHROPIC_API_KEY}
+      - ANTHROPIC_API_BASE=${ANTHROPIC_API_BASE}
+      - VOYAGE_API_KEY=${VOYAGE_API_KEY}
+      - VOYAGE_API_BASE=${VOYAGE_API_BASE}
     volumes:
       - type: bind
         source: ./litellm-config.yaml
@@ -154,7 +147,7 @@ services:
       - POSTGRES_PASSWORD=$SERVICE_PASSWORD_POSTGRES
       - POSTGRES_USER=$SERVICE_USER_POSTGRES
     volumes:
-      - "pg_data:/var/lib/postgresql/data"
+      - "pg-data:/var/lib/postgresql/data"
     healthcheck:
       test:
         - CMD-SHELL
@@ -166,7 +159,7 @@ services:
     image: redis:7-alpine
     command: redis-server --appendonly yes
     volumes:
-      - redis_data:/data
+      - redis-data:/data
     healthcheck:
       test: ["CMD", "redis-cli", "ping"]
       interval: 5s
diff --git a/templates/compose/prefect.yaml b/templates/compose/prefect.yaml
@@ -4,25 +4,19 @@
 # logo: svgs/prefect.png
 # port: 4200
 
-version: "3"
-
-volumes:
-  pg_data:
-
 services:
   prefect:
     image: "prefecthq/prefect:3-latest"
-    restart: always
     depends_on:
       postgresql:
         condition: service_healthy
     environment:
       - SERVICE_FQDN_PREFECT_4200
       - PREFECT_API_DATABASE_CONNECTION_URL=postgresql+asyncpg://${SERVICE_USER_POSTGRES}:${SERVICE_PASSWORD_POSTGRES}@postgresql:5432/${POSTGRES_DB:-prefect}
       - PREFECT_API_KEY=${SERVICE_PASSWORD_APIKEY}
-      - PREFECT_EXPERIMENTAL_WARN=true
-      - PREFECT_EXPERIMENTAL_ENABLE_SCHEDULE_CONCURRENCY=true
-      - PREFECT_RUNNER_SERVER_ENABLE=true
+      - PREFECT_EXPERIMENTAL_WARN=${PREFECT_EXPERIMENTAL_WARN:-false}
+      - PREFECT_EXPERIMENTAL_ENABLE_SCHEDULE_CONCURRENCY=${PREFECT_EXPERIMENTAL_ENABLE_SCHEDULE_CONCURRENCY:-false}
+      - PREFECT_RUNNER_SERVER_ENABLE=${PREFECT_RUNNER_SERVER_ENABLE:-false}
       - PREFECT_DEFAULT_WORK_POOL_NAME=${DEFAULT_POOL_NAME:-default}
     command:
       - prefect
@@ -43,9 +37,8 @@ services:
       retries: 3
   postgresql:
     image: "postgres:16-alpine"
-    restart: always
     volumes:
-      - "pg_data:/var/lib/postgresql/data"
+      - "pg-data:/var/lib/postgresql/data"
     environment:
       - POSTGRES_USER=$SERVICE_USER_POSTGRES
       - POSTGRES_PASSWORD=$SERVICE_PASSWORD_POSTGRES
@@ -59,7 +52,6 @@ services:
       retries: 3
   agent:
     image: "prefecthq/prefect:3-python3.12"
-    restart: always
     depends_on:
       prefect:
         condition: service_healthy
@@ -68,10 +60,10 @@ services:
       - prefect
       - worker
       - start
-      - "--pool=$${DEFAULT_POOL_NAME}"
-      - "--with-healthcheck"
-      - "--name=$${DEFAULT_WORKER_NAME}"
-      - "--limit=$${DEFAULT_POOL_LIMIT}"
+      - --pool=${DEFAULT_POOL_NAME}
+      - --with-healthcheck
+      - --name=${DEFAULT_WORKER_NAME}
+      - --limit=${DEFAULT_POOL_LIMIT}
     environment:
       - PREFECT_API_URL=http://prefect:4200/api
       - PREFECT_API_KEY=${SERVICE_PASSWORD_APIKEY}
diff --git a/templates/compose/qdrant.yaml b/templates/compose/qdrant.yaml
@@ -4,20 +4,14 @@
 # logo: svgs/qdrant.png
 # port: 6333
 
-version: "3"
-
-volumes:
-  qdrant_storage: null
-
 services:
   qdrant:
     image: "qdrant/qdrant:latest"
-    restart: always
     environment:
       - SERVICE_FQDN_QDRANT_6333
       - QDRANT__SERVICE__API_KEY=${SERVICE_PASSWORD_QDRANTAPIKEY}
     volumes:
-      - "qdrant_storage:/qdrant/storage"
+      - "qdrant-storage:/qdrant/storage"
     healthcheck:
       test:
         - CMD-SHELL
diff --git a/templates/compose/searxng.yaml b/templates/compose/searxng.yaml
@@ -4,24 +4,18 @@
 # logo: svgs/searxng.svg
 # port: 8080
 
-version: "3"
-
-volumes:
-  redis_data: null
-
 services:
   searxng:
     image: searxng/searxng
-    restart: always
     depends_on:
       redis:
         condition: service_healthy
     environment:
       - SERVICE_FQDN_SEARXNG_8080
-      - INSTANCE_NAME=coolify
+      - INSTANCE_NAME=${INSTANCE_NAME:-coolify}
       - BASE_URL=${SERVICE_FQDN_SEARXNG_8080}
       - SEARXNG_URL=${SERVICE_FQDN_SEARXNG_8080}
-      - SEARXNG_BIND_ADDRESS=0.0.0.0
+      - SEARXNG_BIND_ADDRESS=${SEARXNG_BIND_ADDRESS:-0.0.0.0}
       - SEARXNG_SECRET=${SERVICE_PASSWORD_SEARXNGSECRET}
       - SEARXNG_REDIS_URL=redis://redis:6379/0
     healthcheck:
@@ -67,7 +61,7 @@ services:
     image: "redis:7"
     restart: always
     volumes:
-      - "redis_data:/data"
+      - "redis-data:/data"
     healthcheck:
       test:
         - CMD
diff --git a/templates/service-templates.json b/templates/service-templates.json

Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ private function process_file($file)`
`78`	`78`	`if ($logo->count() > 0) {`
`79`	`79`	`$logo = str($logo[0])->after('# logo:')->trim()->value();`
`80`	`80`	`} else {`
`81`		`- $logo = 'svgs/unknown.svg';`
	`81`	`+ $logo = 'svgs/coolify.png';`
`82`	`82`	`}`
`83`	`83`	`$minversion = collect(preg_grep('/^# minversion:/', explode("\n", $content)))->values();`
`84`	`84`	`if ($minversion->count() > 0) {`
Original file line number	Diff line number	Diff line change
`@@ -94,10 +94,10 @@ public function loadServices2()`
`94`	`94`	`{`
`95`	`95`	`$services = get_service_templates(true);`
`96`	`96`	`$services = collect($services)->map(function ($service, $key) {`
`97`		`- return array_merge($service, [`
	`97`	`+ return [`
`98`	`98`	`'name' => str($key)->headline(),`
`99`		`- 'logo' => asset($service['logo']),`
`100`		`- ]);`
	`99`	`+ 'logo' => asset(data_get($service, 'logo', 'svgs/unknown.svg')),`
	`100`	`+ ] + (array) $service;`
`101`	`101`	`})->all();`
`102`	`102`	`$gitBasedApplications = [`
`103`	`103`	`[`
`@@ -256,6 +256,7 @@ public function instantSave()`
`256`	`256`
`257`	`257`	`public function setType(string $type)`
`258`	`258`	`{`
	`259`	`+ $type = str($type)->lower()->value();`
`259`	`260`	`if ($this->loading) {`
`260`	`261`	`return;`
`261`	`262`	`}`