From 15035b7b376f4c7b49f9550d4f95fff01f829405 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20V=C3=B6lkl?= <benjamin.voelkl@areya.de>
Date: Fri, 2 Sep 2022 11:34:19 +0200
Subject: [PATCH] .

---
 .idea/workspace.xml               |   7 +-
 content/includes/footer.blade.php |   9 ++-
 content/master.blade.php          | 123 ++++++++++++++++--------------
 content/pages/checkout.blade.php  |   2 +-
 4 files changed, 79 insertions(+), 62 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index cc10da8..92a0f5d 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,7 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
-    <list default="true" id="63513c45-0a61-435e-8541-3831c195f7c0" name="Changes" comment="" />
+    <list default="true" id="63513c45-0a61-435e-8541-3831c195f7c0" name="Changes" comment="">
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/content/includes/footer.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/content/includes/footer.blade.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/content/master.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/content/master.blade.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/content/pages/checkout.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/content/pages/checkout.blade.php" afterDir="false" />
+    </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
diff --git a/content/includes/footer.blade.php b/content/includes/footer.blade.php
index f124926..d2c4ffd 100644
--- a/content/includes/footer.blade.php
+++ b/content/includes/footer.blade.php
@@ -1,5 +1,9 @@
 <footer>
-    <div style="background-color:  #79b27f">
+
+    @unless(Request::is('checkout'))
+
+
+        <div style="background-color:  #79b27f">
         <div class="container pb-5">
             <div class="row">
                 <div class="col-12 col-md-4">
@@ -38,7 +42,8 @@
                 </div>
             </div>
         </div>
-    </div>
+        </div>
+    @endunless
     <div style=" background-color: #546c8a">
         <div class="container pt-2 pb-3">
             <div class="row">
diff --git a/content/master.blade.php b/content/master.blade.php
index 7c36595..b23a85d 100644
--- a/content/master.blade.php
+++ b/content/master.blade.php
@@ -33,57 +33,60 @@
                     <svg  style="fill: beige; width: 50px; margin-top:-60px;margin-right: -10px;"xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><defs><style>.fa-secondary{opacity:.4}</style></defs><path d="M502.42 240.5l-94.7-47.3 33.5-100.4c4.5-13.6-8.4-26.5-21.9-21.9l-100.4 33.5-47.41-94.8a17.31 17.31 0 0 0-31 0l-47.3 94.7L92.7 70.8c-13.6-4.5-26.5 8.4-21.9 21.9l33.5 100.4-94.7 47.4a17.31 17.31 0 0 0 0 31l94.7 47.3-33.5 100.5c-4.5 13.6 8.4 26.5 21.9 21.9l100.41-33.5 47.3 94.7a17.31 17.31 0 0 0 31 0l47.31-94.7 100.4 33.5c13.6 4.5 26.5-8.4 21.9-21.9l-33.5-100.4 94.7-47.3a17.33 17.33 0 0 0 .2-31.1zm-155.9 106c-49.91 49.9-131.11 49.9-181 0a128.13 128.13 0 0 1 0-181c49.9-49.9 131.1-49.9 181 0a128.13 128.13 0 0 1 0 181z" class="fa-secondary"/><path d="M352 256a96 96 0 1 1-96-96 96.15 96.15 0 0 1 96 96z" class="fa-primary"/></svg>
                     <a href="{{url('/')}}" class="fs-2 fw-bold text-decoration-none">Areya Energy</a>
                 </div>
-                <div class="col-2 fs-5 mt-2 text-center ">
-                <a href="{{url('/balkonkraftwerke')}}" class="text-decoration-none mt-2 fw-bold">Balkonkraftwerke</a>
-                </div>
-                <div class="col-2 fs-5 mt-2 text-center ">
-                    <a href="{{url('/produkte')}}" class="text-decoration-none mt-2 fw-bold">Produkte</a>
-                </div>
-                <div class="col-2 fs-5 mt-2 text-center ">
-                    <a href="{{url('/service')}}" class="text-decoration-none mt-2 fw-bold">Service</a>
-                </div>
-                <div class="col-2 fs-5 mt-2 text-center ">
-                    <a href="{{url('/kontakt')}}" class="text-decoration-none mt-2 fw-bold">Kontakt</a>
-                </div>
-                <div class="col-1 text-end">
-                    <a href="" data-bs-toggle="modal" data-bs-target="#ShoppingCart" class="position-relative">
-                        <svg style="fill: white; width: 30px; margin-top: 6px;" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512"><path d="M352 128C352 57.42 294.579 0 224 0 153.42 0 96 57.42 96 128H0v304c0 44.183 35.817 80 80 80h288c44.183 0 80-35.817 80-80V128h-96zM224 48c44.112 0 80 35.888 80 80H144c0-44.112 35.888-80 80-80zm176 384c0 17.645-14.355 32-32 32H80c-17.645 0-32-14.355-32-32V176h48v40c0 13.255 10.745 24 24 24s24-10.745 24-24v-40h160v40c0 13.255 10.745 24 24 24s24-10.745 24-24v-40h48v256z"/></svg>
-                        <span class="position-absolute top-10 start-90 badge rounded-pill bg-danger" style="display: none; right: -10px;" id="count-products-in-bag">0</span>
-                    </a>
-                    <div class="modal fade" id="ShoppingCart" tabindex="-1" aria-labelledby="ShoppingCart" aria-hidden="true">
-                        <div class="modal-dialog modal-lg">
-                            <div class="modal-content">
-                                <div class="modal-header" style="background-color: #546c8a; color: white;">
-                                    <h5 class="modal-title" id="exampleModalLabel">
-                                        <svg style="fill: currentColor; width: 19px; margin-right: 8px;" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512"><path d="M352 128C352 57.42 294.579 0 224 0 153.42 0 96 57.42 96 128H0v304c0 44.183 35.817 80 80 80h288c44.183 0 80-35.817 80-80V128h-96zM224 48c44.112 0 80 35.888 80 80H144c0-44.112 35.888-80 80-80zm176 384c0 17.645-14.355 32-32 32H80c-17.645 0-32-14.355-32-32V176h48v40c0 13.255 10.745 24 24 24s24-10.745 24-24v-40h160v40c0 13.255 10.745 24 24 24s24-10.745 24-24v-40h48v256z"/></svg>
-                                        Warenkorb
-                                    </h5>
-                                    <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
-                                </div>
-                                <div class="modal-body">
-                                    <div class="row">
-                                        <div style="display: none;" class="col-12 text-center" id="no-products">
 
-                                            <br>
-                                            <br>
-                                            <br>
-                                            <script src="https://unpkg.com/@lottiefiles/lottie-player@latest/dist/lottie-player.js"></script>
-                                            <lottie-player src="https://assets2.lottiefiles.com/packages/lf20_3VDN1k.json"  background="transparent"  speed="1"  style="width: 150px; height: 150px; margin-left: 40%"  loop  autoplay></lottie-player>
-                                            <br>
-                                            <br>
-                                            <br>
-                                            <i>Es befinden sich keine Produkte im Warenkorb</i>
-                                            <br>
-                                            <br>
-                                            <a class="btn btn-success mb-3" href="{{url('/produkte')}}">Jetzt Produkte entdecken</a>
-                                            <br>
+                @unless(Request::is('checkout'))
+
+                    <div class="col-2 fs-5 mt-2 text-center ">
+                        <a href="{{url('/balkonkraftwerke')}}" class="text-decoration-none mt-2 fw-bold">Balkonkraftwerke</a>
+                    </div>
+                    <div class="col-2 fs-5 mt-2 text-center ">
+                        <a href="{{url('/produkte')}}" class="text-decoration-none mt-2 fw-bold">Produkte</a>
+                    </div>
+                    <div class="col-2 fs-5 mt-2 text-center ">
+                        <a href="{{url('/service')}}" class="text-decoration-none mt-2 fw-bold">Service</a>
+                    </div>
+                    <div class="col-2 fs-5 mt-2 text-center ">
+                        <a href="{{url('/kontakt')}}" class="text-decoration-none mt-2 fw-bold">Kontakt</a>
+                    </div>
+                    <div class="col-1 text-end">
+                        <a href="" data-bs-toggle="modal" data-bs-target="#ShoppingCart" class="position-relative">
+                            <svg style="fill: white; width: 30px; margin-top: 6px;" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512"><path d="M352 128C352 57.42 294.579 0 224 0 153.42 0 96 57.42 96 128H0v304c0 44.183 35.817 80 80 80h288c44.183 0 80-35.817 80-80V128h-96zM224 48c44.112 0 80 35.888 80 80H144c0-44.112 35.888-80 80-80zm176 384c0 17.645-14.355 32-32 32H80c-17.645 0-32-14.355-32-32V176h48v40c0 13.255 10.745 24 24 24s24-10.745 24-24v-40h160v40c0 13.255 10.745 24 24 24s24-10.745 24-24v-40h48v256z"/></svg>
+                            <span class="position-absolute top-10 start-90 badge rounded-pill bg-danger" style="display: none; right: -10px;" id="count-products-in-bag">0</span>
+                        </a>
+                        <div class="modal fade" id="ShoppingCart" tabindex="-1" aria-labelledby="ShoppingCart" aria-hidden="true">
+                            <div class="modal-dialog modal-lg">
+                                <div class="modal-content">
+                                    <div class="modal-header" style="background-color: #546c8a; color: white;">
+                                        <h5 class="modal-title" id="exampleModalLabel">
+                                            <svg style="fill: currentColor; width: 19px; margin-right: 8px;" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512"><path d="M352 128C352 57.42 294.579 0 224 0 153.42 0 96 57.42 96 128H0v304c0 44.183 35.817 80 80 80h288c44.183 0 80-35.817 80-80V128h-96zM224 48c44.112 0 80 35.888 80 80H144c0-44.112 35.888-80 80-80zm176 384c0 17.645-14.355 32-32 32H80c-17.645 0-32-14.355-32-32V176h48v40c0 13.255 10.745 24 24 24s24-10.745 24-24v-40h160v40c0 13.255 10.745 24 24 24s24-10.745 24-24v-40h48v256z"/></svg>
+                                            Warenkorb
+                                        </h5>
+                                        <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+                                    </div>
+                                    <div class="modal-body">
+                                        <div class="row">
+                                            <div style="display: none;" class="col-12 text-center" id="no-products">
+
+                                                <br>
+                                                <br>
+                                                <br>
+                                                <script src="https://unpkg.com/@lottiefiles/lottie-player@latest/dist/lottie-player.js"></script>
+                                                <lottie-player src="https://assets2.lottiefiles.com/packages/lf20_3VDN1k.json"  background="transparent"  speed="1"  style="width: 150px; height: 150px; margin-left: 40%"  loop  autoplay></lottie-player>
+                                                <br>
+                                                <br>
+                                                <br>
+                                                <i>Es befinden sich keine Produkte im Warenkorb</i>
+                                                <br>
+                                                <br>
+                                                <a class="btn btn-success mb-3" href="{{url('/produkte')}}">Jetzt Produkte entdecken</a>
+                                                <br>
 
 
-                                        </div>
-                                        <div class="col-12">
-                                            <table class="table table-striped">
-                                                <tbody id="list-products-in-bag"></tbody>
-                                                <tfoot>
+                                            </div>
+                                            <div class="col-12">
+                                                <table class="table table-striped">
+                                                    <tbody id="list-products-in-bag"></tbody>
+                                                    <tfoot>
                                                     <tr>
                                                         <th class="text-start" scope="col">Gesammt:</th>
                                                         <th colspan="3" class="text-end">
@@ -92,22 +95,26 @@
                                                             <small class="text-end fw-light">Preise inkl. 19% Umsatzsteuer</small>
                                                         </th>
                                                     </tr>
-                                                </tfoot>
-                                            </table>
-                                        </div>
-                                        <div class="col-12">
-                                            <a href="" class="cart-link text-primary"></a>
-                                            <button class="btn-share">Share</button>
+                                                    </tfoot>
+                                                </table>
+                                            </div>
+                                            <div class="col-12">
+                                                <a href="" class="cart-link text-primary"></a>
+                                                <button class="btn-share">Share</button>
+                                            </div>
                                         </div>
                                     </div>
-                                </div>
-                                <div class="modal-footer">
-                                    <a href="{{url('/checkout')}}" type="button" class="btn btn-primary">Angebot unverbindlich anfragen</a>
+                                    <div class="modal-footer">
+                                        <a href="{{url('/checkout')}}" type="button" class="btn btn-primary">Angebot unverbindlich anfragen</a>
+                                    </div>
                                 </div>
                             </div>
                         </div>
                     </div>
-                </div>
+
+                @endunless
+
+
             </div>
         </div>
     </nav>
diff --git a/content/pages/checkout.blade.php b/content/pages/checkout.blade.php
index 9fee288..1054b20 100644
--- a/content/pages/checkout.blade.php
+++ b/content/pages/checkout.blade.php
@@ -236,7 +236,7 @@
                                 </tr>
                             </tfoot>
                         </table>
-                        <a href="" class="text-muted text-decoration-none">Weitere Produkte hinzufügen</a>
+                        <a href="{{url('/produkte')}}" class="text-muted text-decoration-none">Weitere Produkte hinzufügen</a>
                     </div>
                 </div>
                 <div class="card mt-5 shadow-sm" style="background-color: #f7fcf7;">