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

fix: local dev s3 uploads

Browse Source 
fix: hetzner s3 uploads (mc alias instead of mc host)
This commit is contained in:
Andras Bacsai
2024-10-02 11:45:30 +02:00
parent 2be2f0ac79
commit dd782e75f5
6 changed files with 50 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
resources/views/components/modal-confirmation.blade.php
View File

@@ -296,9 +296,8 @@
</template>
<template x-if="step === 1">
@if(isDev() && $submitAction === 'delete')
<x-forms.button class="w-auto" isError
@click="$wire.delete('hello')">
@if(isDev() && str($submitAction)->contains('delete'))
<x-forms.button class="w-auto" isError wire:click="{{ $submitAction }}('hello')">
<span x-text="step3ButtonText"></span>
</x-forms.button>
@else
@@ -309,7 +308,7 @@
</template>
<template x-if="step === 2">
<x-forms.button x-bind:disabled="confirmationText !== '' && confirmWithText && userConfirmationText !== confirmationText"
<x-forms.button x-bind:disabled="confirmationText !== '' && userConfirmationText !== confirmationText"
class="w-auto" isError
@click="
if (dispatchEvent) {

19
resources/views/livewire/project/database/backup-executions.blade.php
View File

@@ -45,20 +45,11 @@
<x-forms.button class="dark:hover:bg-coolgray-400"
x-on:click="download_file('{{ data_get($execution, 'id') }}')">Download</x-forms.button>
@endif
<x-modal-confirmation
title="Confirm Backup Deletion?"
buttonTitle="Delete"
isErrorButton
submitAction="deleteBackup({{ data_get($execution, 'id') }})"
{{-- :checkboxes="$checkboxes" --}}
:actions="[
'This backup will be permanently deleted from local storage.'
]"
confirmationText="{{ data_get($execution, 'filename') }}"
confirmationLabel="Please confirm the execution of the actions by entering the Backup Filename below"
shortConfirmationLabel="Backup Filename"
step3ButtonText="Permanently Delete"
/>
<x-modal-confirmation title="Confirm Backup Deletion?" buttonTitle="Delete" isErrorButton
submitAction="deleteBackup({{ data_get($execution, 'id') }})"
:actions="['This backup will be permanently deleted from local storage.']" confirmationText="{{ data_get($execution, 'filename') }}"
confirmationLabel="Please confirm the execution of the actions by entering the Backup Filename below"
shortConfirmationLabel="Backup Filename" step3ButtonText="Permanently Delete" />
</div>
</div>
@empty

20
resources/views/livewire/project/database/create-scheduled-backup.blade.php
View File

@@ -2,16 +2,18 @@
<x-forms.input placeholder="0 0 * * * or daily" id="frequency"
helper="You can use every_minute, hourly, daily, weekly, monthly, yearly or a cron expression." label="Frequency"
required />
<x-forms.checkbox id="save_s3" label="Save to S3" />
<x-forms.select id="selected_storage_id">
@if ($s3s->count() === 0)
<option value="0">No S3 Storages found.</option>
@else
@foreach ($s3s as $s3)
<option value="{{ $s3->id }}">{{ $s3->name }}</option>
@endforeach
@if ($s3s->count() === 0)
<div class="text-red-500">No validated S3 Storages found.</div>
@else
<x-forms.checkbox wire:model.live="save_s3" label="Save to S3" />
@if ($save_s3)
<x-forms.select id="selected_storage_id" label="Select a validated S3 storage">
@foreach ($s3s as $s3)
<option value="{{ $s3->id }}">{{ $s3->name }}</option>
@endforeach
</x-forms.select>
@endif
</x-forms.select>
@endif
<x-forms.button type="submit" @click="modalOpen=false">
Save
</x-forms.button>