-
Notifications
You must be signed in to change notification settings - Fork 7
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Move card component outside of includes for more extendability (#139)
- Loading branch information
Showing
28 changed files
with
374 additions
and
353 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,33 +1,31 @@ | ||
| <login :checkout-login="false" v-slot="login" redirect="{{ $redirect ?? route('account.overview') }}"> | ||
| <x-rapidez-ct::card.inactive> | ||
| <form class="space-y-5" v-on:submit.prevent="login.go()"> | ||
| <x-rapidez-ct::input | ||
| name="email" | ||
| type="email" | ||
| label="Email" | ||
| v-model="login.email" | ||
| required | ||
| /> | ||
| <x-rapidez-ct::input.password | ||
| name="password" | ||
| label="Password" | ||
| v-model="login.password" | ||
| required | ||
| /> | ||
| <div class="flex items-center justify-between"> | ||
| <a href="{{ route('account.forgotpassword') }}" class="text-sm text-ct-inactive underline"> | ||
| @lang('Forgot your password?') | ||
| </a> | ||
| <x-rapidez-ct::button.accent | ||
| class="flex items-center gap-1" | ||
| type="submit" | ||
| dusk="continue" | ||
| loader | ||
| > | ||
| @lang('Login') | ||
| <x-heroicon-o-arrow-right class="h-4" /> | ||
| </x-rapidez-ct::button.accent> | ||
| </div> | ||
| </form> | ||
| </x-rapidez-ct::card.inactive> | ||
| <form class="space-y-5" v-on:submit.prevent="login.go()"> | ||
| <x-rapidez-ct::input | ||
| name="email" | ||
| type="email" | ||
| label="Email" | ||
| v-model="login.email" | ||
| required | ||
| /> | ||
| <x-rapidez-ct::input.password | ||
| name="password" | ||
| label="Password" | ||
| v-model="login.password" | ||
| required | ||
| /> | ||
| <div class="flex items-center justify-between"> | ||
| <a href="{{ route('account.forgotpassword') }}" class="text-sm text-ct-inactive underline"> | ||
| @lang('Forgot your password?') | ||
| </a> | ||
| <x-rapidez-ct::button.accent | ||
| class="flex items-center gap-1" | ||
| type="submit" | ||
| dusk="continue" | ||
| loader | ||
| > | ||
| @lang('Login') | ||
| <x-heroicon-o-arrow-right class="h-4" /> | ||
| </x-rapidez-ct::button.accent> | ||
| </div> | ||
| </form> | ||
| </login> |
116 changes: 57 additions & 59 deletions
116
resources/views/account/partials/order/order-info.blade.php
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,60 +1,58 @@ | ||
| <x-rapidez-ct::card.inactive> | ||
| <div class="flex flex-wrap -space-x-px max-sm:-space-y-px"> | ||
| <div class="flex flex-1 flex-col -space-y-px"> | ||
| <template v-if="order.hide_billing || hideBilling || order.shipping_address?.customer_address_id == order.billing_address?.customer_address_id"> | ||
| <x-rapidez-ct::card.address | ||
| v-bind:address="order.shipping_address" | ||
| shipping | ||
| billing | ||
| check | ||
| /> | ||
| </template> | ||
| <template v-else> | ||
| <x-rapidez-ct::card.address | ||
| v-bind:address="order.shipping_address" | ||
| shipping | ||
| check | ||
| /> | ||
| <x-rapidez-ct::card.address | ||
| v-bind:address="order.billing_address" | ||
| billing | ||
| check | ||
| /> | ||
| </template> | ||
| </div> | ||
| <div class="flex flex-1 flex-col -space-y-px"> | ||
| <x-rapidez-ct::card.white class="flex-1" check> | ||
| <x-rapidez-ct::title.lg class="mb-4 pr-8"> | ||
| @lang('Payment method') | ||
| </x-rapidez-ct::title.lg> | ||
| <div class="flex flex-1 flex-wrap justify-between"> | ||
| <ul class="flex flex-col gap-1"> | ||
| <li v-for="data in order.payment_methods"> | ||
| @{{ data.name }} | ||
| </li> | ||
| </ul> | ||
| @if (!empty($slot)) | ||
| <div class="mt-auto flex flex-col self-end"> | ||
| {{ $slot }} | ||
| </div> | ||
| @endif | ||
| </div> | ||
| </x-rapidez-ct::card.white> | ||
| <x-rapidez-ct::card.white class="flex-1" check> | ||
| <x-rapidez-ct::title.lg class="mb-4 pr-8"> | ||
| @lang('Delivery method') | ||
| </x-rapidez-ct::title.lg> | ||
| <div class="flex flex-1 flex-wrap justify-between"> | ||
| <ul class="flex flex-col gap-1"> | ||
| <li v-text="order.shipping_method"></li> | ||
| </ul> | ||
| @if (!empty($slot)) | ||
| <div class="mt-auto flex flex-col self-end"> | ||
| {{ $slot }} | ||
| </div> | ||
| @endif | ||
| </div> | ||
| </x-rapidez-ct::card.white> | ||
| </div> | ||
| <div class="flex flex-wrap -space-x-px max-sm:-space-y-px"> | ||
| <div class="flex flex-1 flex-col -space-y-px"> | ||
| <template v-if="order.hide_billing || hideBilling || order.shipping_address?.customer_address_id == order.billing_address?.customer_address_id"> | ||
| <x-rapidez-ct::card.address | ||
| v-bind:address="order.shipping_address" | ||
| shipping | ||
| billing | ||
| check | ||
| /> | ||
| </template> | ||
| <template v-else> | ||
| <x-rapidez-ct::card.address | ||
| v-bind:address="order.shipping_address" | ||
| shipping | ||
| check | ||
| /> | ||
| <x-rapidez-ct::card.address | ||
| v-bind:address="order.billing_address" | ||
| billing | ||
| check | ||
| /> | ||
| </template> | ||
| </div> | ||
| </x-rapidez-ct::card.inactive> | ||
| <div class="flex flex-1 flex-col -space-y-px"> | ||
| <x-rapidez-ct::card.white class="flex-1" check> | ||
| <x-rapidez-ct::title.lg class="mb-4 pr-8"> | ||
| @lang('Payment method') | ||
| </x-rapidez-ct::title.lg> | ||
| <div class="flex flex-1 flex-wrap justify-between"> | ||
| <ul class="flex flex-col gap-1"> | ||
| <li v-for="data in order.payment_methods"> | ||
| @{{ data.name }} | ||
| </li> | ||
| </ul> | ||
| @if (!empty($slot)) | ||
| <div class="mt-auto flex flex-col self-end"> | ||
| {{ $slot }} | ||
| </div> | ||
| @endif | ||
| </div> | ||
| </x-rapidez-ct::card.white> | ||
| <x-rapidez-ct::card.white class="flex-1" check> | ||
| <x-rapidez-ct::title.lg class="mb-4 pr-8"> | ||
| @lang('Delivery method') | ||
| </x-rapidez-ct::title.lg> | ||
| <div class="flex flex-1 flex-wrap justify-between"> | ||
| <ul class="flex flex-col gap-1"> | ||
| <li v-text="order.shipping_method"></li> | ||
| </ul> | ||
| @if (!empty($slot)) | ||
| <div class="mt-auto flex flex-col self-end"> | ||
| {{ $slot }} | ||
| </div> | ||
| @endif | ||
| </div> | ||
| </x-rapidez-ct::card.white> | ||
| </div> | ||
| </div> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,12 +1,10 @@ | ||
| <x-rapidez-ct::card class="md:w-auto"> | ||
| <x-rapidez-ct::title.lg class="mb-4"> | ||
| @lang('Register within 1 minute') | ||
| </x-rapidez-ct::title.lg> | ||
| <p class="mb-5 text-sm"> | ||
| @lang('Don\'t have an account yet? Create an account and enjoy faster ordering, repeat orders, status of your order, easy returns and more!') | ||
| </p> | ||
| <x-rapidez-ct::button.outline :href="route('account.register')" class="flex w-fit items-center gap-1"> | ||
| @lang('Register') | ||
| <x-heroicon-o-arrow-right class="h-4" /> | ||
| </x-rapidez-ct::button.outline> | ||
| </x-rapidez-ct::card> | ||
| <x-rapidez-ct::title.lg class="mb-4"> | ||
| @lang('Register within 1 minute') | ||
| </x-rapidez-ct::title.lg> | ||
| <p class="mb-5 text-sm"> | ||
| @lang('Don\'t have an account yet? Create an account and enjoy faster ordering, repeat orders, status of your order, easy returns and more!') | ||
| </p> | ||
| <x-rapidez-ct::button.outline :href="route('account.register')" class="flex w-fit items-center gap-1"> | ||
| @lang('Register') | ||
| <x-heroicon-o-arrow-right class="h-4" /> | ||
| </x-rapidez-ct::button.outline> |
Oops, something went wrong.