dave/coolify
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #4754 from coollabsio/improve-git-and-service-provider

Browse Source 
Improves: GitHub handling, AppServiceProvider and 500 error message rendering
This commit is contained in:
Andras Bacsai
2025-01-16 21:09:08 +01:00
committed by GitHub
parent f997872738 dd897a11fd
commit 3c83c7fd6c
13 changed files with 393 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
resources/views/errors/500.blade.php
View File

@@ -1,20 +1,20 @@
@extends('layouts.base')
<div class="flex flex-col items-center justify-center h-full">
<div>
<p class="font-mono font-semibold text-red-500 text-7xl">500</p>
<h1 class="mt-4 font-bold tracking-tight dark:text-white">Wait, this is not cool...</h1>
<p class="text-base leading-7 text-neutral-300">There has been an error, we are working on it.
</p>
<div class="flex items-center justify-center min-h-screen">
<div class="w-full max-w-3xl px-8">
<p class="font-mono font-semibold text-red-500 text-[200px] leading-none">500</p>
<h1 class="text-3xl font-bold tracking-tight dark:text-white">Wait, this is not cool...</h1>
<p class="mt-2 text-lg leading-7 text-neutral-300">There has been an error with the following error message:</p>
@if ($exception->getMessage() !== '')
<code class="mt-6 text-xs text-left text-red-500">Error: {{ $exception->getMessage() }}
</code>
<div class="mt-6 text-sm text-red-500">
{!! Purify::clean($exception->getMessage()) !!}
</div>
@endif
<div class="flex items-center mt-10 gap-x-6">
<div class="flex items-center mt-10 gap-6">
<a href="/">
<x-forms.button>Go back home</x-forms.button>
</a>
<a target="_blank" class="text-xs" href="{{ config('constants.urls.contact') }}">Contact
support
<a target="_blank" class="text-sm hover:text-neutral-300 flex items-center gap-1" href="{{ config('constants.urls.contact') }}">
Contact support
<x-external-link />
</a>
</div>

2
resources/views/livewire/project/application/source.blade.php
View File

@@ -10,7 +10,7 @@
</x-forms.button>
</a>
@if (data_get($application, 'source.is_public') === false)
<a target="_blank" class="hover:no-underline" href="{{ get_installation_path($application->source) }}">
<a target="_blank" class="hover:no-underline" href="{{ getInstallationPath($application->source) }}">
<x-forms.button>
Open Git App
<x-external-link />

2
resources/views/livewire/project/new/github-private-repository.blade.php
View File

@@ -5,7 +5,7 @@
<livewire:source.github.create />
</x-modal-input>
@if ($repositories->count() > 0)
<a target="_blank" class="flex hover:no-underline" href="{{ get_installation_path($github_app) }}">
<a target="_blank" class="flex hover:no-underline" href="{{ getInstallationPath($github_app) }}">
<x-forms.button>
Change Repositories on GitHub
<x-external-link />

6
resources/views/livewire/source/github/change.blade.php
View File

@@ -6,7 +6,7 @@
<div class="flex gap-2">
@if (data_get($github_app, 'installation_id'))
<x-forms.button type="submit">Save</x-forms.button>
<a href="{{ get_installation_path($github_app) }}">
<a href="{{ getInstallationPath($github_app) }}">
<x-forms.button>
Update Repositories
<x-external-link />
@@ -52,7 +52,7 @@
</svg>
<span>You must complete this step before you can use this source!</span>
</div>
<a class="items-center justify-center box" href="{{ get_installation_path($github_app) }}">
<a class="items-center justify-center box" href="{{ getInstallationPath($github_app) }}">
Install Repositories on GitHub
</a>
@else
@@ -106,7 +106,7 @@
<div class="flex items-end gap-2 ">
<h2 class="pt-4">Permissions</h2>
<x-forms.button wire:click.prevent="checkPermissions">Refetch</x-forms.button>
<a href="{{ get_permissions_path($github_app) }}">
<a href="{{ getPermissionsPath($github_app) }}">
<x-forms.button>
Update
<x-external-link />