generated from rapidez/package-template
-
Notifications
You must be signed in to change notification settings - Fork 5
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Feature/v3 colors and tweaks #31
Open
jordythevulder
wants to merge
14
commits into
master
Choose a base branch
from
feature/v3-colors-and-tweaks
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
14 commits
Select commit
Hold shift + click to select a range
45c841f
Implemented primer and various tweaks
jordythevulder 77391bd
V3 colors implementation and various tweaks
jordythevulder 84064af
Fix item removal
Jade-GG 29ae511
Carry attributes over to select input
Jade-GG bb96447
Only show slide-in when cart exists to avoid errors
Jade-GG 0498648
Remove pickup address
Jade-GG c1a63cd
Show configured variant image in the cart (#33)
Jade-GG ccfd41f
Resolved feedback
jordythevulder 71be9bd
Merge branch 'feature/v3-colors-and-tweaks' of github.com:rapidez/con…
jordythevulder 245635f
Restructured inputs
jordythevulder a46a173
removed commented code
jordythevulder 59c5191
resolved merge conflict
jordythevulder 0b02065
Tweaked classes
jordythevulder 41f8583
Merge branch 'master' of github.com:rapidez/confira into feature/v3-c…
Roene-JustBetter File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
6 changes: 3 additions & 3 deletions
6
resources/views/cart/partials/product/remove-button.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,12 +1,12 @@ | ||
| <graphql-mutation | ||
| :query="'mutation ($cart_id: String!, $cart_item_id: Int) { removeItemFromCart(input: { cart_id: $cart_id, cart_item_id: $cart_item_id }) { ...cart } } ' + config.fragments.cart" | ||
| :query="'mutation ($cart_id: String!, $cart_item_id: Int) { removeItemFromCart(input: { cart_id: $cart_id, cart_item_id: $cart_item_id }) { cart { ...cart } } } ' + config.fragments.cart" | ||
| :variables="{ cart_id: mask, cart_item_id: item.id }" | ||
| :notify="{ message: item.product.name+' '+config.translations.cart.remove }" | ||
| :callback="updateCart" | ||
| :error-callback="checkResponseForExpiredCart" | ||
| v-slot="{ mutate }" | ||
| > | ||
| <button v-on:click="mutate" class="text-ct-inactive mt-1 text-xs hover:underline" :dusk="'item-delete-' + index" title="{{ __('Remove') }}"> | ||
| <x-heroicon-o-trash class="text-inactive w-5"/> | ||
| <button v-on:click="mutate" class="mt-1 text-xs" :dusk="'item-delete-' + index" title="{{ __('Remove') }}"> | ||
| <x-heroicon-o-trash class="text-muted w-5"/> | ||
| </button> | ||
| </graphql-mutation> |
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,8 +1,8 @@ | ||
| <div class="flex flex-wrap items-center gap-3 mt-5"> | ||
| <x-rapidez-ct::button.inactive v-on:click.prevent="toggleEdit"> | ||
| <x-rapidez::button v-on:click.prevent="toggleEdit"> | ||
| @lang('Use a new address') | ||
| </x-rapidez-ct::button.inactive> | ||
| <x-rapidez-ct::button.inactive tag="label" for="popup" class="cursor-pointer" v-if="$root.user.addresses.length"> | ||
| </x-rapidez::button> | ||
| <x-rapidez::button tag="label" for="popup" class="cursor-pointer" v-if="data?.customer?.addresses?.length"> | ||
| @lang('My addresses') | ||
| </x-rapidez-ct::button.inactive> | ||
| </x-rapidez::button> | ||
| </div> |
2 changes: 1 addition & 1 deletion
2
resources/views/checkout/partials/buttons/new-address.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,4 +1,4 @@ | ||
| <button v-on:click.prevent="toggleEdit" class="flex flex-col items-center justify-center gap-y-2 text-inactive font-medium bg-ct-inactive-100 rounded-xl max-md:hidden"> | ||
| <button v-on:click.prevent="toggleEdit" class="flex flex-col items-center justify-center gap-y-2 text-muted font-medium bg rounded-md max-md:hidden"> | ||
| <span>+</span> | ||
| <span>@lang('Add new address')</span> | ||
| </button> |
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,27 +1,27 @@ | ||
| <div class="lg:hidden"> | ||
| @include('rapidez-ct::components.slide-in.receipt') | ||
| </div> | ||
| <div class="flex flex-wrap gap-y-3 max-xl:-mt-5 xl:mr-20"> | ||
| <div class="flex flex-wrap gap-y-3 xl:mr-20 max-xl:justify-center"> | ||
| @isset($href) | ||
| <x-rapidez-ct::button.outline class="flex items-center justify-center !p-0 size-12 lg:hidden" :$href> | ||
| <x-rapidez::button.outline class="flex items-center justify-center !p-0 size-12 lg:hidden" :$href> | ||
| <x-heroicon-o-arrow-long-left class="size-6"/> | ||
| </x-rapidez-ct::button.outline> | ||
| </x-rapidez::button.outline> | ||
| @endif | ||
|
|
||
| <div class="flex lg:w-24 *:w-auto *:h-auto max-lg:flex-1 max-lg:h-12"> | ||
| <div class="flex lg:w-16 xl:w-24 *:w-auto *:h-auto max-lg:flex-1 max-lg:h-12"> | ||
| <a href="{{ url('/') }}" class="sticky top-0 max-lg:mx-5 flex items-center lg:self-start max-lg:flex-1 lg:pt-4 max-w-full"> | ||
| <div class="w-inherit flex-1 *:w-auto *:h-auto *:max-w-full max-w-full h-full *:max-h-full"> | ||
| <x-rapidez-ct::logo /> | ||
| </div> | ||
| </a> | ||
| </div> | ||
| <x-rapidez-ct::button.inactive for="slide-in" class="lg:hidden"> | ||
| <x-rapidez::button for="slide-in" class="gap-x-2.5 lg:hidden cursor-pointer"> | ||
| <span class="relative"> | ||
| <span class="absolute flex items-center font-semibold justify-center size-4 -right-2 -top-1.5 rounded-full bg-ct-primary text-white text-xs"> | ||
| <span class="absolute flex items-center font-bold justify-center size-4 -right-2 -top-1.5 rounded-full bg-primary text-white text-xs"> | ||
| @{{ Math.round(cart.total_quantity) }} | ||
| </span> | ||
| <x-heroicon-o-shopping-cart class="size-6"/> | ||
| </span> | ||
| @lang('My order') | ||
| </x-rapidez-ct::button.inactive> | ||
| </x-rapidez::button> | ||
| </div> |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is this a backdrop? In that case we do have a backdrop color for that.