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

uiuiuiui

Browse Source
This commit is contained in:
Andras Bacsai
2024-03-25 19:07:59 +01:00
parent fc9bb7dac6
commit 5a631df2a2
23 changed files with 86 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
resources/views/livewire/activity-monitor.blade.php
View File

@@ -10,7 +10,7 @@
</div>
@endif
<div
class="flex flex-col-reverse w-full px-4 py-2 overflow-y-auto dark:text-white border border-solid rounded bg-coolgray-100 scrollbar border-coolgray-300 max-h-96">
class="flex flex-col-reverse w-full px-4 py-2 overflow-y-auto bg-white border border-solid rounded dark:text-white dark:bg-coolgray-100 scrollbar border-neutral-300 dark:border-coolgray-300 max-h-96">
<pre class="font-mono whitespace-pre-wrap" @if ($isPollingActive) wire:poll.1000ms="polling" @endif>{{ RunRemoteProcess::decodeOutput($this->activity) }}</pre>
</div>
@else

2
resources/views/livewire/profile/index.blade.php
View File

@@ -18,8 +18,10 @@
</div>
<div class="flex flex-col gap-2">
<x-forms.input id="current_password" label="Current Password" required type="password" />
<div class="flex gap-2">
<x-forms.input id="new_password" label="New Password" required type="password" />
<x-forms.input id="new_password_confirmation" label="New Password Again" required type="password" />
</div>
</div>
</form>
<h2 class="py-4">Two-factor Authentication</h2>

6
resources/views/livewire/project/application/general.blade.php
View File

@@ -51,7 +51,7 @@
helper="WARNING: Advanced use cases only. Your docker compose file will be deployed as-is. Nothing is modified by Coolify. You need to configure the proxy parts. More info in the <a href='https://coolify.io/docs/docker/compose#raw-docker-compose-deployment'>documentation.</a>" />
</div>
@if (count($parsedServices) > 0 && !$application->settings->is_raw_compose_deployment_enabled)
<h3>Domains</h3>
<h3>Domains</h3>
@foreach (data_get($parsedServices, 'services') as $serviceName => $service)
@if (!isDatabaseImage(data_get($service, 'image')))
<div class="flex items-end gap-2">
@@ -78,13 +78,13 @@
</x-forms.button>
</div>
@endif
@if ($application->build_pack !== 'dockercompose')
<div class="flex items-center gap-2 pt-8">
<h3>Docker Registry</h3>
@if ($application->build_pack !== 'dockerimage' && !$application->destination->server->isSwarm())
<x-helper
helper='Push the built image to a docker registry. More info <a class="underline"
href="https://coolify.io/docs/docker/registry" target="_blank">here</a>' />
helper="Push the built image to a docker registry. More info <a class='underline' href='https://coolify.io/docs/docker/registry' target='_blank'>here</a>." />
@endif
</div>
@if ($application->destination->server->isSwarm())

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

@@ -9,7 +9,7 @@
<div class="flex flex-wrap">
@forelse ($images as $image)
<div class="w-2/4 p-2">
<div class="rounded shadow-lg bg-coolgray-100">
<div class="bg-white border rounded dark:border-bg-black dark:bg-coolgray-100">
<div class="p-2">
<div class="">
@if (data_get($image, 'is_current'))

2
resources/views/livewire/project/environment-edit.blade.php
View File

@@ -48,7 +48,7 @@
<livewire:project.shared.environment-variable.add />
</x-modal-input>
</div>
<div class="flex items-center gap-2 pb-4">You can use these variables anywhere with <span class="dark:text-warning">@{{environment.VARIABLENAME}}</span><x-helper
<div class="flex items-center gap-2 pb-4">You can use these variables anywhere with <span class="dark:text-warning text-coollabs">@{{environment.VARIABLENAME}}</span><x-helper
helper="More info <a class='underline dark:text-white' href='https://coolify.io/docs/environment-variables#shared-variables' target='_blank'>here</a>."></x-helper>
</div>
<div class="flex flex-col gap-2">

2
resources/views/livewire/project/index.blade.php
View File

@@ -10,7 +10,7 @@
@forelse ($projects as $project)
<div class="box group" x-data
x-on:click="goto('{{ $project->uuid }}')">
<a class="flex flex-col flex-1 mx-6 hover:no-underline"
<a class="flex flex-col justify-center flex-1 mx-6"
href="{{ route('project.show', ['project_uuid' => data_get($project, 'uuid')]) }}">
<div class="box-title">{{ $project->name }}</div>
<div class="box-description ">

12
resources/views/livewire/project/new/docker-compose.blade.php
View File

@@ -6,16 +6,7 @@
<h2>Docker Compose</h2>
<x-forms.button type="submit">Save</x-forms.button>
</div>
<x-forms.textarea label="Docker Compose file"
helper="
You can use these variables in your Docker Compose file and Coolify will generate default values or replace them with the values you set on the UI forms.<br>
<br>
- SERVICE_FQDN_*: FQDN - could be changeable from the UI. (example: SERVICE_FQDN_GHOST)<br>
- SERVICE_URL_*: URL parsed from FQDN - could be changeable from the UI. (example: SERVICE_URL_GHOST)<br>
- SERVICE_BASE64_64_*: Generated 'base64' string with length of '64' (example: SERVICE_BASE64_64_GHOST, to generate 32 bit: SERVICE_BASE64_32_GHOST)<br>
- SERVICE_USER_*: Generated user (example: SERVICE_USER_MYSQL)<br>
- SERVICE_PASSWORD_*: Generated password (example: SERVICE_PASSWORD_MYSQL)<br>"
rows="20" id="dockerComposeRaw"
<x-forms.textarea label="Docker Compose file" rows="20" id="dockerComposeRaw"
placeholder='services:
ghost:
documentation: https://ghost.org/docs/config
@@ -44,6 +35,5 @@
- MYSQL_DATABASE=${MYSQL_DATABASE}
- MYSQL_ROOT_PASSWORD=${SERVICE_PASSWORD_MYSQL_ROOT}
'></x-forms.textarea>
{{-- <x-forms.textarea label="Environment File" rows="20" id="envFile"></x-forms.textarea> --}}
</form>
</div>

2
resources/views/livewire/project/shared/destination.blade.php
View File

@@ -3,7 +3,7 @@
<div class="">Server related configurations.</div>
<div class="grid grid-cols-1 gap-4 py-4">
<div class="flex gap-2">
<div class="relative flex flex-col bg-white cursor-default dark:text-white box-without-bg dark:bg-coolgray-100 w-96">
<div class="relative flex flex-col bg-white border cursor-default dark:text-white box-without-bg dark:bg-coolgray-100 w-96 dark:border-black">
<div class="text-xl font-bold">Primary Server</div>
@if (str($resource->realStatus())->startsWith('running'))
<div title="{{ $resource->realStatus() }}" class="absolute bg-success -top-1 -left-1 badge ">

13
resources/views/livewire/project/shared/environment-variable/show.blade.php
View File

@@ -1,5 +1,6 @@
<div>
<form wire:submit='submit' class="flex flex-col items-center gap-4 p-4 border lg:items-start dark:border-coolgray-300">
<form wire:submit='submit'
class="flex flex-col items-center gap-4 p-4 bg-white border lg:items-start dark:border-coolgray-300">
@if ($isLocked)
<div class="flex flex-1 w-full gap-2">
<x-forms.input disabled id="env.key" />
@@ -12,7 +13,7 @@
</svg>
<x-modal-confirmation isErrorButton buttonTitle="Delete">
You will delete environment variable <span
class="font-bold dark:text-warning">{{ $env->key }}</span>.
class="font-bold dark:text-warning text-coollabs">{{ $env->key }}</span>.
</x-modal-confirmation>
</div>
@else
@@ -39,9 +40,15 @@
</div>
@endif
<div class="flex flex-col w-full gap-2 lg:flex-row">
@if ($type !== 'service' && !$isSharedVariable)
@if ($type === 'service')
<x-forms.checkbox instantSave id="env.is_build_time" label="Build Variable?" />
@else
@if ($env->is_shared)
<x-forms.checkbox instantSave id="env.is_build_time" label="Build Variable?" />
@else
<x-forms.checkbox instantSave id="env.is_multiline" label="Is Multiline?" />
<x-forms.checkbox instantSave id="env.is_build_time" label="Build Variable?" />
@endif
@endif
<div class="flex-1"></div>
@if ($isDisabled)

16
resources/views/livewire/project/shared/resource-operations.blade.php
View File

@@ -14,9 +14,9 @@
<x-modal-confirmation action="cloneTo({{ data_get($destination, 'id') }})">
<x:slot name="content">
<div class="box">
<div class="flex flex-col gap-2 ">
<div class="font-bold dark:text-white">{{ $server->name }}</div>
<div>{{ $destination->name }}</div>
<div class="flex flex-col">
<div class="box-title">{{ $server->name }}</div>
<div class="box-description">{{ $destination->name }}</div>
</div>
</div>
</x:slot>
@@ -35,16 +35,16 @@
class="font-bold dark:text-warning">{{ $resource->environment->project->name }} /
{{ $resource->environment->name }}</span> environment.
</div>
<div class="grid gap-4">
<div class="flex flex-wrap gap-2">
@forelse ($projects as $project)
<div class="flex flex-row flex-wrap gap-2">
<div class="flex flex-wrap gap-2">
@foreach ($project->environments as $environment)
<x-modal-confirmation action="moveTo({{ data_get($environment, 'id') }})">
<x:slot name="content">
<div class="box">
<div class="flex flex-col gap-2 ">
<div class="font-bold dark:text-white">{{ $project->name }}</div>
<div><span class="dark:text-warning">{{ $environment->name }}</span> environment
<div class="flex flex-col">
<div class="box-title">{{ $project->name }}</div>
<div class="box-description">environment: {{ $environment->name }}
</div>
</div>
</div>

2
resources/views/livewire/server/index.blade.php
View File

@@ -18,7 +18,7 @@
'border-red-500' =>
!$server->settings->is_reachable || $server->settings->force_disabled,
])>
<div class="flex flex-col mx-6">
<div class="flex flex-col justify-center mx-6">
<div class="font-bold dark:text-white">
{{ $server->name }}
</div>

2
resources/views/livewire/team-shared-variables-index.blade.php
View File

@@ -7,7 +7,7 @@
</x-modal-input>
</div>
<div class="flex items-center gap-2 pb-4">You can use these variables anywhere with <span
class="dark:text-warning">@{{ team.VARIABLENAME }}</span> <x-helper
class="dark:text-warning text-coollabs">@{{ team.VARIABLENAME }}</span> <x-helper
helper="More info <a class='underline dark:text-white' href='https://coolify.io/docs/environment-variables#shared-variables' target='_blank'>here</a>."></x-helper>
</div>

4
resources/views/livewire/team/member.blade.php
View File

@@ -1,6 +1,6 @@
<tr @class([
'dark:text-white bg-coolblack hover:bg-coolgray-100',
'bg-coolgray-100' => $member->id == auth()->user()->id,
'dark:text-white text-black dark:bg-coolblack dark:hover:bg-coolgray-100',
'dark:bg-coolgray-100 bg-neutral-200' => $member->id == auth()->user()->id,
])>
<td class="px-5 py-4 text-sm whitespace-nowrap">
{{ $member->name }}

4
resources/views/livewire/team/member/index.blade.php
View File

@@ -7,7 +7,7 @@
<div class="overflow-x-auto">
<div class="inline-block min-w-full">
<div class="overflow-hidden">
<table class="min-w-full divide-y divide-coolgray-400">
<table class="min-w-full divide-y dark:divide-coolgray-400 divide-neutral-400">
<thead>
<tr>
<th class="px-5 py-3 text-xs font-medium text-left uppercase">Name
@@ -17,7 +17,7 @@
<th class="px-5 py-3 text-xs font-medium text-left uppercase">Actions</th>
</tr>
</thead>
<tbody class="divide-y divide-coolgray-400">
<tbody class="divide-y dark:divide-coolgray-400 divide-neutral-200">
@foreach (currentTeam()->members as $member)
<livewire:team.member :member="$member" :wire:key="$member->id" />
@endforeach