From 64101b3b0657711b8d032b2229bec8a08f9c7f61 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Wed, 24 May 2023 15:47:04 +0200
Subject: [PATCH] fixes

---
 .../Project/New/PublicGitRepository.php       |  2 +-
 bootstrap/helpers/shared.php                  |  5 ++++
 resources/views/components/navbar.blade.php   |  4 ++--
 .../project/application/deployment.blade.php  |  1 +
 resources/views/projects.blade.php            | 23 +++++++++++++------
 resources/views/servers.blade.php             |  9 +++++++-
 6 files changed, 33 insertions(+), 11 deletions(-)

diff --git a/app/Http/Livewire/Project/New/PublicGitRepository.php b/app/Http/Livewire/Project/New/PublicGitRepository.php
index 782c75998..2b68f24e2 100644
--- a/app/Http/Livewire/Project/New/PublicGitRepository.php
+++ b/app/Http/Livewire/Project/New/PublicGitRepository.php
@@ -78,7 +78,7 @@ public function submit()
 
 
             $application_init = [
-                'name' => generate_random_name(),
+                'name' => generate_application_name($git_repository, $git_branch),
                 'git_repository' => $git_repository,
                 'git_branch' => $git_branch,
                 'build_pack' => 'nixpacks',
diff --git a/bootstrap/helpers/shared.php b/bootstrap/helpers/shared.php
index 471ce2471..57fa14c27 100644
--- a/bootstrap/helpers/shared.php
+++ b/bootstrap/helpers/shared.php
@@ -52,3 +52,8 @@ function generate_random_name()
     $cuid = new Cuid2(7);
     return Str::kebab("{$generator->getName()}-{$cuid}");
 }
+function generate_application_name(string $git_repository, string $git_branch)
+{
+    $cuid = new Cuid2(7);
+    return Str::kebab("{$git_repository}:{$git_branch}-{$cuid}");
+}
diff --git a/resources/views/components/navbar.blade.php b/resources/views/components/navbar.blade.php
index 4b7a3de3d..e49bf3c41 100644
--- a/resources/views/components/navbar.blade.php
+++ b/resources/views/components/navbar.blade.php
@@ -13,7 +13,7 @@
 
             <li class="{{ request()->is('project/*') || request()->is('projects') ? 'text-warning' : '' }}"
                 title="Projects">
-                <a @if (!request()->is('project/*')) href="/projects" @endif>
+                <a @if (!request()->is('projects')) href="/projects" @endif>
                     <svg xmlns="http://www.w3.org/2000/svg" class="icon" viewBox="0 0 24 24" stroke-width="1.5"
                         stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round">
                         <path stroke="none" d="M0 0h24v24H0z" fill="none" />
@@ -25,7 +25,7 @@
             </li>
 
             <li class="{{ request()->is('server/*') || request()->is('servers') ? 'text-warning' : '' }}" title="Servers">
-                <a @if (!request()->is('server/*')) href="/servers" @endif>
+                <a @if (!request()->is('servers')) href="/servers" @endif>
                     <svg xmlns="http://www.w3.org/2000/svg" class="icon" viewBox="0 0 24 24" stroke-width="1.5"
                         stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round">
                         <path stroke="none" d="M0 0h24v24H0z" fill="none" />
diff --git a/resources/views/project/application/deployment.blade.php b/resources/views/project/application/deployment.blade.php
index dc7352153..208122b3c 100644
--- a/resources/views/project/application/deployment.blade.php
+++ b/resources/views/project/application/deployment.blade.php
@@ -12,5 +12,6 @@
         </ul>
     </div>
     <x-applications.navbar :application="$application" />
+    <div class="pt-2 text-sm">{{ data_get($activity, 'properties.status') }}</div>
     <livewire:project.application.deployment-logs :activity="$activity" :deployment_uuid="$deployment_uuid" />
 </x-layout>
diff --git a/resources/views/projects.blade.php b/resources/views/projects.blade.php
index 753a99e4a..62b86d101 100644
--- a/resources/views/projects.blade.php
+++ b/resources/views/projects.blade.php
@@ -1,9 +1,18 @@
 <x-layout>
-    <h1>Projects</h1>
-    @forelse ($projects as $project)
-        <a href="{{ route('project.show', ['project_uuid' => data_get($project, 'uuid')]) }}"
-            class="box">{{ $project->name }}</a>
-    @empty
-        No project found.
-    @endforelse
+    <h1 class="py-0">Projects</h1>
+    <div class="pb-10 text-sm breadcrumbs">
+        <ul>
+            <li>
+                All Projects
+            </li>
+        </ul>
+    </div>
+    <div class="flex flex-col gap-2">
+        @forelse ($projects as $project)
+            <a href="{{ route('project.show', ['project_uuid' => data_get($project, 'uuid')]) }}"
+                class="box">{{ $project->name }}</a>
+        @empty
+            No project found.
+        @endforelse
+    </div>
 </x-layout>
diff --git a/resources/views/servers.blade.php b/resources/views/servers.blade.php
index 13008fca6..5b0cd7c1a 100644
--- a/resources/views/servers.blade.php
+++ b/resources/views/servers.blade.php
@@ -1,5 +1,12 @@
 <x-layout>
-    <h1>Servers</h1>
+    <h1 class="py-0">Servers</h1>
+    <div class="pb-10 text-sm breadcrumbs">
+        <ul>
+            <li>
+                All Servers
+            </li>
+        </ul>
+    </div>
     @forelse ($servers as $server)
         <a href="{{ route('server.show', ['server_uuid' => data_get($server, 'uuid')]) }}"
             class="box">{{ $server->name }}</a>