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

Merge pull request #1887 from coollabsio/next

Browse Source 
v4.0.0-beta.243
This commit is contained in:
Andras Bacsai 2024-03-25 14:54:35 +01:00 committed by GitHub
commit d1627276a6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
20 changed files with 406 additions and 552 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
app/Livewire/Boarding/Index.php
View File

@ -15,14 +15,11 @@ class Index extends Component
{
protected $listeners = ['serverInstalled' => 'validateServer'];
#[Url()]
public string $state = 'welcome';
public string $currentState = 'welcome';
#[Url()]
public ?string $selectedServerType = null;
public ?Collection $privateKeys = null;
#[Url()]
public ?int $selectedExistingPrivateKey = null;
public ?string $privateKeyType = null;
public ?string $privateKey = null;
@ -33,7 +30,6 @@ class Index extends Component
public ?Collection $servers = null;
#[Url()]
public ?int $selectedExistingServer = null;
public ?string $remoteServerName = null;
public ?string $remoteServerDescription = null;
@ -46,7 +42,6 @@ class Index extends Component
public Collection $projects;
#[Url()]
public ?int $selectedProject = null;
public ?Project $createdProject = null;
@ -71,25 +66,25 @@ public function mount()
$this->remoteServerDescription = 'Created by Coolify';
$this->remoteServerHost = 'coolify-testing-host';
}
if ($this->state === 'create-project') {
$this->getProjects();
}
if ($this->state === 'create-resource') {
$this->selectExistingServer();
$this->selectExistingProject();
}
if ($this->state === 'private-key') {
$this->setServerType('remote');
}
if ($this->state === 'create-server') {
$this->selectExistingPrivateKey();
}
if ($this->state === 'validate-server') {
$this->selectExistingServer();
}
if ($this->state === 'select-existing-server') {
$this->selectExistingServer();
}
// if ($this->currentState === 'create-project') {
// $this->getProjects();
// }
// if ($this->currentState === 'create-resource') {
// $this->selectExistingServer();
// $this->selectExistingProject();
// }
// if ($this->currentState === 'private-key') {
// $this->setServerType('remote');
// }
// if ($this->currentState === 'create-server') {
// $this->selectExistingPrivateKey();
// }
// if ($this->currentState === 'validate-server') {
// $this->selectExistingServer();
// }
// if ($this->currentState === 'select-existing-server') {
// $this->selectExistingServer();
// }
}
public function explanation()
@ -97,7 +92,7 @@ public function explanation()
if (isCloud()) {
return $this->setServerType('remote');
}
$this->state = 'select-server-type';
$this->currentState = 'select-server-type';
}
public function restartBoarding()
@ -136,10 +131,10 @@ public function setServerType(string $type)
$this->servers = Server::ownedByCurrentTeam(['name'])->where('id', '!=', 0)->get();
if ($this->servers->count() > 0) {
$this->selectedExistingServer = $this->servers->first()->id;
$this->state = 'select-existing-server';
$this->currentState = 'select-existing-server';
return;
}
$this->state = 'private-key';
$this->currentState = 'private-key';
}
}
public function selectExistingServer()
@ -147,12 +142,12 @@ public function selectExistingServer()
$this->createdServer = Server::find($this->selectedExistingServer);
if (!$this->createdServer) {
$this->dispatch('error', 'Server is not found.');
$this->state = 'private-key';
$this->currentState = 'private-key';
return;
}
$this->selectedExistingPrivateKey = $this->createdServer->privateKey->id;
$this->serverPublicKey = $this->createdServer->privateKey->publicKey();
$this->state = 'validate-server';
$this->currentState = 'validate-server';
}
public function getProxyType()
{
@ -160,7 +155,7 @@ public function getProxyType()
$this->selectProxy(ProxyTypes::TRAEFIK_V2->value);
// $proxyTypeSet = $this->createdServer->proxy->type;
// if (!$proxyTypeSet) {
// $this->state = 'select-proxy';
// $this->currentState = 'select-proxy';
// return;
// }
$this->getProjects();
@ -173,12 +168,12 @@ public function selectExistingPrivateKey()
}
$this->createdPrivateKey = PrivateKey::find($this->selectedExistingPrivateKey);
$this->privateKey = $this->createdPrivateKey->private_key;
$this->state = 'create-server';
$this->currentState = 'create-server';
}
public function createNewServer()
{
$this->selectedExistingServer = null;
$this->state = 'private-key';
$this->currentState = 'private-key';
}
public function setPrivateKey(string $type)
{
@ -187,7 +182,7 @@ public function setPrivateKey(string $type)
if ($type === 'create') {
$this->createNewPrivateKey();
}
$this->state = 'create-private-key';
$this->currentState = 'create-private-key';
}
public function savePrivateKey()
{
@ -202,7 +197,7 @@ public function savePrivateKey()
'team_id' => currentTeam()->id
]);
$this->createdPrivateKey->save();
$this->state = 'create-server';
$this->currentState = 'create-server';
}
public function saveServer()
{
@ -231,7 +226,7 @@ public function saveServer()
$this->createdServer->settings->save();
$this->createdServer->addInitialNetwork();
$this->selectedExistingServer = $this->createdServer->id;
$this->state = 'validate-server';
$this->currentState = 'validate-server';
}
public function installServer()
{
@ -258,7 +253,7 @@ public function validateServer()
$dockerVersion = instant_remote_process(["docker version|head -2|grep -i version| awk '{print $2}'"], $this->createdServer, true);
$dockerVersion = checkMinimumDockerEngineVersion($dockerVersion);
if (is_null($dockerVersion)) {
$this->state = 'validate-server';
$this->currentState = 'validate-server';
throw new \Exception('Docker not found or old version is installed.');
}
$this->createdServer->settings()->update([
@ -286,12 +281,12 @@ public function getProjects()
if ($this->projects->count() > 0) {
$this->selectedProject = $this->projects->first()->id;
}
$this->state = 'create-project';
$this->currentState = 'create-project';
}
public function selectExistingProject()
{
$this->createdProject = Project::find($this->selectedProject);
$this->state = 'create-resource';
$this->currentState = 'create-resource';
}
public function createNewProject()
{
@ -299,7 +294,7 @@ public function createNewProject()
'name' => "My first project",
'team_id' => currentTeam()->id
]);
$this->state = 'create-resource';
$this->currentState = 'create-resource';
}
public function showNewResource()
{

1
composer.json
View File

@ -41,7 +41,6 @@
"stripe/stripe-php": "^12.0",
"symfony/yaml": "^6.2",
"visus/cuid2": "^2.0.0",
"wire-elements/modal": "^2.0",
"yosymfony/toml": "^1.0"
},
"require-dev": {

60
composer.lock generated
View File

@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
"content-hash": "9bdaf702cdd870434444f8937a816fdb",
"content-hash": "e095b8a9eb22df2943cbc3e9649ff9e8",
"packages": [
{
"name": "amphp/amp",
@ -11859,64 +11859,6 @@
},
"time": "2022-06-03T18:03:27+00:00"
},
{
"name": "wire-elements/modal",
"version": "2.0.9",
"source": {
"type": "git",
"url": "https://github.com/wire-elements/modal.git",
"reference": "899b05e313403669aa8a359db71a066246184355"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/wire-elements/modal/zipball/899b05e313403669aa8a359db71a066246184355",
"reference": "899b05e313403669aa8a359db71a066246184355",
"shasum": ""
},
"require": {
"livewire/livewire": "^3.2.3",
"php": "^8.1",
"spatie/laravel-package-tools": "^1.9"
},
"require-dev": {
"orchestra/testbench": "^8.5",
"phpunit/phpunit": "^9.5"
},
"type": "library",
"extra": {
"laravel": {
"providers": [
"LivewireUI\\Modal\\LivewireModalServiceProvider"
]
}
},
"autoload": {
"psr-4": {
"LivewireUI\\Modal\\": "src"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Philo Hermans",
"email": "me@philohermans.com"
}
],
"description": "Laravel Livewire modal component",
"keywords": [
"laravel",
"livewire",
"modal"
],
"support": {
"issues": "https://github.com/wire-elements/modal/issues",
"source": "https://github.com/wire-elements/modal/tree/2.0.9"
},
"time": "2023-12-08T09:31:14+00:00"
},
{
"name": "yosymfony/parser-utils",
"version": "v2.0.0",

2
config/sentry.php
View File

@ -7,7 +7,7 @@
// The release version of your application
// Example with dynamic git hash: trim(exec('git --git-dir ' . base_path('.git') . ' log --pretty="%h" -n1 HEAD'))
'release' => '4.0.0-beta.242',
'release' => '4.0.0-beta.243',
// When left empty or `null` the Laravel environment will be used
'environment' => config('app.env'),

2
config/version.php
View File

@ -1,3 +1,3 @@
<?php
return '4.0.0-beta.242';
return '4.0.0-beta.243';

52
config/wire-elements-modal.php
View File

@ -1,52 +0,0 @@
<?php
return [
/*
|--------------------------------------------------------------------------
| Include CSS
|--------------------------------------------------------------------------
|
| The modal uses TailwindCSS, if you don't use TailwindCSS you will need
| to set this parameter to true. This includes the modern-normalize css.
|
*/
'include_css' => false,
/*
|--------------------------------------------------------------------------
| Include JS
|--------------------------------------------------------------------------
|
| Livewire UI will inject the required Javascript in your blade template.
| If you want to bundle the required Javascript you can set this to false
| and add `require('vendor/wire-elements/modal/resources/js/modal');`
| to your script bundler like webpack.
|
*/
'include_js' => false,
/*
|--------------------------------------------------------------------------
| Modal Component Defaults
|--------------------------------------------------------------------------
|
| Configure the default properties for a modal component.
|
| Supported modal_max_width
| 'sm', 'md', 'lg', 'xl', '2xl', '3xl', '4xl', '5xl', '6xl', '7xl'
*/
'component_defaults' => [
'modal_max_width' => '7xl',
'close_modal_on_click_away' => true,
'close_modal_on_escape' => true,
'close_modal_on_escape_is_forceful' => true,
'dispatch_close_event' => false,
'destroy_on_close' => false,
],
];

1
resources/js/app.js
View File

@ -1,6 +1,5 @@
import { createApp } from "vue";
import MagicBar from "./components/MagicBar.vue";
import "../../vendor/wire-elements/modal/resources/js/modal";
const app = createApp({});
app.component("magic-bar", MagicBar);

2
resources/views/auth/confirm-password.blade.php
View File

@ -3,7 +3,7 @@
<div>
<div class="flex flex-col items-center pb-8">
<div class="text-5xl font-bold tracking-tight text-center dark:text-white">Coolify</div>
<x-version />
{{-- <x-version /> --}}
</div>
<div class="w-96">
<form action="/user/confirm-password" method="POST" class="flex flex-col gap-2">

2
resources/views/auth/forgot-password.blade.php
View File

@ -5,7 +5,7 @@
<a href="{{ route('dashboard') }}">
<div class="text-5xl font-bold tracking-tight text-center dark:text-white">Coolify</div>
</a>
<x-version />
{{-- <x-version /> --}}
</div>
<div class="flex items-center gap-2">

22
resources/views/auth/two-factor-challenge.blade.php
View File

@ -3,31 +3,25 @@
<div>
<div class="flex flex-col items-center pb-8">
<div class="text-5xl font-bold tracking-tight text-center dark:text-white">Coolify</div>
<x-version />
{{-- <x-version /> --}}
</div>
<div class="w-96" x-data="{ showRecovery: false }">
<div class="w-96">
<form action="/two-factor-challenge" method="POST" class="flex flex-col gap-2">
@csrf
<template x-if="!showRecovery">
<div>
<x-forms.input required type="number" name="code" label="{{ __('input.code') }}"
autofocus />
<div class="pt-2 text-xs cursor-pointer hover:underline hover:dark:text-white"
<x-forms.input autofocus type="number" name="code" label="{{ __('input.code') }}" autofocus />
{{-- <div class="pt-2 text-xs cursor-pointer hover:underline hover:dark:text-white"
x-on:click="showRecovery = !showRecovery">Use
Recovery Code
</div> --}}
</div>
</div>
</template>
<template x-if="showRecovery">
<div>
<x-forms.input required type="text" name="recovery_code"
label="{{ __('input.recovery_code') }}" />
<div class="pt-2 text-xs cursor-pointer hover:underline hover:dark:text-white"
<x-forms.input name="recovery_code" label="{{ __('input.recovery_code') }}" />
{{-- <div class="pt-2 text-xs cursor-pointer hover:underline hover:dark:text-white"
x-on:click="showRecovery = !showRecovery">Use
One-Time Code
</div> --}}
</div>
</div>
</template>
<x-forms.button type="submit">{{ __('auth.login') }}</x-forms.button>
</form>
@if ($errors->any())

10
resources/views/auth/verify-email.blade.php
View File

@ -1,6 +1,6 @@
<x-layout-subscription>
<div class="min-h-screen hero">
<div class="min-w-fit">
<x-layout>
<section class="flex flex-col h-full lg:items-center lg:justify-center">
<div class="flex flex-col items-center justify-center px-6 py-8 mx-auto max-w-7xl lg:py-0">
<h1> Verification Email Sent </h1>
<div class="flex justify-center gap-2 text-center">
<br>To activate your account, please open the email and follow the
@ -8,5 +8,5 @@
</div>
<livewire:verify-email />
</div>
</div>
</x-layout-subscription>
</section>
</x-layout>

4
resources/views/components/navbar.blade.php
View File

@ -12,7 +12,7 @@
<ul role="list" class="flex flex-col flex-1 gap-y-7">
<li class="flex-1 ">
<ul role="list" class="flex flex-col h-full space-y-1.5">
@if (isSubscribed())
@if (isSubscribed() || !isCloud())
<li>
<a title="Dashboard" href="/"
class="{{ request()->is('/') ? 'menu-item-active menu-item' : 'menu-item' }}">
@ -263,7 +263,7 @@ class="{{ request()->is('onboarding*') ? 'menu-item-active menu-item' : 'menu-it
<livewire:help />
</x-modal-input>
</li>
<li >
<li>
<form action="/logout" method="POST">
@csrf
<button title="Logout" type="submit" class="gap-2 mb-6 menu-item">

2
resources/views/layouts/app.blade.php
View File

@ -1,7 +1,7 @@
@extends('layouts.base')
@section('body')
@parent
@if (isSubscribed())
@if (isSubscribed() || !isCloud())
<livewire:layout-popups />
@endif
@auth

1
resources/views/layouts/base.blade.php
View File

@ -38,7 +38,6 @@
@section('body')
<body>
{{-- @livewire('wire-elements-modal') --}}
<x-toast />
<script data-navigate-once>
if (localStorage.theme === 'dark' || (!('theme' in localStorage) && window.matchMedia(

4
resources/views/layouts/simple.blade.php
View File

@ -1,7 +1,7 @@
@extends('layouts.base')
@section('body')
@parent
<main>
<main class="h-full bg-gray-50 dark:bg-base">
{{ $slot }}
</main>
@parent
@endsection

71
resources/views/livewire/boarding/index.blade.php
View File

@ -1,17 +1,15 @@
@php use App\Enums\ProxyTypes; @endphp
<section class="flex flex-col h-full lg:items-center lg:justify-center">
<div class="flex flex-col items-center justify-center px-6 py-8 mx-auto max-w-7xl lg:py-0">
@if ($state === 'welcome')
@if ($currentState === 'welcome')
<h1 class="text-3xl font-bold lg:text-5xl">Welcome to Coolify</h1>
<p class="py-6 text-base text-center lg:text-xl">Let me help you set up the basics.</p>
<div class="flex justify-center ">
<x-forms.button class="justify-center w-64 box" wire:click="$set('state','explanation')">Get
<x-forms.button class="justify-center w-64 box" wire:click="$set('currentState','explanation')">Get
Started
</x-forms.button>
</div>
@endif
<div>
@if ($state === 'explanation')
@elseif ($currentState === 'explanation')
<x-boarding-step title="What is Coolify?">
<x-slot:question>
Coolify is an all-in-one application to automate tasks on your servers, deploy application with
@ -39,8 +37,7 @@
</x-forms.button>
</x-slot:actions>
</x-boarding-step>
@endif
@if ($state === 'select-server-type')
@elseif ($currentState === 'select-server-type')
<x-boarding-step title="Server">
<x-slot:question>
Do you want to deploy your resources to your <x-highlighted text="Localhost" />
@ -82,10 +79,7 @@
provider.</p>
</x-slot:explanation>
</x-boarding-step>
@endif
</div>
<div>
@if ($state === 'private-key')
@elseif ($currentState === 'private-key')
<x-boarding-step title="SSH Key">
<x-slot:question>
Do you have your own SSH Private Key?
@ -118,10 +112,7 @@
</p>
</x-slot:explanation>
</x-boarding-step>
@endif
</div>
<div>
@if ($state === 'select-existing-server')
@elseif ($currentState === 'select-existing-server')
<x-boarding-step title="Select a server">
<x-slot:question>
There are already servers available for your Team. Do you want to use one of them?
@ -155,8 +146,7 @@
'root' or skip the boarding process and add a new private key manually to Coolify and to the
server.
<x-forms.input readonly id="serverPublicKey"></x-forms.input>
<x-forms.button class="w-64 box" wire:target="validateServer"
wire:click="validateServer">Check
<x-forms.button class="w-64 box" wire:target="validateServer" wire:click="validateServer">Check
again
</x-forms.button>
@endif
@ -169,10 +159,7 @@
</p>
</x-slot:explanation>
</x-boarding-step>
@endif
</div>
<div>
@if ($state === 'create-private-key')
@elseif ($currentState === 'create-private-key')
<x-boarding-step title="Create Private Key">
<x-slot:question>
Please let me know your key details.
@ -183,8 +170,8 @@
label="Name" id="privateKeyName" />
<x-forms.input placeholder="Description, so others will know more about this."
label="Description" id="privateKeyDescription" />
<x-forms.textarea required placeholder="-----BEGIN OPENSSH PRIVATE KEY-----"
label="Private Key" id="privateKey" />
<x-forms.textarea required placeholder="-----BEGIN OPENSSH PRIVATE KEY-----" label="Private Key"
id="privateKey" />
@if ($privateKeyType === 'create')
<x-forms.textarea rows="7" readonly label="Public Key" id="publicKey" />
<span class="font-bold dark:text-warning">ACTION REQUIRED: Copy the 'Public Key' to your
@ -203,10 +190,7 @@
</p>
</x-slot:explanation>
</x-boarding-step>
@endif
</div>
<div>
@if ($state === 'create-server')
@elseif ($currentState === 'create-server')
<x-boarding-step title="Create Server">
<x-slot:question>
Please let me know your server details.
@ -220,13 +204,12 @@
label="Description" id="remoteServerDescription" />
</div>
<div class="flex flex-col gap-2 lg:flex-row ">
<x-forms.input required placeholder="127.0.0.1" label="IP Address"
id="remoteServerHost" />
<x-forms.input required placeholder="127.0.0.1" label="IP Address" id="remoteServerHost" />
<x-forms.input required placeholder="Port number of your server. Default is 22."
label="Port" id="remoteServerPort" />
<x-forms.input required readonly
placeholder="Username to connect to your server. Default is root."
label="Username" id="remoteServerUser" />
placeholder="Username to connect to your server. Default is root." label="Username"
id="remoteServerUser" />
</div>
<div class="lg:w-64">
<x-forms.checkbox
@ -241,10 +224,7 @@
non-root users.</p>
</x-slot:explanation>
</x-boarding-step>
@endif
</div>
<div>
@if ($state === 'validate-server')
@elseif ($currentState === 'validate-server')
<x-boarding-step title="Validate & Configure Server">
<x-slot:question>
I need to validate your server (connection, Docker Engine, etc) and configure if something is
@ -271,10 +251,7 @@
documentation</a>.</p>
</x-slot:explanation>
</x-boarding-step>
@endif
</div>
<div>
@if ($state === 'create-project')
@elseif ($currentState === 'create-project')
<x-boarding-step title="Project">
<x-slot:question>
@if (count($projects) > 0)
@ -309,10 +286,7 @@
staging version of the same application, but grouped separately.</p>
</x-slot:explanation>
</x-boarding-step>
@endif
</div>
<div>
@if ($state === 'create-resource')
@elseif ($currentState === 'create-resource')
<x-boarding-step title="Resources">
<x-slot:question>
Let's go to the new resource page, where you can create your first resource.
@ -329,14 +303,17 @@
</div>
<div class="flex flex-col justify-center gap-4 pt-4 lg:gap-2 lg:flex">
<div class="flex justify-center w-full gap-2">
<x-forms.button wire:click='skipBoarding'>Skip onboarding</x-forms.button>
<x-forms.button wire:click='restartBoarding'>Restart onboarding</x-forms.button>
<div class="cursor-pointer hover:underline dark:hover:text-white" wire:click='skipBoarding'>Skip
onboarding</div>
<div class="cursor-pointer hover:underline dark:hover:text-white" wire:click='restartBoarding'>Restart
onboarding</div>
</div>
<x-modal-input title="How can we help?">
<x-slot:content>
<x-forms.button class="w-full" title="Send us feedback or get help!">
<div class="w-full text-center cursor-pointer hover:underline dark:hover:text-white"
title="Send us feedback or get help!">
Feedback
</x-forms.button>
</div>
</x-slot:content>
<livewire:help />
</x-modal-input>

10
resources/views/livewire/subscription/index.blade.php
View File

@ -1,4 +1,5 @@
@if ($settings->is_resale_license_active)
<div>
@if ($settings->is_resale_license_active)
@if (auth()->user()->isAdminFromSession())
<div>
<div class="flex gap-2">
@ -29,10 +30,11 @@
<h1>Subscription</h1>
</div>
<div>You are not an admin or have been removed from this team. If this does not make sense, please <span
class="dark:text-white underline cursor-pointer" wire:click="help">contact
class="underline cursor-pointer dark:text-white" wire:click="help">contact
us</span>.</div>
</div>
@endif
@else
@else
<div class="px-10">Resale license is not active. Please contact your instance admin.</div>
@endif
@endif
</div>

1
tailwind.config.js
View File

@ -15,7 +15,6 @@ const colors = {
module.exports = {
darkMode: "selector",
content: [
'./vendor/wire-elements/modal/resources/views/*.blade.php',
'./storage/framework/views/*.php',
"./resources/**/*.blade.php",
"./app/**/*.php",

2
versions.json
View File

@ -4,7 +4,7 @@
"version": "3.12.36"
},
"v4": {
"version": "4.0.0-beta.242"
"version": "4.0.0-beta.243"
}
}
}