Shiloh/lasthourcloud
Shiloh/lasthourcloud
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases 4 Wiki Activity

feat: cloud

Browse Source
This commit is contained in:
Andras Bacsai 2023-08-14 15:22:29 +02:00
parent b941f35812
commit e4279bf257
17 changed files with 189 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
app/Http/Controllers/ServerController.php Normal file
View File

@ -0,0 +1,24 @@
<?php
namespace App\Http\Controllers;
use App\Models\PrivateKey;
use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
use Illuminate\Foundation\Validation\ValidatesRequests;
class ServerController extends Controller
{
use AuthorizesRequests, ValidatesRequests;
public function new_server()
{
$servers = auth()->user()->currentTeam()->servers->count();
$subscription = auth()->user()->currentTeam()->subscription->type();
$limits = config('constants.limits.server')[strtolower($subscription)];
$limit_reached = true ?? $servers >= $limits[$subscription];
return view('server.create', [
'limit_reached' => $limit_reached,
'private_keys' => PrivateKey::ownedByCurrentTeam()->get(),
]);
}
}

1
app/Http/Livewire/Server/New/ByIp.php
View File

@ -8,6 +8,7 @@
class ByIp extends Component
{
public $private_keys;
public $limit_reached;
public int|null $private_key_id = null;
public $new_private_key_name;
public $new_private_key_description;

26
app/Http/Middleware/SubscriptionValid.php
View File

@ -8,11 +8,24 @@
class SubscriptionValid
{
public function handle(Request $request, Closure $next): Response
{
if (auth()->user()) {
if (is_cloud() && !isSubscribed()) {
$is_instance_admin = auth()->user()?->isInstanceAdmin();
if (!auth()->user() || !is_cloud()) {
if ($request->path() === 'subscription' && !$is_instance_admin) {
return redirect('/');
} else {
return $next($request);
}
}
if (is_subscription_active() && $request->path() === 'subscription' && !$is_instance_admin) {
return redirect('/');
}
if (is_subscription_in_grace_period()) {
return $next($request);
}
if (!is_subscription_active() && !is_subscription_in_grace_period()) {
ray('SubscriptionValid Middleware');
$allowed_paths = [
@ -28,13 +41,6 @@ public function handle(Request $request, Closure $next): Response
} else {
return $next($request);
}
} else {
if ($request->path() === 'subscription' && !auth()->user()->isInstanceAdmin()) {
return redirect('/');
} else {
return $next($request);
}
}
}
return $next($request);
}

18
app/Models/Subscription.php
View File

@ -12,4 +12,22 @@ public function team()
{
return $this->belongsTo(Team::class);
}
public function type()
{
$basic = explode(',', config('coolify.lemon_squeezy_basic_plan_ids'));
$pro = explode(',', config('coolify.lemon_squeezy_pro_plan_ids'));
$ultimate = explode(',', config('coolify.lemon_squeezy_ultimate_plan_ids'));
$subscription = $this->lemon_variant_id;
if (in_array($subscription, $basic)) {
return 'basic';
}
if (in_array($subscription, $pro)) {
return 'pro';
}
if (in_array($subscription, $ultimate)) {
return 'ultimate';
}
return 'unknown';
}
}

37
bootstrap/helpers/subscriptions.php
View File

@ -43,11 +43,36 @@ function getEndDate()
return Carbon::parse(auth()->user()->currentTeam()->subscription->lemon_renews_at)->format('Y-M-d H:i:s');
}
function isSubscribed()
function is_subscription_active()
{
return
auth()->user()?->currentTeam()?->subscription?->lemon_status === 'active' ||
(auth()->user()?->currentTeam()?->subscription?->lemon_ends_at &&
Carbon::parse(auth()->user()->currentTeam()->subscription->lemon_ends_at) > Carbon::now()
) || auth()->user()->isInstanceAdmin();
$team = auth()->user()?->currentTeam();
if (!$team) {
return false;
}
$subscription = $team?->subscription;
if (!$subscription) {
return false;
}
$is_active = $subscription->lemon_status === 'active';
$is_instance_admin = auth()->user()->isInstanceAdmin();
ray($is_instance_admin);
return $is_active || $is_instance_admin;
}
function is_subscription_in_grace_period()
{
$team = auth()->user()?->currentTeam();
if (!$team) {
return false;
}
$subscription = $team?->subscription;
if (!$subscription) {
return false;
}
$is_instance_admin = auth()->user()->isInstanceAdmin();
$is_still_grace_period = $subscription->lemon_ends_at &&
Carbon::parse($subscription->lemon_ends_at) > Carbon::now();
return $is_still_grace_period || $is_instance_admin;
}

7
config/constants.php
View File

@ -6,4 +6,11 @@
'expiration' => 10,
],
],
'limits' => [
'server' => [
'basic' => 1,
'pro' => 3,
'ultimate' => 9999999999999999999,
]
]
];

13
config/coolify.php
View File

@ -3,9 +3,16 @@
return [
'self_hosted' => env('SELF_HOSTED', true),
'license_url' => 'https://license.coolify.io',
'lemon_squeezy_webhook_secret' => env('LEMON_SQUEEZY_WEBHOOK_SECRET'),
'lemon_squeezy_checkout_id_monthly' => env('LEMON_SQUEEZY_CHECKOUT_ID_MONTHLY'),
'lemon_squeezy_checkout_id_yearly' => env('LEMON_SQUEEZY_CHECKOUT_ID_YEARLY'),
'lemon_squeezy_webhook_secret' => env('LEMON_SQUEEZY_WEBHOOK_SECRET', null),
'lemon_squeezy_checkout_id_monthly_basic' => env('LEMON_SQUEEZY_CHECKOUT_ID_MONTHLY_BASIC', null),
'lemon_squeezy_checkout_id_monthly_pro' => env('LEMON_SQUEEZY_CHECKOUT_ID_MONTHLY_PRO', null),
'lemon_squeezy_checkout_id_monthly_ultimate' => env('LEMON_SQUEEZY_CHECKOUT_ID_MONTHLY_ULTIMATE', null),
'lemon_squeezy_checkout_id_yearly_basic' => env('LEMON_SQUEEZY_CHECKOUT_ID_YEARLY_BASIC', null),
'lemon_squeezy_checkout_id_yearly_pro' => env('LEMON_SQUEEZY_CHECKOUT_ID_YEARLY_PRO', null),
'lemon_squeezy_checkout_id_yearly_ultimate' => env('LEMON_SQUEEZY_CHECKOUT_ID_YEARLY_ULTIMATE', null),
'lemon_squeezy_basic_plan_ids' => env('LEMON_SQUEEZY_BASIC_PLAN_IDS', ""),
'lemon_squeezy_pro_plan_ids' => env('LEMON_SQUEEZY_PRO_PLAN_IDS', ""),
'lemon_squeezy_ultimate_plan_ids' => env('LEMON_SQUEEZY_ULTIMATE_PLAN_IDS', ""),
'mux_enabled' => env('MUX_ENABLED', true),
'dev_webhook' => env('SERVEO_URL'),
'base_config_path' => env('BASE_CONFIG_PATH', '/_data/coolify'),

11
docker-compose.prod.yml
View File

@ -34,8 +34,15 @@ services:
- PHP_PM_MAX_SPARE_SERVERS=10
- SELF_HOSTED
- LEMON_SQUEEZY_WEBHOOK_SECRET
- LEMON_SQUEEZY_CHECKOUT_ID_MONTHLY
- LEMON_SQUEEZY_CHECKOUT_ID_YEARLY
- LEMON_SQUEEZY_CHECKOUT_ID_MONTHLY_BASIC
- LEMON_SQUEEZY_CHECKOUT_ID_MONTHLY_PRO
- LEMON_SQUEEZY_CHECKOUT_ID_MONTHLY_ULTIMATE
- LEMON_SQUEEZY_CHECKOUT_ID_YEARLY_BASIC
- LEMON_SQUEEZY_CHECKOUT_ID_YEARLY_PRO
- LEMON_SQUEEZY_CHECKOUT_ID_YEARLY_ULTIMATE
- LEMON_SQUEEZY_BASIC_PLAN_IDS
- LEMON_SQUEEZY_PRO_PLAN_IDS
- LEMON_SQUEEZY_ULTIMATE_PLAN_IDS
ports:
- "${APP_PORT:-8000}:80"
expose:

2
resources/views/components/layout-subscription.blade.php
View File

@ -25,7 +25,7 @@
<body>
@livewireScripts
<x-toaster-hub />
@if (auth()->user()->isInstanceAdmin())
@if (auth()->user()->isInstanceAdmin() || is_subscription_in_grace_period())
<div class="fixed top-3 left-4" id="vue">
<magic-bar></magic-bar>
</div>

6
resources/views/components/limit-reached.blade.php Normal file
View File

@ -0,0 +1,6 @@
<div class="flex flex-col items-center justify-center h-screen">
<span class="text-xl font-bold text-white">You have reached the limit of {{ $name }} you can create.</span>
<span>Please <a class="text-white underline "href="{{ route('team.show') }}">upgrade your
subscription<a /> to create more
{{ $name }}.</span>
</div>

6
resources/views/components/pricing-plans.blade.php
View File

@ -111,7 +111,7 @@ class="grid max-w-sm grid-cols-1 -mt-16 divide-y divide-coolgray-500 isolate gap
<span x-show="selected === 'yearly'" x-cloak class="text-warning">(save $6)</span>
<a x-show="selected === 'monthly'" x-cloak aria-describedby="tier-basic" class="buyme"
href="{{ getSubscriptionLink('monthly') }}">Subscribe</a>
href="{{ getSubscriptionLink('monthly_basic') }}">Subscribe</a>
<a x-show="selected === 'yearly'" x-cloak aria-describedby="tier-basic" class="buyme"
href="{{ getSubscriptionLink('yearly') }}">Subscribe</a>
<p class="mt-10 text-sm leading-6 text-white h-[6.5rem]">Start self-hosting in
@ -185,7 +185,7 @@ class="grid max-w-sm grid-cols-1 -mt-16 divide-y divide-coolgray-500 isolate gap
</p>
<span x-show="selected === 'yearly'" x-cloak class="text-warning">(save $29)</span>
<a x-show="selected === 'monthly'" x-cloak aria-describedby="tier-essential" class="buyme"
href="{{ getSubscriptionLink('monthly') }}">Subscribe</a>
href="{{ getSubscriptionLink('monthly_pro') }}">Subscribe</a>
<a x-show="selected === 'yearly'" x-cloak aria-describedby="tier-essential" class="buyme"
href="{{ getSubscriptionLink('yearly') }}">Subscribe</a>
<p class="h-20 mt-10 text-sm leading-6 text-white">Scale your business or self-hosting environment.
@ -255,7 +255,7 @@ class="grid max-w-sm grid-cols-1 -mt-16 divide-y divide-coolgray-500 isolate gap
</p>
<span x-show="selected === 'yearly'" x-cloak class="text-warning">(save $69)</span>
<a x-show="selected === 'monthly'" x-cloak aria-describedby="tier-growth" class="buyme"
href="{{ getSubscriptionLink('monthly') }}">Subscribe</a>
href="{{ getSubscriptionLink('monthly_ultimate') }}">Subscribe</a>
<a x-show="selected === 'yearly'" x-cloak aria-describedby="tier-growth" class="buyme"
href="{{ getSubscriptionLink('yearly') }}">Subscribe</a>
<p class="h-20 mt-10 text-sm leading-6 text-white">Deploy complex infrastuctures and

5
resources/views/livewire/server/new/by-ip.blade.php
View File

@ -1,4 +1,7 @@
<div>
@if ($limit_reached)
<x-limit-reached name="servers" />
@else
<h1>Create a new Server</h1>
<div class="subtitle ">Servers are the main blocks of your infrastructure.</div>
<form class="flex flex-col gap-2" wire:submit.prevent='submit'>
@ -26,4 +29,6 @@
Save New Server
</x-forms.button>
</form>
@endif
</div>

5
resources/views/server/all.blade.php
View File

@ -35,6 +35,11 @@
<x-use-magic-bar link="/server/new" />
</div>
@endforelse
@isset($error)
<div class="text-center text-error">
<span>{{ $error }}</span>
</div>
@endisset
<script>
function goto(uuid) {
window.location.href = '/server/' + uuid;

2
resources/views/server/create.blade.php
View File

@ -4,6 +4,6 @@
<div class="subtitle">You need to create a private key before you can create a server.</div>
<livewire:private-key.create from="server" />
@else
<livewire:server.new.by-ip :private_keys="$private_keys" />
<livewire:server.new.by-ip :private_keys="$private_keys" :limit_reached="$limit_reached" />
@endif
</x-layout>

12
resources/views/team/show.blade.php
View File

@ -5,19 +5,25 @@
<livewire:team.form />
@if (is_cloud())
<div class="pb-8">
<h3>Subscription</h3>
<h2>Subscription</h2>
@if (data_get(auth()->user()->currentTeam(),
'subscription'))
<div>Status: {{ auth()->user()->currentTeam()->subscription->lemon_status }}</div>
<div>Type: {{ auth()->user()->currentTeam()->subscription->lemon_variant_name }}</div>
@if (auth()->user()->currentTeam()->subscription->lemon_status === 'cancelled')
<div class="pb-4">Subscriptions ends at: {{ getRenewDate() }}</div>
<x-forms.button><a class="text-white" href="{{ route('subscription') }}">Subscribe
Again</a>
<x-forms.button class="bg-coollabs-gradient"><a class="text-white hover:no-underline"
href="{{ route('subscription') }}">Resume Subscription</a>
</x-forms.button>
<div class="py-4">If you would like to change the subscription to a lower/higher plan, <a
class="text-white underline" href="https://docs.coollabs.io/contact" target="_blank">please
contact
us.</a></div>
@else
<div class="pb-4">Renews at: {{ getRenewDate() }}</div>
@endif
<x-forms.button><a class="text-white hover:no-underline" href="{{ getPaymentLink() }}">Update Payment
Details</a>
</x-forms.button>

5
resources/views/team/storages/all.blade.php
View File

@ -4,9 +4,8 @@
->currentTeam()" />
<div class="flex items-start gap-2">
<h2 class="pb-4">S3 Storages</h2>
<x-forms.button class="btn">
<a class="text-white hover:no-underline" href="/team/storages/new">+ Add</a>
</x-forms.button>
<a class="text-white hover:no-underline" href="/team/storages/new"> <x-forms.button class="btn">+ Add
</x-forms.button></a>
</div>
<div class="grid gap-2 lg:grid-cols-2">
@forelse ($s3 as $storage)

5
routes/web.php
View File

@ -5,6 +5,7 @@
use App\Http\Controllers\DatabaseController;
use App\Http\Controllers\MagicController;
use App\Http\Controllers\ProjectController;
use App\Http\Controllers\ServerController;
use App\Models\GithubApp;
use App\Models\GitlabApp;
use App\Models\InstanceSettings;
@ -71,9 +72,7 @@
Route::get('/servers', fn () => view('server.all', [
'servers' => Server::ownedByCurrentTeam()->get()
]))->name('server.all');
Route::get('/server/new', fn () => view('server.create', [
'private_keys' => PrivateKey::ownedByCurrentTeam()->get(),
]))->name('server.create');
Route::get('/server/new', [ServerController::class, 'new_server'])->name('server.create');
Route::get('/server/{server_uuid}', fn () => view('server.show', [
'server' => Server::ownedByCurrentTeam(['name', 'description', 'ip', 'port', 'user', 'proxy'])->whereUuid(request()->server_uuid)->firstOrFail(),
]))->name('server.show');