Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@
"laravel/fortify": "^1.8",
"league/commonmark": "^2.0",
"livewire/livewire": "^2.6",
"lukeraymonddowning/honey": "^0.3.4",
"mockery/mockery": "^1.4",
"nunomaduro/collision": "^5.5",
"nunomaduro/larastan": "^0.7",
Expand All @@ -58,6 +57,7 @@
"rector/rector": "^0.11.38",
"ruafozy/mersenne-twister": "^1.3",
"spatie/laravel-flash": "^1.7",
"spatie/laravel-honeypot": "^4.0",
"spatie/laravel-medialibrary": "^9.7",
"spatie/laravel-newsletter": "^4.10",
"spatie/laravel-package-tools": "^1.9",
Expand Down
165 changes: 88 additions & 77 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions resources/views/auth/forgot-password.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
@section('content')
<x-data-bag key="fortify-content" resolver="name" view="ark-fortify::components.component-heading"/>

<div class="max-w-xl py-8 mx-auto">
<div class="py-8 mx-auto max-w-xl">
<div class="px-8">
<x-ark-flash/>
</div>
Expand All @@ -37,12 +37,12 @@ class="w-full"
</div>
</div>

<div class="flex flex-col-reverse items-center justify-between space-y-4 md:space-y-0 md:flex-row">
<div class="flex flex-col-reverse justify-between items-center space-y-4 md:flex-row md:space-y-0">
<div class="flex-1 mt-8 md:mt-0">
<a href="{{ route('login') }}" class="link">@lang('ui::actions.cancel')</a>
</div>

<button type="submit" class="w-full button-secondary md:w-auto">
<button type="submit" class="w-full md:w-auto button-secondary">
@lang('ui::auth.forgot-password.reset_link')
</button>
</div>
Expand Down
6 changes: 3 additions & 3 deletions resources/views/auth/login.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -79,20 +79,20 @@ class="flex flex-col-reverse items-center space-y-4 sm:space-y-0 sm:flex-row {{
@if($hasForgotPassword)
<div class="flex-1 mt-8 sm:mt-0">
<a href="{{ route('password.request') }}"
class="link font-semibold">@lang('ui::auth.sign-in.forgot_password')</a>
class="font-semibold link">@lang('ui::auth.sign-in.forgot_password')</a>
</div>
@endif
</div>

<button type="submit" class="w-full button-secondary sm:w-auto">
<button type="submit" class="w-full sm:w-auto button-secondary">
@lang('ui::actions.sign_in')
</button>
</div>
</div>
</x:ark-fortify::form-wrapper>

@if(Route::has('register'))
<div class="text-center mb-8">
<div class="mb-8 text-center">
<x-data-bag key="fortify-content" resolver="name" view="ark-fortify::components.register-now"/>
</div>
@endif
Expand Down
2 changes: 1 addition & 1 deletion resources/views/auth/register-form.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ class="w-full"
</div>

<div class="text-right">
<button type="submit" class="w-full button-secondary sm:w-auto">
<button type="submit" class="w-full sm:w-auto button-secondary">
@lang('ui::actions.sign_up')
</button>
</div>
Expand Down
2 changes: 1 addition & 1 deletion resources/views/auth/register.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
@section('content')
<x-data-bag key="fortify-content" resolver="name" view="ark-fortify::components.component-heading" />

<div class="sm:max-w-xl py-8 mx-auto">
<div class="py-8 mx-auto sm:max-w-xl">
<livewire:auth.register-form />

<div class="text-center">
Expand Down
4 changes: 2 additions & 2 deletions resources/views/auth/reset-password-form.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -53,12 +53,12 @@ class="w-full"
</div>
</div>

<div class="flex flex-col-reverse items-center justify-between space-y-4 md:space-y-0 md:flex-row">
<div class="flex flex-col-reverse justify-between items-center space-y-4 md:flex-row md:space-y-0">
<div class="flex-1 mt-8 md:mt-0">
<a href="{{ route('login') }}" class="link">@lang('ui::actions.cancel')</a>
</div>

<button type="submit" class="w-full button-secondary md:w-auto">
<button type="submit" class="w-full md:w-auto button-secondary">
@lang('ui::actions.reset_password')
</button>
</div>
Expand Down
2 changes: 1 addition & 1 deletion resources/views/auth/reset-password.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
@section('content')
<x-data-bag key="fortify-content" resolver="name" view="ark-fortify::components.component-heading" />

<div class="max-w-xl py-8 mx-auto">
<div class="py-8 mx-auto max-w-xl">
<livewire:auth.reset-password-form :token="request()->route('token')" :email="old('email', request()->email)" />
</div>
@endsection
8 changes: 4 additions & 4 deletions resources/views/auth/two-factor-challenge.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@
@endsection

@section('content')
<div class="w-full py-8 bg-theme-secondary-100">
<div class="container mx-auto ">
<h1 class="mx-4 text-2xl font-bold text-center md:text-4xl md:mx-8 xl:mx-16 text-theme-secondary-900">@lang('ui::auth.two-factor.page_header')</h1>
<p class="mx-4 mt-4 font-semibold text-center text-theme-secondary-700 md:mx-8 xl:mx-16">@lang('ui::auth.two-factor.page_description')</p>
<div class="py-8 w-full bg-theme-secondary-100">
<div class="container mx-auto">
<h1 class="mx-4 text-2xl font-bold text-center md:mx-8 md:text-4xl xl:mx-16 text-theme-secondary-900">@lang('ui::auth.two-factor.page_header')</h1>
<p class="mx-4 mt-4 font-semibold text-center md:mx-8 xl:mx-16 text-theme-secondary-700">@lang('ui::auth.two-factor.page_description')</p>
</div>
</div>

Expand Down
6 changes: 3 additions & 3 deletions resources/views/auth/two-factor/form.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@ class="w-full hide-number-input-arrows"
</div>
</div>

<div class="flex flex-col-reverse items-center justify-between sm:flex-row">
<button @click="recovery = true" type="button" class="w-full mt-4 font-semibold link sm:w-auto sm:mt-0">
<div class="flex flex-col-reverse justify-between items-center sm:flex-row">
<button @click="recovery = true" type="button" class="mt-4 w-full font-semibold sm:mt-0 sm:w-auto link">
@lang('ui::actions.enter_recovery_code')
</button>

<button type="submit" class="w-full button-secondary sm:w-auto">
<button type="submit" class="w-full sm:w-auto button-secondary">
@lang('ui::actions.sign_in')
</button>
</div>
Expand Down
6 changes: 3 additions & 3 deletions resources/views/auth/two-factor/recovery-form.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@ class="w-full"
</div>
</div>

<div class="flex flex-col-reverse items-center justify-between sm:flex-row">
<button @click="recovery = false" type="button" class="w-full mt-4 font-semibold link sm:w-auto sm:mt-0"
<div class="flex flex-col-reverse justify-between items-center sm:flex-row">
<button @click="recovery = false" type="button" class="mt-4 w-full font-semibold sm:mt-0 sm:w-auto link"
x-cloak>
@lang('ui::actions.enter_2fa_code')
</button>

<button type="submit" class="w-full button-secondary sm:w-auto">
<button type="submit" class="w-full sm:w-auto button-secondary">
@lang('ui::actions.sign_in')
</button>
</div>
Expand Down
6 changes: 3 additions & 3 deletions resources/views/components/auth-verify-email.blade.php
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<div class="flex max-w-xl p-8 mx-auto my-6 bg-white rounded-lg">
<div class="flex flex-col w-full text-center space-y-6">
<div class="flex p-8 my-6 mx-auto max-w-xl bg-white rounded-lg">
<div class="flex flex-col space-y-6 w-full text-center">
<div class="space-y-4">
<h1>@lang('ui::auth.verify.page_header')</h1>

<p>@lang('ui::auth.verify.link_description')</p>
</div>

<img class="mb-5 mx-12" src="/images/auth/verify-email.svg" alt="" />
<img class="mx-12 mb-5" src="/images/auth/verify-email.svg" alt="" />

<form wire:click.prevent="resend" wire:poll>
<p class="text-sm text-theme-secondary-600 lg:no-wrap-span-children">
Expand Down
6 changes: 3 additions & 3 deletions resources/views/components/component-heading.blade.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<div class="w-full py-8 bg-theme-secondary-100">
<div class="container mx-auto ">
<div class="py-8 w-full bg-theme-secondary-100">
<div class="container mx-auto">
<h1 class="mx-4 text-center md:mx-8 xl:mx-16">{{ $title }}</h1>
<p class="mx-8 mt-4 text-lg leading-8 font-semibold text-center text-theme-secondary-700 md:mx-8 xl:mx-16">{{ $description }}</p>
<p class="mx-8 mt-4 text-lg font-semibold leading-8 text-center md:mx-8 xl:mx-16 text-theme-secondary-700">{{ $description }}</p>
</div>
</div>
4 changes: 2 additions & 2 deletions resources/views/components/form-wrapper.blade.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
@props(['action', 'method' => 'POST'])

<div class="sm:max-w-xl py-8 mx-auto" {{ $attributes }}>
<form action="{{ $action }}" method="{{ $method }}" class="flex flex-col px-8 pb-8 sm:pt-8 border-b-2 sm:border-2 sm:rounded-xl border-theme-secondary-200">
<div class="py-8 mx-auto sm:max-w-xl" {{ $attributes }}>
<form action="{{ $action }}" method="{{ $method }}" class="flex flex-col px-8 pb-8 border-b-2 sm:pt-8 sm:rounded-xl sm:border-2 border-theme-secondary-200">
@csrf
{{ $slot }}
</form>
Expand Down
Loading