From c870cd8ced9cf16875a1cffa8062b2029015b7bb Mon Sep 17 00:00:00 2001 From: Gary Date: Fri, 8 Mar 2024 14:35:29 -0800 Subject: [PATCH] fix: UI and copy issues --- .../views/components/emails/footer.blade.php | 2 +- resources/views/components/navbar.blade.php | 8 +- resources/views/layouts/boarding.blade.php | 2 +- .../livewire/project/new/select.blade.php | 526 +++++++++--------- .../views/livewire/settings/email.blade.php | 27 +- 5 files changed, 271 insertions(+), 294 deletions(-) diff --git a/resources/views/components/emails/footer.blade.php b/resources/views/components/emails/footer.blade.php index d275015de..8b3cad06c 100644 --- a/resources/views/components/emails/footer.blade.php +++ b/resources/views/components/emails/footer.blade.php @@ -1,6 +1,6 @@ {{ Illuminate\Mail\Markdown::parse('---') }} Thank you,
-{{ config('app.name') ?? 'Last Hour Cloud' }} +Last Hour Cloud {{ Illuminate\Mail\Markdown::parse('[Contact Support](https://lasthourhosting.org/contact.html)') }} \ No newline at end of file diff --git a/resources/views/components/navbar.blade.php b/resources/views/components/navbar.blade.php index b66a062d7..79f854deb 100644 --- a/resources/views/components/navbar.blade.php +++ b/resources/views/components/navbar.blade.php @@ -154,15 +154,15 @@
  • - +
  • -
    - - +
    + +
    diff --git a/resources/views/layouts/boarding.blade.php b/resources/views/layouts/boarding.blade.php index e42791218..96ec1e94e 100644 --- a/resources/views/layouts/boarding.blade.php +++ b/resources/views/layouts/boarding.blade.php @@ -2,7 +2,7 @@ @section('body')
    -
    +
    diff --git a/resources/views/livewire/project/new/select.blade.php b/resources/views/livewire/project/new/select.blade.php index 0f67bf9d5..a49091673 100644 --- a/resources/views/livewire/project/new/select.blade.php +++ b/resources/views/livewire/project/new/select.blade.php @@ -4,7 +4,7 @@
    @foreach ($environments as $environment) - + @endforeach
    @@ -12,147 +12,136 @@
    Deploy resources, like Applications, Databases, Services...
    @if ($current_step === 'type') -
      -
    • Select Resource Type
      • -
    • Select a Server
      • -
    • Select a Destination
      • -
    -

    Applications

    -
    - - Public Repository +
      +
    • Select Resource Type
      • +
    • Select a Server
      • +
    • Select a Destination
      • +
    +

    Applications

    +
    + + Public Repository You can deploy any kind of public repositories from the supported git providers. - - - - - - - Private Repository (with GitHub App) + + + + + + + Private Repository (with GitHub App) You can deploy public & private repositories through your GitHub Apps. - - - - - + + + + + - - Private Repository (with deploy key) + + Private Repository (with deploy key) You can deploy public & private repositories with a simple deploy key (SSH key). - - - - - -
    -
    - - Based on a Dockerfile + + + + + +
    +
    + + Based on a Dockerfile You can deploy a simple Dockerfile, without Git. - - - - - - - Based on a Docker Compose + + + + + + + Based on a Docker Compose You can deploy complex application easily with Docker Compose, without Git. - - - - - - - Based on an existing Docker Image + + + + + + + Based on an existing Docker Image You can deploy an existing Docker Image from any Registry, without Git. - - - - - -
    -

    Databases

    -
    - - New PostgreSQL + + + + + +
    +

    Databases

    +
    + + New PostgreSQL PostgreSQL is an object-relational database known for its robustness, advanced features, and strong standards compliance. - - - - - - - New Redis + + + + + + + New Redis Redis is an open-source, in-memory data structure store, used as a database, cache, and message broker. - - - - - - - New MongoDB + + + + + + + New MongoDB MongoDB is a source-available, NoSQL database that uses JSON-like documents with optional schemas. - - - - - - - New MySQL + + + + + + + New MySQL MySQL is a relational database known for its speed, reliability, and flexibility. - - - - - - - New Mariadb + + + + + + + New Mariadb MariaDB is a relational database that serves as a drop-in replacement for MySQL. - - - - - + + + + + - {{--
    + {{--
    Backup Existing PostgreSQL @@ -162,105 +151,99 @@
    --}} -
    -
    -

    Services

    - Reload List - -
    -
    - @if ($loadingServices) - - @else - @forelse ($services as $serviceName => $service) - @if (data_get($service, 'minversion') && version_compare(config('version'), data_get($service, 'minversion'), '<')) - - {{ Str::headline($serviceName) }} - - @if (data_get($service, 'slogan')) - {{ data_get($service, 'slogan') }} - @endif +
    +
    +

    Services

    + Reload List + +
    +
    + @if ($loadingServices) + + @else + @forelse ($services as $serviceName => $service) + @if (data_get($service, 'minversion') && version_compare(config('version'), data_get($service, 'minversion'), '<')) + {{ Str::headline($serviceName) }} + + @if (data_get($service, 'slogan')) + {{ data_get($service, 'slogan') }} + @endif + + + @if (data_get($service, 'logo')) + + @endif + + + {{ data_get($service, 'documentation') }} + + + You need to upgrade Last Hour Cloud to {{ data_get($service, 'minversion') }} to use this + service. - - @if (data_get($service, 'logo')) - - @endif - - - {{ data_get($service, 'documentation') }} - - - You need to upgrade Coolify to {{ data_get($service, 'minversion') }} to use this - service. - - - {{-- --}} - @else - - {{ Str::headline($serviceName) }} - - @if (data_get($service, 'slogan')) - {{ data_get($service, 'slogan') }} - @endif - - - @if (file_exists(public_path(data_get($service, 'logo')))) - - @else - - @endif - - - {{ data_get($service, 'documentation') }} - - - {{-- --}} - @endif - @empty -
    No service found. Please try to reload the list!
    - @endforelse +
    + You need to upgrade to {{ data_get($service, 'minversion') }} to use this service. +
    + --}} + @else + + {{ Str::headline($serviceName) }} + + @if (data_get($service, 'slogan')) + {{ data_get($service, 'slogan') }} @endif -
    -
    Trademarks Policy: The respective trademarks mentioned here are owned by the - respective - companies, and use of them does not imply any affiliation or endorsement.
    + + + @if (file_exists(public_path(data_get($service, 'logo')))) + + @else + + @endif + + + {{ data_get($service, 'documentation') }} + + + {{-- --}} + @endif + @empty +
    No service found. Please try to reload the list!
    + @endforelse + @endif +
    +
    Trademarks Policy: The respective trademarks mentioned here are owned by the + respective + companies, and use of them does not imply any affiliation or endorsement.
    +@endif +@if ($current_step === 'servers') +
      +
    • Select Resource Type
      • +
    • Select a Server
      • +
    • Select a Destination
      • +
    - {{-- @if ($isDatabase) +{{-- @if ($isDatabase)
    @endif --}} -
    - @forelse($servers as $server) -
    -
    -
    - {{ $server->name }} -
    -
    - {{ $server->description }}
    -
    -
    - @empty -     - @endforelse +
    + @forelse($servers as $server) +
    +
    +
    + {{ $server->name }}
    - {{-- @if ($isDatabase) +
    + {{ $server->description }} +
    +
    +
    + @empty +
    +
    No validated & reachable servers found. + Go to servers page +
    + + +
    + @endforelse +
    +{{-- @if ($isDatabase)
    Swarm clusters are excluded from this type of resource at the moment. It will be activated soon. Stay tuned.
    @endif --}} - @endif - @if ($current_step === 'destinations') -
      -
    • Select Resource Type
      • -
    • Select a Server
      • -
    • Select a Destination
      • -
    +@endif +@if ($current_step === 'destinations') +
      +
    • Select Resource Type
      • +
    • Select a Server
      • +
    • Select a Destination
      • +
    -
    - @if ($server->isSwarm()) - @foreach ($swarmDockers as $swarmDocker) -
    -
    -
    - Swarm Docker ({{ $swarmDocker->name }}) -
    -
    -
    - @endforeach - @else - @foreach ($standaloneDockers as $standaloneDocker) -
    -
    -
    - Standalone Docker ({{ $standaloneDocker->name }}) -
    -
    - Network: {{ $standaloneDocker->network }}
    -
    -
    - @endforeach - @endif - -
    -
    - + Add New -
    -
    -     +
    + @if ($server->isSwarm()) + @foreach ($swarmDockers as $swarmDocker) +
    +
    +
    + Swarm Docker ({{ $swarmDocker->name }})
    - @endif - @if ($current_step === 'existing-postgresql') -
    - - Add Database - - @endif +
    + @endforeach + @else + @foreach ($standaloneDockers as $standaloneDocker) +
    +
    +
    + Standalone Docker ({{ $standaloneDocker->name }}) +
    +
    + Network: {{ $standaloneDocker->network }}
    +
    +
    + @endforeach + @endif + +
    +
    + + Add New +
    +
    +
    +@endif +@if ($current_step === 'existing-postgresql') +
    + + Add Database + +@endif +
    +
    \ No newline at end of file diff --git a/resources/views/livewire/settings/email.blade.php b/resources/views/livewire/settings/email.blade.php index 78520bb39..79e7e81d8 100644 --- a/resources/views/livewire/settings/email.blade.php +++ b/resources/views/livewire/settings/email.blade.php @@ -13,22 +13,20 @@

    Transactional Email

    -
    Email settings for password resets, invitations, shared with Pro+ subscribers etc.
    +
    Email settings for password resets, invitations, shared with users etc.
    - + Save @if (isEmailEnabled($settings) && - auth()->user()->isAdminFromSession() && - isTestEmailEnabled($settings)) - - Send Test Email - + auth()->user()->isAdminFromSession() && + isTestEmailEnabled($settings)) + + Send Test Email + @endif
    @@ -43,14 +41,12 @@
    - +
    - +
    @@ -68,8 +64,7 @@
    - +
    @@ -80,4 +75,4 @@
    -
    +
    \ No newline at end of file