v4.0.0-beta.420 (#6008)
* chore(version): update coolify-realtime to version 1.0.9 in docker-compose and versions files * feat(migration): add is_sentinel_enabled column to server_settings with default true * fix(migration): update default value handling for is_sentinel_enabled column in server_settings * feat(seeder): dispatch StartProxy action for each server in ProductionSeeder * feat(seeder): add CheckAndStartSentinelJob dispatch for each server in ProductionSeeder * fix(seeder): conditionally dispatch CheckAndStartSentinelJob based on server's sentinel status * feat(seeder): conditionally dispatch StartProxy action based on proxy check result * refactor(ui): terminal * refactor(ui): remove terminal header from execute-container-command view * refactor(ui): remove unnecessary padding from deployment, backup, and logs sections * fix(service): disable healthcheck logging for Gotenberg (#6005) * fix(service): Joplin volume name (#5930) * chore(version): update coolify version to 4.0.0-beta.420 and nightly version to 4.0.0-beta.421 * fix(server): update sentinelUpdatedAt assignment to use server's sentinel_updated_at property * feat(service): update Changedetection template (#5937) * chore(service): changedetection remove unused code * fix(service): audiobookshelf healthcheck command (#5993) * refactor(service): update Hoarder to their new name karakeep (#5964) * fix(service): downgrade Evolution API phone version (#5977) * feat(service): add Miniflux service (#5843) * refactor(service): karakeep naming and formatting * refactor(service): improve miniflux - improve DB url - add depends_on - formatting, naming & order * feat(service): add Pingvin Share service (#5969) * fix(service): pingvinshare-with-clamav - add platform to make clamav work - formatting * feat(auth): Add Discord OAuth Provider (#5552) * feat(auth): Add Clerk OAuth Provider (#5553) * feat(auth): add Zitadel OAuth Provider (#5490) * Update composer.lock * fix(ssh): scp requires square brackets for ipv6 (#6001) * refactor(core): rename API rate limit ENV * refactor(ui): simplify container selection form in execute-container-command view * chore(service): Update Evolution API image to the official one (#6031) * chore(versions): bump coolify versions to v4.0.0-beta.420 and v4.0.0-beta.421 * fix(github): changing github app breaks the webhook. it does not anymore * feat(service): enhance service status handling and UI updates * fix(parser): improve FQDN generation and update environment variable handling * fix(ui): enhance status refresh buttons with loading indicators * fix(ui): update confirmation button text for stopping database and service * fix(routes): update middleware for deploy route to use 'api.ability:deploy' * fix(ui): refine API token creation form and update helper text for clarity * fix(ui): adjust layout of deployments section for improved alignment * chore(dependencies): update composer dependencies to latest versions including resend-laravel to ^0.19.0 and aws-sdk-php to 3.347.0 * refactor(email): streamline SMTP and resend settings logic for improved clarity * fix(ui): adjust project grid layout and refine server border styling for better visibility * fix(ui): update border styling for consistency across components and enhance loading indicators * feat(cleanup): add functionality to delete teams with no members or servers in CleanupStuckedResources command * refactor(invitation): rename methods for consistency and enhance invitation deletion logic * refactor(user): streamline user deletion process and enhance team management logic * fix(ui): add padding to section headers in settings views for improved spacing * fix(ui): reduce gap between input fields in email settings for better alignment * fix(docker): conditionally enable gzip compression in Traefik labels based on configuration * fix(parser): enable gzip compression conditionally for Pocketbase images and streamline service creation logic * fix(ui): update padding for trademarks policy and enhance spacing in advanced settings section * feat(ui): add heart icon and enhance popup messaging for sponsorship support * feat(settings): add sponsorship popup toggle and corresponding database migration * fix(ui): correct closing tag for sponsorship link in layout popups * fix(ui): refine wording in sponsorship donation prompt in layout popups * fix(ui): update navbar icon color and enhance popup layout for sponsorship support * Update resources/views/livewire/project/shared/health-checks.blade.php Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * Update app/Livewire/Subscription/Index.php Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * fix(ui): add target="_blank" to sponsorship links in layout popups for improved user experience * fix(models): refine comment wording in User model for clarity on user deletion criteria * Update app/Providers/RouteServiceProvider.php Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * fix(models): improve user deletion logic in User model to handle team member roles and prevent deletion if user is alone in root team * fix(ui): update wording in sponsorship prompt for clarity and engagement --------- Co-authored-by: Andras Bacsai <5845193+andrasbacsai@users.noreply.github.com> Co-authored-by: Khiet Tam Nguyen <86177399+nktnet1@users.noreply.github.com> Co-authored-by: Carsten <BanditsBacon@users.noreply.github.com> Co-authored-by: Alberto Rizzi <48057685+albertorizzi@users.noreply.github.com> Co-authored-by: Jonas Klesen <deklesen@gmail.com> Co-authored-by: Stew Night. <22344601+stewnight@users.noreply.github.com> Co-authored-by: Jeffer Marcelino <jeffersunde72@gmail.com> Co-authored-by: Lucas Eduardo <lucas59356@gmail.com> Co-authored-by: CrazyTim71 <118295691+CrazyTim71@users.noreply.github.com> Co-authored-by: Yassir Elmarissi <yassir.elmarissi@hm.edu> Co-authored-by: Hauke Schnau <hauke@schnau-lilienthal.de> Co-authored-by: Darren Sisson <74752850+djsisson@users.noreply.github.com> Co-authored-by: Alkesh Das <67038642+smad-bro@users.noreply.github.com> Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
This commit is contained in:
🏔️ Peak
@@ -4,9 +4,10 @@
|
||||
notification: true,
|
||||
realtime: false,
|
||||
},
|
||||
isDevelopment: {{ isDev() ? 'true' : 'false' }},
|
||||
init() {
|
||||
this.popups.sponsorship = localStorage.getItem('popupSponsorship') !== 'false';
|
||||
this.popups.notification = localStorage.getItem('popupNotification') !== 'false';
|
||||
this.popups.sponsorship = this.shouldShowMonthlyPopup('popupSponsorship');
|
||||
this.popups.notification = this.shouldShowMonthlyPopup('popupNotification');
|
||||
this.popups.realtime = localStorage.getItem('popupRealtime');
|
||||
|
||||
let checkNumber = 1;
|
||||
@@ -31,6 +32,35 @@
|
||||
}
|
||||
}, 2000);
|
||||
}
|
||||
},
|
||||
shouldShowMonthlyPopup(storageKey) {
|
||||
const disabledTimestamp = localStorage.getItem(storageKey);
|
||||
|
||||
// If never disabled, show the popup
|
||||
if (!disabledTimestamp || disabledTimestamp === 'false') {
|
||||
return true;
|
||||
}
|
||||
|
||||
// If disabled timestamp is not a valid number, show the popup
|
||||
const disabledTime = parseInt(disabledTimestamp);
|
||||
if (isNaN(disabledTime)) {
|
||||
return true;
|
||||
}
|
||||
|
||||
const now = new Date();
|
||||
const disabledDate = new Date(disabledTime);
|
||||
|
||||
{{-- if (this.isDevelopment) {
|
||||
// In development: check if 10 seconds have passed
|
||||
const timeDifference = now.getTime() - disabledDate.getTime();
|
||||
const tenSecondsInMs = 10 * 1000;
|
||||
return timeDifference >= tenSecondsInMs;
|
||||
} else { --}}
|
||||
// In production: check if we're in a different month or year
|
||||
const isDifferentMonth = now.getMonth() !== disabledDate.getMonth() ||
|
||||
now.getFullYear() !== disabledDate.getFullYear();
|
||||
return isDifferentMonth;
|
||||
{{-- } --}}
|
||||
}
|
||||
}">
|
||||
@auth
|
||||
@@ -56,35 +86,60 @@
|
||||
@endif
|
||||
</span>
|
||||
@endauth
|
||||
<span x-show="popups.sponsorship">
|
||||
<x-popup>
|
||||
<x-slot:title>
|
||||
Love Coolify as we do?
|
||||
</x-slot:title>
|
||||
<x-slot:icon>
|
||||
<img src="https://cdn-icons-png.flaticon.com/512/8236/8236748.png"
|
||||
class="w-8 h-8 sm:w-12 sm:h-12 lg:w-16 lg:h-16">
|
||||
</x-slot:icon>
|
||||
<x-slot:description>
|
||||
<span>Please
|
||||
consider donating on <a href="https://github.com/sponsors/coollabsio"
|
||||
class="text-xs underline dark:text-white">GitHub</a> or <a
|
||||
href="https://opencollective.com/coollabsio"
|
||||
class="text-xs underline dark:text-white">OpenCollective</a>.<br><br></span>
|
||||
<span>It enables us to keep creating features without paywalls, ensuring our work remains free and
|
||||
open.</span>
|
||||
</x-slot:description>
|
||||
<x-slot:button-text @click="disableSponsorship()">
|
||||
Disable This Popup
|
||||
</x-slot:button-text>
|
||||
</x-popup>
|
||||
</span>
|
||||
@if (instanceSettings()->is_sponsorship_popup_enabled && !isCloud())
|
||||
<span x-show="popups.sponsorship">
|
||||
<x-popup>
|
||||
<x-slot:customActions>
|
||||
<div
|
||||
class="flex md:flex-row flex-col max-w-4xl p-6 mx-auto bg-white border shadow-lg lg:border-t dark:border-coolgray-300 border-neutral-200 dark:bg-coolgray-100 lg:p-8 lg:pb-4 sm:rounded-sm gap-2">
|
||||
<div class="md:block hidden">
|
||||
<img src="{{ asset('heart.png') }}" class="w-20 h-20">
|
||||
</div>
|
||||
<div class="flex flex-col gap-2 lg:px-10 px-1">
|
||||
<div class="lg:text-xl text-md dark:text-white font-bold">Love Coolify? Support our work.
|
||||
</div>
|
||||
<div class="lg:text-sm text-xs dark:text-white">
|
||||
We are already profitable thanks to <span class="font-bold text-pink-500">YOU</span>
|
||||
but...<br />We
|
||||
would
|
||||
like to
|
||||
make
|
||||
more cool features.
|
||||
</div>
|
||||
<div class="lg:text-sm text-xs dark:text-white pt-2 ">
|
||||
For this we need your help to support our work financially.
|
||||
</div>
|
||||
</div>
|
||||
<div class="flex flex-col gap-2 text-center md:mx-auto lg:py-0 pt-2">
|
||||
<x-forms.button isHighlighted class="md:w-36 w-full"><a target="_blank"
|
||||
href="https://github.com/sponsors/coollabsio"
|
||||
class="font-bold dark:text-white">GitHub
|
||||
Sponsors</a></x-forms.button>
|
||||
<x-forms.button isHighlighted class="md:w-36 w-full"><a target="_blank"
|
||||
href="https://opencollective.com/coollabsio/donate?interval=month&amount=10&name=&legalName=&email="
|
||||
class="font-bold dark:text-white">Open
|
||||
Collective</a></x-forms.button>
|
||||
<x-forms.button isHighlighted class="md:w-36 w-full"><a
|
||||
href="https://donate.stripe.com/8x2bJ104ifmB9kB45u38402" target="_blank"
|
||||
class="font-bold dark:text-white">Stripe</a></x-forms.button>
|
||||
<div class="pt-4 dark:text-white hover:underline cursor-pointer lg:text-base text-xs"
|
||||
@click="bannerVisible=false;disableSponsorship()">
|
||||
Maybe next time
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</x-slot:customActions>
|
||||
</x-popup>
|
||||
</span>
|
||||
@endif
|
||||
@if (currentTeam()->subscriptionPastOverDue())
|
||||
<x-banner :closable=false>
|
||||
<div><span class="font-bold text-red-500">WARNING:</span> Your subscription is in over-due. If your latest
|
||||
<div><span class="font-bold text-red-500">WARNING:</span> Your subscription is in over-due. If your
|
||||
latest
|
||||
payment is not paid within a week, all automations <span class="font-bold text-red-500">will
|
||||
be deactivated</span>. Visit <a href="{{ route('subscription.show') }}"
|
||||
class="underline dark:text-white">/subscription</a> to check your subscription status or pay your
|
||||
class="underline dark:text-white">/subscription</a> to check your subscription status or pay
|
||||
your
|
||||
invoice (or check your email for the invoice).
|
||||
</div>
|
||||
</x-banner>
|
||||
@@ -128,11 +183,13 @@
|
||||
@endif
|
||||
<script>
|
||||
function disableSponsorship() {
|
||||
localStorage.setItem('popupSponsorship', false);
|
||||
// Store current timestamp instead of just 'false'
|
||||
localStorage.setItem('popupSponsorship', Date.now().toString());
|
||||
}
|
||||
|
||||
function disableNotification() {
|
||||
localStorage.setItem('popupNotification', false);
|
||||
// Store current timestamp instead of just 'false'
|
||||
localStorage.setItem('popupNotification', Date.now().toString());
|
||||
}
|
||||
|
||||
function disableRealtime() {
|
||||
|
||||
Reference in New Issue
Block a user