jev/opensem
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix design, add addresses

Browse Source
This commit is contained in:
Ludovic CANDELLIER
2022-12-29 16:16:09 +01:00
parent 7819a8e11b
commit 28c200fd9f
22 changed files with 165 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
resources/views/Shop/Articles/partials/article.blade.php
View File

@@ -3,7 +3,7 @@
<img src="{{ App\Repositories\Shop\Articles::getPreviewSrc($article['image'] ?? false) }}" class="card-img-top" alt="{{ $product_name }}">
<div class="card-body p-2 pb-1">
<div class="row card-title">
<div class="col-12">
<div class="col-12 light">
<!--
<i class="fa fa-heart red"></i>
-->

4
resources/views/Shop/Articles/show.blade.php
View File

@@ -28,10 +28,10 @@
@if (count($article['tags'] ?? []))
<h3>Caractéristiques</h3>
@foreach ($article['tags'] as $tag_group => $items)
<div>
<div class="mb-2">
{{ $tag_group }} :
@foreach ($items as $tag)
<span class="btn btn-xs pt-0 pb-0">{{ $tag }}</span>
<span class="btn btn-xs btn-secondary pt-0 pb-0">{{ $tag }}</span>
@endforeach
</div>
@endforeach

36
resources/views/Shop/Customers/partials/address.blade.php Normal file
View File

@@ -0,0 +1,36 @@
<div class="row">
<div class="col-12">
@include('components.form.input', [
'name' => ($prefix ?? '') . 'address',
'value' => $customer['address'] ?? '',
'label' => $label ?? '',
])
</div>
</div>
<div class="row">
<div class="col-12">
@include('components.form.input', [
'name' => ($prefix ?? '') . 'address2',
'value' => $customer['address2'] ?? '',
'label' => 'Complément d\'adresse',
])
</div>
</div>
<div class="row">
<div class="col-4">
@include('components.form.input', [
'name' => ($prefix ?? '') . 'zipcode',
'value' => $customer['zipcode'] ?? '',
'label' => 'Code postal',
])
</div>
<div class="col-8">
@include('components.form.input', [
'name' => ($prefix ?? '') . 'city',
'value' => $customer['city'] ?? '',
'label' => 'Ville',
])
</div>
</div>

36
resources/views/Shop/Customers/partials/delivery.blade.php Normal file
View File

@@ -0,0 +1,36 @@
<div class="row">
<div class="col-12">
@include('components.form.input', [
'name' => 'delivery_address',
'value' => $customer['address'] ?? '',
'label' => $label ?? '',
])
</div>
</div>
<div class="row">
<div class="col-12">
@include('components.form.input', [
'name' => 'delivery_address2',
'value' => $customer['address2'] ?? '',
'label' => 'Complément d\'adresse',
])
</div>
</div>
<div class="row">
<div class="col-4">
@include('components.form.input', [
'name' => 'delivery_zipcode',
'value' => $customer['zipcode'] ?? '',
'label' => 'Code postal',
])
</div>
<div class="col-8">
@include('components.form.input', [
'name' => 'delivery_city',
'value' => $customer['city'] ?? '',
'label' => 'Ville',
])
</div>
</div>

38
resources/views/Shop/Customers/partials/registration.blade.php
View File

@@ -49,40 +49,4 @@
</div>
</div>
<div class="row">
<div class="col-12">
@include('components.form.input', [
'name' => 'address',
'value' => $customer['address'] ?? '',
'label' => 'Adresse de facturation',
])
</div>
</div>
<div class="row">
<div class="col-12">
@include('components.form.input', [
'name' => 'address2',
'value' => $customer['address2'] ?? '',
'label' => 'Complément d\'adresse',
])
</div>
</div>
<div class="row">
<div class="col-4">
@include('components.form.input', [
'name' => 'zipcode',
'value' => $customer['zipcode'] ?? '',
'label' => 'Code postal',
])
</div>
<div class="col-8">
@include('components.form.input', [
'name' => 'city',
'value' => $customer['city'] ?? '',
'label' => 'Ville',
])
</div>
</div>
@include('Shop.Customers.partials.address', ['label' => 'Adresse de facturation'])

6
resources/views/Shop/Homepage/partials/sliderByShelve.blade.php
View File

@@ -1,8 +1,8 @@
@if ($shelve['articles'])
<div class="mb-3 bg-green-ultra-dark rounded-lg">
<div class="mb-3 rounded-lg">
<div class="row">
<div class="col-6">
<h1 class="p-2" style="font-size: 2em;">{{ $shelve['name'] }}</h1>
<h1 class="p-2 green" style="font-size: 2em;">{{ $shelve['name'] }}</h1>
</div>
<div class="col-6 text-right">
<a class="mt-2 btn btn-green-dark" href="{{ route('Shop.Categories.show', ['id' => $shelve['id']]) }}">Découvrir la sélection</a>
@@ -13,7 +13,7 @@
<div class="col-11 mx-auto shelve_slider_{{ $shelve['id'] }} slider">
@foreach ($shelve['articles'] as $name => $article)
<div class="text-center pr-2 pl-2">
<a class="green-fluo" href="{{ route('Shop.Articles.show', ['id' => $article['id']]) }}">
<a class="green" href="{{ route('Shop.Articles.show', ['id' => $article['id']]) }}">
<img data-lazy="{{ App\Repositories\Shop\Articles::getPreviewSrc($article['image'] ?? false) }}" class="d-block w-100 rounded" alt="{{ $name }}"/>
{{ $name }}
</a>

12
resources/views/Shop/Orders/order.blade.php
View File

@@ -11,11 +11,11 @@
<button class="btn btn-secondary" id="register">Créez mon compte</button>
</p>
<x-layout.collapse id="identification" title="Déjà client" class="d-none identification gradient-green1 rounded-lg">
<x-layout.collapse id="identification" title="Déjà client" class="d-none identification rounded-lg">
@include('Shop.auth.partials.login')
</x-layout.collapse>
<x-layout.collapse id="personal_data" title="Informations personnelles" class="d-none personal_data gradient-green1 rounded-lg">
<x-layout.collapse id="personal_data" title="Informations personnelles" class="d-none personal_data rounded-lg" uncollapsed=true>
@include('Shop.auth.partials.register')
</x-layout.collapse>
@endif
@@ -23,15 +23,15 @@
{{ Form::open(['route' => 'Shop.Orders.store', 'id' => 'order-form', 'autocomplete' => 'off']) }}
<div id="registred" @if (!App\Repositories\Shop\Customers::isConnected()) class="d-none" @endif>
<x-layout.collapse id="adresses" title="Adresses" class="gradient-green1 rounded-lg mb-3" uncollapsed=true>
<x-layout.collapse id="adresses" title="Adresses" class="rounded-lg mb-3" uncollapsed=true>
@include('Shop.Orders.partials.addresses')
</x-layout.collapse>
<x-layout.collapse id="delivery_mode" title="Mode de livraison" class="gradient-green1 rounded-lg mb-3" uncollapsed=true>
<x-layout.collapse id="delivery_mode" title="Mode de livraison" class="rounded-lg mb-3" uncollapsed=true>
@include('Shop.Orders.partials.deliveries')
</x-layout.collapse>
<x-layout.collapse id="payment" title="Paiement" class="gradient-green1 rounded-lg mb-3" uncollapsed=true>
<x-layout.collapse id="payment" title="Paiement" class="rounded-lg mb-3" uncollapsed=true>
@include('Shop.Orders.partials.payments')
</x-layout.collapse>
</div>
@@ -40,7 +40,7 @@
</div>
<div class="col-4">
<x-card class='shadow gradient-green1'>
<x-card class='shadow'>
@include('Shop.Baskets.partials.basketTotal')
</x-card>
</div>

26
resources/views/Shop/auth/partials/register.blade.php
View File

@@ -1,5 +1,5 @@
{!! Form::open(['route' => 'Shop.register.post', 'method' => 'post', 'autocomplete'=> 'off']) !!}
<div class="row">
<div class="row green">
<div class="col-12">
<x-card title='Créez votre compte' class='mt-3 mb-3'>
@@ -8,11 +8,13 @@
<div class="row">
<div class="col-6">
<div class="form-group {{ $errors->has('password') ? 'has-error' : '' }}">
<label>Mot de passe</label>
{{ Form::password('password', ['class' => 'form-control', 'placeholder' => __('boilerplate::auth.fields.password'), 'required']) }}
{!! $errors->first('password','<p class="text-danger"><strong>:message</strong></p>') !!}
</div>
</div>
<div class="col-6">
<label>Confirmation du mot de passe</label>
<div class="form-group {{ $errors->has('password_confirmation') ? 'has-error' : '' }}">
{{ Form::password('password_confirmation', ['class' => 'form-control', 'placeholder' => __('boilerplate::auth.fields.password_confirm'), 'required']) }}
{!! $errors->first('password_confirmation','<p class="text-danger"><strong>:message</strong></p>') !!}
@@ -22,8 +24,17 @@
<div class="row">
<div class="col-12">
@include('components.form.checkbox', ['name' => 'use_for_delivery', 'value' => false])
Utiliser une autre adresse pour la livraison
@include('components.form.checkboxes.icheck', [
'name' => 'use_for_delivery',
'value' => false,
'label' => 'Utiliser une autre adresse pour la livraison',
])
</div>
</div>
<div class="row d-none" id="address_delivery">
<div class="col-12">
@include('Shop.Customers.partials.address', ['label' => 'Adresse de livraison', 'prefix' => 'delivery_'])
</div>
</div>
@@ -40,3 +51,12 @@
</div>
</div>
{!! Form::close() !!}
@push('js')
<script>
$('#use_for_delivery').click(function() {
$('#address_delivery').toggleClass('d-none');
})
</script>
@endpush

2
resources/views/Shop/layout/layout.blade.php
View File

@@ -23,7 +23,7 @@
<body class="bg-green-dark">
<div class="container bg-green-ultra-dark" style="min-height: 100vh;">
<div class="container bg-light" style="min-height: 100vh;">
<main>
@include("Shop.layout.partials.header")
<div class="content-wrapper">

2
resources/views/Shop/layout/partials/header-basket.blade.php
View File

@@ -1,7 +1,7 @@
<div class="row">
<div class="col-12 text-right p-2">
<a href="{{ route('Shop.Basket.basket') }}" style="color: white;">
<button type="button" class="btn bg-green-dark light">
<button type="button" class="btn green">
<i class="fa fa-2x fa-fw fa-shopping-basket mr-2"></i>
<span class="ml-2 badge bg-yellow green-dark">
<span id="count-basket">{{ \App\Repositories\Core\User\ShopCart::getTotalQuantity() }}</span>

4
resources/views/Shop/layout/partials/header-nav.blade.php
View File

@@ -1,7 +1,7 @@
<div class="row bg-green">
<div class="row bg-light">
<div class="col-3 form-inline">
<a href="/"><img src="/img/logo.jpg" class="img-responvive"></a>
<a href="/"><img src="/img/logo.png" height="52"></a>
</div>
<div class="col-5 form-inline">

2
resources/views/Shop/layout/partials/header-profile.blade.php
View File

@@ -1,6 +1,6 @@
<div class="row">
<div class="col-12 text-right p-2">
<button type="button" class="btn bg-green-dark light" data-toggle="dropdown">
<button type="button" class="btn bg-light green" data-toggle="dropdown">
@if (App\Repositories\Shop\Customers::isConnected())
<img src="{{ App\Repositories\Shop\Customers::getAvatar() }}" class="img-fluid" title="{{ App\Repositories\Shop\Customers::getName() }}">
@else

8
resources/views/Shop/layout/partials/sections.blade.php
View File

@@ -1,19 +1,19 @@
<div class="row shadow mb-3">
<div class="col-12 pl-0 pr-0">
<nav class="navbar navbar-expand-lg navbar-light gradient-green1">
<nav class="navbar navbar-expand-lg navbar-light">
<div class="collapse navbar-collapse" id="navbarContent">
<ul class="navbar-nav">
@foreach ($categories as $menu)
<li class="nav-item dropdown megamenu">
@if ($menu['children'] ?? false)
<a id="megamenu_{{ $menu['id'] }}" href="{{ route('Shop.Categories.show', ['id' => $menu['id']]) }}" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" class="nav-link dropdown-toggle font-weight-bold text-uppercase @if (($category['id'] ?? false) == $menu['id']) active @endif">
<a id="megamenu_{{ $menu['id'] }}" href="{{ route('Shop.Categories.show', ['id' => $menu['id']]) }}" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" class="nav-link dropdown-toggle font-weight-bold text-uppercase green @if (($category['id'] ?? false) == $menu['id']) active @endif">
{{ $menu['name'] }}
</a>
<div aria-labelledby="megamenu_{{ $menu['id'] }}" class="dropdown-menu border-0 p-0 m-0">
@include('Shop.layout.partials.megamenu')
</div>
@else
<a href="{{ route('Shop.Categories.show', ['id' => $menu['id']]) }}" class="nav-link font-weight-bold text-uppercase @if (($category['id'] ?? false) == $menu['id']) active @endif">
<a href="{{ route('Shop.Categories.show', ['id' => $menu['id']]) }}" class="nav-link font-weight-bold text-uppercase green @if (($category['id'] ?? false) == $menu['id']) active @endif">
{{ $menu['name'] }}
</a>
@endif
@@ -22,7 +22,7 @@
</ul>
</div>
<div class="float-right p-3">
<span style="font-size: 1.2em; font-weight: 600;">
<span class="green" style="font-size: 1.2em; font-weight: 600;">
Variétés Paysannes de la Semence à l'Assiette
</span>
</div>

2
resources/views/components/form/checkboxes/icheck.blade.php
View File

@@ -1,4 +1,4 @@
<div class="icheck-{{ $color ?? 'success' }} {{ $class ?? '' }}">
@include('components.form.checkbox')
<label class="control-label light" for="{{ $id_name ?? $name }}">{{ $label ?? '' }}</label>
<label class="control-label" for="{{ $id_name ?? $name }}">{{ $label ?? '' }}</label>
</div>