Footer was added with essential data like terms and conditions, conta…

…ct information and social media panel
Vilgefortzz · May 11, 2017 · 7fac75a · 7fac75a
1 parent d1cd82d
commit 7fac75a
Show file tree

Hide file tree

Showing 24 changed files with 649 additions and 55 deletions.
diff --git a/database/migrations/2017_03_05_184755_create_products_table.php b/database/migrations/2017_03_05_184755_create_products_table.php
@@ -17,7 +17,7 @@ public function up()
             $table->increments('id');
             $table->string('name', 30)->unique();
             $table->string('description', 50)->nullable();
-            $table->string('image')->default('missing.png');
+            $table->string('path_to_image')->default('/images/missing.png');
             $table->float('price')->unsigned();
             $table->integer('quantity')->unsigned()->nullable();
             $table->boolean('recommended')->default(false);

diff --git a/database/migrations/2017_03_05_185813_create_categories_table.php b/database/migrations/2017_03_05_185813_create_categories_table.php
@@ -16,6 +16,7 @@ public function up()
         Schema::create('categories', function (Blueprint $table) {
             $table->increments('id');
             $table->string('name', 40)->unique();
+            $table->string('path_to_image')->default('/images/missing.png');
             $table->timestamps();
         });
     }

diff --git a/database/seeds/CategoriesTableSeeder.php b/database/seeds/CategoriesTableSeeder.php
@@ -12,13 +12,13 @@ class CategoriesTableSeeder extends Seeder
      */
     public function run()
     {
-        $categoryNames = ['To Fight', 'To Defend'];
-
-        $categories = [];
+        $categoryNames = ['To Attack', 'To Defend'];
+        $pathToImages = ['/images/icons/attack_category.png', '/images/icons/defend_category.png'];
 
         for ($i = 0; $i < count($categoryNames); $i++) {
-            $categories[] = factory(Category::class)->create([
-                'name' => $categoryNames[$i]
+            factory(Category::class)->create([
+                'name' => $categoryNames[$i],
+                'path_to_image' => $pathToImages[$i]
             ]);
         }
     }

diff --git a/database/seeds/ProductsTableSeeder.php b/database/seeds/ProductsTableSeeder.php
@@ -38,7 +38,7 @@ public function run()
             factory(Product::class)->create([
                 'subcategory_id' => $subcategorySwords->id,
                 'name' => $productsToSwords[$i],
-                'image' => $swordsImages[$i],
+                'path_to_image' => $swordsImages[$i],
                 'quantity' => 5
             ]);
         }
@@ -47,7 +47,7 @@ public function run()
             factory(Product::class)->create([
                 'subcategory_id' => $subcategoryAxes->id,
                 'name' => $productsToAxes[$i],
-                'image' => $axesImages[$i],
+                'path_to_image' => $axesImages[$i],
                 'quantity' => 8
             ]);
         }
@@ -56,7 +56,7 @@ public function run()
             factory(Product::class)->create([
                 'subcategory_id' => $subcategoryShields->id,
                 'name' => $productsToShields[$i],
-                'image' => $shieldsImages[$i],
+                'path_to_image' => $shieldsImages[$i],
                 'quantity' => 14
             ]);
         }
@@ -65,7 +65,7 @@ public function run()
             factory(Product::class)->create([
                 'subcategory_id' => $subcategoryHelmets->id,
                 'name' => $productsToHelmets[$i],
-                'image' => $helmetsImages[$i],
+                'path_to_image' => $helmetsImages[$i],
                 'quantity' => 3
             ]);
         }

diff --git a/database/seeds/SubcategoriesTableSeeder.php b/database/seeds/SubcategoriesTableSeeder.php
@@ -13,18 +13,18 @@ class SubcategoriesTableSeeder extends Seeder
      */
     public function run()
     {
-        $subcategoryNamesToFight = ['swords', 'axes', 'katanas'];
+        $subcategoryNamesToAttack = ['swords', 'axes', 'katanas'];
         $subcategoryNamesToDefend = ['armours', 'helmets', 'shields'];
 
         $categories = Category::all();
 
-        $categoryToFight = $categories->where('name', 'To Fight')->first();
+        $categoryToAttack = $categories->where('name', 'To Attack')->first();
         $categoryToDefend = $categories->where('name', 'To Defend')->first();
 
-        for ($i = 0; $i < count($subcategoryNamesToFight); $i++) {
+        for ($i = 0; $i < count($subcategoryNamesToAttack); $i++) {
             factory(Subcategory::class)->create([
-                'name' => $subcategoryNamesToFight[$i],
-                'category_id' => $categoryToFight->id
+                'name' => $subcategoryNamesToAttack[$i],
+                'category_id' => $categoryToAttack->id
             ]);
         }
 

diff --git a/public/css/app.css b/public/css/app.css
diff --git a/public/images/icons/attack_category.png b/public/images/icons/attack_category.png
diff --git a/public/images/icons/defend_category.png b/public/images/icons/defend_category.png
diff --git a/public/js/app.js b/public/js/app.js
@@ -11301,6 +11301,18 @@ $(document).ready(function () {
 
         sessionStorage.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/resources/assets/js/app.js b/resources/assets/js/app.js
@@ -86,4 +86,16 @@ $(document).ready(function() {
 
         sessionStorage.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
@@ -13,6 +13,9 @@
 // Categories side bar menu
 @import "categories_nav_bar";
 
+// Footer
+@import "footer";
+
 // Bootstrap
 @import "node_modules/bootstrap-sass/assets/stylesheets/bootstrap";
 
@@ -388,4 +391,13 @@ body{
 .remove_all:focus{
   color: black;
   text-decoration: none;
+}
+
+.faq_group:hover{
+  color: white;
+  background: #312822;
+}
+
+.answer_group{
+  list-style: none;
 }
diff --git a/resources/assets/sass/categories_nav_bar.scss b/resources/assets/sass/categories_nav_bar.scss
@@ -3,10 +3,6 @@
 .panel-body table tr td { padding-left: 15px }
 .panel-body .table {margin-bottom: 0; }
 
-#accordion{
-  position: fixed;
-}
-
 #accordion a{
   text-decoration: none;
   color: #4c4c4c;

diff --git a/resources/assets/sass/footer.scss b/resources/assets/sass/footer.scss
@@ -0,0 +1,63 @@
+footer { background-color: #f9f9f9; min-height:340px; margin-top: 20px}
+
+.footerleft { margin-top:25px; padding:0 36px; }
+.logofooter { margin-bottom:10px; font-size:25px;}
+
+.footerleft p { font-size:12px !important; margin-bottom:15px}
+.footerleft p span { width:20px; color: #0a0a0a
+}
+
+.paddingtop-bottom { margin-top:25px;}
+
+.footer-ul { list-style-type:none;  padding-left:0; margin-left:2px;}
+.footer-ul li { line-height:29px; font-size:12px;}
+.footer-ul li a { color: #2F3133; transition: color 0.2s linear 0s, background 0.2s linear 0s; }
+.footer-ul i { margin-right:10px;}
+.footer-ul li a:hover {transition: color 0.2s linear 0s, background 0.2s linear 0s; color: #2e8f58; }
+
+.icon-ul { list-style-type:none !important; margin:0; padding:0;}
+.icon-ul li { line-height:75px; width:100%; float:left;}
+.icon { float:left; margin-right:5px;}
+
+.copyright { min-height:20px; background-color:#000000;}
+.copyright p { font-size: 12px; color:#FFF; padding:10px 0; margin-bottom:0;}
+
+.heading7 { font-size:21px; margin-bottom:12px; text-align: center; margin-top: 20px}
+
+.post p { font-size:12px; color:#FFF; line-height:20px;}
+.post p span { display:block; color:#8f8f8f;}
+
+// Social media section in footer
+
+.social:hover {
+  -webkit-transform: scale(1.8);
+  -moz-transform: scale(1.8);
+  -o-transform: scale(1.8);
+}
+.social {
+  -webkit-transform: scale(1.0);
+  /* Browser Variations: */
+
+  -moz-transform: scale(1.0);
+  -o-transform: scale(1.0);
+  -webkit-transition-duration: 0.5s;
+  -moz-transition-duration: 0.5s;
+  -o-transition-duration: 0.5s;
+}
+
+/*
+    Multicoloured Hover Variations
+*/
+
+#social-fb:hover {
+  color: #3B5998;
+}
+#social-tw:hover {
+  color: #4099FF;
+}
+#social-gp:hover {
+  color: #d34836;
+}
+#social-em:hover {
+  color: #f39c12;
+}
diff --git a/resources/views/cart.blade.php b/resources/views/cart.blade.php
@@ -1,4 +1,4 @@
-@extends('layouts.app')
+@extends('layouts.app_without_footer')
 
 @section('content')
     <div class="container container-fix">
@@ -22,28 +22,44 @@
                                     <li id="cart_product_{{array_first($products)['id']}}" class="list-group-item clearfix">
                                         <div id="product{{array_first($products)['id']}}_quantity">
 
-                                            <img src="{{array_first($products)['product']['image']}}" width="50" height="50">
+                                            <img src="{{array_first($products)['product']['path_to_image']}}" width="50" height="50">
                                             <b>{{array_first($products)['product']['name']}}</b>
 
                                             {{-- Change items number --}}
                                             <div class="input-group pull-right" style="width: 150px;">
 
-                                                <span class="input-group-btn">
-                                                    <button id="minus_{{array_first($products)['id']}}" type="button" class="btn btn-default delete-item set-quantity" disabled="disabled" data-type="minus" style="width: 38px">
-                                                        <span class="glyphicon glyphicon-minus"></span>
-                                                    </button>
-                                                </span>
+                                                @if(array_first($products)['quantity'] == 1)
+                                                    <span class="input-group-btn">
+                                                        <button id="minus_{{array_first($products)['id']}}" type="button" class="btn btn-default delete-item set-quantity" disabled="disabled" data-type="minus" style="width: 38px">
+                                                            <span class="glyphicon glyphicon-minus"></span>
+                                                        </button>
+                                                    </span>
+                                                @else
+                                                    <span class="input-group-btn">
+                                                        <button id="minus_{{array_first($products)['id']}}" type="button" class="btn btn-default delete-item set-quantity" data-type="minus" style="width: 38px">
+                                                            <span class="glyphicon glyphicon-minus"></span>
+                                                        </button>
+                                                    </span>
+                                                @endif
 
                                                 <input id="input_{{array_first($products)['id']}}" type="text"
                                                        href="{{ url('/cart/products/'.array_first($products)['id'].'/quantity')}}"
                                                        class="text-center form-control input-number"
                                                        value="{{array_first($products)['quantity']}}" min="1" max="{{array_first($products)['onStock']}}">
 
-                                                <span class="input-group-btn">
-                                                    <button id="plus_{{array_first($products)['id']}}" type="button" class="btn btn-default add-item set-quantity" data-type="plus" style="width: 38px">
-                                                        <span class="glyphicon glyphicon-plus"></span>
-                                                    </button>
-                                                </span>
+                                                    @if(array_first($products)['quantity'] == array_first($products)['onStock'])
+                                                        <span class="input-group-btn">
+                                                            <button id="plus_{{array_first($products)['id']}}" type="button" class="btn btn-default add-item set-quantity" disabled="disabled" data-type="plus" style="width: 38px">
+                                                                <span class="glyphicon glyphicon-plus"></span>
+                                                            </button>
+                                                        </span>
+                                                    @else
+                                                        <span class="input-group-btn">
+                                                            <button id="plus_{{array_first($products)['id']}}" type="button" class="btn btn-default add-item set-quantity" data-type="plus" style="width: 38px">
+                                                                <span class="glyphicon glyphicon-plus"></span>
+                                                            </button>
+                                                        </span>
+                                                    @endif
                                             </div>
                                         </div>
 
@@ -65,29 +81,45 @@ class="text-center form-control input-number"
                                         <li id="cart_product_{{$product['id']}}" class="list-group-item clearfix">
                                             <div id="product{{$product['id']}}_quantity">
 
-                                                <img src="{{$product['product']['image']}}" width="50" height="50">
+                                                <img src="{{$product['product']['path_to_image']}}" width="50" height="50">
 
                                                 <b>{{$product['product']['name']}}</b>
 
                                                 {{-- Change items number --}}
                                                 <div class="input-group pull-right" style="width: 150px;">
 
-                                                    <span class="input-group-btn">
+                                                    @if($product['quantity'] == 1)
+                                                        <span class="input-group-btn">
                                                          <button id="minus_{{$product['id']}}" type="button" class="btn btn-default delete-item set-quantity" disabled="disabled" data-type="minus" style="width: 38px">
                                                              <span class="glyphicon glyphicon-minus"></span>
                                                          </button>
-                                                    </span>
+                                                        </span>
+                                                    @else
+                                                        <span class="input-group-btn">
+                                                         <button id="minus_{{$product['id']}}" type="button" class="btn btn-default delete-item set-quantity" data-type="minus" style="width: 38px">
+                                                             <span class="glyphicon glyphicon-minus"></span>
+                                                         </button>
+                                                        </span>
+                                                    @endif
 
                                                     <input id="input_{{$product['id']}}" type="text"
                                                            href="{{ url('/cart/products/'.$product['id'].'/quantity') }}"
                                                            class="text-center form-control input-number"
                                                            value="{{$product['quantity']}}" min="1" max="{{$product['onStock']}}">
 
-                                                    <span class="input-group-btn">
-                                                        <button id="plus_{{$product['id']}}" type="button" class="btn btn-default add-item set-quantity" data-type="plus" style="width: 38px">
-                                                            <span class="glyphicon glyphicon-plus"></span>
-                                                        </button>
-                                                    </span>
+                                                        @if($product['quantity'] == $product['onStock'])
+                                                            <span class="input-group-btn">
+                                                                <button id="plus_{{$product['id']}}" type="button" class="btn btn-default add-item set-quantity" disabled="disabled" data-type="plus" style="width: 38px">
+                                                                    <span class="glyphicon glyphicon-plus"></span>
+                                                                </button>
+                                                            </span>
+                                                        @else
+                                                            <span class="input-group-btn">
+                                                                <button id="plus_{{$product['id']}}" type="button" class="btn btn-default add-item set-quantity" data-type="plus" style="width: 38px">
+                                                                    <span class="glyphicon glyphicon-plus"></span>
+                                                                </button>
+                                                            </span>
+                                                        @endif
                                                 </div>
 
                                             </div>

diff --git a/resources/views/info/about_us.blade.php b/resources/views/info/about_us.blade.php
@@ -0,0 +1,34 @@
+@extends('layouts.app')
+
+@section('content')
+
+
+    <div class="container container-fix">
+
+        <div class="panel panel-default panel_without_border">
+
+            <div class="panel-heading text-center">
+                <h1 class="bigger_header">About us</h1>
+            </div>
+
+            <div class="panel-body">
+
+                The Company
+                In the end of 1980s we have originaly started as a swordsmen and the actors of amateur theatre. That is why we had to produce some stage properties, costumes and the other equipment. Later, when we achieve some experiences and people started to like our products we decided to live on this kind of art. This period of our firm is situated in 1994. Since this time we have got through several production and mind periods.
+
+                After the long years of research and scientific investigation of original artwork,
+                study of literature and technical publication we were able to produce replicas that can be
+                really compared with the originals. The range of our activity is quite comprehesive.
+                We produce the replicas for the swordsmen, production for the museum,
+                collectors of decoration of period interier and also the production for the movies and
+                theatres. For the first sight it could seems very simple but e.g. the sword for the swordsmen
+                and the sword for the movie is diametrically different constructed.
+                These swords only look similar and not always.
+                At the end we would like to underline one more thing.
+                We really enjoy the production of these replicas and that is not good
+                only for us – it is good also for you – for our customers.
+
+            </div>
+        </div>
+    </div>
+@endsection