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

Update version numbers and fix layout in subscription views

Browse Source
This commit is contained in:
Andras Bacsai 2024-03-25 14:09:13 +01:00
parent 901a580e11
commit c9160cabc5
6 changed files with 44 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/sentry.php
View File

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

2
config/version.php
View File

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

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

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

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

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

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

@ -1,38 +1,40 @@
@if ($settings->is_resale_license_active) <div>
@if (auth()->user()->isAdminFromSession()) @if ($settings->is_resale_license_active)
<div> @if (auth()->user()->isAdminFromSession())
<div class="flex gap-2"> <div>
<h1>Choose a Plan</h1> <div class="flex gap-2">
@if (subscriptionProvider() === 'stripe' && $alreadySubscribed) <h1>Choose a Plan</h1>
<x-forms.button wire:click='stripeCustomerPortal'>Manage My Subscription</x-forms.button> @if (subscriptionProvider() === 'stripe' && $alreadySubscribed)
<x-forms.button wire:click='stripeCustomerPortal'>Manage My Subscription</x-forms.button>
@endif
</div>
@if (request()->query->get('cancelled'))
<div class="mb-6 rounded alert-error">
<svg xmlns="http://www.w3.org/2000/svg" class="w-6 h-6 stroke-current shrink-0" fill="none"
viewBox="0 0 24 24">
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2"
d="M10 14l2-2m0 0l2-2m-2 2l-2-2m2 2l2 2m7-2a9 9 0 11-18 0 9 9 0 0118 0z" />
</svg>
<span>Something went wrong with your subscription. Please try again or contact
support.</span>
</div>
@endif
@if (config('subscription.provider') !== null)
<livewire:subscription.pricing-plans />
@endif @endif
</div> </div>
@if (request()->query->get('cancelled')) @else
<div class="mb-6 rounded alert-error"> <div class="flex flex-col justify-center mx-10">
<svg xmlns="http://www.w3.org/2000/svg" class="w-6 h-6 stroke-current shrink-0" fill="none" <div class="flex gap-2">
viewBox="0 0 24 24"> <h1>Subscription</h1>
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2"
d="M10 14l2-2m0 0l2-2m-2 2l-2-2m2 2l2 2m7-2a9 9 0 11-18 0 9 9 0 0118 0z" />
</svg>
<span>Something went wrong with your subscription. Please try again or contact
support.</span>
</div> </div>
@endif <div>You are not an admin or have been removed from this team. If this does not make sense, please <span
class="underline cursor-pointer dark:text-white" wire:click="help">contact
@if (config('subscription.provider') !== null) us</span>.</div>
<livewire:subscription.pricing-plans />
@endif
</div>
@else
<div class="flex flex-col justify-center mx-10">
<div class="flex gap-2">
<h1>Subscription</h1>
</div> </div>
<div>You are not an admin or have been removed from this team. If this does not make sense, please <span @endif
class="dark:text-white underline cursor-pointer" wire:click="help">contact @else
us</span>.</div> <div class="px-10">Resale license is not active. Please contact your instance admin.</div>
</div>
@endif @endif
@else </div>
<div class="px-10">Resale license is not active. Please contact your instance admin.</div>
@endif

2
versions.json
View File

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