Merge pull request #4238 from peaklabs-dev/dep-and-remove-unused-stuff

Chore: Remove unused stuff, update dependecies
2024-11-14 12:31:09 +01:00
parent bf6222e5a0 552f563162
commit c9f7863fff
80 changed files with 2768 additions and 2733 deletions
--- a/resources/css/app.css
+++ b/resources/css/app.css
@@ -4,8 +4,6 @@
@tailwind components;
@tailwind utilities;

-
-
 html,
 body {
    @apply h-full bg-neutral-50 text-neutral-800 dark:bg-base dark:text-neutral-400;
@@ -172,10 +170,6 @@ section {
    @apply bg-error;
 }

-/* [type='checkbox']:checked {
-    background-image: url("data:image/svg+xml,%3csvg viewBox='0 0 16 16' fill='black' xmlns='http://www.w3.org/2000/svg'%3e%3cpath d='M12.207 4.793a1 1 0 010 1.414l-5 5a1 1 0 01-1.414 0l-2-2a1 1 0 011.414-1.414L6.5 9.086l4.293-4.293a1 1 0 011.414 0z'/%3e%3c/svg%3e");
-} */
-
 .menu {
    @apply flex items-center gap-1;
 }
@@ -197,7 +191,7 @@ section {
 }

 .scrollbar {
-    @apply scrollbar-thumb-coollabs-100 dark:scrollbar-track-coolgray-200 scrollbar-track-neutral-200 scrollbar-w-2;
+    @apply scrollbar-thumb-coollabs-100 dark:scrollbar-track-coolgray-200 scrollbar-track-neutral-200 scrollbar-thin;
 }

 .main {
--- a/resources/js/bootstrap.js
+++ b/resources/js/bootstrap.js
@@ -1,32 +0,0 @@
-/**
- * We'll load the axios HTTP library which allows us to easily issue requests
- * to our Laravel back-end. This library automatically handles sending the
- * CSRF token as a header based on the value of the "XSRF" token cookie.
- */
-
-// import axios from 'axios';
-// window.axios = axios;
-
-// window.axios.defaults.headers.common['X-Requested-With'] = 'XMLHttpRequest';
-
-/**
- * Echo exposes an expressive API for subscribing to channels and listening
- * for events that are broadcast by Laravel. Echo and event broadcasting
- * allows your team to easily build robust real-time web applications.
- */
-
-// import Echo from 'laravel-echo';
-
-// import Pusher from 'pusher-js';
-// window.Pusher = Pusher;
-
-// window.Echo = new Echo({
-//     broadcaster: 'pusher',
-//     key: import.meta.env.VITE_PUSHER_APP_KEY,
-//     cluster: import.meta.env.VITE_PUSHER_APP_CLUSTER ?? 'mt1',
-//     wsHost: import.meta.env.VITE_PUSHER_HOST ? import.meta.env.VITE_PUSHER_HOST : `ws-${import.meta.env.VITE_PUSHER_APP_CLUSTER}.pusher.com`,
-//     wsPort: import.meta.env.VITE_PUSHER_PORT ?? 80,
-//     wssPort: import.meta.env.VITE_PUSHER_PORT ?? 443,
-//     forceTLS: (import.meta.env.VITE_PUSHER_SCHEME ?? 'https') === 'https',
-//     enabledTransports: ['ws', 'wss'],
-// });
--- a/resources/views/auth/forgot-password.blade.php
+++ b/resources/views/auth/forgot-password.blade.php
@@ -18,7 +18,7 @@
                @else
                    <div>Transactional emails are not active on this instance.</div>
                    <div>See how to set it in our <a class="dark:text-white" target="_blank"
-                            href="{{ config('constants.docs.base_url') }}">docs</a>, or how to
+                            href="{{ config('constants.urls.docs') }}">docs</a>, or how to
                        manually reset password.
                    </div>
                @endif
--- a/resources/views/components/modal-confirmation.blade.php
+++ b/resources/views/components/modal-confirmation.blade.php
@@ -28,7 +28,7 @@
    $disableTwoStepConfirmation = data_get(InstanceSettings::get(), 'disable_two_step_confirmation');
@endphp

-<div x-data="{
+<div wire:ignore x-data="{
    modalOpen: false,
    step: {{ empty($checkboxes) ? 2 : 1 }},
    initialStep: {{ empty($checkboxes) ? 2 : 1 }},
@@ -106,8 +106,8 @@
            this.selectedActions.push(id);
        }
    }
-}" @keydown.escape.window="modalOpen = false; resetModal()" :class="{ 'z-40': modalOpen }"
-    class="relative w-auto h-auto">
+}" @keydown.escape.window="modalOpen = false; resetModal()"
+    :class="{ 'z-40': modalOpen }" class="relative w-auto h-auto">
    @if ($customButton)
        @if ($buttonFullWidth)
            <x-forms.button @click="modalOpen=true" class="w-full">
@@ -302,7 +302,8 @@
                                </x-forms.button>
                            @endif
                            <x-forms.button
-                                x-bind:disabled="!disableTwoStepConfirmation && confirmWithText && userConfirmationText !== confirmationText"
+                                x-bind:disabled="!disableTwoStepConfirmation && confirmWithText && userConfirmationText !==
+                                    confirmationText"
                                class="w-auto" isError
                                @click="
                                    if (dispatchEvent) {
@@ -337,11 +338,14 @@
                                    Your Password
                                </label>
                                <form @submit.prevent="false" @keydown.enter.prevent>
-                                    <input type="text" name="username" autocomplete="username" value="{{ auth()->user()->email }}" style="display: none;">
-                                    <input type="password" id="password-confirm-{{ $passwordConfirm }}" x-model="password"
-                                        class="w-full input" placeholder="Enter your password" autocomplete="current-password">
+                                    <input type="text" name="username" autocomplete="username"
+                                        value="{{ auth()->user()->email }}" style="display: none;">
+                                    <input type="password" id="password-confirm-{{ $passwordConfirm }}"
+                                        x-model="password" class="w-full input" placeholder="Enter your password"
+                                        autocomplete="current-password">
                                </form>
-                                <p x-show="passwordError" x-text="passwordError" class="mt-1 text-sm text-red-500"></p>
+                                <p x-show="passwordError" x-text="passwordError" class="mt-1 text-sm text-red-500">
+                                </p>
                                @error('password')
                                    <p class="mt-1 text-sm text-red-500">{{ $message }}</p>
                                @enderror
--- a/resources/views/components/pricing-plans.blade.php
+++ b/resources/views/components/pricing-plans.blade.php
@@ -262,7 +262,7 @@
                    your self-hosted instance?
                    <x-forms.button>
                        <a class="font-bold dark:text-white hover:no-underline"
-                            href="{{ config('coolify.contact') }}">Contact
+                            href="{{ config('constants.urls.contact') }}">Contact
                            Us</a>
                    </x-forms.button>
                </div>
--- a/resources/views/components/settings/navbar.blade.php
+++ b/resources/views/components/settings/navbar.blade.php
@@ -7,12 +7,6 @@
                href="{{ route('settings.index') }}">
                <button>Configuration</button>
            </a>
-            @if (isCloud())
-                <a class="{{ request()->routeIs('settings.license') ? 'dark:text-white' : '' }}"
-                    href="{{ route('settings.license') }}">
-                    <button>Resale License</button>
-                </a>
-            @endif
            <a class="{{ request()->routeIs('settings.backup') ? 'dark:text-white' : '' }}"
                href="{{ route('settings.backup') }}">
                <button>Backup</button>
--- a/resources/views/errors/400.blade.php
+++ b/resources/views/errors/400.blade.php
@@ -14,7 +14,7 @@
            <a href="/">
                <x-forms.button>Go back home</x-forms.button>
            </a>
-            <a target="_blank" class="text-xs" href="{{ config('coolify.contact') }}">Contact
+            <a target="_blank" class="text-xs" href="{{ config('constants.urls.contact') }}">Contact
                support
                <x-external-link />
            </a>
--- a/resources/views/errors/401.blade.php
+++ b/resources/views/errors/401.blade.php
@@ -9,7 +9,7 @@
            <a href="/">
                <x-forms.button>Go back home</x-forms.button>
            </a>
-            <a target="_blank" class="text-xs" href="{{ config('coolify.contact') }}">Contact
+            <a target="_blank" class="text-xs" href="{{ config('constants.urls.contact') }}">Contact
                support
                <x-external-link />
            </a>
--- a/resources/views/errors/402.blade.php
+++ b/resources/views/errors/402.blade.php
@@ -8,7 +8,7 @@
            <a href="/">
                <x-forms.button>Go back home</x-forms.button>
            </a>
-            <a target="_blank" class="text-xs" href="{{ config('coolify.contact') }}">Contact
+            <a target="_blank" class="text-xs" href="{{ config('constants.urls.contact') }}">Contact
                support
                <x-external-link />
            </a>
--- a/resources/views/errors/403.blade.php
+++ b/resources/views/errors/403.blade.php
@@ -9,7 +9,7 @@
            <a href="/">
                <x-forms.button>Go back home</x-forms.button>
            </a>
-            <a target="_blank" class="text-xs" href="{{ config('coolify.contact') }}">Contact
+            <a target="_blank" class="text-xs" href="{{ config('constants.urls.contact') }}">Contact
                support
                <x-external-link />
            </a>
--- a/resources/views/errors/404.blade.php
+++ b/resources/views/errors/404.blade.php
@@ -10,7 +10,7 @@
            <a href="/">
                <x-forms.button>Go back home</x-forms.button>
            </a>
-            <a target="_blank" class="text-xs" href="{{ config('coolify.contact') }}">Contact
+            <a target="_blank" class="text-xs" href="{{ config('constants.urls.contact') }}">Contact
                support
                <x-external-link />
            </a>
--- a/resources/views/errors/419.blade.php
+++ b/resources/views/errors/419.blade.php
@@ -10,7 +10,7 @@
            <a href="/">
                <x-forms.button>Go back home</x-forms.button>
            </a>
-            <a target="_blank" class="text-xs" href="{{ config('coolify.contact') }}">Contact
+            <a target="_blank" class="text-xs" href="{{ config('constants.urls.contact') }}">Contact
                support
                <x-external-link />
            </a>
--- a/resources/views/errors/429.blade.php
+++ b/resources/views/errors/429.blade.php
@@ -10,7 +10,7 @@
            <a href="/">
                <x-forms.button>Go back home</x-forms.button>
            </a>
-            <a target="_blank" class="text-xs" href="{{ config('coolify.contact') }}">Contact
+            <a target="_blank" class="text-xs" href="{{ config('constants.urls.contact') }}">Contact
                support
                <x-external-link />
            </a>
--- a/resources/views/errors/500.blade.php
+++ b/resources/views/errors/500.blade.php
@@ -13,7 +13,7 @@
            <a href="/">
                <x-forms.button>Go back home</x-forms.button>
            </a>
-            <a target="_blank" class="text-xs" href="{{ config('coolify.contact') }}">Contact
+            <a target="_blank" class="text-xs" href="{{ config('constants.urls.contact') }}">Contact
                support
                <x-external-link />
            </a>
--- a/resources/views/errors/503.blade.php
+++ b/resources/views/errors/503.blade.php
@@ -7,7 +7,7 @@
            patience.
        </p>
        <div class="flex items-center mt-10 gap-x-6">
-            <a target="_blank" class="text-xs" href="{{ config('coolify.contact') }}">Contact
+            <a target="_blank" class="text-xs" href="{{ config('constants.urls.contact') }}">Contact
                support
                <x-external-link />
            </a>
--- a/resources/views/layouts/base.blade.php
+++ b/resources/views/layouts/base.blade.php
@@ -84,9 +84,9 @@
            window.Pusher = Pusher;
            window.Echo = new Echo({
                broadcaster: 'pusher',
-                cluster: "{{ env('PUSHER_HOST') }}" || window.location.hostname,
-                key: "{{ env('PUSHER_APP_KEY') }}" || 'coolify',
-                wsHost: "{{ env('PUSHER_HOST') }}" || window.location.hostname,
+                cluster: "{{ config('constants.pusher.host') }}" || window.location.hostname,
+                key: "{{ config('constants.pusher.app_key') }}" || 'coolify',
+                wsHost: "{{ config('constants.pusher.host') }}" || window.location.hostname,
                wsPort: "{{ getRealtime() }}",
                wssPort: "{{ getRealtime() }}",
                forceTLS: false,
--- a/resources/views/livewire/dev/compose.blade.php
+++ b/resources/views/livewire/dev/compose.blade.php
@@ -1,13 +0,0 @@
-<div class="pb-10" x-data>
-    <h1>Compose</h1>
-    <div>All kinds of compose files.</div>
-    <h3 class="pt-4">Services</h3>
-    @foreach ($services as $serviceName => $value)
-        <x-forms.button wire:click="setService('{{ $serviceName }}')">{{ Str::headline($serviceName) }}</x-forms.button>
-    @endforeach
-    <h3 class="pt-4">Base64 En/Decode</h3>
-    <x-forms.button x-on:click="copyToClipboard('{{ $base64 }}')">Copy Base64 Compose</x-forms.button>
-    <div class="pt-4">
-        <x-forms.textarea realtimeValidation rows="40" id="compose"></x-forms.textarea>
-    </div>
-</div>
--- a/resources/views/livewire/dev/s3-test.blade.php
+++ b/resources/views/livewire/dev/s3-test.blade.php
@@ -1,15 +0,0 @@
-<div>
-    <h2>S3 Test</h2>
-    <form wire:submit="save">
-        <input type="file" wire:model="file">
-        @error('file')
-            <span class="error">{{ $message }}</span>
-        @enderror
-        <div wire:loading wire:target="file">Uploading to server...</div>
-        @if ($file)
-            <x-forms.button type="submit">Upload file to s3:/files</x-forms.button>
-        @endif
-    </form>
-    <h4>Functions</h4>
-    <x-forms.button wire:click="get_files">Get s3:/files</x-forms.button>
-</div>
--- a/resources/views/livewire/project/shared/terminal.blade.php
+++ b/resources/views/livewire/project/shared/terminal.blade.php
@@ -26,9 +26,9 @@
    <script>
        // expose terminal config to the terminal.js file
        window.terminalConfig = {
-            protocol: "{{ env('TERMINAL_PROTOCOL') }}",
-            host: "{{ env('TERMINAL_HOST') }}",
-            port: "{{ env('TERMINAL_PORT') }}"
+            protocol: "{{ config('constants.terminal.protocol') }}",
+            host: "{{ config('constants.terminal.host') }}",
+            port: "{{ config('constants.terminal.port') }}"
        }
    </script>
    @endscript
--- a/resources/views/livewire/settings/index.blade.php
+++ b/resources/views/livewire/settings/index.blade.php
@@ -100,7 +100,7 @@
            placeholder="1.1.1.1,8.8.8.8" />
        <h4 class="pt-6">Update</h4>
        <div class="text-right md:w-96">
-            @if (!is_null(env('AUTOUPDATE', null)))
+            @if (!is_null(config('constants.coolify.autoupdate', null)))
                <div class="text-right md:w-96">
                    <x-forms.checkbox instantSave helper="AUTOUPDATE is set in .env file, you need to modify it there."
                        disabled id="is_auto_update_enabled" label="Enabled" />
@@ -117,7 +117,7 @@
                <x-forms.button wire:click='checkManually'>Check Manually</x-forms.button>
            </div>

-            @if (is_null(env('AUTOUPDATE', null)) && $is_auto_update_enabled)
+            @if (is_null(config('constants.coolify.autoupdate', null)) && $is_auto_update_enabled)
                <x-forms.input required id="auto_update_frequency" label="Auto Update Frequency" placeholder="0 0 * * *"
                    helper="Cron expression for auto update frequency (automatically update coolify).<br>You can use every_minute, hourly, daily, weekly, monthly, yearly.<br><br>Default is every day at 00:00" />
            @endif
--- a/resources/views/livewire/settings/license.blade.php
+++ b/resources/views/livewire/settings/license.blade.php
@@ -1,28 +0,0 @@
-<div>
-    <x-settings.navbar />
-    <h2>Resale License</h2>
-    <form wire:submit='submit' class="flex flex-col gap-2">
-        <div>
-            @if ($settings->is_resale_license_active)
-                <div class="text-success">License is active</div>
-            @else
-                <div class="text-error">License is not active</div>
-            @endif
-        </div>
-        <div class="flex gap-2">
-            <x-forms.input type="password" id="settings.resale_license"
-                placeholder="eg: BE558E91-0CC5-4AA2-B1C0-B6403C2988DD" label="License Key" />
-            <x-forms.input type="password" id="instance_id" label="Instance Id (do not change this)" disabled />
-        </div>
-        <div class="flex gap-2">
-            <x-forms.button type="submit">
-                Check License
-            </x-forms.button>
-        </div>
-        @if (session()->has('error'))
-            <div class="text-error">
-                {!! session('error') !!}
-            </div>
-        @endif
-    </form>
-</div>
--- a/resources/views/livewire/source/github/change.blade.php
+++ b/resources/views/livewire/source/github/change.blade.php
@@ -254,7 +254,7 @@
                const name = @js($name);
                const isDev = @js(config('app.env')) ===
                    'local';
-                const devWebhook = @js(config('coolify.dev_webhook'));
+                const devWebhook = @js(config('constants.webhooks.dev_webhook'));
                if (isDev && devWebhook) {
                    baseUrl = devWebhook;
                }
--- a/resources/views/livewire/subscription/actions.blade.php
+++ b/resources/views/livewire/subscription/actions.blade.php
@@ -45,7 +45,7 @@
            </div>
        </div>
        <div class="pt-4">
-            If you have any problems, please <a class="underline dark:text-white" href="{{ config('coolify.contact') }}"
+            If you have any problems, please <a class="underline dark:text-white" href="{{ config('constants.urls.contact') }}"
                target="_blank">contact us.</a>
        </div>
    @endif