ershisan99/coolify
1
0
Fork 0
mirror of https://github.com/ershisan99/coolify.git synced 2025-12-16 12:33:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: add new stuffs to magicbar

Browse Source 
feat: add user invitation command
feat: add user_email function
fix: update pricing plans
This commit is contained in:
Andras Bacsai
2023-08-17 15:19:37 +02:00
parent 5a3457c180
commit ee14d5caf5
16 changed files with 382 additions and 210 deletions
Download Patch File Download Diff File Expand all files Collapse all files

77
app/Console/Commands/InviteFromWaitlist.php Normal file
View File

@@ -0,0 +1,77 @@
<?php
namespace App\Console\Commands;
use App\Models\User;
use App\Models\Waitlist;
use Illuminate\Console\Command;
use Illuminate\Notifications\Messages\MailMessage;
use Illuminate\Support\Facades\Hash;
use Illuminate\Support\Str;
class InviteFromWaitlist extends Command
{
public Waitlist|null $next_patient = null;
public User|null $new_user = null;
public string|null $password = null;
/**
* The name and signature of the console command.
*
* @var string
*/
protected $signature = 'app:invite-from-waitlist';
/**
* The console command description.
*
* @var string
*/
protected $description = 'Send invitation to the next user in the waitlist';
/**
* Execute the console command.
*/
public function handle()
{
$this->next_patient = Waitlist::orderBy('created_at', 'asc')->where('verified', true)->first();
if ($this->next_patient) {
$this->register_user();
$this->remove_from_waitlist();
$this->send_email();
} else {
$this->info('No one in the waitlist who is verified. 👀');
}
}
private function register_user()
{
$already_registered = User::whereEmail($this->next_patient->email)->first();
if (!$already_registered) {
$this->password = Str::password();
$this->new_user = User::create([
'name' => Str::of($this->next_patient->email)->before('@'),
'email' => $this->next_patient->email,
'password' => Hash::make($this->password),
'force_password_reset' => true,
]);
$this->info("User registered ({$this->next_patient->email}) successfully. 🎉");
} else {
throw new \Exception('User already registered');
}
}
private function remove_from_waitlist()
{
$this->next_patient->delete();
$this->info("User removed from waitlist successfully.");
}
private function send_email()
{
$mail = new MailMessage();
$mail->view('emails.waitlist-invitation', [
'email' => $this->next_patient->email,
'password' => $this->password,
]);
$mail->subject('Congratulations! You are invited to join Coolify Cloud.');
send_user_an_email($mail, $this->next_patient->email);
$this->info("Email sent successfully. 📧");
}
}

72
app/Http/Livewire/Subscription/Actions.php Normal file
View File

@@ -0,0 +1,72 @@
<?php
namespace App\Http\Livewire\Subscription;
use Illuminate\Support\Facades\Http;
use Livewire\Component;
class Actions extends Component
{
public function cancel()
{
try {
$subscription_id = auth()->user()->currentTeam()->subscription->lemon_subscription_id;
if (!$subscription_id) {
throw new \Exception('No subscription found');
}
$response = Http::withHeaders([
'Accept' => 'application/vnd.api+json',
'Content-Type' => 'application/vnd.api+json',
'Authorization' => 'Bearer ' . config('coolify.lemon_squeezy_api_key'),
])->delete('https://api.lemonsqueezy.com/v1/subscriptions/' . $subscription_id);
$json = $response->json();
if ($response->failed()) {
$error = data_get($json, 'errors.0.status');
if ($error === '404') {
throw new \Exception('Subscription not found.');
}
throw new \Exception(data_get($json, 'errors.0.title', 'Something went wrong. Please try again later.'));
} else {
$this->emit('success', 'Subscription cancelled successfully. Reloading in 5s.');
$this->emit('reloadWindow', 5000);
}
} catch (\Exception $e) {
return general_error_handler($e, $this);
}
}
public function resume()
{
try {
$subscription_id = auth()->user()->currentTeam()->subscription->lemon_subscription_id;
if (!$subscription_id) {
throw new \Exception('No subscription found');
}
$response = Http::withHeaders([
'Accept' => 'application/vnd.api+json',
'Content-Type' => 'application/vnd.api+json',
'Authorization' => 'Bearer ' . config('coolify.lemon_squeezy_api_key'),
])->patch('https://api.lemonsqueezy.com/v1/subscriptions/' . $subscription_id, [
'data' => [
'type' => 'subscriptions',
'id' => $subscription_id,
'attributes' => [
'cancelled' => false,
],
],
]);
$json = $response->json();
if ($response->failed()) {
$error = data_get($json, 'errors.0.status');
if ($error === '404') {
throw new \Exception('Subscription not found.');
}
throw new \Exception(data_get($json, 'errors.0.title', 'Something went wrong. Please try again later.'));
} else {
$this->emit('success', 'Subscription resumed successfully. Reloading in 5s.');
$this->emit('reloadWindow', 5000);
}
} catch (\Exception $e) {
return general_error_handler($e, $this);
}
}
}

7
app/Http/Livewire/Waitlist.php
View File

@@ -18,7 +18,7 @@ class Waitlist extends Component
public function mount()
{
if (is_dev()) {
$this->email = 'test@example.com';
$this->email = 'waitlist@example.com';
}
}
public function submit()
@@ -27,8 +27,7 @@ class Waitlist extends Component
try {
$already_registered = User::whereEmail($this->email)->first();
if ($already_registered) {
$this->emit('success', 'You are already registered (Thank you 💜).');
return;
throw new \Exception('You are already on the waitlist or registered. <br>Please check your email to verify your email address or contact support.');
}
$found = ModelsWaitlist::where('email', $this->email)->first();
if ($found) {
@@ -36,7 +35,7 @@ class Waitlist extends Component
$this->emit('error', 'You are already on the waitlist. <br>Please check your email to verify your email address.');
return;
}
$this->emit('error', 'You are already on the waitlist.');
$this->emit('error', 'You are already on the waitlist. <br>You will be notified when your turn comes. <br>Thank you.');
return;
}
$waitlist = ModelsWaitlist::create([

17
app/Jobs/SendConfirmationForWaitlistJob.php
View File

@@ -24,10 +24,6 @@ class SendConfirmationForWaitlistJob implements ShouldQueue
public function handle()
{
try {
$settings = InstanceSettings::get();
set_transanctional_email_settings($settings);
$mail = new MailMessage();
$confirmation_url = base_url() . '/webhooks/waitlist/confirm?email=' . $this->email . '&confirmation_code=' . $this->uuid;
@@ -39,18 +35,7 @@ class SendConfirmationForWaitlistJob implements ShouldQueue
'cancel_url' => $cancel_url,
]);
$mail->subject('You are on the waitlist!');
Mail::send(
[],
[],
fn(Message $message) => $message
->from(
data_get($settings, 'smtp_from_address'),
data_get($settings, 'smtp_from_name')
)
->to($this->email)
->subject($mail->subject)
->html((string) $mail->render())
);
send_user_an_email($mail, $this->email);
} catch (\Throwable $th) {
send_internal_notification('SendConfirmationForWaitlistJob failed with error: ' . $th->getMessage());
ray($th->getMessage());

1
app/Models/User.php
View File

@@ -4,7 +4,6 @@ namespace App\Models;
use App\Notifications\Channels\SendsEmail;
use App\Notifications\TransactionalEmails\ResetPassword as TransactionalEmailsResetPassword;
use App\Notifications\TrnsactionalEmails\ResetPassword;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Foundation\Auth\User as Authenticatable;
use Illuminate\Notifications\Notifiable;