From 62da6173e28e24c1a329ad577289c7c8e366eaa3 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Wed, 17 May 2023 09:26:50 +0200
Subject: [PATCH] wip

---
 resources/css/app.css                         |  6 +++-
 .../components/applications/navbar.blade.php  |  2 +-
 .../project/application/source.blade.php      | 28 +++++++++++--------
 .../application/configuration.blade.php       |  2 +-
 .../project/application/deployment.blade.php  |  2 +-
 .../project/application/deployments.blade.php |  2 +-
 6 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/resources/css/app.css b/resources/css/app.css
index 0602337f0..a3ab821b3 100644
--- a/resources/css/app.css
+++ b/resources/css/app.css
@@ -11,7 +11,11 @@ label {
 }
 input,
 textarea {
-    @apply border border-solid border-coolgray-500 bg-coolgray-200 rounded p-2 px-4  text-white disabled:text-neutral-600 read-only:text-neutral-600 read-only:select-none outline-none focus:bg-coolgray-200/50 transition-all hover:bg-coolgray-200/50;
+    @apply border border-solid border-coolgray-500 bg-coolgray-200 rounded p-2 px-4 text-white outline-none transition-all;
+}
+input,
+textarea {
+    @apply disabled:text-neutral-600 read-only:text-neutral-600 read-only:select-none read-only:bg-coolgray-200/50;
 }
 select {
     @apply border border-solid border-coolgray-400 rounded p-2 px-4 bg-coolgray-200 text-white disabled:text-neutral-600 read-only:select-none outline-none;
diff --git a/resources/views/components/applications/navbar.blade.php b/resources/views/components/applications/navbar.blade.php
index a6ac7f856..42db03bc5 100644
--- a/resources/views/components/applications/navbar.blade.php
+++ b/resources/views/components/applications/navbar.blade.php
@@ -15,7 +15,7 @@
         ]) }}">
         Deployments
     </a>
-    <a target="_blank" href="{{ $gitBranchLocation }}">
+    <a target="_blank" href="{{ $application->gitBranchLocation }}">
         Open on Git <img class="inline-flex w-4 h-4" src="{{ Vite::asset('public/svgs/external-link.svg') }}">
     </a>
     @if (data_get($application, 'ports_mappings_array'))
diff --git a/resources/views/livewire/project/application/source.blade.php b/resources/views/livewire/project/application/source.blade.php
index 14e7b901e..31462ddbe 100644
--- a/resources/views/livewire/project/application/source.blade.php
+++ b/resources/views/livewire/project/application/source.blade.php
@@ -1,16 +1,20 @@
 <div>
     <h3>Source</h3>
-    <p>Source Name: {{ data_get($application, 'source.name') }}</p>
-    <p>Is Public Source: {{ data_get($application, 'source.is_public') }}</p>
-    <div class="flex flex-col w-96">
-        <x-inputs.input id="application.git_repository" label="Git Repository" readonly />
-        <x-inputs.input id="application.git_branch" label="Git Branch" readonly />
-        <form wire:submit.prevent='submit'>
-            <x-inputs.input id="application.git_commit_sha" placeholder="HEAD" label="Git Commit SHA" />
-            <x-inputs.button type="submit">Save</x-inputs.button>
-        </form>
-        <a target="_blank" href="{{ $application->gitCommits }}">
-            <x-inputs.button>Commits ↗️</x-inputs.button>
-        </a>
+    <div class="pb-8">{{ data_get($application, 'source.name') }}
+        @if (data_get($application, 'source.is_public'))
+            <span class="text-xs">public</span>
+        @endif
     </div>
+    <form wire:submit.prevent='submit' class="flex flex-col gap-2 w-max-fit">
+        <x-inputs.input id="application.git_repository" label="Repository" readonly />
+        <x-inputs.input id="application.git_branch" label=" Branch" readonly />
+        <x-inputs.input id="application.git_commit_sha" placeholder="HEAD" label="Commit SHA" />
+        <div>
+            <x-inputs.button type="submit">Save</x-inputs.button>
+            <a target="_blank" href="{{ $application->gitCommits }}">
+                Commits <img class="inline-flex w-4 h-4" src="{{ Vite::asset('public/svgs/external-link.svg') }}">
+            </a>
+        </div>
+    </form>
+
 </div>
diff --git a/resources/views/project/application/configuration.blade.php b/resources/views/project/application/configuration.blade.php
index 0dde49534..bcececbed 100644
--- a/resources/views/project/application/configuration.blade.php
+++ b/resources/views/project/application/configuration.blade.php
@@ -1,5 +1,5 @@
 <x-layout>
-    <x-applications.navbar :application="$application" :gitBranchLocation="$application->gitBranchLocation" />
+    <x-applications.navbar :application="$application" />
     <h1 class="py-10">Configuration</h1>
     <div x-data="{ activeTab: window.location.hash ? window.location.hash.substring(1) : 'general' }" class="flex pt-6">
         <div class="flex flex-col min-w-fit">
diff --git a/resources/views/project/application/deployment.blade.php b/resources/views/project/application/deployment.blade.php
index 7e2b4b200..f10fd38f7 100644
--- a/resources/views/project/application/deployment.blade.php
+++ b/resources/views/project/application/deployment.blade.php
@@ -1,5 +1,5 @@
 <x-layout>
-    <x-applications.navbar :applicationId="$application->id" :gitBranchLocation="$application->gitBranchLocation" />
+    <x-applications.navbar :application="$application" />
     <h1 class="py-10">Deployment</h1>
     <livewire:project.application.poll-deployment :activity="$activity" :deployment_uuid="$deployment_uuid" />
 </x-layout>
diff --git a/resources/views/project/application/deployments.blade.php b/resources/views/project/application/deployments.blade.php
index a54266725..c4842d4db 100644
--- a/resources/views/project/application/deployments.blade.php
+++ b/resources/views/project/application/deployments.blade.php
@@ -1,5 +1,5 @@
 <x-layout>
-    <x-applications.navbar :application="$application" :gitBranchLocation="$application->gitBranchLocation" />
+    <x-applications.navbar :application="$application" />
     <h1 class="py-10">Deployments</h1>
     <div class="pt-2">
         @forelse ($deployments as $deployment)