Checkout panel was added. Refactoring and improvements in appearance

Vilgefortzz · May 13, 2017 · ad3ba52 · ad3ba52
1 parent 7fac75a
commit ad3ba52
Show file tree

Hide file tree

Showing 16 changed files with 376 additions and 197 deletions.
diff --git a/app/Http/Controllers/ShopController.php b/app/Http/Controllers/ShopController.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\Cart;
+use Illuminate\Http\Request;
+use Session;
+
+class ShopController extends Controller
+{
+    public function showCheckout(){
+
+        if (!Session::has('cart')){
+            return back();
+        }
+
+        $oldCart = Session::get('cart');
+        $cart = new Cart($oldCart);
+
+        return view('orders.checkout', ['products' => $cart->products, 'totalPrice' => $cart->totalPrice]);
+    }
+}
diff --git a/public/css/app.css b/public/css/app.css
diff --git a/public/js/app.js b/public/js/app.js
@@ -11280,12 +11280,34 @@ $(document).ready(function () {
         }
     });
 
-    $('.give_review').on('click', function () {
+    /**
+     * FAQ
+     */
+
+    $('.faq_group').on('click', function () {
+
+        var faq_id = $(this).attr('id');
+        var id = faq_id.split('_')[1];
 
-        sessionStorage.setItem('hash', 'write_review');
+        $('#answer_' + id).slideDown();
     });
 
-    if (sessionStorage.length > 0) {
+    /**
+     * Subcategory menu from main page
+     */
+
+    $('.dropdown_cat').on('click', function (e) {
+        e.preventDefault();
+
+        var cat_id = $(this).attr('id');
+        var id = cat_id.split('_')[1];
+
+        $('.sub_cat_menu').hide();
+
+        $('#sub_cat_' + id).fadeIn();
+    });
+
+    if (localStorage.length > 0) {
 
         if ($('#write_review').length != 0) {
             $('html, body').animate({
@@ -11299,20 +11321,8 @@ $(document).ready(function () {
             }, 800);
         }
 
-        sessionStorage.clear();
+        localStorage.clear();
     }
-
-    /**
-     * FAQ
-     */
-
-    $('.faq_group').on('click', function () {
-
-        var faq_id = $(this).attr('id');
-        var id = faq_id.split('_')[1];
-
-        $('#answer_' + id).slideDown();
-    });
 });
 /* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(1)))
 

diff --git a/public/js/focus_and_dim.js b/public/js/focus_and_dim.js
diff --git a/resources/assets/js/app.js b/resources/assets/js/app.js
@@ -64,12 +64,34 @@ $(document).ready(function() {
         }
     });
 
-    $('.give_review').on('click', function () {
+    /**
+     * FAQ
+     */
+
+    $('.faq_group').on('click', function () {
+
+        var faq_id = $(this).attr('id');
+        var id = faq_id.split('_')[1];
 
-        sessionStorage.setItem('hash', 'write_review');
+        $('#answer_' + id).slideDown();
     });
 
-    if (sessionStorage.length > 0){
+    /**
+     * Subcategory menu from main page
+     */
+
+    $('.dropdown_cat').on('click', function (e) {
+        e.preventDefault();
+
+        var cat_id = $(this).attr('id');
+        var id = cat_id.split('_')[1];
+
+        $('.sub_cat_menu').hide();
+
+        $('#sub_cat_' + id).fadeIn();
+    });
+
+    if (localStorage.length > 0){
 
         if($('#write_review').length != 0) {
             $('html, body').animate({
@@ -84,18 +106,6 @@ $(document).ready(function() {
             }, 800);
         }
 
-        sessionStorage.clear();
+        localStorage.clear();
     }
-
-    /**
-     * FAQ
-     */
-
-    $('.faq_group').on('click', function () {
-
-        var faq_id = $(this).attr('id');
-        var id = faq_id.split('_')[1];
-
-        $('#answer_' + id).slideDown();
-    });
 });
diff --git a/resources/assets/sass/app.scss b/resources/assets/sass/app.scss
@@ -4,9 +4,6 @@
 // Variables
 @import "variables";
 
-// Focus and dim screen on hover
-@import "focus_and_dim";
-
 // Recommended products list
 @import "products_list";
 
@@ -79,8 +76,37 @@ body{
   text-decoration: none;
 }
 
+.dropdown_cat{
+  display: inline-block;
+}
+
+.dropdown_cat a{
+  display: block;
+  color: #59585b;
+  padding: 14px 16px;
+  text-decoration: none;
+}
+
+.sub_cat_menu{
+  font-size: 20px;
+  list-style: none;
+}
+
+.sub_cat_menu a{
+  color: darkred;
+  text-decoration: none;
+}
+
+.sub_cat_menu a:hover{
+  color: black;
+}
+
 .horizontal_menu > li a:hover{
-  color: #29282b;
+  color: black;
+}
+
+.horizontal_menu > li a:focus{
+  color: black;
 }
 
 .horizontal_line{
@@ -393,11 +419,40 @@ body{
   text-decoration: none;
 }
 
+.nice_links{
+  color: black;
+  text-decoration: none;
+}
+
+.nice_links:hover{
+  color: darkred;
+  text-decoration: none;
+}
+
+.nice_links:active{
+  color: darkred;
+  text-decoration: none;
+}
+
 .faq_group:hover{
   color: white;
   background: #312822;
 }
 
 .answer_group{
   list-style: none;
+}
+
+// Checkout styles
+
+.table > tbody > tr > .no-line {
+  border-top: none;
+}
+
+.table > thead > tr > .no-line {
+  border-bottom: none;
+}
+
+.table > tbody > tr > .thick-line {
+  border-top: 2px solid;
 }
diff --git a/resources/assets/sass/focus_and_dim.scss b/resources/assets/sass/focus_and_dim.scss
diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php
@@ -1,4 +1,4 @@
-@extends('layouts.app')
+@extends('layouts.app_without_footer')
 
 @section('content')
 <div class="container container-fix">

diff --git a/resources/views/auth/register.blade.php b/resources/views/auth/register.blade.php
@@ -1,4 +1,4 @@
-@extends('layouts.app')
+@extends('layouts.app_without_footer')
 
 @section('content')
 <div class="container container-fix">