Merge remote-tracking branch 'origin/master'

# Conflicts:
#	.idea/workspace.xml
#	resources/views/main.blade.php

resources/views/layouts/user_new.blade.php

@@ -58,7 +58,7 @@
         <strong>Fazoshop</strong>
     </a>
     <nav class="my-2 my-md-0 mr-md-3 top-menu">
-        <a class="p-2 text-dark" href="#">На главную</a>
+        <a class="p-2 text-dark" href="/main">На главную</a>
         <a class="p-2 text-dark" href="{{ route('package') }}">Посылки</a>
         <a class="p-2 text-dark" href="{{ route('address') }}">Адреса</a>
         <a class="p-2 text-dark" href="{{ url('/profile') }}">Профиль</a>
@@ -95,8 +95,8 @@
         <div class="container">
             <div class="row">
                 <div class="col-12 col-md">
-                    <img class="mb-2" src="/docs/4.3/assets/brand/bootstrap-solid.svg" alt="" width="24" height="24">
-                    <small class="d-block mb-3 text-muted">&copy; 2017-2019</small>
+                    <img class="mb-2" src="{{ url('/assets/img/icon/logo.png') }}" alt="" width="24" height="24">
+                    <small class="d-block mb-3 text-muted">&copy; 2019</small>
                 </div>
                 <div class="col-6 col-md">
                     <h5>Клиентам</h5>

resources/views/pages/tarifs/index.blade.php

-@extends('layouts.app')
+@extends('layouts.user')
 @section('page-title', 'Мои посылки')
 @section('content')
 

resources/views/pages/terms.blade.php

 
-@extends('layouts.app')
-@section('page-title', 'Мои посылки')
+@extends('layouts.user')
+@section('page-title', 'Terms')
 @section('content')
+    <section class="section section-inset-1">
+        <div class="container">
+            <h2 class="text-center" style="color: #004085;">PRIVACY NOTICE AND PRIVACY POLICY</h2>
+            <hr>
 
-    <br><br><br>
-    <div class="">
-        <h4 style="text-align: center; color: #004085;">Terms of Use and Privacy Policy</h4><br>
-        <h6>
-            All services provided by Fazoshop.us are governed under our Terms and Conditions, and are subject to change at any time. These Terms and Conditions apply to a standard routed export transaction, when Member purchase products in the United States from merchants acting as the U.S. Principal Party in Interest, as defined by the United States Foreign Trade Regulations. Part VIII, below, provides additional
-            terms when Members engage in a direct export transaction as the U.S. Principal Party in Interest.
-        </h6>
-    </div>
 
-    <h4 class="my-4" style="color: #004085;">PRIVACY NOTICE AND PRIVACY POLICY</h4>
             <p style="font-size: 18px; text-align: justify"><span class="text-danger">*</span> This Privacy Policy describes the ways that FazoShop.us collects, uses, protects, transfers, and discloses information that you provide to us, that we collect, or that we receive through our website, located at www.FazoShop.us (the "Website"). This Privacy Policy also describes the measures we take to safeguard the Personal information (defined below) you provide to us. In addition, we tell you how you can ask us to (i) access or change the Personal information we maintain about you, (ii) withdraw consent you previously provided to us, (iii) refrain from sending you certain communications, and (iv) answer questions you may
                 have about our privacy practices. This Privacy Policy was last updated on October 6, 2019.</p>
 
@@ -537,6 +532,9 @@
             <h4 class="my-4" style="color: #004085;">X. CONFLICT OF LAWS</h4>
             <p style="text-align: justify;">This Agreement and all disputes concerning this Agreement shall be governed by the applicable law and the applicable regulations of the United States and by the applicable regulations of any agency of the United States, without applying conflict of law principles that would result in applying any state law or state regulation other than those of New York State. The parties, in all disputes between them, consent and submit to the exclusive jurisdiction and the exclusive venue of the United States courts and the parties waive all claims that such jurisdiction and venue is improper or inconvenient. In all lawsuits to enforce or interpret this Agreement, the parties waive all rights to a jury trial, and in such actions the prevailing party shall recover from the other party the prevailing party's costs and expenses, including the prevailing party's attorneys, experts and consultants. Notwithstanding the foregoing jurisdiction, and venue restrictions, the party in whose favor a judgment with respect to this agreement is entered shall be entitled to enforce that judgment in any jurisdiction in any venue.</p>
 
+        </div>
+    </section>
+