forge-joniko/ldc-boutique-cnc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Bo with bootstrap 5 - to be continued

Browse source
This commit is contained in:
Olivier Legat 2022-03-24 19:38:51 +01:00
parent 94befc1f3f
commit 02308f6fe1
9 changed files with 84172 additions and 109 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/Http/Controllers/Bo/SettingsController.php
View file

@ -48,9 +48,8 @@ class SettingsController extends Controller
$redirector = redirect()->route('bo.settings')->with('success', 'Modifications enregistrés !'); $redirector = redirect()->route('bo.settings')->with('success', 'Modifications enregistrés !');
//all settings saved : cache routes //all settings saved : cache routes
//doesn't work : put Ignition routes in route cache Artisan::call('route:clear');
//doesn't execute in the same context as CLI call //programmer un php artisan optimize ? (une fois par jour la nuit par exemple)
//Artisan::call('route:cache');
return $redirector; return $redirector;
} }

5
app/Jobs/RefreshSiteMap.php
View file

@ -47,7 +47,10 @@ class RefreshSiteMap implements ShouldQueue
// '/la-marque/tracabilite/search', // '/la-marque/tracabilite/search',
// '/frame', // '/frame',
// '/map', // '/map',
'/_debugbar' // Hack ignore laravel debug bar '/_debugbar', // Hack ignore laravel debug bar
'_ignition/health-check', //ignore ignition route
'_ignition/scripts/{script}', //ignore ignition route
'_ignition/styles/{style}' //ignore ignition route
]; ];
/** /**

43
package-lock.json generated
View file

@ -15,7 +15,7 @@
"devDependencies": { "devDependencies": {
"@voerro/vue-tagsinput": "^2.7.1", "@voerro/vue-tagsinput": "^2.7.1",
"axios": "^0.21.1", "axios": "^0.21.1",
"bootstrap": "^4.6.0", "bootstrap": "^5.1.3",
"cross-env": "^7.0", "cross-env": "^7.0",
"jquery": "^3.6", "jquery": "^3.6",
"laravel-mix": "^5.0.1", "laravel-mix": "^5.0.1",
@ -1156,9 +1156,13 @@
} }
}, },
"node_modules/@popperjs/core": { "node_modules/@popperjs/core": {
"version": "2.9.2", "version": "2.11.4",
"resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.9.2.tgz", "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.4.tgz",
"integrity": "sha512-VZMYa7+fXHdwIq1TDhSXoVmSPEGM/aa+6Aiq3nVVJ9bXr24zScr+NlKFKC3iPljA7ho/GAZr+d2jOf5GIRC30Q==" "integrity": "sha512-q/ytXxO5NKvyT37pmisQAItCFqA7FD/vNb8dgaJy3/630Fsc+Mz9/9f2SziBoIZ30TJooXyTwZmhi1zjXmObYg==",
"funding": {
"type": "opencollective",
"url": "https://opencollective.com/popperjs"
}
}, },
"node_modules/@types/glob": { "node_modules/@types/glob": {
"version": "7.1.3", "version": "7.1.3",
@ -2103,10 +2107,18 @@
"dev": true "dev": true
}, },
"node_modules/bootstrap": { "node_modules/bootstrap": {
"version": "4.6.0", "version": "5.1.3",
"resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-4.6.0.tgz", "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.1.3.tgz",
"integrity": "sha512-Io55IuQY3kydzHtbGvQya3H+KorS/M9rSNyfCGCg9WZ4pyT/lCxIlpJgG1GXW/PswzC84Tr2fBYi+7+jFVQQBw==", "integrity": "sha512-fcQztozJ8jToQWXxVuEyXWW+dSo8AiXWKwiSSrKWsRB/Qt+Ewwza+JWoLKiTuQLaEPhdNAJ7+Dosc9DOIqNy7Q==",
"dev": true "dev": true,
"license": "MIT",
"funding": {
"type": "opencollective",
"url": "https://opencollective.com/bootstrap"
},
"peerDependencies": {
"@popperjs/core": "^2.10.2"
}
}, },
"node_modules/brace-expansion": { "node_modules/brace-expansion": {
"version": "1.1.11", "version": "1.1.11",
@ -13505,9 +13517,9 @@
"dev": true "dev": true
}, },
"@popperjs/core": { "@popperjs/core": {
"version": "2.9.2", "version": "2.11.4",
"resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.9.2.tgz", "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.4.tgz",
"integrity": "sha512-VZMYa7+fXHdwIq1TDhSXoVmSPEGM/aa+6Aiq3nVVJ9bXr24zScr+NlKFKC3iPljA7ho/GAZr+d2jOf5GIRC30Q==" "integrity": "sha512-q/ytXxO5NKvyT37pmisQAItCFqA7FD/vNb8dgaJy3/630Fsc+Mz9/9f2SziBoIZ30TJooXyTwZmhi1zjXmObYg=="
}, },
"@types/glob": { "@types/glob": {
"version": "7.1.3", "version": "7.1.3",
@ -14348,10 +14360,11 @@
"dev": true "dev": true
}, },
"bootstrap": { "bootstrap": {
"version": "4.6.0", "version": "5.1.3",
"resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-4.6.0.tgz", "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.1.3.tgz",
"integrity": "sha512-Io55IuQY3kydzHtbGvQya3H+KorS/M9rSNyfCGCg9WZ4pyT/lCxIlpJgG1GXW/PswzC84Tr2fBYi+7+jFVQQBw==", "integrity": "sha512-fcQztozJ8jToQWXxVuEyXWW+dSo8AiXWKwiSSrKWsRB/Qt+Ewwza+JWoLKiTuQLaEPhdNAJ7+Dosc9DOIqNy7Q==",
"dev": true "dev": true,
"requires": {}
}, },
"brace-expansion": { "brace-expansion": {
"version": "1.1.11", "version": "1.1.11",

2
package.json
View file

@ -12,7 +12,7 @@
"devDependencies": { "devDependencies": {
"@voerro/vue-tagsinput": "^2.7.1", "@voerro/vue-tagsinput": "^2.7.1",
"axios": "^0.21.1", "axios": "^0.21.1",
"bootstrap": "^4.6.0", "bootstrap": "^5.1.3",
"cross-env": "^7.0", "cross-env": "^7.0",
"jquery": "^3.6", "jquery": "^3.6",
"laravel-mix": "^5.0.1", "laravel-mix": "^5.0.1",

18435
public/b-o/css/app.css vendored
View file

File diff suppressed because one or more lines are too long

65525
public/b-o/js/app.js vendored
View file

File diff suppressed because one or more lines are too long

93
resources/sass/_dashboard.scss vendored
View file

@ -1,103 +1,102 @@
body { body {
font-size: .875rem; font-size: .875rem;
} }
.feather { .lni {
width: 16px; width: 16px;
height: 16px; height: 16px;
vertical-align: text-bottom; vertical-align: text-bottom;
} font-size: 20px !important;
font-weight: bold !important;
}
/* /*
* Sidebar * Sidebar
*/ */
.sidebar { .sidebar {
position: fixed; position: fixed;
top: 0; top: 0;
/* rtl:raw:
right: 0;
*/
bottom: 0; bottom: 0;
/* rtl:remove */
left: 0; left: 0;
z-index: 100; /* Behind the navbar */ z-index: 100; /* Behind the navbar */
padding: 48px 0 0; /* Height of navbar */ padding: 48px 0 0; /* Height of navbar */
box-shadow: inset -1px 0 0 rgba(0, 0, 0, .1); box-shadow: inset -1px 0 0 rgba(0, 0, 0, .1);
} }
@media (max-width: 767.98px) { @media (max-width: 767.98px) {
.sidebar { .sidebar {
top: 5rem; top: 5rem;
} }
} }
.sidebar-sticky { .sidebar-sticky {
position: relative; position: relative;
top: 0; top: 0;
height: calc(100vh - 48px); height: calc(100vh - 48px);
padding-top: .5rem; padding-top: .5rem;
overflow-x: hidden; overflow-x: hidden;
overflow-y: auto; /* Scrollable contents if viewport is shorter than content. */ overflow-y: auto; /* Scrollable contents if viewport is shorter than content. */
} }
@supports ((position: -webkit-sticky) or (position: sticky)) { .sidebar .nav-link {
.sidebar-sticky {
position: -webkit-sticky;
position: sticky;
}
}
.sidebar .nav-link {
font-weight: 500; font-weight: 500;
color: #333; color: #333;
} }
.sidebar .nav-link .feather { .sidebar .nav-link .lni {
margin-right: 4px; margin-right: 8px;
color: #999; color: #727272;
} }
.sidebar .nav-link.active { .sidebar .nav-link.active {
color: #007bff; color: #2470dc;
} }
.sidebar .nav-link:hover .feather, .sidebar .nav-link:hover .lni,
.sidebar .nav-link.active .feather { .sidebar .nav-link.active .lni {
color: inherit; color: inherit;
} }
.sidebar-heading { .sidebar-heading {
font-size: .75rem; font-size: .75rem;
text-transform: uppercase; text-transform: uppercase;
} }
/* /*
* Navbar * Navbar
*/ */
.navbar-brand { .navbar-brand {
padding-top: .75rem; padding-top: .75rem;
padding-bottom: .75rem; padding-bottom: .75rem;
font-size: 1rem; font-size: 1rem;
background-color: rgba(0, 0, 0, .25); background-color: rgba(0, 0, 0, .25);
box-shadow: inset -1px 0 0 rgba(0, 0, 0, .25); box-shadow: inset -1px 0 0 rgba(0, 0, 0, .25);
} }
.navbar .navbar-toggler { .navbar .navbar-toggler {
top: .25rem; top: .25rem;
right: 1rem; right: 1rem;
} }
.navbar .form-control { .navbar .form-control {
padding: .75rem 1rem; padding: .75rem 1rem;
border-width: 0; border-width: 0;
border-radius: 0; border-radius: 0;
} }
.form-control-dark { .form-control-dark {
color: #fff; color: #fff;
background-color: rgba(255, 255, 255, .1); background-color: rgba(255, 255, 255, .1);
border-color: rgba(255, 255, 255, .1); border-color: rgba(255, 255, 255, .1);
} }
.form-control-dark:focus { .form-control-dark:focus {
border-color: transparent; border-color: transparent;
box-shadow: 0 0 0 3px rgba(255, 255, 255, .25); box-shadow: 0 0 0 3px rgba(255, 255, 255, .25);
} }

2
resources/sass/app.scss vendored
View file

@ -17,7 +17,7 @@ $fa-font-path: "../../webfonts";
@import '~tippy.js/themes/translucent.css'; @import '~tippy.js/themes/translucent.css';
// Variables // Variables
@import 'variables'; //@import 'variables';
@import 'classes'; @import 'classes';

171
resources/views/layouts/bo-layout.blade.php
View file

@ -29,47 +29,142 @@
<div class="container-fluid"> <div class="container-fluid">
<div class="row"> <div class="row">
<nav id="sidebarMenu" class="col-md-3 col-lg-2 d-md-block bg-light sidebar collapse"> <nav id="sidebarMenu" class="col-md-3 col-lg-2 d-md-block bg-light sidebar collapse">
<div class="sidebar-sticky pt-3"> <div class="position-sticky pt-3">
{{--<ul class="nav flex-column">
<li class="nav-item">
<a class="nav-link" href="#">Tableau de bord</a>
</li>
<li class="nav-item">
<a class="nav-link" href="#">Commandes</a>
</li>
<li class="nav-item">
<a class="nav-link" href="#">Utilisateurs</a>
</li>
</ul>--}}
{{--<h6 class="sidebar-heading d-flex justify-content-between align-items-center px-3 mt-4 mb-1 text-muted">
<span>PAGES</span>
</h6>
<ul class="nav flex-column mb-2">
<li class="nav-item"><a class="nav-link" href="{{route('bo.content', 'accueil')}}">Accueil</a></li>
<li class="nav-item"><a class="nav-link" href="{{route('bo.content', 'contact')}}">Contact</a></li>
<li class="nav-item"><a class="nav-link" href="{{route('bo.content', 'legals')}}">Mentions Légales</a></li>
<li class="nav-item"><a class="nav-link" href="{{route('bo.content', 'cgv')}}">CGV</a></li>
<li class="nav-item"><a class="nav-link" href="{{route('bo.content', 'confidentialite')}}">Politique de confidentialité</a></li>
<li class="nav-item"><a class="nav-link" href="{{route('bo.faq')}}">FAQ</a></li>
</ul>
<h6 class="sidebar-heading d-flex justify-content-between align-items-center px-3 mt-4 mb-1 text-muted">
<span>PRODUITS</span>
</h6>
<ul class="nav flex-column mb-2">
<li class="nav-item">
<a class="nav-link" href="{{route('bo.products.index')}}">Produits</a>
<a class="nav-link" href="{{route('bo.ranges.index')}}">Gammes de produits</a>
</li>
</ul>--}}
<ul class="nav flex-column mb-2"> <ul class="nav flex-column mb-2">
<li class="nav-item"> <li class="nav-item">
<a class="nav-link" href="{{route('home')}}" target="_front">Voir le site</a> <a class="nav-link" href="{{route('home')}}" target="_front">Voir le site</a>
</li> </li>
</ul> </ul>
<div class="accordion" id="accordionMenu"> <div class="accordion" id="accordionMenu">
<div class="card"> <div class="accordion-item">
<h2 class="accordion-header" id="headingSliders">
<button class="accordion-button {{ ( request()->routeIs('bo.sliders*') || request()->routeIs('bo.slides*') ) ? '' : 'collapsed' }}" type="button" data-bs-toggle="collapse" data-bs-target="#collapseSliders" aria-expanded="true" aria-controls="collapseSliders">
<i class="fas fa-tv"></i>&nbsp;Sliders
</button>
</h2>
<div id="collapseSliders" class="accordion-collapse collapse {{ ( request()->routeIs('bo.sliders*') || request()->routeIs('bo.slides*') ) ? 'show' : '' }}" aria-labelledby="headingSliders" data-bs-parent="#accordionMenu">
<div class="accordion-body">
<ul class="nav flex-column mb-2">
<li class="nav-item"><a class="nav-link" href="{{route('bo.sliders.index')}}">Sliders</a></li>
<li class="nav-item"><a class="nav-link" href="{{route('bo.slides.index')}}">Slides</a></li>
</ul>
</div>
</div>
</div>
<div class="accordion-item">
<h2 class="accordion-header" id="headingPages">
<button class="accordion-button {{ ( request()->routeIs('bo.content') || request()->routeIs('bo.faq') ) ? '' : 'collapsed' }}" type="button" data-bs-toggle="collapse" data-bs-target="#collapsePages" aria-expanded="true" aria-controls="collapsePages">
<i class="far fa-file-word"></i>&nbsp;Pages
</button>
</h2>
<div id="collapsePages" class="accordion-collapse collapse {{ ( request()->routeIs('bo.content') || request()->routeIs('bo.faq') ) ? 'show' : '' }}" aria-labelledby="headingPages" data-bs-parent="#accordionMenu">
<div class="accordion-body">
<ul class="nav flex-column mb-2">
<li class="nav-item"><a class="nav-link" href="{{route('bo.content', 'accueil')}}">Accueil</a></li>
<li class="nav-item"><a class="nav-link" href="{{route('bo.content', 'contact')}}">Contact</a></li>
<li class="nav-item"><a class="nav-link" href="{{route('bo.content', 'legals')}}">Mentions Légales</a></li>
<li class="nav-item"><a class="nav-link" href="{{route('bo.content', 'cgv')}}">CGV</a></li>
<li class="nav-item"><a class="nav-link" href="{{route('bo.content', 'confidentialite')}}">Politique de confidentialité</a></li>
<li class="nav-item"><a class="nav-link" href="{{route('bo.faq')}}">FAQ</a></li>
</ul>
</div>
</div>
</div>
<div class="accordion-item">
<h2 class="accordion-header" id="headingProduits">
<button class="accordion-button {{ ( request()->routeIs('bo.products*') || request()->routeIs('bo.ranges*') || request()->routeIs('bo.tags*') ) ? '' : 'collapsed' }}" type="button" data-bs-toggle="collapse" data-bs-target="#collapseProduits" aria-expanded="true" aria-controls="collapseProduits">
<i class="fas fa-warehouse"></i>&nbsp;Catalogue
</button>
</h2>
<div id="collapseProduits" class="accordion-collapse collapse {{ ( request()->routeIs('bo.products*') || request()->routeIs('bo.ranges*') || request()->routeIs('bo.tags*') ) ? 'show' : '' }}" aria-labelledby="headingProduits" data-bs-parent="#accordionMenu">
<div class="accordion-body">
<ul class="nav flex-column mb-2">
<li class="nav-item">
<a class="nav-link" href="{{route('bo.products.index')}}">Produits</a>
<a class="nav-link" href="{{route('bo.ranges.index')}}">Gammes de produits</a>
<a class="nav-link" href="{{route('bo.tags.index')}}">Mots Clés</a>
</li>
</ul>
</div>
</div>
</div>
<div class="accordion-item">
<h2 class="accordion-header" id="headingMerchandising">
<button class="accordion-button {{ ( request()->routeIs('bo.promotions*') || request()->routeIs('bo.products.starred') ) ? '' : 'collapsed' }}" type="button" data-bs-toggle="collapse" data-bs-target="#collapseMerchandising" aria-expanded="true" aria-controls="collapseMerchandising">
<i class="fas fa-cart-arrow-down"></i>&nbsp;Merchandising
</button>
</h2>
<div id="collapseMerchandising" class="accordion-collapse collapse {{ ( request()->routeIs('bo.promotions*') || request()->routeIs('bo.products.starred') ) ? 'show' : '' }}" aria-labelledby="headingMerchandising" data-bs-parent="#accordionMenu">
<div class="accordion-body">
<ul class="nav flex-column mb-2">
<li class="nav-item">
<a class="nav-link" href="{{route('bo.promotions.index')}}">Promotions</a>
<a class="nav-link" href="{{route('bo.products.starred')}}">Mise en avant</a>
{{--<a class="nav-link" href="#">Associations de produits</a>--}}
</li>
</ul>
</div>
</div>
</div>
<!-- Commandes -->
<div class="accordion-item">
<h2 class="accordion-header" id="headingOrders">
<button class="accordion-button {{ ( request()->routeIs('bo.orders*') ) ? '' : 'collapsed' }}" type="button" data-bs-toggle="collapse" data-bs-target="#collapseOrders" aria-expanded="true" aria-controls="collapseOrders">
<i class="fas fa-cash-register"></i>&nbsp;Commandes
</button>
</h2>
<div id="collapseOrders" class="accordion-collapse collapse {{ ( request()->routeIs('bo.orders*') ) ? 'show' : '' }}" aria-labelledby="headingOrders" data-bs-parent="#accordionMenu">
<div class="accordion-body">
<ul class="nav flex-column mb-2">
<li class="nav-item">
<a class="nav-link" href="{{route('bo.orders')}}">Commandes</a>
<a class="nav-link" href="{{route('bo.orders.today')}}">Commandes à retirer aujourd'hui</a>
</li>
</ul>
</div>
</div>
</div>
<!-- Points de Collecte -->
<div class="accordion-item">
<h2 class="accordion-header" id="headingCollecte">
<button class="accordion-button {{ ( request()->routeIs('bo.magasins*') || request()->routeIs('bo.creneaux*') ) ? '' : 'collapsed' }}" type="button" data-bs-toggle="collapse" data-bs-target="#collapseCollecte" aria-expanded="true" aria-controls="collapseCollecte">
<i class="fas fa-store"></i>&nbsp;Points de retrait
</button>
</h2>
<div id="collapseCollecte" class="accordion-collapse collapse {{ ( request()->routeIs('bo.magasins*') || request()->routeIs('bo.creneaux*') ) ? 'show' : '' }}" aria-labelledby="headingCollecte" data-bs-parent="#accordionMenu">
<div class="accordion-body">
<ul class="nav flex-column mb-2">
<li class="nav-item">
<a class="nav-link" href="{{route('bo.magasins.index')}}">Magasins</a>
</li>
</ul>
</div>
</div>
</div>
<div class="accordion-item">
<h2 class="accordion-header" id="headingSettings">
<button class="accordion-button {{ ( request()->routeIs('bo.settings*') ) ? '' : 'collapsed' }}" type="button" data-bs-toggle="collapse" data-bs-target="#collapseSettings" aria-expanded="true" aria-controls="collapseSettings">
<i class="fas fa-cog"></i>&nbsp;Règlages
</button>
</h2>
<div id="collapseSettings" class="accordion-collapse collapse {{ ( request()->routeIs('bo.settings*') ) ? 'show' : '' }}" aria-labelledby="headingSettings" data-bs-parent="#accordionMenu">
<div class="accordion-body">
<ul class="nav flex-column mb-2">
<li class="nav-item">
<a class="nav-link" href="{{route('bo.settings')}}">Paramètres généraux</a>
@if(!empty(Config::get('theme.bo_theme_settings')))
<a class="nav-link" href="{{route('bo.themesettings')}}">Paramètres site public</a>
@endif
</li>
</ul>
</div>
</div>
</div>
{{-- <div class="card">
<div class="card-header" id="headingSliders"> <div class="card-header" id="headingSliders">
<h2 class="mb-0"> <h2 class="mb-0">
<button class="btn btn-link btn-block text-left" type="button" data-toggle="collapse" data-target="#collapseSliders" aria-expanded="true" aria-controls="collapseOne"> <button class="btn btn-link btn-block text-left" type="button" data-toggle="collapse" data-target="#collapseSliders" aria-expanded="true" aria-controls="collapseOne">
@ -145,7 +240,7 @@
<li class="nav-item"> <li class="nav-item">
<a class="nav-link" href="{{route('bo.promotions.index')}}">Promotions</a> <a class="nav-link" href="{{route('bo.promotions.index')}}">Promotions</a>
<a class="nav-link" href="{{route('bo.products.starred')}}">Mise en avant</a> <a class="nav-link" href="{{route('bo.products.starred')}}">Mise en avant</a>
{{--<a class="nav-link" href="#">Associations de produits</a>--}} {{--<a class="nav-link" href="#">Associations de produits</a>
</li> </li>
</ul> </ul>
</div> </div>
@ -213,12 +308,12 @@
</ul> </ul>
</div> </div>
</div> </div>
</div> </div> --}}
</div> </div>
</div> </div>
</nav> </nav>
<main role="main" class="col-md-9 ml-sm-auto col-lg-10 px-md-4"> <main class="col-md-9 ms-sm-auto col-lg-10 px-md-4">
@yield('content') @yield('content')
</main> </main>
</div> </div>