From e9574ac65e26436267ff16dd824b8741216b56c7 Mon Sep 17 00:00:00 2001
From: Paul <paulageyev@gmail.com>
Date: Thu, 29 Mar 2018 16:27:45 +0300
Subject: [PATCH 001/253] Add `narrow` property to `app-drawer-layout`

---
 client/user/src/mealorder/meal-order.html | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/client/user/src/mealorder/meal-order.html b/client/user/src/mealorder/meal-order.html
index 3d0d27d5..113eef8e 100644
--- a/client/user/src/mealorder/meal-order.html
+++ b/client/user/src/mealorder/meal-order.html
@@ -33,6 +33,9 @@
 <dom-module id="meal-order">
     <template>
         <style>
+            .app-toolbar {
+                background-color: white
+            }
         </style>
 
         <app-location route="{{route}}"
@@ -43,10 +46,9 @@
                 pattern="/:page"
                 data="{{routeData}}"></app-route>
 
-        <app-drawer-layout fullbleed>
-
+        <app-drawer-layout fullbleed narrow="{{narrow}}">
             <app-drawer slot="drawer" align="right" class$="[[_getClassForDrawer(routeData.page)]]">
-                <app-toolbar style="background-color: white">
+                <app-toolbar class="app-toolbar">
                 </app-toolbar>
             </app-drawer>
 

From a3a05453a642c000b0af8dccc74ca3aeebfdca88 Mon Sep 17 00:00:00 2001
From: Paul <paulageyev@gmail.com>
Date: Thu, 29 Mar 2018 16:31:49 +0300
Subject: [PATCH 002/253] Add `app-toolbar` with `iron-pages` for menu and
 history pages

---
 client/user/src/mealorder/meal-order.html | 34 +++++++++++++++++++++--
 1 file changed, 32 insertions(+), 2 deletions(-)

diff --git a/client/user/src/mealorder/meal-order.html b/client/user/src/mealorder/meal-order.html
index 113eef8e..1c3163aa 100644
--- a/client/user/src/mealorder/meal-order.html
+++ b/client/user/src/mealorder/meal-order.html
@@ -48,8 +48,38 @@
 
         <app-drawer-layout fullbleed narrow="{{narrow}}">
             <app-drawer slot="drawer" align="right" class$="[[_getClassForDrawer(routeData.page)]]">
-                <app-toolbar class="app-toolbar">
-                </app-toolbar>
+
+                <iron-pages selected="[[routeData.page]]"
+                            attr-for-selected="name"
+                            fallback-selection="view404"
+                            role="main">
+                    <app-toolbar name="menu">
+                        <div class="order-date">
+                            <div class="order">Заказ</div>
+                            <div>
+                                <div class="day">Пн</div>
+                                <div class="day-of-the-week">21</div>
+                            </div>
+                        </div>
+                    </app-toolbar>
+
+                    <app-toolbar name="history">
+                        <div class="order-date">
+                            <div class="order">История заказов</div>
+                        </div>
+                    </app-toolbar>
+                </iron-pages>
+
+                <iron-pages
+                        selected="[[routeData.page]]"
+                        attr-for-selected="name"
+                        fallback-selection="view404"
+                        role="main">
+                    <user-cart name="menu" order="[[order]]" on-dish-removed="_removeDishFromOrder"></user-cart>
+                    <app-datepicker id="date-picker" name="history" view="vertical"
+                                    date="{{currentDate}}" auto-update-date="true"></app-datepicker>
+
+                </iron-pages>
             </app-drawer>
 
             <app-header-layout>

From cb34e8de723792d6d520e734ffdc5017b670d547 Mon Sep 17 00:00:00 2001
From: Paul <paulageyev@gmail.com>
Date: Thu, 29 Mar 2018 16:33:27 +0300
Subject: [PATCH 003/253] Add `app-datepicker` to `app-drawer` for history page

---
 client/user/src/mealorder/meal-order.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/user/src/mealorder/meal-order.html b/client/user/src/mealorder/meal-order.html
index 1c3163aa..aad5ac59 100644
--- a/client/user/src/mealorder/meal-order.html
+++ b/client/user/src/mealorder/meal-order.html
@@ -75,10 +75,9 @@
                         attr-for-selected="name"
                         fallback-selection="view404"
                         role="main">
-                    <user-cart name="menu" order="[[order]]" on-dish-removed="_removeDishFromOrder"></user-cart>
+
                     <app-datepicker id="date-picker" name="history" view="vertical"
                                     date="{{currentDate}}" auto-update-date="true"></app-datepicker>
-
                 </iron-pages>
             </app-drawer>
 
@@ -114,6 +113,7 @@
                 return page;
             }
         }
+
         window.customElements.define(MealOrder.is, MealOrder);
     </script>
 </dom-module>

From 0ced5202b957b24d5ab0d312dd15c8e3587d47d2 Mon Sep 17 00:00:00 2001
From: Paul <paulageyev@gmail.com>
Date: Thu, 29 Mar 2018 16:33:49 +0300
Subject: [PATCH 004/253] Add `user-cart` to `app-drawer` for menu page

---
 client/user/src/mealorder/meal-order.html | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/client/user/src/mealorder/meal-order.html b/client/user/src/mealorder/meal-order.html
index aad5ac59..c36a6c5d 100644
--- a/client/user/src/mealorder/meal-order.html
+++ b/client/user/src/mealorder/meal-order.html
@@ -75,7 +75,8 @@
                         attr-for-selected="name"
                         fallback-selection="view404"
                         role="main">
-
+                    <user-cart name="menu" order="[[order]]"
+                               on-dish-removed="_removeDishFromOrder"></user-cart>
                     <app-datepicker id="date-picker" name="history" view="vertical"
                                     date="{{currentDate}}" auto-update-date="true"></app-datepicker>
                 </iron-pages>

From 2045ff9faf4def962ee6df975a2448630ec3f9f6 Mon Sep 17 00:00:00 2001
From: Paul <paulageyev@gmail.com>
Date: Thu, 29 Mar 2018 16:37:12 +0300
Subject: [PATCH 005/253] Add `app-header` with text and icons for menu and
 history pages

---
 client/user/src/mealorder/meal-order.html | 42 +++++++++++++++++++++++
 1 file changed, 42 insertions(+)

diff --git a/client/user/src/mealorder/meal-order.html b/client/user/src/mealorder/meal-order.html
index c36a6c5d..15639040 100644
--- a/client/user/src/mealorder/meal-order.html
+++ b/client/user/src/mealorder/meal-order.html
@@ -85,6 +85,48 @@
             <app-header-layout>
                 <app-header slot="header" reveals effects="waterfall">
                     <app-toolbar>
+                        <div class="container">
+                            <div class="order-container">
+                                <div class="main-title">Заказ обедов</div>
+                                <div class="date-container">
+                                    <div class="calendar">Март&nbsp;2018</div>
+                                </div>
+                            </div>
+                            <iron-pages
+                                    selected="[[routeData.page]]"
+                                    attr-for-selected="name"
+                                    fallback-selection="view404"
+                                    role="main">
+
+                                <div name="menu">
+                                    <div class="history-of-orders"><a href="/#/history/">История заказов</a></div>
+                                    <div class="icon-container">
+                                        <a href="/#/history/">
+                                            <iron-icon class="history-icon" icon="maps:icons:history"></iron-icon>
+                                        </a>
+                                        <div>
+                                            <iron-icon class="order" icon="icons:shopping-cart"
+                                                       drawer-toggle></iron-icon>
+                                        </div>
+                                    </div>
+                                </div>
+
+                                <div name="history">
+                                    <div class="history-of-orders menu-history"><a href="/#/menu/">Сделать заказ</a>
+                                    </div>
+                                    <div class="icon-container">
+                                        <a href="/#/menu/">
+                                            <iron-icon class="history-icon" icon="maps:icons:create"></iron-icon>
+                                        </a>
+                                        <div>
+                                            <iron-icon class="order" icon="icons:date-range"
+                                                       drawer-toggle></iron-icon>
+                                        </div>
+                                    </div>
+                                </div>
+                            </iron-pages>
+
+                        </div>
                     </app-toolbar>
                 </app-header>
             </app-header-layout>

From e12afad54074667343d026d1a5a96f108cc32e28 Mon Sep 17 00:00:00 2001
From: Paul <paulageyev@gmail.com>
Date: Thu, 29 Mar 2018 16:39:20 +0300
Subject: [PATCH 006/253] Add `iron-pages` for `menu-order` and `history-order`
 components

---
 client/user/src/mealorder/meal-order.html | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/client/user/src/mealorder/meal-order.html b/client/user/src/mealorder/meal-order.html
index 15639040..6844932a 100644
--- a/client/user/src/mealorder/meal-order.html
+++ b/client/user/src/mealorder/meal-order.html
@@ -125,10 +125,19 @@
                                     </div>
                                 </div>
                             </iron-pages>
-
                         </div>
                     </app-toolbar>
                 </app-header>
+
+                <iron-pages
+                        selected="[[routeData.page]]"
+                        attr-for-selected="name"
+                        fallback-selection="view404"
+                        role="main">
+                    <menu-order name="menu" on-dish-added="_addDishToOrder"></menu-order>
+                    <user-history name="history" cart="[[history]]" narrow="[[narrow]]"></user-history>
+                </iron-pages>
+
             </app-header-layout>
 
         </app-drawer-layout>

From dbf176e9b2410e2b1595db9dd4e49d82fac05edf Mon Sep 17 00:00:00 2001
From: Paul <paulageyev@gmail.com>
Date: Thu, 29 Mar 2018 16:39:55 +0300
Subject: [PATCH 007/253] Add properties for `meal-order` component

---
 client/user/src/mealorder/meal-order.html | 30 +++++++++++++++++++++--
 1 file changed, 28 insertions(+), 2 deletions(-)

diff --git a/client/user/src/mealorder/meal-order.html b/client/user/src/mealorder/meal-order.html
index 6844932a..9fb81a94 100644
--- a/client/user/src/mealorder/meal-order.html
+++ b/client/user/src/mealorder/meal-order.html
@@ -150,8 +150,34 @@
             }
 
             static get properties() {
-                return {}
-            }
+                return {
+                    /**
+                     * Used for routing.
+                     */
+                    routeData: {},
+
+                    /**
+                     * Chosen date.
+                     */
+                    currentDate: {},
+
+                    /**
+                     * Current user's meal order.
+                     */
+                    order: {
+                        type: Array,
+                        statePath: 'currentOrder'
+                    },
+
+                    /**
+                     * User's history for the chosen day.
+                     */
+                    history: {
+                        type: Array,
+                        statePath: 'currentHistory'
+                    }
+                }
+            };
 
             _changehistoryUrl() {
                 if (this.routeData.page.startsWith('history')) {

From 5341b3e3d3e81c14cefaf73cae724edfc0727910 Mon Sep 17 00:00:00 2001
From: Paul <paulageyev@gmail.com>
Date: Thu, 29 Mar 2018 16:40:11 +0300
Subject: [PATCH 008/253] Add actions for `meal-order` component

---
 client/user/src/mealorder/meal-order.html | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/client/user/src/mealorder/meal-order.html b/client/user/src/mealorder/meal-order.html
index 9fb81a94..0598fcfd 100644
--- a/client/user/src/mealorder/meal-order.html
+++ b/client/user/src/mealorder/meal-order.html
@@ -149,6 +149,29 @@
                 return 'meal-order';
             }
 
+            static get actions() {
+                return {
+                    addDish(dish) {
+                        return {
+                            type: ArrayAction.ADD_DISH,
+                            dish: dish
+                        }
+                    },
+                    removeDish(dish) {
+                        return {
+                            type: ArrayAction.REMOVE_DISH,
+                            dish: dish
+                        }
+                    },
+                    changeHistoryDate(date) {
+                        return {
+                            type: ArrayAction.CHANGE_HISTORY_DAY,
+                            date: date
+                        }
+                    }
+                }
+            }
+
             static get properties() {
                 return {
                     /**

From 59ca60a244d86b1bc2623e429c1cae02f49458f6 Mon Sep 17 00:00:00 2001
From: Paul <paulageyev@gmail.com>
Date: Thu, 29 Mar 2018 16:40:42 +0300
Subject: [PATCH 009/253] Add observers for `meal-order` component

---
 client/user/src/mealorder/meal-order.html | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/client/user/src/mealorder/meal-order.html b/client/user/src/mealorder/meal-order.html
index 0598fcfd..0e22f3db 100644
--- a/client/user/src/mealorder/meal-order.html
+++ b/client/user/src/mealorder/meal-order.html
@@ -149,6 +149,13 @@
                 return 'meal-order';
             }
 
+            static get observers() {
+                return [
+                    '_updateDate(currentDate)',
+                    '_changehistoryUrl(currentDate)'
+                ];
+            }
+
             static get actions() {
                 return {
                     addDish(dish) {

From 55d2ada1b8092cd2c1786896b6f312b4db6d642d Mon Sep 17 00:00:00 2001
From: Paul <paulageyev@gmail.com>
Date: Thu, 29 Mar 2018 16:41:40 +0300
Subject: [PATCH 010/253] Add event handler methods for `meal-order` component

---
 client/user/src/mealorder/meal-order.html | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/client/user/src/mealorder/meal-order.html b/client/user/src/mealorder/meal-order.html
index 0e22f3db..a7bc14cf 100644
--- a/client/user/src/mealorder/meal-order.html
+++ b/client/user/src/mealorder/meal-order.html
@@ -217,6 +217,23 @@
                 }
             }
 
+            _updateDate() {
+                const arr = this.currentDate.split('/');
+                const date = {};
+                date.year = arr[0];
+                date.month = arr[1];
+                date.day = arr[2];
+                this.dispatch('changeHistoryDate', date);
+            }
+
+            _addDishToOrder(e) {
+                this.dispatch('addDish', e.detail);
+            }
+
+            _removeDishFromOrder(e) {
+                this.dispatch('removeDish', e.detail);
+            }
+
             _getClassForDrawer(page) {
                 return page;
             }

From f9a0b5a694837f1babee10ef96b306444f399759 Mon Sep 17 00:00:00 2001
From: Paul <paulageyev@gmail.com>
Date: Thu, 29 Mar 2018 16:42:05 +0300
Subject: [PATCH 011/253] Add docs for `meal-order` component

---
 client/user/src/mealorder/meal-order.html | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/client/user/src/mealorder/meal-order.html b/client/user/src/mealorder/meal-order.html
index a7bc14cf..f69d88b4 100644
--- a/client/user/src/mealorder/meal-order.html
+++ b/client/user/src/mealorder/meal-order.html
@@ -142,8 +142,25 @@
 
         </app-drawer-layout>
     </template>
-
     <script>
+        /**
+         * Main user meal order component.
+         *
+         * <p>Is adopted for both desktop and mobile.
+         * Consists of 2 page:
+         * 1. A page with vendor menus, and user's shopping cart.
+         * 2. A page with user's history.
+         *
+         * The redux mixin provides its own data system and data flow.
+         * Fires following redux events:
+         * <li>addDish</li>
+         * <li>removeDish</li>
+         * <li>changeHistoryDate</li>
+         *
+         * @customElement
+         * @polymer
+         * @ReduxMixin
+         */
         class MealOrder extends ReduxMixin(Polymer.Element) {
             static get is() {
                 return 'meal-order';
@@ -238,7 +255,6 @@
                 return page;
             }
         }
-
         window.customElements.define(MealOrder.is, MealOrder);
     </script>
 </dom-module>

From 50ccdc834be8605911d430ee6119fba0295b9c1b Mon Sep 17 00:00:00 2001
From: Paul <paulageyev@gmail.com>
Date: Thu, 29 Mar 2018 16:42:36 +0300
Subject: [PATCH 012/253] Add CSS for `meal-order` component

---
 client/user/src/mealorder/meal-order.html | 136 +++++++++++++++++++++-
 1 file changed, 134 insertions(+), 2 deletions(-)

diff --git a/client/user/src/mealorder/meal-order.html b/client/user/src/mealorder/meal-order.html
index f69d88b4..ff82c0c2 100644
--- a/client/user/src/mealorder/meal-order.html
+++ b/client/user/src/mealorder/meal-order.html
@@ -33,8 +33,140 @@
 <dom-module id="meal-order">
     <template>
         <style>
-            .app-toolbar {
-                background-color: white
+            :host {
+                font-family: 'Roboto', 'Noto', sans-serif;
+                --app-primary-color: #4285f4;
+                --app-secondary-color: black;
+                display: block;
+            }
+
+            app-header {
+                background-color: #616161;
+                color: #fff;
+                right: 300px;
+            }
+
+            app-header .main-title {
+                font-size: 1.375em;
+            }
+
+            app-drawer-layout {
+                background-color: #F2F2F2;
+            }
+
+            app-drawer-layout:not([narrow]) [drawer-toggle] {
+                display: none;
+            }
+
+            app-header app-toolbar .container {
+                display: flex;
+                width: 100%;
+                align-items: center;
+                justify-content: space-between;
+            }
+
+            app-header app-toolbar .container .order-container {
+                display: flex;
+            }
+
+            app-header app-toolbar .container .date-container {
+                display: flex;
+                margin-left: 10px;
+                align-items: center;
+            }
+
+            app-header .history-of-orders a {
+                font-size: 0.8em;
+                text-decoration: none;
+                color: white;
+            }
+
+            app-header .history-of-orders a:hover {
+                color: #179EFF;
+            }
+
+            app-header .history-icon {
+                display: none;
+                color: white;
+            }
+
+            app-header .calendar {
+                font-weight: lighter;
+                font-size: 0.75em;
+            }
+
+            app-header .order {
+                font-size: 0.75em;
+            }
+
+            .order-date {
+                display: flex;
+                justify-content: space-between;
+                align-items: center;
+                width: 100%
+            }
+
+            .order-date .order {
+                font-size: 24px;
+            }
+
+            .order-date .day {
+                font-size: 0.7em;
+                font-weight: lighter;
+                text-align: center;
+            }
+
+            .order-date .day-of-the-week {
+                font-size: 22px;
+            }
+
+            @media only screen and (max-width: 600px) {
+
+                .history-of-orders {
+                    display: none;
+                }
+
+                app-header .history-icon {
+                    display: block;
+                }
+
+                app-header .date-container .date-range-icon {
+                    display: none;
+                }
+
+                app-header .date-container .calendar {
+                    display: none;
+                }
+
+            }
+
+            app-drawer.history {
+                --app-drawer-width: 300px;
+            }
+
+            #date-picker {
+                --app-datepicker-selection-bg: #fafafa;
+                --app-datepicker-selection-color: #616161;
+                --app-datepicker-iron-selected: #616161;
+                --app-datepicker-selected-day-bg: #179EFF;
+                --app-datepicker-today-color: #179EFF;
+                --app-datepicker-date-hover-background-color: #179EFF;
+            }
+
+            app-drawer {
+                --app-drawer-content-container: {
+                    background-color: #fafafa;
+                }
+            }
+
+            .menu-history {
+                margin-right: 44px;
+            }
+
+            .icon-container {
+                width: 100px;
+                display: flex;
+                justify-content: space-around;
             }
         </style>
 

From cd03ce8c1a6a8be699a7adfe526187b663a4ceeb Mon Sep 17 00:00:00 2001
From: Paul <paulageyev@gmail.com>
Date: Thu, 29 Mar 2018 16:45:14 +0300
Subject: [PATCH 013/253] Add component imports for the "meal-order" component

---
 client/user/src/mealorder/meal-order.html | 25 +++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/client/user/src/mealorder/meal-order.html b/client/user/src/mealorder/meal-order.html
index ff82c0c2..0170f540 100644
--- a/client/user/src/mealorder/meal-order.html
+++ b/client/user/src/mealorder/meal-order.html
@@ -18,18 +18,27 @@
   ~ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   -->
 <script src="../../bower_components/webcomponentsjs/webcomponents-lite.js"></script>
+
 <link rel="import" href="../../bower_components/polymer/polymer-element.html">
-<link rel="import" href="../../bower_components/app-route/app-location.html">
-<link rel="import" href="../../bower_components/app-route/app-route.html">
 <link rel="import" href="../../bower_components/app-layout/app-drawer/app-drawer.html">
-<link rel="import"
-      href="../../bower_components/app-layout/app-drawer-layout/app-drawer-layout.html">
+<link rel="import" href="../../bower_components/app-layout/app-drawer-layout/app-drawer-layout.html">
 <link rel="import" href="../../bower_components/app-layout/app-header/app-header.html">
-<link rel="import"
-      href="../../bower_components/app-layout/app-header-layout/app-header-layout.html">
-<link rel="import"
-      href="../../bower_components/app-layout/app-scroll-effects/app-scroll-effects.html">
+<link rel="import" href="../../bower_components/app-layout/app-header-layout/app-header-layout.html">
+<link rel="import" href="../../bower_components/app-layout/app-scroll-effects/app-scroll-effects.html">
 <link rel="import" href="../../bower_components/app-layout/app-toolbar/app-toolbar.html">
+<link rel="import" href="../../bower_components/app-route/app-location.html">
+<link rel="import" href="../../bower_components/app-route/app-route.html">
+<link rel="import" href="../../bower_components/iron-pages/iron-pages.html">
+<link rel="import" href="../../bower_components/iron-selector/iron-selector.html">
+<link rel="import" href="../../bower_components/paper-icon-button/paper-icon-button.html">
+<link rel="import" href="../../bower_components/paper-tabs/paper-tabs.html">
+<link rel="import" href="../../bower_components/iron-icons/iron-icons.html">
+<link rel="import" href="../../bower_components/iron-icons/maps-icons.html">
+<link rel="import" href="../../bower_components/app-datepicker/app-datepicker.html">
+
+<link rel="import" href="shell/redux-store.html">
+<link rel="import" href="menu/user-cart.html">
+<link rel="import" href="menu/menu-order.html">
 <dom-module id="meal-order">
     <template>
         <style>

From 23dcad9e723875de87fea2303c1dde9dfb658e0d Mon Sep 17 00:00:00 2001
From: Paul <paulageyev@gmail.com>
Date: Thu, 29 Mar 2018 16:49:47 +0300
Subject: [PATCH 014/253] Create `menu-order` component

---
 .../user/src/mealorder/menu/menu-order.html   | 34 +++++++++++++++++++
 1 file changed, 34 insertions(+)
 create mode 100644 client/user/src/mealorder/menu/menu-order.html

diff --git a/client/user/src/mealorder/menu/menu-order.html b/client/user/src/mealorder/menu/menu-order.html
new file mode 100644
index 00000000..7fc7e8ba
--- /dev/null
+++ b/client/user/src/mealorder/menu/menu-order.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!--
+  ~ Copyright 2018, TeamDev Ltd. All rights reserved.
+  ~
+  ~ Redistribution and use in source and/or binary forms, with or without
+  ~ modification, must retain the above copyright notice and the following
+  ~ disclaimer.
+  ~
+  ~ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+  ~ "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+  ~ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+  ~ A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+  ~ OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+  ~ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+  ~ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+  ~ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+  ~ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  ~ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+  ~ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+  -->
+<dom-module id="menu-order">
+    <template>
+        <style>
+        </style>
+    </template>
+    <script>
+        class MenuOrder extends ReduxMixin(Polymer.Element) {
+            static get is() {
+                return 'menu-order';
+            }
+        }
+        window.customElements.define(MenuOrder.is, MenuOrder);
+    </script>
+</dom-module>

From 3302408ea64740891e4a55f0eb263dbf6009f11c Mon Sep 17 00:00:00 2001
From: Paul <paulageyev@gmail.com>
Date: Thu, 29 Mar 2018 16:50:53 +0300
Subject: [PATCH 015/253] Add routing for the `menu-order` component

---
 client/user/src/mealorder/menu/menu-order.html | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/client/user/src/mealorder/menu/menu-order.html b/client/user/src/mealorder/menu/menu-order.html
index 7fc7e8ba..e4b9f988 100644
--- a/client/user/src/mealorder/menu/menu-order.html
+++ b/client/user/src/mealorder/menu/menu-order.html
@@ -22,6 +22,15 @@
     <template>
         <style>
         </style>
+        <app-location route="{{route}}"
+                      use-hash-as-path></app-location>
+
+        <app-route
+                route="{{route}}"
+                pattern="/:menu"
+                data="{{routeData}}"
+                tail="{{subroute}}">
+        </app-route>
     </template>
     <script>
         class MenuOrder extends ReduxMixin(Polymer.Element) {

From 4a113ed6a8e7d87130a1f751c7f36cad6c617f44 Mon Sep 17 00:00:00 2001
From: Paul <paulageyev@gmail.com>
Date: Thu, 29 Mar 2018 16:52:19 +0300
Subject: [PATCH 016/253] Add `paper-tabs` for the `menu-order` component

---
 client/user/src/mealorder/menu/menu-order.html | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/client/user/src/mealorder/menu/menu-order.html b/client/user/src/mealorder/menu/menu-order.html
index e4b9f988..76429101 100644
--- a/client/user/src/mealorder/menu/menu-order.html
+++ b/client/user/src/mealorder/menu/menu-order.html
@@ -31,6 +31,21 @@
                 data="{{routeData}}"
                 tail="{{subroute}}">
         </app-route>
+
+        <paper-tabs class="tabs" selected="[[routeData.menu]]" attr-for-selected='key'>
+            <template is="dom-repeat" items="{{menuForDates}}" as="calendar">
+                <paper-tab key="[[calendar.date.year]]-[[calendar.date.month]]-[[calendar.date.day]]" link>
+                    <a class="link" name="[[calendar.date.year]]/[[calendar.date.month]]/[[calendar.date.day]]"
+                       href="/#/menu/#/[[calendar.date.year]]/[[calendar.date.month]]/[[calendar.date.day]]"
+                       on-click="_handleClick">
+                        <div>
+                            <div class="day-of-the-week">Пн</div>
+                            <div class="day">{{calendar.date.day}}</div>
+                        </div>
+                    </a>
+                </paper-tab>
+            </template>
+        </paper-tabs>
     </template>
     <script>
         class MenuOrder extends ReduxMixin(Polymer.Element) {

From c874805625cb9748556aefca600df48a88c0f3b5 Mon Sep 17 00:00:00 2001
From: Paul <paulageyev@gmail.com>
Date: Thu, 29 Mar 2018 16:53:04 +0300
Subject: [PATCH 017/253] Add `iron-pages` with `vendor-menus` component for
 the `menu-order` component

---
 client/user/src/mealorder/menu/menu-order.html | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/client/user/src/mealorder/menu/menu-order.html b/client/user/src/mealorder/menu/menu-order.html
index 76429101..15c190fe 100644
--- a/client/user/src/mealorder/menu/menu-order.html
+++ b/client/user/src/mealorder/menu/menu-order.html
@@ -46,6 +46,16 @@
                 </paper-tab>
             </template>
         </paper-tabs>
+
+        <iron-pages
+                selected="[[routeData.menu]]"
+                attr-for-selected="name"
+                fallback-selection="view404"
+                role="main">
+
+            <vendor-menus name="[[routeData.menu]]"
+                          items="[[menu]]" route="[[subroute]]" on-dish-added="addDishToOrder"></vendor-menus>
+        </iron-pages>
     </template>
     <script>
         class MenuOrder extends ReduxMixin(Polymer.Element) {

From f317d415da893f38a8347ea8d90883f383e82b16 Mon Sep 17 00:00:00 2001
From: Paul <paulageyev@gmail.com>
Date: Thu, 29 Mar 2018 16:54:00 +0300
Subject: [PATCH 018/253] Add observer with `_pageChanged' method for the
 `menu-order` component

---
 client/user/src/mealorder/menu/menu-order.html | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/client/user/src/mealorder/menu/menu-order.html b/client/user/src/mealorder/menu/menu-order.html
index 15c190fe..43b1c02f 100644
--- a/client/user/src/mealorder/menu/menu-order.html
+++ b/client/user/src/mealorder/menu/menu-order.html
@@ -62,6 +62,16 @@
             static get is() {
                 return 'menu-order';
             }
+            static get observers() {
+                return [
+                    '_pageChanged(routeData.menu)'
+                ];
+            }
+            _pageChanged() {
+                if (!this.route.path) {
+                    this.set('route.path', '/menu/#/2018/03/21');
+                }
+            }
         }
         window.customElements.define(MenuOrder.is, MenuOrder);
     </script>

From c9f3c41f994bf0bb7693892cdd984fa9202f78de Mon Sep 17 00:00:00 2001
From: Paul <paulageyev@gmail.com>
Date: Thu, 29 Mar 2018 16:54:35 +0300
Subject: [PATCH 019/253] Add properties for the `menu-order` component

---
 .../user/src/mealorder/menu/menu-order.html   | 29 +++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/client/user/src/mealorder/menu/menu-order.html b/client/user/src/mealorder/menu/menu-order.html
index 43b1c02f..c1658a99 100644
--- a/client/user/src/mealorder/menu/menu-order.html
+++ b/client/user/src/mealorder/menu/menu-order.html
@@ -62,11 +62,40 @@
             static get is() {
                 return 'menu-order';
             }
+
             static get observers() {
                 return [
                     '_pageChanged(routeData.menu)'
                 ];
             }
+
+            static get properties() {
+                return {
+                    /**
+                     * Fired when a dish add button is tapped.
+                     *
+                     * @event `dish-added`
+                     * @param {dish} contains vendor, category, title.
+                     */
+
+                    /**
+                     * Array of dates with existing menu.
+                     */
+                    menuForDates: {
+                        type: Array,
+                        statePath: 'menuForDates'
+                    },
+
+                    /**
+                     * Menu for a current day.
+                     */
+                    menu: {
+                        type: Array,
+                        statePath: 'menuForDay'
+                    }
+                };
+            }
+
             _pageChanged() {
                 if (!this.route.path) {
                     this.set('route.path', '/menu/#/2018/03/21');

From e1b02b206d054b07af75ec2dea64f50f305c7a3a Mon Sep 17 00:00:00 2001
From: Paul <paulageyev@gmail.com>
Date: Thu, 29 Mar 2018 16:55:01 +0300
Subject: [PATCH 020/253] Add actions for the `menu-order` component

---
 client/user/src/mealorder/menu/menu-order.html | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/client/user/src/mealorder/menu/menu-order.html b/client/user/src/mealorder/menu/menu-order.html
index c1658a99..a1a74108 100644
--- a/client/user/src/mealorder/menu/menu-order.html
+++ b/client/user/src/mealorder/menu/menu-order.html
@@ -69,6 +69,17 @@
                 ];
             }
 
+            static get actions() {
+                return {
+                    menuForDay(date) {
+                        return {
+                            type: ArrayAction.MENU_FOR_DAY,
+                            date: date
+                        }
+                    },
+                }
+            }
+
             static get properties() {
                 return {
                     /**

From e1098d78b32c054a25e1b5c5cd77b0131164cb08 Mon Sep 17 00:00:00 2001
From: Paul <paulageyev@gmail.com>
Date: Thu, 29 Mar 2018 16:55:30 +0300
Subject: [PATCH 021/253] Add `connectedCallback` with `menuForDay` action for
 the `menu-order` component

---
 client/user/src/mealorder/menu/menu-order.html | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/client/user/src/mealorder/menu/menu-order.html b/client/user/src/mealorder/menu/menu-order.html
index a1a74108..f8c5ffc7 100644
--- a/client/user/src/mealorder/menu/menu-order.html
+++ b/client/user/src/mealorder/menu/menu-order.html
@@ -63,6 +63,13 @@
                 return 'menu-order';
             }
 
+            connectedCallback() {
+                super.connectedCallback();
+                if (this.menuForDates[0].hasMenu) {
+                    this.dispatch('menuForDay', this.menuForDates[0]);
+                }
+            }
+
             static get observers() {
                 return [
                     '_pageChanged(routeData.menu)'

From 01af2ba1afa0ed45b493349c4a8226765ef904d5 Mon Sep 17 00:00:00 2001
From: Paul <paulageyev@gmail.com>
Date: Thu, 29 Mar 2018 16:56:09 +0300
Subject: [PATCH 022/253] Add handler for `paper-tabs`

---
 client/user/src/mealorder/menu/menu-order.html | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/client/user/src/mealorder/menu/menu-order.html b/client/user/src/mealorder/menu/menu-order.html
index f8c5ffc7..a4da7520 100644
--- a/client/user/src/mealorder/menu/menu-order.html
+++ b/client/user/src/mealorder/menu/menu-order.html
@@ -119,6 +119,11 @@
                     this.set('route.path', '/menu/#/2018/03/21');
                 }
             }
+
+            _handleClick(e) {
+                this.dispatch('menuForDay', this.menuForDates[e.model.index]);
+            }
+
         }
         window.customElements.define(MenuOrder.is, MenuOrder);
     </script>

From 82526894f43b63537ba9d7fdda09040b9e91bff8 Mon Sep 17 00:00:00 2001
From: Paul <paulageyev@gmail.com>
Date: Thu, 29 Mar 2018 16:56:46 +0300
Subject: [PATCH 023/253] Add event handler for the `dish-added` event

---
 client/user/src/mealorder/menu/menu-order.html | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/client/user/src/mealorder/menu/menu-order.html b/client/user/src/mealorder/menu/menu-order.html
index a4da7520..db43cb8b 100644
--- a/client/user/src/mealorder/menu/menu-order.html
+++ b/client/user/src/mealorder/menu/menu-order.html
@@ -124,6 +124,10 @@
                 this.dispatch('menuForDay', this.menuForDates[e.model.index]);
             }
 
+            addDishToOrder(e) {
+                this.dispatchEvent(new CustomEvent('dish-added', {detail: e.detail}));
+            }
+
         }
         window.customElements.define(MenuOrder.is, MenuOrder);
     </script>

From e870564aa38eeee5742366c20ff17e6c53889027 Mon Sep 17 00:00:00 2001
From: Paul <paulageyev@gmail.com>
Date: Thu, 29 Mar 2018 16:57:07 +0300
Subject: [PATCH 024/253] Add docs for the `menu-order` component

---
 client/user/src/mealorder/menu/menu-order.html | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/client/user/src/mealorder/menu/menu-order.html b/client/user/src/mealorder/menu/menu-order.html
index db43cb8b..5c1561a2 100644
--- a/client/user/src/mealorder/menu/menu-order.html
+++ b/client/user/src/mealorder/menu/menu-order.html
@@ -58,6 +58,17 @@
         </iron-pages>
     </template>
     <script>
+        /**
+         * menu-order is container for vendors' menus and navigation.
+         *
+         * <p>Is adopted for both desktop and mobile.
+         * Contains a menu for the current date and tabs for quick date navigation.
+         *
+         * Fires redux `menuForDay` event
+         * @customElement
+         * @polymer
+         * @ReduxMixin
+         */
         class MenuOrder extends ReduxMixin(Polymer.Element) {
             static get is() {
                 return 'menu-order';

From b8d224486dfafb6b2c2b78b5f354b9836d6375dd Mon Sep 17 00:00:00 2001
From: Paul <paulageyev@gmail.com>
Date: Thu, 29 Mar 2018 16:57:59 +0300
Subject: [PATCH 025/253] Add component imports for the "menu-order" component

---
 client/user/src/mealorder/menu/menu-order.html | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/client/user/src/mealorder/menu/menu-order.html b/client/user/src/mealorder/menu/menu-order.html
index 5c1561a2..bbe63270 100644
--- a/client/user/src/mealorder/menu/menu-order.html
+++ b/client/user/src/mealorder/menu/menu-order.html
@@ -1,4 +1,3 @@
-<!DOCTYPE html>
 <!--
   ~ Copyright 2018, TeamDev Ltd. All rights reserved.
   ~
@@ -18,6 +17,17 @@
   ~ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
   ~ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   -->
+<script src="../../../bower_components/webcomponentsjs/webcomponents-lite.js"></script>
+<link rel="import" href="../../../bower_components/polymer/polymer-element.html">
+<link rel="import" href="../../../bower_components/paper-tabs/paper-tabs.html">
+<link rel="import" href="../../../bower_components/app-route/app-location.html">
+<link rel="import" href="../../../bower_components/app-route/app-route.html">
+<link rel="import" href="../../../bower_components/iron-pages/iron-pages.html">
+<link rel="import" href="../shell/redux-store.html">
+<link rel="import" href="../../../bower_components/polymer/lib/elements/dom-repeat.html">
+
+<link rel="import" href="vendor-menus.html">
+<link rel="import" href="user-history.html">
 <dom-module id="menu-order">
     <template>
         <style>

From c3adee37ad7eec0605035f62a30f1bc2b19ab828 Mon Sep 17 00:00:00 2001
From: Paul <paulageyev@gmail.com>
Date: Thu, 29 Mar 2018 16:58:34 +0300
Subject: [PATCH 026/253] Add CSS for the `menu-order` component

---
 .../user/src/mealorder/menu/menu-order.html   | 52 +++++++++++++++++++
 1 file changed, 52 insertions(+)

diff --git a/client/user/src/mealorder/menu/menu-order.html b/client/user/src/mealorder/menu/menu-order.html
index bbe63270..683c53c1 100644
--- a/client/user/src/mealorder/menu/menu-order.html
+++ b/client/user/src/mealorder/menu/menu-order.html
@@ -31,6 +31,58 @@
 <dom-module id="menu-order">
     <template>
         <style>
+            body {
+                font-family: 'Roboto', 'Noto', sans-serif;
+                margin: 0;
+                display: flex;
+                align-items: flex-end;
+                height: 80px;
+                background: #009688;
+                color: white;
+            }
+
+            paper-tabs {
+                -webkit-font-smoothing: antialiased;
+                width: 100%;
+                margin-bottom: 1px;
+                --paper-tabs-selection-bar-color: #179EFF;
+                --paper-tab-ink: #179EFF;
+            }
+
+            paper-tabs {
+                margin: 3% auto;
+                width: 70%;
+            }
+
+            paper-tab.iron-selected .day-of-the-week {
+                color: #179EFF;
+            }
+
+            paper-tab.iron-selected .day {
+                color: #179EFF;
+            }
+
+            .link {
+                @apply --layout-horizontal;
+                @apply --layout-center-center;
+                text-decoration: none;
+                color: #4f4f4f;
+                font-size: 1.5em;
+            }
+
+            .day-of-the-week {
+                font-size: 0.7em;
+                font-weight: lighter;
+            }
+
+            @media only screen and (max-width: 600px) {
+
+                paper-tabs {
+                    margin-top: 3%;
+                    width: 100%;
+                }
+
+            }
         </style>
         <app-location route="{{route}}"
                       use-hash-as-path></app-location>

From 50727ef52a5bbaa665a59d9dd1b1ecff5bb89f7f Mon Sep 17 00:00:00 2001
From: "alexander.karpetc" <alexander.karpetc@gmail.com>
Date: Thu, 29 Mar 2018 17:04:39 +0300
Subject: [PATCH 027/253] Create `vendor-menus` component

---
 .../user/src/mealorder/menu/vendor-menus.html | 46 +++++++++++++++++++
 1 file changed, 46 insertions(+)
 create mode 100644 client/user/src/mealorder/menu/vendor-menus.html

diff --git a/client/user/src/mealorder/menu/vendor-menus.html b/client/user/src/mealorder/menu/vendor-menus.html
new file mode 100644
index 00000000..97e871e2
--- /dev/null
+++ b/client/user/src/mealorder/menu/vendor-menus.html
@@ -0,0 +1,46 @@
+<!--
+  ~ Copyright 2018, TeamDev Ltd. All rights reserved.
+  ~
+  ~ Redistribution and use in source and/or binary forms, with or without
+  ~ modification, must retain the above copyright notice and the following
+  ~ disclaimer.
+  ~
+  ~ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+  ~ "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+  ~ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+  ~ A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+  ~ OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+  ~ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+  ~ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+  ~ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+  ~ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  ~ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+  ~ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+  -->
+
+<script src="../../../bower_components/webcomponentsjs/webcomponents-lite.js"></script>
+<link rel="import" href="../../../bower_components/polymer/polymer-element.html">
+
+
+<dom-module id="vendor-menus">
+    <template>
+        <style>
+
+        </style>
+
+    </template>
+    <script>
+
+        class VendorMenus extends Polymer.Element {
+            static get is() {
+                return 'vendor-menus';
+            }
+
+            static get properties() {
+                return {}
+            };
+        }
+
+        window.customElements.define(VendorMenus.is, VendorMenus);
+    </script>
+</dom-module>

From d5eadcb76d10d71efeb88104d380b3cd2c455a84 Mon Sep 17 00:00:00 2001
From: "alexander.karpetc" <alexander.karpetc@gmail.com>
Date: Thu, 29 Mar 2018 17:05:41 +0300
Subject: [PATCH 028/253] Add iron-list of menus

---
 .../user/src/mealorder/menu/vendor-menus.html | 69 ++++++++++++++++++-
 1 file changed, 68 insertions(+), 1 deletion(-)

diff --git a/client/user/src/mealorder/menu/vendor-menus.html b/client/user/src/mealorder/menu/vendor-menus.html
index 97e871e2..3136e8f9 100644
--- a/client/user/src/mealorder/menu/vendor-menus.html
+++ b/client/user/src/mealorder/menu/vendor-menus.html
@@ -20,14 +20,81 @@
 
 <script src="../../../bower_components/webcomponentsjs/webcomponents-lite.js"></script>
 <link rel="import" href="../../../bower_components/polymer/polymer-element.html">
-
+<link rel="import" href="../../../bower_components/iron-list/iron-list.html">
+<link rel="import" href="../../../bower_components/paper-item/paper-item.html">
+<link rel="import" href="../../../bower_components/paper-icon-button/paper-icon-button.html">
+<link rel="import" href="../../../bower_components/paper-button/paper-button.html">
+<link rel="import" href="../../../bower_components/iron-icons/iron-icons.html">
+<link rel="import" href="../../../bower_components/paper-input/paper-input.html">
+<link rel="import" href="../../../bower_components/paper-search/paper-search-bar.html">
 
 <dom-module id="vendor-menus">
     <template>
         <style>
 
         </style>
+        <iron-list scroll-target="document" id="list" items="[[filtered]]" as="item"
+                   selection-enabled
+                   multi-selection>
+            <template>
+                <div class="non-select">
+                    <div class$="[[getClassForItem(selected)]]" tabindex$="[[tabIndex]]">
+                        <div class="pad">
+                            <div class="primary">
+                                [[item.name]]
+                                <paper-icon-button id="expand-button" icon="[[getIcon(selected)]]"
+                                                   on-click="_reSelect"></paper-icon-button>
+                            </div>
+
+                            <dom-repeat items="[[item.categories]]" as="category">
+                                <template>
+                                    <dom-if if="[[categoryExists(category)]]">
+                                        <template>
+                                            <div class="vendor">
+
+                                                <div class="category">
+                                                    <paper-item>
+                                                        <div class="dish-title bolder">
+                                                            [[category.categoryName]]
+                                                        </div>
+                                                        <div class="dish-price bolder">
+                                                            Цена
+                                                        </div>
+                                                        <div class="add-dish-icon">
+                                                            <paper-icon-button
+                                                                    icon=""></paper-icon-button>
+                                                        </div>
+                                                    </paper-item>
+                                                </div>
 
+                                                <dom-repeat items="[[category.dishes]]" as="dish">
+                                                    <template>
+                                                        <div class="menu-dashboard">
+                                                            <paper-item>
+                                                                <div class="dish-title">
+                                                                    [[dish.title]]
+                                                                </div>
+                                                                <div class="dish-price">
+                                                                    [[dish.price]]₴
+                                                                </div>
+                                                                <div class="add-dish-icon">
+                                                                    <paper-icon-button icon="add"
+                                                                                       on-click="addDish"></paper-icon-button>
+                                                                </div>
+                                                            </paper-item>
+                                                        </div>
+                                                    </template>
+                                                </dom-repeat>
+                                            </div>
+                                        </template>
+                                    </dom-if>
+                                </template>
+                            </dom-repeat>
+                        </div>
+                    </div>
+                </div>
+            </template>
+        </iron-list>
     </template>
     <script>
 

From 0f33be7acdc4b4fa54a90ecff0189a2a8c01c5ab Mon Sep 17 00:00:00 2001
From: "alexander.karpetc" <alexander.karpetc@gmail.com>
Date: Thu, 29 Mar 2018 17:06:26 +0300
Subject: [PATCH 029/253] Add search-bar

---
 client/user/src/mealorder/menu/vendor-menus.html | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/client/user/src/mealorder/menu/vendor-menus.html b/client/user/src/mealorder/menu/vendor-menus.html
index 3136e8f9..b5a66697 100644
--- a/client/user/src/mealorder/menu/vendor-menus.html
+++ b/client/user/src/mealorder/menu/vendor-menus.html
@@ -33,6 +33,10 @@
         <style>
 
         </style>
+
+        <paper-search-bar query="{{filter}}" hide-filter-button="true"
+                          placeholder="Поиск"></paper-search-bar>
+
         <iron-list scroll-target="document" id="list" items="[[filtered]]" as="item"
                    selection-enabled
                    multi-selection>

From 8ed7538a4f1bf7675126056df36fdb51dc96f2c5 Mon Sep 17 00:00:00 2001
From: "alexander.karpetc" <alexander.karpetc@gmail.com>
Date: Thu, 29 Mar 2018 17:07:01 +0300
Subject: [PATCH 030/253] Add styles for desktop and mobile

---
 .../user/src/mealorder/menu/vendor-menus.html | 162 ++++++++++++++++++
 1 file changed, 162 insertions(+)

diff --git a/client/user/src/mealorder/menu/vendor-menus.html b/client/user/src/mealorder/menu/vendor-menus.html
index b5a66697..5f6c3c57 100644
--- a/client/user/src/mealorder/menu/vendor-menus.html
+++ b/client/user/src/mealorder/menu/vendor-menus.html
@@ -31,7 +31,169 @@
 <dom-module id="vendor-menus">
     <template>
         <style>
+            :host {
+                font-family: 'Roboto', 'Noto', sans-serif;
+                display: block;
+                padding: 0;
+            }
+
+            body {
+                height: 100vh;
+                margin: 0;
+                display: flex;
+                flex-direction: column;
+            }
+
+            app-toolbar {
+                background-color: var(--google-green-700);
+                box-shadow: 0 2px 5px 0 rgba(0, 0, 0, 0.3);
+                font-weight: bold;
+                color: white;
+                font-size: 18px;
+                z-index: 1;
+                position: fixed;
+                top: 0;
+                left: 0;
+                right: 0;
+            }
+
+            app-toolbar paper-icon-button {
+                --paper-icon-button-ink-color: white;
+            }
+
+            iron-list {
+                --iron-list-items-container: {
+                    width: 70%;
+                    margin: 2% auto;
+                    border-bottom: 1px solid #ddd;
+                };
+            }
+
+            div[role="listbox"] {
+                border: 1px solid #e5e5e5;
+            }
+
+            paper-search-bar {
+                margin: 0 auto;
+                width: 70%;
+                border-radius: 5px;
+                background-color: #ffffff;
+            }
+
+            paper-item {
+                width: 100%;
+            }
+
+            .item {
+                @apply --layout-horizontal;
+                /*padding: 20px;*/
+                background-color: white;
+                border: 1px solid #ddd;
+                cursor: pointer;
+                margin-bottom: 10px;
+            }
+
+            .pad {
+                padding: 15px;
+                @apply --layout-flex;
+                @apply --layout-vertical;
+                font-size: 15px;
+            }
+
+            paper-item {
+                font-size: 15px;
+                padding: 0;
+            }
+
+            .vendor {
+                color: #4f4f4f;
+                display: none;
+            }
+
+            .item.expand .vendor {
+                display: block;
+            }
 
+            @media (max-width: 460px) {
+                paper-toolbar .bottom.title {
+                    font-size: 14px;
+                }
+            }
+
+            #expand-button {
+                position: absolute;
+                right: 0;
+                top: 7px;
+            }
+
+            .primary {
+                font-size: 16px;
+            }
+
+            .menu-dashboard {
+                display: flex;
+                justify-content: space-between;
+                align-items: center;
+                border-top: 1px solid #fcfcfc;
+                border-bottom: 1px solid #fcfcfc;
+            }
+
+            .category {
+                display: flex;
+                justify-content: space-between;
+                align-items: center;
+            }
+
+            .bolder {
+                font-weight: bolder;
+            }
+
+            .dish-title {
+                width: 55%;
+                padding-left: 10px;
+                text-align: left;
+            }
+
+            .dish-price {
+                width: 50px;
+                text-align: right;
+            }
+
+            .add-dish-icon {
+                margin-bottom: 2px;
+                width: 45%;
+                text-align: right;
+            }
+
+            .non-select {
+                -webkit-touch-callout: none; /* iOS Safari */
+                -webkit-user-select: none; /* Safari */
+                -khtml-user-select: none; /* Konqueror HTML */
+                -moz-user-select: none; /* Firefox */
+                -ms-user-select: none; /* Internet Explorer/Edge */
+                user-select: none;
+                /* Non-prefixed version, currently supported by Chrome and Opera */
+            }
+
+            @media only screen and (max-width: 600px) {
+
+                paper-search-bar {
+                    margin: 0 auto;
+                    width: 100%;
+                }
+
+                iron-list {
+                    --iron-list-items-container: {
+                        margin: 4% auto;
+                        width: 100%;
+                    }
+                }
+
+                .dish-price {
+                    padding-left: 30px;
+                }
+
+            }
         </style>
 
         <paper-search-bar query="{{filter}}" hide-filter-button="true"

From f89c2fb08e94a7db72a8f772c13feba4ff1d59c1 Mon Sep 17 00:00:00 2001
From: "alexander.karpetc" <alexander.karpetc@gmail.com>
Date: Thu, 29 Mar 2018 17:07:35 +0300
Subject: [PATCH 031/253] Add properties

---
 .../user/src/mealorder/menu/vendor-menus.html | 36 ++++++++++++++++++-
 1 file changed, 35 insertions(+), 1 deletion(-)

diff --git a/client/user/src/mealorder/menu/vendor-menus.html b/client/user/src/mealorder/menu/vendor-menus.html
index 5f6c3c57..2e6e084b 100644
--- a/client/user/src/mealorder/menu/vendor-menus.html
+++ b/client/user/src/mealorder/menu/vendor-menus.html
@@ -270,7 +270,41 @@
             }
 
             static get properties() {
-                return {}
+                return {
+                    /**
+                     * Fired when a dish add button is tapped.
+                     *
+                     * @event `dish-added`
+                     * @param {dish} contains vendor, category, title.
+                     */
+
+                    /**
+                     * Full menu for day.
+                     * For structure details see {@code redux-store.html} or inner template.
+                     */
+                    items: {
+                        type: Array,
+                    },
+
+                    /**
+                     * Menu with filter applied.
+                     */
+                    filtered: {
+                        type: Array,
+                        computed: 'filteredItems(items,filter)',
+                        reflectToAttribute: true
+                    },
+
+                    /**
+                     * Inputted key word or word part to search in menu.
+                     */
+                    filter: {
+                        type: String,
+                        value: '',
+                        notify: true
+                    }
+
+                }
             };
         }
 

From 7f3db5b26a13d3ab107978fa82665b0efba9ac53 Mon Sep 17 00:00:00 2001
From: "alexander.karpetc" <alexander.karpetc@gmail.com>
Date: Thu, 29 Mar 2018 17:09:15 +0300
Subject: [PATCH 032/253] Add inner methods that renders components in
 different ways depending on state

---
 .../user/src/mealorder/menu/vendor-menus.html | 24 +++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/client/user/src/mealorder/menu/vendor-menus.html b/client/user/src/mealorder/menu/vendor-menus.html
index 2e6e084b..9e656c54 100644
--- a/client/user/src/mealorder/menu/vendor-menus.html
+++ b/client/user/src/mealorder/menu/vendor-menus.html
@@ -306,6 +306,30 @@
 
                 }
             };
+
+            getClassForItem(selected) {
+                return selected ? 'item expand' : 'item';
+            };
+
+            getIcon(selected) {
+                if (selected) {
+                    return 'expand-less';
+                }
+                else {
+                    return 'expand-more';
+
+                }
+            }
+
+            _reSelect(e) {
+                const div = this.shadowRoot.querySelector("#list");
+                if (!e.model.selected) {
+                    div.selectIndex(e.model.index);
+                }
+                else {
+                    div.deselectIndex(e.model.index);
+                }
+            }
         }
 
         window.customElements.define(VendorMenus.is, VendorMenus);

From 37d1e66831c7ff94b9eca6959a1d75c35e4c3a09 Mon Sep 17 00:00:00 2001
From: "alexander.karpetc" <alexander.karpetc@gmail.com>
Date: Thu, 29 Mar 2018 17:11:15 +0300
Subject: [PATCH 033/253] Add filter by dish name

---
 .../user/src/mealorder/menu/vendor-menus.html | 69 +++++++++++++++++++
 1 file changed, 69 insertions(+)

diff --git a/client/user/src/mealorder/menu/vendor-menus.html b/client/user/src/mealorder/menu/vendor-menus.html
index 9e656c54..33b3a477 100644
--- a/client/user/src/mealorder/menu/vendor-menus.html
+++ b/client/user/src/mealorder/menu/vendor-menus.html
@@ -307,6 +307,75 @@
                 }
             };
 
+            getClassForItem(selected) {
+                return selected ? 'item expand' : 'item';
+            };
+
+            getIcon(selected) {
+                if (selected) {
+                    return 'expand-less';
+                }
+                else {
+                    return 'expand-more';
+
+                }
+            }
+
+            static get observers() {
+                return [
+                    '_handleInput(filter)'
+                ];
+            }
+
+            categoryExists(item) {
+                return item.dishes.length > 0;
+            }
+
+            addDish(e) {
+                const dish = {};
+                //dish.category = e.model.parentModel.__data.category.categoryName;
+                dish.vendor = e.model.parentModel.parentModel.__data.item.name;
+                dish.name = e.model.__data.dish.title;
+                dish.price = e.model.__data.dish.price;
+                this.dispatchEvent(new CustomEvent('dish-added', {detail: dish}));
+            }
+
+
+            _handleInput() {
+                const div = this.shadowRoot.querySelector("#list");
+                for (let i = 0; i < this.items.length; i++) {
+                    if (this.filter !== '') {
+                        div.selectIndex(i);
+                        div.selectIndex(i);
+                    }
+                }
+            }
+
+            filteredItems() {
+                const predicate = this.filter;
+                const filtered = [];
+                for (let i = 0; i < this.items.length; i++) {
+                    const vendorCategories = this.items[i].categories;
+                    let newVendorCategories = [];
+                    for (let j = 0; j < vendorCategories.length; j++) {
+                        let vendorDishes = vendorCategories[j].dishes;
+                        let newVendorDishes = [];
+                        for (let k = 0; k < vendorDishes.length; k++) {
+                            if (vendorDishes[k].title.toLowerCase().includes(predicate.toLowerCase())) {
+                                newVendorDishes.push(vendorDishes[k]);
+                            }
+                        }
+                        newVendorCategories.push({
+                            categoryName: vendorCategories[j].categoryName,
+                            dishes: newVendorDishes
+                        });
+                    }
+                    filtered.push({name: this.items[i].name, categories: newVendorCategories});
+                }
+                return filtered;
+            }
+
+
             getClassForItem(selected) {
                 return selected ? 'item expand' : 'item';
             };

From f0520c3acc91d5bf73f335b8a66a3cf7723adbff Mon Sep 17 00:00:00 2001
From: "alexander.karpetc" <alexander.karpetc@gmail.com>
Date: Thu, 29 Mar 2018 17:12:41 +0300
Subject: [PATCH 034/253] Add `vendor-menus` docs

---
 .../user/src/mealorder/menu/vendor-menus.html | 24 +++++++------------
 1 file changed, 9 insertions(+), 15 deletions(-)

diff --git a/client/user/src/mealorder/menu/vendor-menus.html b/client/user/src/mealorder/menu/vendor-menus.html
index 33b3a477..70ff74dc 100644
--- a/client/user/src/mealorder/menu/vendor-menus.html
+++ b/client/user/src/mealorder/menu/vendor-menus.html
@@ -263,7 +263,15 @@
         </iron-list>
     </template>
     <script>
-
+        /**
+         * vendor-menus represents an expanding list of menus for current date and filter.
+         *
+         * <p>Is adopted for both desktop and mobile.
+         * Contains search by dish keywords.
+         *
+         * @customElement
+         * @polymer
+         */
         class VendorMenus extends Polymer.Element {
             static get is() {
                 return 'vendor-menus';
@@ -307,20 +315,6 @@
                 }
             };
 
-            getClassForItem(selected) {
-                return selected ? 'item expand' : 'item';
-            };
-
-            getIcon(selected) {
-                if (selected) {
-                    return 'expand-less';
-                }
-                else {
-                    return 'expand-more';
-
-                }
-            }
-
             static get observers() {
                 return [
                     '_handleInput(filter)'

From 684d31729252b0b23001a3c302e02ff0466ce244 Mon Sep 17 00:00:00 2001
From: "alexander.karpetc" <alexander.karpetc@gmail.com>
Date: Thu, 29 Mar 2018 17:23:05 +0300
Subject: [PATCH 035/253] Edit styles for mobile

---
 .../user/src/mealorder/menu/vendor-menus.html | 38 +++++++++----------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/client/user/src/mealorder/menu/vendor-menus.html b/client/user/src/mealorder/menu/vendor-menus.html
index 70ff74dc..88ad16d3 100644
--- a/client/user/src/mealorder/menu/vendor-menus.html
+++ b/client/user/src/mealorder/menu/vendor-menus.html
@@ -37,6 +37,25 @@
                 padding: 0;
             }
 
+            @media only screen and (max-width: 600px) {
+                paper-search-bar {
+                    margin: 0 auto;
+                    width: 100%;
+                }
+
+                iron-list {
+                    --iron-list-items-container: {
+                        margin: 4% auto;
+                        width: 100%;
+                    }
+                }
+
+                .dish-price {
+                    padding-left: 30px;
+                }
+
+            }
+
             body {
                 height: 100vh;
                 margin: 0;
@@ -175,25 +194,6 @@
                 /* Non-prefixed version, currently supported by Chrome and Opera */
             }
 
-            @media only screen and (max-width: 600px) {
-
-                paper-search-bar {
-                    margin: 0 auto;
-                    width: 100%;
-                }
-
-                iron-list {
-                    --iron-list-items-container: {
-                        margin: 4% auto;
-                        width: 100%;
-                    }
-                }
-
-                .dish-price {
-                    padding-left: 30px;
-                }
-
-            }
         </style>
 
         <paper-search-bar query="{{filter}}" hide-filter-button="true"

From 3bea6d79ab9fc1762bb95ef53294aefc6bfe0814 Mon Sep 17 00:00:00 2001
From: "alexander.karpetc" <alexander.karpetc@gmail.com>
Date: Thu, 29 Mar 2018 17:23:55 +0300
Subject: [PATCH 036/253] Remove commended code

---
 client/user/src/mealorder/menu/vendor-menus.html | 2 --
 1 file changed, 2 deletions(-)

diff --git a/client/user/src/mealorder/menu/vendor-menus.html b/client/user/src/mealorder/menu/vendor-menus.html
index 88ad16d3..d138ab03 100644
--- a/client/user/src/mealorder/menu/vendor-menus.html
+++ b/client/user/src/mealorder/menu/vendor-menus.html
@@ -105,7 +105,6 @@
 
             .item {
                 @apply --layout-horizontal;
-                /*padding: 20px;*/
                 background-color: white;
                 border: 1px solid #ddd;
                 cursor: pointer;
@@ -327,7 +326,6 @@
 
             addDish(e) {
                 const dish = {};
-                //dish.category = e.model.parentModel.__data.category.categoryName;
                 dish.vendor = e.model.parentModel.parentModel.__data.item.name;
                 dish.name = e.model.__data.dish.title;
                 dish.price = e.model.__data.dish.price;

From 4d9e92b0a1de6a60aa93ebdda32a72f5d5269852 Mon Sep 17 00:00:00 2001
From: "alexander.karpetc" <alexander.karpetc@gmail.com>
Date: Thu, 29 Mar 2018 17:25:37 +0300
Subject: [PATCH 037/253] Remove redundant whitespaces

---
 client/user/src/mealorder/menu/vendor-menus.html | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/client/user/src/mealorder/menu/vendor-menus.html b/client/user/src/mealorder/menu/vendor-menus.html
index d138ab03..e44430cf 100644
--- a/client/user/src/mealorder/menu/vendor-menus.html
+++ b/client/user/src/mealorder/menu/vendor-menus.html
@@ -332,7 +332,6 @@
                 this.dispatchEvent(new CustomEvent('dish-added', {detail: dish}));
             }
 
-
             _handleInput() {
                 const div = this.shadowRoot.querySelector("#list");
                 for (let i = 0; i < this.items.length; i++) {
@@ -367,7 +366,6 @@
                 return filtered;
             }
 
-
             getClassForItem(selected) {
                 return selected ? 'item expand' : 'item';
             };
@@ -378,7 +376,6 @@
                 }
                 else {
                     return 'expand-more';
-
                 }
             }
 

From 1d313010cb3c8009e8890e26dfdf478946b859da Mon Sep 17 00:00:00 2001
From: "alexander.karpetc" <alexander.karpetc@gmail.com>
Date: Thu, 29 Mar 2018 17:26:52 +0300
Subject: [PATCH 038/253] Regroup css styles

---
 .../user/src/mealorder/menu/vendor-menus.html | 20 +++++++++----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/client/user/src/mealorder/menu/vendor-menus.html b/client/user/src/mealorder/menu/vendor-menus.html
index e44430cf..8d4820c7 100644
--- a/client/user/src/mealorder/menu/vendor-menus.html
+++ b/client/user/src/mealorder/menu/vendor-menus.html
@@ -56,6 +56,12 @@
 
             }
 
+            @media (max-width: 460px) {
+                paper-toolbar .bottom.title {
+                    font-size: 14px;
+                }
+            }
+
             body {
                 height: 100vh;
                 margin: 0;
@@ -100,7 +106,10 @@
             }
 
             paper-item {
+                font-size: 15px;
+                padding: 0;
                 width: 100%;
+
             }
 
             .item {
@@ -118,11 +127,6 @@
                 font-size: 15px;
             }
 
-            paper-item {
-                font-size: 15px;
-                padding: 0;
-            }
-
             .vendor {
                 color: #4f4f4f;
                 display: none;
@@ -132,12 +136,6 @@
                 display: block;
             }
 
-            @media (max-width: 460px) {
-                paper-toolbar .bottom.title {
-                    font-size: 14px;
-                }
-            }
-
             #expand-button {
                 position: absolute;
                 right: 0;

From 56ee4faead45502bed50eb473881a157034b0982 Mon Sep 17 00:00:00 2001
From: Paul <paulageyev@gmail.com>
Date: Thu, 29 Mar 2018 17:45:14 +0300
Subject: [PATCH 039/253] Create `user-cart` component

---
 client/user/src/mealorder/menu/user-cart.html | 34 +++++++++++++++++++
 1 file changed, 34 insertions(+)
 create mode 100644 client/user/src/mealorder/menu/user-cart.html

diff --git a/client/user/src/mealorder/menu/user-cart.html b/client/user/src/mealorder/menu/user-cart.html
new file mode 100644
index 00000000..8657d497
--- /dev/null
+++ b/client/user/src/mealorder/menu/user-cart.html
@@ -0,0 +1,34 @@
+<!--
+  ~ Copyright 2018, TeamDev Ltd. All rights reserved.
+  ~
+  ~ Redistribution and use in source and/or binary forms, with or without
+  ~ modification, must retain the above copyright notice and the following
+  ~ disclaimer.
+  ~
+  ~ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+  ~ "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+  ~ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+  ~ A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+  ~ OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+  ~ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+  ~ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+  ~ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+  ~ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  ~ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+  ~ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+  -->
+<dom-module id="user-cart">
+    <template>
+        <style>
+        </style>
+    </template>
+    <script>
+        class UserCart extends Polymer.Element {
+            static get is() {
+                return 'user-cart';
+            }
+        }
+
+        window.customElements.define(UserCart.is, UserCart);
+    </script>
+</dom-module>

From 1f20aac05047bb5f5d0d379a6001b4d08d06f78a Mon Sep 17 00:00:00 2001
From: Paul <paulageyev@gmail.com>
Date: Thu, 29 Mar 2018 17:48:12 +0300
Subject: [PATCH 040/253] Add `cart` class for the `user-cart` component

---
 client/user/src/mealorder/menu/user-cart.html | 34 +++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/client/user/src/mealorder/menu/user-cart.html b/client/user/src/mealorder/menu/user-cart.html
index 8657d497..554eedaf 100644
--- a/client/user/src/mealorder/menu/user-cart.html
+++ b/client/user/src/mealorder/menu/user-cart.html
@@ -21,6 +21,40 @@
     <template>
         <style>
         </style>
+        <div class="cart">
+
+            <dom-repeat items="[[order]]" as="dish">
+                <template>
+                    <div class="vendor">
+                        <div>[[dish.vendor]]</div>
+                        <paper-icon-button icon="delete" class="icon-delete"></paper-icon-button>
+                    </div>
+                    <dom-repeat items="[[dish.dishes]]" as="d">
+                        <template>
+                            <div class="order-details">
+                                <div class="order-title">[[d.title]]</div>
+                                <div class="order-price">[[d.price]] ₴</div>
+                                <div class="order-quantity">[[d.quantity]]</div>
+                                <paper-icon-button icon="remove" on-click="_removeDish"></paper-icon-button>
+                            </div>
+                        </template>
+                    </dom-repeat>
+
+                    <div class="order-details">
+                        <div class="amount-title">Сумма:</div>
+                        <div class="amount-order-price">500 ₴</div>
+                        <div class="order-quantity"></div>
+                        <paper-icon-button></paper-icon-button>
+                    </div>
+                </template>
+            </dom-repeat>
+
+            <div class="total">
+                <div class="amount">Общая сумма:</div>
+                <div class="price">1400 ₴</div>
+            </div>
+
+        </div>
     </template>
     <script>
         class UserCart extends Polymer.Element {

From 309597d9de033a1c52ae6a10c49324d16065ad47 Mon Sep 17 00:00:00 2001
From: Paul <paulageyev@gmail.com>
Date: Thu, 29 Mar 2018 17:48:44 +0300
Subject: [PATCH 041/253] Add properties for the `user-cart` component

---
 client/user/src/mealorder/menu/user-cart.html | 25 +++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/client/user/src/mealorder/menu/user-cart.html b/client/user/src/mealorder/menu/user-cart.html
index 554eedaf..fb8d06c2 100644
--- a/client/user/src/mealorder/menu/user-cart.html
+++ b/client/user/src/mealorder/menu/user-cart.html
@@ -61,6 +61,31 @@
             static get is() {
                 return 'user-cart';
             }
+
+            static get properties() {
+                return {
+                    /**
+                     * Fired on dish remove button tap.
+                     *
+                     * @event `dish-removed`
+                     * @param {dish} contains vendor, title.
+                     */
+
+                    /**
+                     * Fired when a dish add button is tapped.
+                     *
+                     * @event `order-removed`
+                     * @param {order} contains vendor.
+                     */
+
+                    /**
+                     * Array to be displayed in a user cart.
+                     */
+                    order: {
+                        type: Array,
+                    }
+                }
+            };
         }
 
         window.customElements.define(UserCart.is, UserCart);

From 9374c9d9ce4546834165f18bf0d645128a00fb45 Mon Sep 17 00:00:00 2001
From: Paul <paulageyev@gmail.com>
Date: Thu, 29 Mar 2018 17:51:09 +0300
Subject: [PATCH 042/253] Add a button handler to remove the dish from the
 order

---
 client/user/src/mealorder/menu/user-cart.html | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/client/user/src/mealorder/menu/user-cart.html b/client/user/src/mealorder/menu/user-cart.html
index fb8d06c2..dc5b2517 100644
--- a/client/user/src/mealorder/menu/user-cart.html
+++ b/client/user/src/mealorder/menu/user-cart.html
@@ -86,6 +86,13 @@
                     }
                 }
             };
+
+            _removeDish(e) {
+                const dish = {};
+                dish.vendor = e.model.parentModel.__data.dish.vendor;
+                dish.name = e.model.__data.d.title;
+                this.dispatchEvent(new CustomEvent('dish-removed', {detail: dish}));
+            }
         }
 
         window.customElements.define(UserCart.is, UserCart);

From 8a14ed0f4a5b23e8de519f1662432e97eb3e5b35 Mon Sep 17 00:00:00 2001
From: Paul <paulageyev@gmail.com>
Date: Thu, 29 Mar 2018 17:55:52 +0300
Subject: [PATCH 043/253] Add CSS for the `user-cart` component

---
 client/user/src/mealorder/menu/user-cart.html | 60 ++++++++++++++++++-
 1 file changed, 59 insertions(+), 1 deletion(-)

diff --git a/client/user/src/mealorder/menu/user-cart.html b/client/user/src/mealorder/menu/user-cart.html
index dc5b2517..0e58db4e 100644
--- a/client/user/src/mealorder/menu/user-cart.html
+++ b/client/user/src/mealorder/menu/user-cart.html
@@ -20,6 +20,65 @@
 <dom-module id="user-cart">
     <template>
         <style>
+            :host {
+                color: #4f4f4f;
+            }
+
+            .order-details {
+                display: flex;
+                font-size: 15px;
+                align-items: center;
+                border-bottom: 2px solid #fcfcfc;
+            }
+
+            .vendor {
+                display: flex;
+                justify-content: space-between;
+                align-items: center;
+                padding-left: 4%;
+                background-color: #fcfcfc;
+            }
+
+            .cart {
+                overflow-x: hidden;
+                overflow-y: auto;
+                max-height: 93vh;
+            }
+
+            .order-title {
+                width: 50%;
+                text-align: left;
+                padding-left: 4%;
+            }
+
+            .order-price {
+                width: 20%;
+                text-align: right;
+            }
+
+            .order-quantity {
+                width: 15%;
+            }
+
+            .amount-title {
+                width: 50%;
+                text-align: left;
+                padding-left: 4%;
+                font-weight: bolder;
+            }
+
+            .amount-order-price {
+                width: 20%;
+                text-align: right;
+
+            }
+
+            .total {
+                display: flex;
+                justify-content: space-between;
+                margin: 6% 4% 10% 4%;
+                font-weight: bolder;
+            }
         </style>
         <div class="cart">
 
@@ -94,7 +153,6 @@
                 this.dispatchEvent(new CustomEvent('dish-removed', {detail: dish}));
             }
         }
-
         window.customElements.define(UserCart.is, UserCart);
     </script>
 </dom-module>

From 7a117a6b3ce56b915be669f84525fbf6501f98eb Mon Sep 17 00:00:00 2001
From: Paul <paulageyev@gmail.com>
Date: Thu, 29 Mar 2018 17:56:12 +0300
Subject: [PATCH 044/253] Add docs for the `user-cart` component

---
 client/user/src/mealorder/menu/user-cart.html | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/client/user/src/mealorder/menu/user-cart.html b/client/user/src/mealorder/menu/user-cart.html
index 0e58db4e..acea80af 100644
--- a/client/user/src/mealorder/menu/user-cart.html
+++ b/client/user/src/mealorder/menu/user-cart.html
@@ -116,6 +116,14 @@
         </div>
     </template>
     <script>
+        /**
+         * user-cart is user's order for current date.
+         *
+         * <p>Is adopted for both desktop and mobile.
+         *
+         * @customElement
+         * @polymer
+         */
         class UserCart extends Polymer.Element {
             static get is() {
                 return 'user-cart';

From 910b19724ef81ec16f1332c4cf3f7b61691318de Mon Sep 17 00:00:00 2001
From: Paul <paulageyev@gmail.com>
Date: Thu, 29 Mar 2018 17:56:56 +0300
Subject: [PATCH 045/253] Add component imports for the "user-cart" component

---
 client/user/src/mealorder/menu/user-cart.html | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/client/user/src/mealorder/menu/user-cart.html b/client/user/src/mealorder/menu/user-cart.html
index acea80af..8c9296d7 100644
--- a/client/user/src/mealorder/menu/user-cart.html
+++ b/client/user/src/mealorder/menu/user-cart.html
@@ -17,6 +17,20 @@
   ~ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
   ~ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   -->
+<script src="../../../bower_components/webcomponentsjs/webcomponents-lite.js"></script>
+<link rel="import" href="../../../bower_components/polymer/polymer-element.html">
+<link rel="import" href="../../../bower_components/iron-list/iron-list.html">
+<link rel="import" href="../../../bower_components/paper-item/paper-item.html">
+<link rel="import" href="../../../bower_components/paper-icon-button/paper-icon-button.html">
+<link rel="import" href="../../../bower_components/paper-button/paper-button.html">
+<link rel="import" href="../../../bower_components/iron-icons/iron-icons.html">
+<link rel="import" href="../../../bower_components/app-layout/app-drawer-layout/app-drawer-layout.html">
+<link rel="import" href="../../../bower_components/app-layout/app-drawer/app-drawer.html">
+<link rel="import" href="../../../bower_components/app-layout/app-header/app-header.html">
+<link rel="import" href="../../../bower_components/app-layout/app-header-layout/app-header-layout.html">
+<link rel="import" href="../../../bower_components/app-layout/app-scroll-effects/app-scroll-effects.html">
+<link rel="import" href="../../../bower_components/app-layout/app-toolbar/app-toolbar.html">
+<link rel="import" href="../../../bower_components/iron-flex-layout/iron-flex-layout.html">
 <dom-module id="user-cart">
     <template>
         <style>

From 4e282c39ae4ad4fb94e6bc41fd7385d779cbdbb6 Mon Sep 17 00:00:00 2001
From: "alexander.karpetc" <alexander.karpetc@gmail.com>
Date: Thu, 29 Mar 2018 18:10:41 +0300
Subject: [PATCH 046/253] Create `user-history` component

---
 .../user/src/mealorder/menu/user-history.html | 45 +++++++++++++++++++
 1 file changed, 45 insertions(+)
 create mode 100644 client/user/src/mealorder/menu/user-history.html

diff --git a/client/user/src/mealorder/menu/user-history.html b/client/user/src/mealorder/menu/user-history.html
new file mode 100644
index 00000000..b27eeccb
--- /dev/null
+++ b/client/user/src/mealorder/menu/user-history.html
@@ -0,0 +1,45 @@
+<!--
+  ~ Copyright 2018, TeamDev Ltd. All rights reserved.
+  ~
+  ~ Redistribution and use in source and/or binary forms, with or without
+  ~ modification, must retain the above copyright notice and the following
+  ~ disclaimer.
+  ~
+  ~ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+  ~ "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+  ~ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+  ~ A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+  ~ OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+  ~ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+  ~ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+  ~ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+  ~ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  ~ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+  ~ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+  -->
+<script src="../../../bower_components/webcomponentsjs/webcomponents-lite.js"></script>
+<link rel="import" href="../../../bower_components/polymer/polymer-element.html">
+
+<dom-module id="user-history">
+    <template>
+        <style>
+
+        </style>
+
+
+    </template>
+    <script>
+
+        class UserHistory extends Polymer.Element {
+            static get is() {
+                return 'user-history';
+            }
+
+            static get properties() {
+                return {}
+            };
+        }
+
+        window.customElements.define(UserHistory.is, UserHistory);
+    </script>
+</dom-module>

From 49de11c904e380c5add832ab9c0703f2830c8a8e Mon Sep 17 00:00:00 2001
From: "alexander.karpetc" <alexander.karpetc@gmail.com>
Date: Thu, 29 Mar 2018 18:11:30 +0300
Subject: [PATCH 047/253] Add grid for history records

---
 .../user/src/mealorder/menu/user-history.html | 31 +++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/client/user/src/mealorder/menu/user-history.html b/client/user/src/mealorder/menu/user-history.html
index b27eeccb..ac80b443 100644
--- a/client/user/src/mealorder/menu/user-history.html
+++ b/client/user/src/mealorder/menu/user-history.html
@@ -25,7 +25,38 @@
         <style>
 
         </style>
+        <dom-repeat items="[[cart]]" as="vendor">
+            <template>
+                <div class="vendor">[[vendor.vendor]]</div>
+                <vaadin-grid title="vendor" aria-label="Basic Binding Example"
+                             items="[[vendor.dishes]]"
+                             as="vendor">
+                    <vaadin-grid-column>
+                        <template class="header">
+                            <p class="dish">Наименование</p>
+                        </template>
+                        <template>
+                            <p class="dish">[[item.title]]</p>
+                        </template>
+                    </vaadin-grid-column>
 
+                    <vaadin-grid-column width="15px">
+                        <template class="header"><p class="price">Цена</p></template>
+                        <template>
+                            <p class="price">[[item.price]]</p>
+                        </template>
+                    </vaadin-grid-column>
+
+                    <vaadin-grid-column width="50px">
+                        <template class="header"><p class="quantity">Количество</p></template>
+                        <template>
+                            <p class="quantity">[[item.quantity]]</p>
+                        </template>
+                        <template class="footer">Итого: [[_getTotal(vendor)]]</template>
+                    </vaadin-grid-column>
+                </vaadin-grid>
+            </template>
+        </dom-repeat>
 
     </template>
     <script>

From 97eb95fadba4a83285da46deb7f5608bd7eaa2da Mon Sep 17 00:00:00 2001
From: "alexander.karpetc" <alexander.karpetc@gmail.com>
Date: Thu, 29 Mar 2018 18:12:02 +0300
Subject: [PATCH 048/253] Wrap dom-repeat with div

---
 .../user/src/mealorder/menu/user-history.html | 63 ++++++++++---------
 1 file changed, 32 insertions(+), 31 deletions(-)

diff --git a/client/user/src/mealorder/menu/user-history.html b/client/user/src/mealorder/menu/user-history.html
index ac80b443..d6a27bc1 100644
--- a/client/user/src/mealorder/menu/user-history.html
+++ b/client/user/src/mealorder/menu/user-history.html
@@ -25,39 +25,40 @@
         <style>
 
         </style>
-        <dom-repeat items="[[cart]]" as="vendor">
-            <template>
-                <div class="vendor">[[vendor.vendor]]</div>
-                <vaadin-grid title="vendor" aria-label="Basic Binding Example"
-                             items="[[vendor.dishes]]"
-                             as="vendor">
-                    <vaadin-grid-column>
-                        <template class="header">
-                            <p class="dish">Наименование</p>
-                        </template>
-                        <template>
-                            <p class="dish">[[item.title]]</p>
-                        </template>
-                    </vaadin-grid-column>
+        <div class="history">
+            <dom-repeat items="[[cart]]" as="vendor">
+                <template>
+                    <div class="vendor">[[vendor.vendor]]</div>
+                    <vaadin-grid title="vendor" aria-label="Basic Binding Example"
+                                 items="[[vendor.dishes]]"
+                                 as="vendor">
+                        <vaadin-grid-column>
+                            <template class="header">
+                                <p class="dish">Наименование</p>
+                            </template>
+                            <template>
+                                <p class="dish">[[item.title]]</p>
+                            </template>
+                        </vaadin-grid-column>
 
-                    <vaadin-grid-column width="15px">
-                        <template class="header"><p class="price">Цена</p></template>
-                        <template>
-                            <p class="price">[[item.price]]</p>
-                        </template>
-                    </vaadin-grid-column>
-
-                    <vaadin-grid-column width="50px">
-                        <template class="header"><p class="quantity">Количество</p></template>
-                        <template>
-                            <p class="quantity">[[item.quantity]]</p>
-                        </template>
-                        <template class="footer">Итого: [[_getTotal(vendor)]]</template>
-                    </vaadin-grid-column>
-                </vaadin-grid>
-            </template>
-        </dom-repeat>
+                        <vaadin-grid-column width="15px">
+                            <template class="header"><p class="price">Цена</p></template>
+                            <template>
+                                <p class="price">[[item.price]]</p>
+                            </template>
+                        </vaadin-grid-column>
 
+                        <vaadin-grid-column width="50px">
+                            <template class="header"><p class="quantity">Количество</p></template>
+                            <template>
+                                <p class="quantity">[[item.quantity]]</p>
+                            </template>
+                            <template class="footer">Итого: [[_getTotal(vendor)]]</template>
+                        </vaadin-grid-column>
+                    </vaadin-grid>
+                </template>
+            </dom-repeat>
+        </div>
     </template>
     <script>
 

From 5533bb0a69a51f1f026b8f3e2f91bcb763f5a874 Mon Sep 17 00:00:00 2001
From: "alexander.karpetc" <alexander.karpetc@gmail.com>
Date: Thu, 29 Mar 2018 18:12:31 +0300
Subject: [PATCH 049/253] Add components styles

---
 .../user/src/mealorder/menu/user-history.html | 33 +++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/client/user/src/mealorder/menu/user-history.html b/client/user/src/mealorder/menu/user-history.html
index d6a27bc1..0add3f75 100644
--- a/client/user/src/mealorder/menu/user-history.html
+++ b/client/user/src/mealorder/menu/user-history.html
@@ -23,7 +23,40 @@
 <dom-module id="user-history">
     <template>
         <style>
+            :host {
+                color: #4f4f4f;
+            }
+
+            paper-card {
+                display: block;
+            }
+
+            vaadin-grid {
+                height: max-content;
 
+                width: 70%;
+                display: block;
+                margin-left: 15%;
+            }
+
+            .vendor {
+                margin-left: 15%;
+                font: bold 24px/1.5 Times, 'New Century Schoolbook', serif;
+            }
+
+            .quantity {
+                text-align: right;
+                padding-right: 10%;
+            }
+
+            .price {
+                text-align: right;
+                padding-right: 10%;
+            }
+
+            .dish {
+                padding-left: 5%;
+            }
         </style>
         <div class="history">
             <dom-repeat items="[[cart]]" as="vendor">

From c1db86fef05271198061f8cbe1897404bb6b4bb6 Mon Sep 17 00:00:00 2001
From: "alexander.karpetc" <alexander.karpetc@gmail.com>
Date: Thu, 29 Mar 2018 18:12:55 +0300
Subject: [PATCH 050/253] Add mobile styles

---
 client/user/src/mealorder/menu/user-history.html | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/client/user/src/mealorder/menu/user-history.html b/client/user/src/mealorder/menu/user-history.html
index 0add3f75..5679618d 100644
--- a/client/user/src/mealorder/menu/user-history.html
+++ b/client/user/src/mealorder/menu/user-history.html
@@ -57,6 +57,20 @@
             .dish {
                 padding-left: 5%;
             }
+
+            @media only screen and (max-width: 600px) {
+                .vendor {
+                    margin-left: 5%;
+                }
+
+                vaadin-grid {
+                    width: 90%;
+                    display: block;
+                    margin-left: 5%;
+                    margin-right: 5%;
+                    padding-right: 0;
+                }
+            }
         </style>
         <div class="history">
             <dom-repeat items="[[cart]]" as="vendor">

From 9edea0bdeeb65b30658fb60e459151c1f2e49eae Mon Sep 17 00:00:00 2001
From: "alexander.karpetc" <alexander.karpetc@gmail.com>
Date: Thu, 29 Mar 2018 18:13:23 +0300
Subject: [PATCH 051/253] Add properties

---
 client/user/src/mealorder/menu/user-history.html | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/client/user/src/mealorder/menu/user-history.html b/client/user/src/mealorder/menu/user-history.html
index 5679618d..132e498f 100644
--- a/client/user/src/mealorder/menu/user-history.html
+++ b/client/user/src/mealorder/menu/user-history.html
@@ -115,7 +115,12 @@
             }
 
             static get properties() {
-                return {}
+                return {
+                    /**
+                     * An array containing items to be displayed.
+                     */
+                    cart: {type: Array}
+                }
             };
         }
 

From 65975e28216d17a831e9dd22d9bb079a250826a7 Mon Sep 17 00:00:00 2001
From: "alexander.karpetc" <alexander.karpetc@gmail.com>
Date: Thu, 29 Mar 2018 18:16:36 +0300
Subject: [PATCH 052/253] Add total order sum function

---
 client/user/src/mealorder/menu/user-history.html | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/client/user/src/mealorder/menu/user-history.html b/client/user/src/mealorder/menu/user-history.html
index 132e498f..4d7ed30f 100644
--- a/client/user/src/mealorder/menu/user-history.html
+++ b/client/user/src/mealorder/menu/user-history.html
@@ -122,6 +122,15 @@
                     cart: {type: Array}
                 }
             };
+
+            _getTotal(vendor) {
+                const dishes = vendor.dishes;
+                let sum = 0;
+                for (let i = 0; i < dishes.length; i++) {
+                    sum += (dishes[i].price) * dishes[i].quantity;
+                }
+                return sum;
+            }
         }
 
         window.customElements.define(UserHistory.is, UserHistory);

From dd7499591eb51c9c68b185220394946edacee0de Mon Sep 17 00:00:00 2001
From: "alexander.karpetc" <alexander.karpetc@gmail.com>
Date: Thu, 29 Mar 2018 18:17:08 +0300
Subject: [PATCH 053/253] Add `user-history` docs

---
 client/user/src/mealorder/menu/user-history.html | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/client/user/src/mealorder/menu/user-history.html b/client/user/src/mealorder/menu/user-history.html
index 4d7ed30f..fae2a59c 100644
--- a/client/user/src/mealorder/menu/user-history.html
+++ b/client/user/src/mealorder/menu/user-history.html
@@ -108,7 +108,14 @@
         </div>
     </template>
     <script>
-
+        /**
+         * User's history for individual day.
+         *
+         * <p>Is adopted for both desktop and mobile.
+         *
+         * @customElement
+         * @polymer
+         */
         class UserHistory extends Polymer.Element {
             static get is() {
                 return 'user-history';

From 16657dd1dd24df22c91c8e9a165f6b326180156f Mon Sep 17 00:00:00 2001
From: "alexander.karpetc" <alexander.karpetc@gmail.com>
Date: Thu, 29 Mar 2018 18:18:00 +0300
Subject: [PATCH 054/253] Organize imports

---
 client/user/src/mealorder/menu/user-history.html | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/client/user/src/mealorder/menu/user-history.html b/client/user/src/mealorder/menu/user-history.html
index fae2a59c..bc8775f4 100644
--- a/client/user/src/mealorder/menu/user-history.html
+++ b/client/user/src/mealorder/menu/user-history.html
@@ -20,6 +20,8 @@
 <script src="../../../bower_components/webcomponentsjs/webcomponents-lite.js"></script>
 <link rel="import" href="../../../bower_components/polymer/polymer-element.html">
 
+<link rel="import" href="../../../bower_components/paper-card/paper-card.html">
+<link rel="import" href="../../../bower_components/vaadin-grid/vaadin-grid.html">
 <dom-module id="user-history">
     <template>
         <style>

From d9ad8a4d977f97e756d57b815f4d135d31aea52c Mon Sep 17 00:00:00 2001
From: Paul <paulageyev@gmail.com>
Date: Fri, 30 Mar 2018 14:34:01 +0300
Subject: [PATCH 055/253] Refactor styles for the `icon-container` class

---
 client/user/src/mealorder/meal-order.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/client/user/src/mealorder/meal-order.html b/client/user/src/mealorder/meal-order.html
index 0170f540..af73c28c 100644
--- a/client/user/src/mealorder/meal-order.html
+++ b/client/user/src/mealorder/meal-order.html
@@ -176,6 +176,7 @@
                 width: 100px;
                 display: flex;
                 justify-content: space-around;
+                align-items: center;
             }
         </style>
 

From 0b627119dc793ded1267e6ab7d74918c4ced6a0b Mon Sep 17 00:00:00 2001
From: "alexander.karpetc" <alexander.karpetc@gmail.com>
Date: Tue, 3 Apr 2018 13:11:17 +0300
Subject: [PATCH 056/253] Add prefix meal-order to components

---
 .../{vendor-menus.html => mea-order-vendor-menus.html}    | 8 ++++----
 .../user/src/mealorder/menu/meal-order-vendor-menu.html   | 0
 2 files changed, 4 insertions(+), 4 deletions(-)
 rename client/user/src/mealorder/menu/{vendor-menus.html => mea-order-vendor-menus.html} (98%)
 create mode 100644 client/user/src/mealorder/menu/meal-order-vendor-menu.html

diff --git a/client/user/src/mealorder/menu/vendor-menus.html b/client/user/src/mealorder/menu/mea-order-vendor-menus.html
similarity index 98%
rename from client/user/src/mealorder/menu/vendor-menus.html
rename to client/user/src/mealorder/menu/mea-order-vendor-menus.html
index 8d4820c7..5be7a5ba 100644
--- a/client/user/src/mealorder/menu/vendor-menus.html
+++ b/client/user/src/mealorder/menu/mea-order-vendor-menus.html
@@ -28,7 +28,7 @@
 <link rel="import" href="../../../bower_components/paper-input/paper-input.html">
 <link rel="import" href="../../../bower_components/paper-search/paper-search-bar.html">
 
-<dom-module id="vendor-menus">
+<dom-module id="meal-order-vendor-menus">
     <template>
         <style>
             :host {
@@ -269,9 +269,9 @@
          * @customElement
          * @polymer
          */
-        class VendorMenus extends Polymer.Element {
+        class MealOrderVendorMenus extends Polymer.Element {
             static get is() {
-                return 'vendor-menus';
+                return 'meal-order-vendor-menus';
             }
 
             static get properties() {
@@ -388,6 +388,6 @@
             }
         }
 
-        window.customElements.define(VendorMenus.is, VendorMenus);
+        window.customElements.define(MealOrderVendorMenus.is, MealOrderVendorMenus);
     </script>
 </dom-module>
diff --git a/client/user/src/mealorder/menu/meal-order-vendor-menu.html b/client/user/src/mealorder/menu/meal-order-vendor-menu.html
new file mode 100644
index 00000000..e69de29b

From 9c87817def63a8ada34ddda7ab1f73a28b8ccd00 Mon Sep 17 00:00:00 2001
From: Paul <paulageyev@gmail.com>
Date: Tue, 3 Apr 2018 13:24:07 +0300
Subject: [PATCH 057/253] Create `meal-order-drawer` component

---
 client/user/bower.json                        |   6 +-
 client/user/index.html                        |   4 +-
 .../src/mealorder/meal-order-main-app.html    |  92 ++++-----------
 .../src/mealorder/menu/meal-order-drawer.html | 106 ++++++++++++++++++
 4 files changed, 137 insertions(+), 71 deletions(-)
 create mode 100644 client/user/src/mealorder/menu/meal-order-drawer.html

diff --git a/client/user/bower.json b/client/user/bower.json
index d895af69..6124f669 100644
--- a/client/user/bower.json
+++ b/client/user/bower.json
@@ -13,7 +13,11 @@
     "app-layout": "PolymerElements/app-layout#^2.0.0",
     "app-route": "PolymerElements/app-route#^2.0.0",
     "iron-form": "PolymerElements/iron-form#^2.0.0",
-    "polymer-redux": "^1.0.5"
+    "polymer-redux": "^1.0.5",
+    "iron-pages": "PolymerElements/iron-pages#^2.1.0",
+    "paper-icon-button": "PolymerElements/paper-icon-button#^2.2.0",
+    "paper-tabs": "PolymerElements/paper-tabs#^2.1.0",
+    "iron-icons": "PolymerElements/iron-icons#^2.1.1"
   },
   "devDependencies": {
     "web-component-tester": "Polymer/web-component-tester#^6.0.0",
diff --git a/client/user/index.html b/client/user/index.html
index 8d151d9a..c1e67204 100644
--- a/client/user/index.html
+++ b/client/user/index.html
@@ -26,7 +26,7 @@
     <script src="bower_components/webcomponentsjs/webcomponents-loader.js"></script>
     <script src="node_modules/redux/dist/redux.js"></script>
     <link rel="icon" href="images/favicon-16x16.png" type="image/png">
-    <link rel=import href="src/mealorder/meal-order.html">
+    <link rel=import href="src/mealorder/meal-order-main-app.html">
     <title>MealOrder</title>
     <style>
         body {
@@ -35,6 +35,6 @@
     </style>
 </head>
 <body>
-<meal-order></meal-order>
+<meal-order-main-app></meal-order-main-app>
 </body>
 </html>
diff --git a/client/user/src/mealorder/meal-order-main-app.html b/client/user/src/mealorder/meal-order-main-app.html
index 84f26911..c84dc0fd 100644
--- a/client/user/src/mealorder/meal-order-main-app.html
+++ b/client/user/src/mealorder/meal-order-main-app.html
@@ -34,11 +34,8 @@
 <link rel="import" href="../../bower_components/paper-tabs/paper-tabs.html">
 <link rel="import" href="../../bower_components/iron-icons/iron-icons.html">
 <link rel="import" href="../../bower_components/iron-icons/maps-icons.html">
-<link rel="import" href="../../bower_components/app-datepicker/app-datepicker.html">
 
 <link rel="import" href="shell/redux-store.html">
-<link rel="import" href="menu/user-cart.html">
-<link rel="import" href="menu/menu-order.html">
 <dom-module id="meal-order-main-app">
     <template>
         <style>
@@ -153,14 +150,6 @@
                 --app-drawer-width: 300px;
             }
 
-            #date-picker {
-                --app-datepicker-selection-bg: #fafafa;
-                --app-datepicker-selection-color: #616161;
-                --app-datepicker-iron-selected: #616161;
-                --app-datepicker-selected-day-bg: #179EFF;
-                --app-datepicker-today-color: #179EFF;
-                --app-datepicker-date-hover-background-color: #179EFF;
-            }
 
             app-drawer {
                 --app-drawer-content-container: {
@@ -212,16 +201,8 @@
                     </app-toolbar>
                 </iron-pages>
 
-                <iron-pages
-                        selected="[[routeData.page]]"
-                        attr-for-selected="name"
-                        fallback-selection="view404"
-                        role="main">
-                    <user-cart name="menu" order="[[order]]"
-                               on-dish-removed="_removeDishFromOrder"></user-cart>
-                    <app-datepicker id="date-picker" name="history" view="vertical"
-                                    date="{{currentDate}}" auto-update-date="true"></app-datepicker>
-                </iron-pages>
+
+
             </app-drawer>
 
             <app-header-layout>
@@ -276,8 +257,8 @@
                         attr-for-selected="name"
                         fallback-selection="view404"
                         role="main">
-                    <menu-order name="menu" on-dish-added="_addDishToOrder"></menu-order>
-                    <user-history name="history" cart="[[history]]" narrow="[[narrow]]"></user-history>
+                    <menu-order></menu-order>
+                    <user-history></user-history>
                 </iron-pages>
 
             </app-header-layout>
@@ -308,36 +289,6 @@
                 return 'meal-order-main-app';
             }
 
-            static get observers() {
-                return [
-                    '_updateDate(currentDate)',
-                    '_changehistoryUrl(currentDate)'
-                ];
-            }
-
-            static get actions() {
-                return {
-                    addDish(dish) {
-                        return {
-                            type: ArrayAction.ADD_DISH,
-                            dish: dish
-                        }
-                    },
-                    removeDish(dish) {
-                        return {
-                            type: ArrayAction.REMOVE_DISH,
-                            dish: dish
-                        }
-                    },
-                    changeHistoryDate(date) {
-                        return {
-                            type: ArrayAction.CHANGE_HISTORY_DAY,
-                            date: date
-                        }
-                    }
-                }
-            }
-
             static get properties() {
                 return {
                     /**
@@ -368,23 +319,28 @@
                 }
             };
 
-            _changehistoryUrl() {
-                if (this.routeData.page.startsWith('history')) {
-                    const newRouteData = {};
-                    newRouteData.page = 'history/' + '#/' + this.currentDate;
-                    this.set('routeData', newRouteData);
+            static get actions() {
+                return {
+                    addDish(dish) {
+                        return {
+                            type: UserAction.ADD_DISH,
+                            dish: dish
+                        }
+                    },
+                    removeDish(dish) {
+                        return {
+                            type: UserAction.REMOVE_DISH,
+                            dish: dish
+                        }
+                    },
+                    changeHistoryDate(date) {
+                        return {
+                            type: UserAction.CHANGE_HISTORY_DAY,
+                            date: date
+                        }
+                    }
                 }
             }
-
-            _updateDate() {
-                const arr = this.currentDate.split('/');
-                const date = {};
-                date.year = arr[0];
-                date.month = arr[1];
-                date.day = arr[2];
-                this.dispatch('changeHistoryDate', date);
-            }
-
             _addDishToOrder(e) {
                 this.dispatch('addDish', e.detail);
             }
diff --git a/client/user/src/mealorder/menu/meal-order-drawer.html b/client/user/src/mealorder/menu/meal-order-drawer.html
new file mode 100644
index 00000000..1b129d0b
--- /dev/null
+++ b/client/user/src/mealorder/menu/meal-order-drawer.html
@@ -0,0 +1,106 @@
+<!--
+  ~ Copyright 2018, TeamDev Ltd. All rights reserved.
+  ~
+  ~ Redistribution and use in source and/or binary forms, with or without
+  ~ modification, must retain the above copyright notice and the following
+  ~ disclaimer.
+  ~
+  ~ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+  ~ "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+  ~ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+  ~ A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+  ~ OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+  ~ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+  ~ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+  ~ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+  ~ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  ~ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+  ~ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+  -->
+<link rel="import" href="../../../bower_components/app-route/app-location.html">
+<link rel="import" href="../../../bower_components/app-route/app-route.html">
+<link rel="import" href="../../../bower_components/iron-pages/iron-pages.html">
+
+<dom-module id="meal-order-drawer">
+    <template>
+        <style>
+            #date-picker {
+                --app-datepicker-selection-bg: #fafafa;
+                --app-datepicker-selection-color: #616161;
+                --app-datepicker-iron-selected: #616161;
+                --app-datepicker-selected-day-bg: #179EFF;
+                --app-datepicker-today-color: #179EFF;
+                --app-datepicker-date-hover-background-color: #179EFF;
+            }
+        </style>
+
+        <app-location route="{{route}}"
+                      use-hash-as-path></app-location>
+
+        <app-route
+                route="{{route}}"
+                pattern="/:page"
+                data="{{routeData}}"></app-route>
+
+        <iron-pages
+                selected="[[routeData.page]]"
+                attr-for-selected="name"
+                fallback-selection="view404"
+                role="main">
+            <user-cart name="menu" order="[[order]]"
+                       on-dish-removed="_removeDishFromOrder"></user-cart>
+            <app-datepicker name="history" id="date-picker" view="vertical"
+                            date="{{currentDate}}" auto-update-date="true"></app-datepicker>
+        </iron-pages>
+    </template>
+
+    <script>
+        class MealOrderDrawer extends ReduxMixin(Polymer.Element) {
+            static get is() {
+                return 'meal-order-drawer';
+            }
+            static get properties() {
+                return {
+                    /**
+                     * Current user's meal order.
+                     */
+                    order: {
+                        type: Array,
+                        statePath: 'currentOrder'
+                    },
+
+                    /**
+                     * Chosen date.
+                     */
+                    currentDate: {},
+                }
+            };
+            static get observers() {
+                return [
+                    '_updateDate(currentDate)',
+                    '_changehistoryUrl(currentDate)'
+                ];
+            }
+
+            _changehistoryUrl() {
+                if (this.routeData.page.startsWith('history')) {
+                    const newRouteData = {};
+                    newRouteData.page = 'history/' + '#/' + this.currentDate;
+                    this.set('routeData', newRouteData);
+                }
+            }
+
+            _updateDate() {
+                const arr = this.currentDate.split('/');
+                const date = {};
+                date.year = arr[0];
+                date.month = arr[1];
+                date.day = arr[2];
+                this.dispatch('changeHistoryDate', date);
+            }
+        }
+
+        window.customElements.define(MealOrderDrawer.is, MealOrderDrawer);
+    </script>
+
+</dom-module>

From 2c86bfb2270b696896556cb5e9cdc3671274782d Mon Sep 17 00:00:00 2001
From: Paul <paulageyev@gmail.com>
Date: Tue, 3 Apr 2018 13:25:11 +0300
Subject: [PATCH 058/253] Add `meal-order drawer` to `meal-order-main-app`

---
 client/user/src/mealorder/meal-order-main-app.html | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/client/user/src/mealorder/meal-order-main-app.html b/client/user/src/mealorder/meal-order-main-app.html
index c84dc0fd..0d62e0c9 100644
--- a/client/user/src/mealorder/meal-order-main-app.html
+++ b/client/user/src/mealorder/meal-order-main-app.html
@@ -200,9 +200,7 @@
                         </div>
                     </app-toolbar>
                 </iron-pages>
-
-
-
+                <meal-order-drawer order="[[order]]" currentDate="[[currentDate]]"></meal-order-drawer>
             </app-drawer>
 
             <app-header-layout>

From c033a969cc06ddf5f081c448866a8668d9c59ef9 Mon Sep 17 00:00:00 2001
From: "alexander.karpetc" <alexander.karpetc@gmail.com>
Date: Tue, 3 Apr 2018 13:28:45 +0300
Subject: [PATCH 059/253] Add `meal-order-vendor-menu` component

---
 .../menu/meal-order-vendor-menu.html          | 164 ++++++++++++++++++
 ...enus.html => meal-order-vendor-menus.html} |  49 +-----
 2 files changed, 168 insertions(+), 45 deletions(-)
 rename client/user/src/mealorder/menu/{mea-order-vendor-menus.html => meal-order-vendor-menus.html} (79%)

diff --git a/client/user/src/mealorder/menu/meal-order-vendor-menu.html b/client/user/src/mealorder/menu/meal-order-vendor-menu.html
index e69de29b..c44fd4f3 100644
--- a/client/user/src/mealorder/menu/meal-order-vendor-menu.html
+++ b/client/user/src/mealorder/menu/meal-order-vendor-menu.html
@@ -0,0 +1,164 @@
+<!--
+  ~ Copyright 2018, TeamDev Ltd. All rights reserved.
+  ~
+  ~ Redistribution and use in source and/or binary forms, with or without
+  ~ modification, must retain the above copyright notice and the following
+  ~ disclaimer.
+  ~
+  ~ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+  ~ "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+  ~ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+  ~ A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+  ~ OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+  ~ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+  ~ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+  ~ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+  ~ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  ~ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+  ~ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+  -->
+
+<script src="../../../bower_components/webcomponentsjs/webcomponents-lite.js"></script>
+<link rel="import" href="../../../bower_components/polymer/polymer-element.html">
+<link rel="import" href="../../../bower_components/iron-list/iron-list.html">
+<link rel="import" href="../../../bower_components/paper-item/paper-item.html">
+<link rel="import" href="../../../bower_components/paper-icon-button/paper-icon-button.html">
+<link rel="import" href="../../../bower_components/paper-button/paper-button.html">
+<link rel="import" href="../../../bower_components/iron-icons/iron-icons.html">
+<link rel="import" href="../../../bower_components/paper-input/paper-input.html">
+<link rel="import" href="../../../bower_components/paper-search/paper-search-bar.html">
+
+<dom-module id="meal-order-vendor-menu">
+    <template>
+        <style>
+            :host {
+                font-family: 'Roboto', 'Noto', sans-serif;
+                display: block;
+                padding: 0;
+            }
+
+            body {
+                height: 100vh;
+                margin: 0;
+                display: flex;
+                flex-direction: column;
+            }
+
+            div[role="listbox"] {
+                border: 1px solid #e5e5e5;
+            }
+
+            paper-item {
+                font-size: 15px;
+                padding: 0;
+                width: 100%;
+
+            }
+
+            .vendor {
+                color: #4f4f4f;
+                display: none;
+            }
+
+            .item.expand .vendor {
+                display: block;
+            }
+
+            .menu-dashboard {
+                display: flex;
+                justify-content: space-between;
+                align-items: center;
+                border-top: 1px solid #fcfcfc;
+                border-bottom: 1px solid #fcfcfc;
+            }
+
+            .category {
+                display: flex;
+                justify-content: space-between;
+                align-items: center;
+            }
+
+            .bolder {
+                font-weight: bolder;
+            }
+
+            .dish-title {
+                width: 55%;
+                padding-left: 10px;
+                text-align: left;
+            }
+
+            .dish-price {
+                width: 50px;
+                text-align: right;
+            }
+
+            .add-dish-icon {
+                margin-bottom: 2px;
+                width: 45%;
+                text-align: right;
+            }
+        </style>
+
+
+        <dom-repeat items="[[items]]" as="category">
+            <template>
+                <dom-if if="[[categoryExists(category)]]">
+                    <template>
+                        <div class="vendor">
+
+                            <div class="category">
+                                <paper-item>
+                                    <div class="dish-title bolder">
+                                        [[category.categoryName]]
+                                    </div>
+                                    <div class="dish-price bolder">
+                                        Цена
+                                    </div>
+                                    <div class="add-dish-icon">
+                                        <paper-icon-button
+                                                icon=""></paper-icon-button>
+                                    </div>
+                                </paper-item>
+                            </div>
+
+                            <dom-repeat items="[[category.dishes]]" as="dish">
+                                <template>
+                                    <div class="menu-dashboard">
+                                        <paper-item>
+                                            <div class="dish-title">
+                                                [[dish.title]]
+                                            </div>
+                                            <div class="dish-price">
+                                                [[dish.price]]₴
+                                            </div>
+                                            <div class="add-dish-icon">
+                                                <paper-icon-button icon="add"
+                                                                   on-click="addDish"></paper-icon-button>
+                                            </div>
+                                        </paper-item>
+                                    </div>
+                                </template>
+                            </dom-repeat>
+                        </div>
+                    </template>
+                </dom-if>
+            </template>
+        </dom-repeat>
+
+    </template>
+    <script>
+
+        class MealOrderVendorMenu extends Polymer.Element {
+            static get is() {
+                return 'meal-order-vendor-menu';
+            }
+
+            static get properties() {
+                return {}
+            };
+        }
+
+        window.customElements.define(MealOrderVendorMenus.is, MealOrderVendorMenus);
+    </script>
+</dom-module>
diff --git a/client/user/src/mealorder/menu/mea-order-vendor-menus.html b/client/user/src/mealorder/menu/meal-order-vendor-menus.html
similarity index 79%
rename from client/user/src/mealorder/menu/mea-order-vendor-menus.html
rename to client/user/src/mealorder/menu/meal-order-vendor-menus.html
index 5be7a5ba..5df63e99 100644
--- a/client/user/src/mealorder/menu/mea-order-vendor-menus.html
+++ b/client/user/src/mealorder/menu/meal-order-vendor-menus.html
@@ -28,6 +28,8 @@
 <link rel="import" href="../../../bower_components/paper-input/paper-input.html">
 <link rel="import" href="../../../bower_components/paper-search/paper-search-bar.html">
 
+<link rel="import" href="meal-order-vendor-menu.html">
+
 <dom-module id="meal-order-vendor-menus">
     <template>
         <style>
@@ -208,51 +210,8 @@
                                 <paper-icon-button id="expand-button" icon="[[getIcon(selected)]]"
                                                    on-click="_reSelect"></paper-icon-button>
                             </div>
-
-                            <dom-repeat items="[[item.categories]]" as="category">
-                                <template>
-                                    <dom-if if="[[categoryExists(category)]]">
-                                        <template>
-                                            <div class="vendor">
-
-                                                <div class="category">
-                                                    <paper-item>
-                                                        <div class="dish-title bolder">
-                                                            [[category.categoryName]]
-                                                        </div>
-                                                        <div class="dish-price bolder">
-                                                            Цена
-                                                        </div>
-                                                        <div class="add-dish-icon">
-                                                            <paper-icon-button
-                                                                    icon=""></paper-icon-button>
-                                                        </div>
-                                                    </paper-item>
-                                                </div>
-
-                                                <dom-repeat items="[[category.dishes]]" as="dish">
-                                                    <template>
-                                                        <div class="menu-dashboard">
-                                                            <paper-item>
-                                                                <div class="dish-title">
-                                                                    [[dish.title]]
-                                                                </div>
-                                                                <div class="dish-price">
-                                                                    [[dish.price]]₴
-                                                                </div>
-                                                                <div class="add-dish-icon">
-                                                                    <paper-icon-button icon="add"
-                                                                                       on-click="addDish"></paper-icon-button>
-                                                                </div>
-                                                            </paper-item>
-                                                        </div>
-                                                    </template>
-                                                </dom-repeat>
-                                            </div>
-                                        </template>
-                                    </dom-if>
-                                </template>
-                            </dom-repeat>
+                            <meal-order-vendor-menu
+                                    items="[[item.categories]]"></meal-order-vendor-menu>
                         </div>
                     </div>
                 </div>

From 9821c8a7912a4542c1fc4273b9b694e27b5e7f13 Mon Sep 17 00:00:00 2001
From: Paul <paulageyev@gmail.com>
Date: Tue, 3 Apr 2018 13:31:19 +0300
Subject: [PATCH 060/253] Refactor `meal-order-drawer` component

---
 client/user/src/mealorder/menu/meal-order-drawer.html | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/client/user/src/mealorder/menu/meal-order-drawer.html b/client/user/src/mealorder/menu/meal-order-drawer.html
index 1b129d0b..e219ec4e 100644
--- a/client/user/src/mealorder/menu/meal-order-drawer.html
+++ b/client/user/src/mealorder/menu/meal-order-drawer.html
@@ -59,6 +59,7 @@
             static get is() {
                 return 'meal-order-drawer';
             }
+
             static get properties() {
                 return {
                     /**
@@ -75,6 +76,7 @@
                     currentDate: {},
                 }
             };
+
             static get observers() {
                 return [
                     '_updateDate(currentDate)',
@@ -102,5 +104,4 @@
 
         window.customElements.define(MealOrderDrawer.is, MealOrderDrawer);
     </script>
-
 </dom-module>

From 4663c5d3bf48cf36f6efeaf71318135001521980 Mon Sep 17 00:00:00 2001
From: "alexander.karpetc" <alexander.karpetc@gmail.com>
Date: Tue, 3 Apr 2018 13:33:52 +0300
Subject: [PATCH 061/253] Remove redundant styles

---
 .../menu/meal-order-vendor-menus.html         | 47 -------------------
 1 file changed, 47 deletions(-)

diff --git a/client/user/src/mealorder/menu/meal-order-vendor-menus.html b/client/user/src/mealorder/menu/meal-order-vendor-menus.html
index 5df63e99..7a01f9ed 100644
--- a/client/user/src/mealorder/menu/meal-order-vendor-menus.html
+++ b/client/user/src/mealorder/menu/meal-order-vendor-menus.html
@@ -114,14 +114,6 @@
 
             }
 
-            .item {
-                @apply --layout-horizontal;
-                background-color: white;
-                border: 1px solid #ddd;
-                cursor: pointer;
-                margin-bottom: 10px;
-            }
-
             .pad {
                 padding: 15px;
                 @apply --layout-flex;
@@ -129,10 +121,6 @@
                 font-size: 15px;
             }
 
-            .vendor {
-                color: #4f4f4f;
-                display: none;
-            }
 
             .item.expand .vendor {
                 display: block;
@@ -148,41 +136,6 @@
                 font-size: 16px;
             }
 
-            .menu-dashboard {
-                display: flex;
-                justify-content: space-between;
-                align-items: center;
-                border-top: 1px solid #fcfcfc;
-                border-bottom: 1px solid #fcfcfc;
-            }
-
-            .category {
-                display: flex;
-                justify-content: space-between;
-                align-items: center;
-            }
-
-            .bolder {
-                font-weight: bolder;
-            }
-
-            .dish-title {
-                width: 55%;
-                padding-left: 10px;
-                text-align: left;
-            }
-
-            .dish-price {
-                width: 50px;
-                text-align: right;
-            }
-
-            .add-dish-icon {
-                margin-bottom: 2px;
-                width: 45%;
-                text-align: right;
-            }
-
             .non-select {
                 -webkit-touch-callout: none; /* iOS Safari */
                 -webkit-user-select: none; /* Safari */

From 17ff855a9cb54f44907fbff33239a7ef038173af Mon Sep 17 00:00:00 2001
From: Paul <paulageyev@gmail.com>
Date: Tue, 3 Apr 2018 13:49:01 +0300
Subject: [PATCH 062/253] Add menu for initialStore

---
 .../user/src/mealorder/shell/redux-store.html | 167 +++++++++++++++++-
 1 file changed, 166 insertions(+), 1 deletion(-)

diff --git a/client/user/src/mealorder/shell/redux-store.html b/client/user/src/mealorder/shell/redux-store.html
index a3d5a00c..302732a8 100644
--- a/client/user/src/mealorder/shell/redux-store.html
+++ b/client/user/src/mealorder/shell/redux-store.html
@@ -22,8 +22,173 @@
 <link rel="import" href="reducers/reducers.html">
 <link rel="import" href="actions/user-actions.html">
 <script>
+    const arrayOfDates = [{
+        date: {
+            year: '2018',
+            month: '03',
+            day: '21',
+        },
+        hasMenu: true
+    },
+        {
+            date: {
+                year: '2018',
+                month: '03',
+                day: '22',
+            },
+            hasMenu: true
+        },
+        {
+            date: {
+                year: '2018',
+                month: '03',
+                day: '23',
+            },
+            hasMenu: true
+        },
+        {
+            date: {
+                year: '2018',
+                month: '03',
+                day: '24',
+            },
+            hasMenu: false
+        },
+        {
+            date: {
+                year: '2018',
+                month: '03',
+                day: '25',
+            },
+            hasMenu: false
+        }
+        , {
+            date: {
+                year: '2018',
+                month: '03',
+                day: '26',
+            },
+            hasMenu: true
+        }
+        , {
+            date: {
+                year: '2018',
+                month: '03',
+                day: '27',
+            },
+            hasMenu: true
+        }
+        , {
+            date: {
+                year: '2018',
+                month: '03',
+                day: '28',
+            },
+            hasMenu: true
+        }];
+
+    const initialState = {
+        menuForDates: arrayOfDates,
+        menuForDay: [],
+
+        menu: [
+            {
+                name: 'Пюре',
+                date: {
+                    year: '2018',
+                    month: '03',
+                    day: '21',
+                },
+                categories: [{
+                    categoryName: 'Первое блюдо', dishes: [
+                        {title: 'Борщ украинский', price: 35},
+                        {title: 'Солянка', price: 40},
+                        {title: 'Суп гороховый', price: 140},
+                        {title: 'Уха', price: 35},
+                        {title: 'Суп-пюре грибной', price: 40}]
+                }
+                    , {
+                        categoryName: 'Второе блюдо', dishes: [
+                            {title: 'Утиные крылышки', price: 40},
+                            {title: 'Куриные крылышки', price: 45}]
+                    }
+                ]
+            },
+            {
+                name: 'Позитив',
+                date: {
+                    year: '2018',
+                    month: '03',
+                    day: '21',
+                },
+                categories: [{
+                    categoryName: 'Первое блюдо', dishes: [
+                        {title: 'Борщ украинский', price: 35},
+                        {title: 'Суп с лапшой', price: 40},
+                        {title: 'Борщ красный', price: 40},
+                        {title: 'Борщ зеленый', price: 35}]
+                }
+                    , {
+                        categoryName: 'Второе блюдо', dishes: [
+                            {title: 'Стейк из лосося', price: 40},
+                            {title: 'Стейк из говядины', price: 45}]
+                    },
+                    {
+                        categoryName: 'Напитки', dishes: [
+                            {title: 'Лимонад', price: 40}]
+                    }
+                ]
+            },
+            {
+                name: 'Пюре',
+                date: {
+                    year: '2018',
+                    month: '03',
+                    day: '22',
+                },
+                categories: [{
+                    categoryName: 'Первое блюдо', dishes: [
+                        {title: 'Суп гречневый', price: 35},
+                        {title: 'Солянка', price: 40},
+                        {title: 'Суп гороховый', price: 140},
+                        {title: 'Уха', price: 35},
+                        {title: 'Суп-пюре грибной', price: 40}]
+                }
+                    , {
+                        categoryName: 'Второе блюдо', dishes: [
+                            {title: 'Утиные крылышки', price: 40},
+                            {title: 'Куриные крылышки', price: 45}]
+                    }
+                ]
+            },
+            {
+                name: 'Позитив',
+                date: {
+                    year: '2018',
+                    month: '03',
+                    day: '22',
+                },
+                categories: [{
+                    categoryName: 'Первое блюдо', dishes: [
+                        {title: 'Суп сырный', price: 35},
+                        {title: 'Суп с лапшой', price: 40},
+                        {title: 'Борщ красный', price: 40},
+                        {title: 'Борщ зеленый', price: 35}]
+                }
+                    , {
+                        categoryName: 'Второе блюдо', dishes: [
+                            {title: 'Стейк из лосося', price: 40},
+                            {title: 'Стейк из говядины', price: 45}]
+                    },
+                    {
+                        categoryName: 'Напитки', dishes: [
+                            {title: 'Лимонад', price: 40}]
+                    }
+                ]
+            }],
+
+    };
 
-    const initialState = {};
     const store = Redux.createStore(reducer);
 
     window.MealOrderApp = {};

From 36943488aee4aadee2a98bf0de9be260f8187be2 Mon Sep 17 00:00:00 2001
From: Paul <paulageyev@gmail.com>
Date: Tue, 3 Apr 2018 13:53:06 +0300
Subject: [PATCH 063/253] Refactor reducer, add `MENU_FOR_DAY` action

---
 .../mealorder/shell/actions/user-actions.html |  4 ++-
 .../mealorder/shell/reducers/reducers.html    | 27 ++++++++++++++-----
 2 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/client/user/src/mealorder/shell/actions/user-actions.html b/client/user/src/mealorder/shell/actions/user-actions.html
index 64eeff7b..5f9c2de1 100644
--- a/client/user/src/mealorder/shell/actions/user-actions.html
+++ b/client/user/src/mealorder/shell/actions/user-actions.html
@@ -19,5 +19,7 @@
   -->
 
 <script>
-    const UserAction = {}
+    const UserAction = {
+        MENU_FOR_DAY: "MENU_FOR_DAY"
+    }
 </script>
diff --git a/client/user/src/mealorder/shell/reducers/reducers.html b/client/user/src/mealorder/shell/reducers/reducers.html
index cfd4d5a3..88327f2f 100644
--- a/client/user/src/mealorder/shell/reducers/reducers.html
+++ b/client/user/src/mealorder/shell/reducers/reducers.html
@@ -19,13 +19,26 @@
   -->
 <script>
     const reducer = (state, action) => {
-            if (!state) {
-                return initialState;
-            }
-            switch (action.type) {
-                default :
-                    return state;
+        if (!state) {
+            return initialState;
+        }
+        switch (action.type) {
+            case UserAction.MENU_FOR_DAY: {
+                let arr = [];
+                let k = 0;
+
+                for (let i = 0; i < initialState.menu.length; i++) {
+                    if (initialState.menu[i].date.day === action.date.date.day) {
+                        arr[k] = initialState.menu[i];
+                        k++;
+                    }
+                }
+                return Object.assign({}, state, {
+                        dateForMenu: initialState.dateForMenu,
+                        menuForDay: arr
+                    }
+                );
             }
         }
-    ;
+    };
 </script>

From d0abf4550dd11acc214e47ffe4570bf1b2e071f9 Mon Sep 17 00:00:00 2001
From: Paul <paulageyev@gmail.com>
Date: Tue, 3 Apr 2018 15:15:27 +0300
Subject: [PATCH 064/253] Refactor `user-cart` component

---
 .../src/mealorder/meal-order-main-app.html    | 357 ++++++++++++++++++
 client/user/src/mealorder/menu/user-cart.html |   1 -
 .../user/src/mealorder/shell/redux-store.html |   1 -
 3 files changed, 357 insertions(+), 2 deletions(-)
 create mode 100644 client/user/src/mealorder/meal-order-main-app.html

diff --git a/client/user/src/mealorder/meal-order-main-app.html b/client/user/src/mealorder/meal-order-main-app.html
new file mode 100644
index 00000000..0d62e0c9
--- /dev/null
+++ b/client/user/src/mealorder/meal-order-main-app.html
@@ -0,0 +1,357 @@
+<!--
+  ~ Copyright 2018, TeamDev Ltd. All rights reserved.
+  ~
+  ~ Redistribution and use in source and/or binary forms, with or without
+  ~ modification, must retain the above copyright notice and the following
+  ~ disclaimer.
+  ~
+  ~ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+  ~ "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+  ~ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+  ~ A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+  ~ OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+  ~ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+  ~ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+  ~ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+  ~ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  ~ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+  ~ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+  -->
+<script src="../../bower_components/webcomponentsjs/webcomponents-lite.js"></script>
+
+<link rel="import" href="../../bower_components/polymer/polymer-element.html">
+<link rel="import" href="../../bower_components/app-layout/app-drawer/app-drawer.html">
+<link rel="import" href="../../bower_components/app-layout/app-drawer-layout/app-drawer-layout.html">
+<link rel="import" href="../../bower_components/app-layout/app-header/app-header.html">
+<link rel="import" href="../../bower_components/app-layout/app-header-layout/app-header-layout.html">
+<link rel="import" href="../../bower_components/app-layout/app-scroll-effects/app-scroll-effects.html">
+<link rel="import" href="../../bower_components/app-layout/app-toolbar/app-toolbar.html">
+<link rel="import" href="../../bower_components/app-route/app-location.html">
+<link rel="import" href="../../bower_components/app-route/app-route.html">
+<link rel="import" href="../../bower_components/iron-pages/iron-pages.html">
+<link rel="import" href="../../bower_components/iron-selector/iron-selector.html">
+<link rel="import" href="../../bower_components/paper-icon-button/paper-icon-button.html">
+<link rel="import" href="../../bower_components/paper-tabs/paper-tabs.html">
+<link rel="import" href="../../bower_components/iron-icons/iron-icons.html">
+<link rel="import" href="../../bower_components/iron-icons/maps-icons.html">
+
+<link rel="import" href="shell/redux-store.html">
+<dom-module id="meal-order-main-app">
+    <template>
+        <style>
+            :host {
+                font-family: 'Roboto', 'Noto', sans-serif;
+                --app-primary-color: #4285f4;
+                --app-secondary-color: black;
+                display: block;
+            }
+
+            app-header {
+                background-color: #616161;
+                color: #fff;
+                right: 300px;
+            }
+
+            app-header .main-title {
+                font-size: 1.375em;
+            }
+
+            app-drawer-layout {
+                background-color: #F2F2F2;
+            }
+
+            app-drawer-layout:not([narrow]) [drawer-toggle] {
+                display: none;
+            }
+
+            app-header app-toolbar .container {
+                display: flex;
+                width: 100%;
+                align-items: center;
+                justify-content: space-between;
+            }
+
+            app-header app-toolbar .container .order-container {
+                display: flex;
+            }
+
+            app-header app-toolbar .container .date-container {
+                display: flex;
+                margin-left: 10px;
+                align-items: center;
+            }
+
+            app-header .history-of-orders a {
+                font-size: 0.8em;
+                text-decoration: none;
+                color: white;
+            }
+
+            app-header .history-of-orders a:hover {
+                color: #179EFF;
+            }
+
+            app-header .history-icon {
+                display: none;
+                color: white;
+            }
+
+            app-header .calendar {
+                font-weight: lighter;
+                font-size: 0.75em;
+            }
+
+            app-header .order {
+                font-size: 0.75em;
+            }
+
+            .order-date {
+                display: flex;
+                justify-content: space-between;
+                align-items: center;
+                width: 100%
+            }
+
+            .order-date .order {
+                font-size: 24px;
+            }
+
+            .order-date .day {
+                font-size: 0.7em;
+                font-weight: lighter;
+                text-align: center;
+            }
+
+            .order-date .day-of-the-week {
+                font-size: 22px;
+            }
+
+            @media only screen and (max-width: 600px) {
+
+                .history-of-orders {
+                    display: none;
+                }
+
+                app-header .history-icon {
+                    display: block;
+                }
+
+                app-header .date-container .date-range-icon {
+                    display: none;
+                }
+
+                app-header .date-container .calendar {
+                    display: none;
+                }
+
+            }
+
+            app-drawer.history {
+                --app-drawer-width: 300px;
+            }
+
+
+            app-drawer {
+                --app-drawer-content-container: {
+                    background-color: #fafafa;
+                }
+            }
+
+            .menu-history {
+                margin-right: 44px;
+            }
+
+            .icon-container {
+                width: 100px;
+                display: flex;
+                justify-content: space-around;
+                align-items: center;
+            }
+        </style>
+
+        <app-location route="{{route}}"
+                      use-hash-as-path></app-location>
+
+        <app-route
+                route="{{route}}"
+                pattern="/:page"
+                data="{{routeData}}"></app-route>
+
+        <app-drawer-layout fullbleed narrow="{{narrow}}">
+            <app-drawer slot="drawer" align="right" class$="[[_getClassForDrawer(routeData.page)]]">
+
+                <iron-pages selected="[[routeData.page]]"
+                            attr-for-selected="name"
+                            fallback-selection="view404"
+                            role="main">
+                    <app-toolbar name="menu">
+                        <div class="order-date">
+                            <div class="order">Заказ</div>
+                            <div>
+                                <div class="day">Пн</div>
+                                <div class="day-of-the-week">21</div>
+                            </div>
+                        </div>
+                    </app-toolbar>
+
+                    <app-toolbar name="history">
+                        <div class="order-date">
+                            <div class="order">История заказов</div>
+                        </div>
+                    </app-toolbar>
+                </iron-pages>
+                <meal-order-drawer order="[[order]]" currentDate="[[currentDate]]"></meal-order-drawer>
+            </app-drawer>
+
+            <app-header-layout>
+                <app-header slot="header" reveals effects="waterfall">
+                    <app-toolbar>
+                        <div class="container">
+                            <div class="order-container">
+                                <div class="main-title">Заказ обедов</div>
+                                <div class="date-container">
+                                    <div class="calendar">Март&nbsp;2018</div>
+                                </div>
+                            </div>
+                            <iron-pages
+                                    selected="[[routeData.page]]"
+                                    attr-for-selected="name"
+                                    fallback-selection="view404"
+                                    role="main">
+
+                                <div name="menu">
+                                    <div class="history-of-orders"><a href="/#/history/">История заказов</a></div>
+                                    <div class="icon-container">
+                                        <a href="/#/history/">
+                                            <iron-icon class="history-icon" icon="maps:icons:history"></iron-icon>
+                                        </a>
+                                        <div>
+                                            <iron-icon class="order" icon="icons:shopping-cart"
+                                                       drawer-toggle></iron-icon>
+                                        </div>
+                                    </div>
+                                </div>
+
+                                <div name="history">
+                                    <div class="history-of-orders menu-history"><a href="/#/menu/">Сделать заказ</a>
+                                    </div>
+                                    <div class="icon-container">
+                                        <a href="/#/menu/">
+                                            <iron-icon class="history-icon" icon="maps:icons:create"></iron-icon>
+                                        </a>
+                                        <div>
+                                            <iron-icon class="order" icon="icons:date-range"
+                                                       drawer-toggle></iron-icon>
+                                        </div>
+                                    </div>
+                                </div>
+                            </iron-pages>
+                        </div>
+                    </app-toolbar>
+                </app-header>
+
+                <iron-pages
+                        selected="[[routeData.page]]"
+                        attr-for-selected="name"
+                        fallback-selection="view404"
+                        role="main">
+                    <menu-order></menu-order>
+                    <user-history></user-history>
+                </iron-pages>
+
+            </app-header-layout>
+
+        </app-drawer-layout>
+    </template>
+    <script>
+        /**
+         * Main user meal order component.
+         *
+         * <p>Is adopted for both desktop and mobile.
+         * Consists of 2 page:
+         * 1. A page with vendor menus, and user's shopping cart.
+         * 2. A page with user's history.
+         *
+         * The redux mixin provides its own data system and data flow.
+         * Fires following redux events:
+         * <li>addDish</li>
+         * <li>removeDish</li>
+         * <li>changeHistoryDate</li>
+         *
+         * @customElement
+         * @polymer
+         * @ReduxMixin
+         */
+        class MealOrderMainApp extends ReduxMixin(Polymer.Element) {
+            static get is() {
+                return 'meal-order-main-app';
+            }
+
+            static get properties() {
+                return {
+                    /**
+                     * Used for routing.
+                     */
+                    routeData: {},
+
+                    /**
+                     * Chosen date.
+                     */
+                    currentDate: {},
+
+                    /**
+                     * Current user's meal order.
+                     */
+                    order: {
+                        type: Array,
+                        statePath: 'currentOrder'
+                    },
+
+                    /**
+                     * User's history for the chosen day.
+                     */
+                    history: {
+                        type: Array,
+                        statePath: 'currentHistory'
+                    }
+                }
+            };
+
+            static get actions() {
+                return {
+                    addDish(dish) {
+                        return {
+                            type: UserAction.ADD_DISH,
+                            dish: dish
+                        }
+                    },
+                    removeDish(dish) {
+                        return {
+                            type: UserAction.REMOVE_DISH,
+                            dish: dish
+                        }
+                    },
+                    changeHistoryDate(date) {
+                        return {
+                            type: UserAction.CHANGE_HISTORY_DAY,
+                            date: date
+                        }
+                    }
+                }
+            }
+            _addDishToOrder(e) {
+                this.dispatch('addDish', e.detail);
+            }
+
+            _removeDishFromOrder(e) {
+                this.dispatch('removeDish', e.detail);
+            }
+
+            _getClassForDrawer(page) {
+                return page;
+            }
+        }
+
+        window.customElements.define(MealOrderMainApp.is, MealOrderMainApp);
+    </script>
+</dom-module>
diff --git a/client/user/src/mealorder/menu/user-cart.html b/client/user/src/mealorder/menu/user-cart.html
index 8c9296d7..6a35763f 100644
--- a/client/user/src/mealorder/menu/user-cart.html
+++ b/client/user/src/mealorder/menu/user-cart.html
@@ -167,7 +167,6 @@
                     }
                 }
             };
-
             _removeDish(e) {
                 const dish = {};
                 dish.vendor = e.model.parentModel.__data.dish.vendor;
diff --git a/client/user/src/mealorder/shell/redux-store.html b/client/user/src/mealorder/shell/redux-store.html
index a3d5a00c..ebfbb23f 100644
--- a/client/user/src/mealorder/shell/redux-store.html
+++ b/client/user/src/mealorder/shell/redux-store.html
@@ -22,7 +22,6 @@
 <link rel="import" href="reducers/reducers.html">
 <link rel="import" href="actions/user-actions.html">
 <script>
-
     const initialState = {};
     const store = Redux.createStore(reducer);
 

From 38645e384eb02dba7fbfc40b42e8297ef75f21ff Mon Sep 17 00:00:00 2001
From: Paul <paulageyev@gmail.com>
Date: Tue, 3 Apr 2018 15:17:06 +0300
Subject: [PATCH 065/253] Add dependencies to bower.json

---
 client/user/bower.json | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/client/user/bower.json b/client/user/bower.json
index d895af69..76492716 100644
--- a/client/user/bower.json
+++ b/client/user/bower.json
@@ -13,7 +13,10 @@
     "app-layout": "PolymerElements/app-layout#^2.0.0",
     "app-route": "PolymerElements/app-route#^2.0.0",
     "iron-form": "PolymerElements/iron-form#^2.0.0",
-    "polymer-redux": "^1.0.5"
+    "polymer-redux": "^1.0.5",
+    "iron-list": "PolymerElements/iron-list#^2.0.14",
+    "paper-item": "PolymerElements/paper-item#^2.1.0",
+    "paper-button": "PolymerElements/paper-button#^2.1.0"
   },
   "devDependencies": {
     "web-component-tester": "Polymer/web-component-tester#^6.0.0",

From ec8f398ea359ec94ff4f7367226a481e5e4d4131 Mon Sep 17 00:00:00 2001
From: Paul <paulageyev@gmail.com>
Date: Tue, 3 Apr 2018 15:37:12 +0300
Subject: [PATCH 066/253] Refactor reducer for the `user-cart` component

---
 client/user/src/mealorder/shell/actions/user-actions.html | 4 +++-
 client/user/src/mealorder/shell/reducers/reducers.html    | 4 ++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/client/user/src/mealorder/shell/actions/user-actions.html b/client/user/src/mealorder/shell/actions/user-actions.html
index 64eeff7b..4743dbf8 100644
--- a/client/user/src/mealorder/shell/actions/user-actions.html
+++ b/client/user/src/mealorder/shell/actions/user-actions.html
@@ -19,5 +19,7 @@
   -->
 
 <script>
-    const UserAction = {}
+    const UserAction = {
+        REMOVE_DISH : "REMOVE_DISH"
+    }
 </script>
diff --git a/client/user/src/mealorder/shell/reducers/reducers.html b/client/user/src/mealorder/shell/reducers/reducers.html
index cfd4d5a3..690ade3a 100644
--- a/client/user/src/mealorder/shell/reducers/reducers.html
+++ b/client/user/src/mealorder/shell/reducers/reducers.html
@@ -23,6 +23,10 @@
                 return initialState;
             }
             switch (action.type) {
+
+                case UserAction.REMOVE_DISH: {
+                    return state;
+                }
                 default :
                     return state;
             }

From 5eaec500470ec6b1b1559b93a51e0a011d067bdf Mon Sep 17 00:00:00 2001
From: Paul <paulageyev@gmail.com>
Date: Tue, 3 Apr 2018 15:49:26 +0300
Subject: [PATCH 067/253] Add reducer for the `user-history` component

---
 client/user/bower.json                        |  4 +++-
 .../mealorder/shell/actions/user-actions.html |  4 +++-
 .../mealorder/shell/reducers/reducers.html    | 13 +++++++++++++
 .../user/src/mealorder/shell/utils/Utils.js   | 19 +++++++++++++++++++
 4 files changed, 38 insertions(+), 2 deletions(-)
 create mode 100644 client/user/src/mealorder/shell/utils/Utils.js

diff --git a/client/user/bower.json b/client/user/bower.json
index d895af69..65d4c0e3 100644
--- a/client/user/bower.json
+++ b/client/user/bower.json
@@ -13,7 +13,9 @@
     "app-layout": "PolymerElements/app-layout#^2.0.0",
     "app-route": "PolymerElements/app-route#^2.0.0",
     "iron-form": "PolymerElements/iron-form#^2.0.0",
-    "polymer-redux": "^1.0.5"
+    "polymer-redux": "^1.0.5",
+    "paper-card": "PolymerElements/paper-card#^2.1.0",
+    "vaadin-grid": "vaadin/vaadin-grid#^4.1.7"
   },
   "devDependencies": {
     "web-component-tester": "Polymer/web-component-tester#^6.0.0",
diff --git a/client/user/src/mealorder/shell/actions/user-actions.html b/client/user/src/mealorder/shell/actions/user-actions.html
index 64eeff7b..9b622e6b 100644
--- a/client/user/src/mealorder/shell/actions/user-actions.html
+++ b/client/user/src/mealorder/shell/actions/user-actions.html
@@ -19,5 +19,7 @@
   -->
 
 <script>
-    const UserAction = {}
+    const UserAction = {
+        CHANGE_HISTORY_DAY: "CHANGE_HISTORY_DAY"
+    }
 </script>
diff --git a/client/user/src/mealorder/shell/reducers/reducers.html b/client/user/src/mealorder/shell/reducers/reducers.html
index cfd4d5a3..29bceff2 100644
--- a/client/user/src/mealorder/shell/reducers/reducers.html
+++ b/client/user/src/mealorder/shell/reducers/reducers.html
@@ -23,6 +23,19 @@
                 return initialState;
             }
             switch (action.type) {
+                case UserAction.CHANGE_HISTORY_DAY: {
+                    let newHistory = [];
+                    for (let i = 0; i < initialState.history.length; i++) {
+                        if (Utils.compareObjects(action.date, initialState.history[i].date)) {
+                            newHistory = initialState.history[i].order;
+                            break;
+                        }
+                    }
+                    return Object.assign({}, state, {
+                            currentHistory: newHistory
+                        }
+                    );
+                }
                 default :
                     return state;
             }
diff --git a/client/user/src/mealorder/shell/utils/Utils.js b/client/user/src/mealorder/shell/utils/Utils.js
new file mode 100644
index 00000000..943adb30
--- /dev/null
+++ b/client/user/src/mealorder/shell/utils/Utils.js
@@ -0,0 +1,19 @@
+class Utils {
+    static compareObjects(o1, o2) {
+        for (let p in o1) {
+            if (o1.hasOwnProperty(p)) {
+                if (o1[p] !== o2[p]) {
+                    return false;
+                }
+            }
+        }
+        for (let p in o2) {
+            if (o2.hasOwnProperty(p)) {
+                if (o1[p] !== o2[p]) {
+                    return false;
+                }
+            }
+        }
+        return true;
+    };
+}

From eac6271a7dbe04f030a15d0f5bc67ab95b10bba0 Mon Sep 17 00:00:00 2001
From: Paul <paulageyev@gmail.com>
Date: Tue, 3 Apr 2018 15:58:57 +0300
Subject: [PATCH 068/253] Refactor `menu-order` component

---
 .../user/src/mealorder/menu/menu-order.html   | 52 +++++++++----------
 1 file changed, 25 insertions(+), 27 deletions(-)

diff --git a/client/user/src/mealorder/menu/menu-order.html b/client/user/src/mealorder/menu/menu-order.html
index 683c53c1..a968f164 100644
--- a/client/user/src/mealorder/menu/menu-order.html
+++ b/client/user/src/mealorder/menu/menu-order.html
@@ -25,9 +25,7 @@
 <link rel="import" href="../../../bower_components/iron-pages/iron-pages.html">
 <link rel="import" href="../shell/redux-store.html">
 <link rel="import" href="../../../bower_components/polymer/lib/elements/dom-repeat.html">
-
-<link rel="import" href="vendor-menus.html">
-<link rel="import" href="user-history.html">
+<link rel="import" href="../menu/meal-order-vendor-menus.html">
 <dom-module id="menu-order">
     <template>
         <style>
@@ -136,30 +134,6 @@
                 return 'menu-order';
             }
 
-            connectedCallback() {
-                super.connectedCallback();
-                if (this.menuForDates[0].hasMenu) {
-                    this.dispatch('menuForDay', this.menuForDates[0]);
-                }
-            }
-
-            static get observers() {
-                return [
-                    '_pageChanged(routeData.menu)'
-                ];
-            }
-
-            static get actions() {
-                return {
-                    menuForDay(date) {
-                        return {
-                            type: ArrayAction.MENU_FOR_DAY,
-                            date: date
-                        }
-                    },
-                }
-            }
-
             static get properties() {
                 return {
                     /**
@@ -187,6 +161,30 @@
                 };
             }
 
+            static get actions() {
+                return {
+                    menuForDay(date) {
+                        return {
+                            type: UserAction.MENU_FOR_DAY,
+                            date: date
+                        }
+                    },
+                }
+            }
+
+            connectedCallback() {
+                super.connectedCallback();
+                if (this.menuForDates[0].hasMenu) {
+                    this.dispatch('menuForDay', this.menuForDates[0]);
+                }
+            }
+
+            static get observers() {
+                return [
+                    '_pageChanged(routeData.menu)'
+                ];
+            }
+
             _pageChanged() {
                 if (!this.route.path) {
                     this.set('route.path', '/menu/#/2018/03/21');

From 423d2c4813b63e81fee1c8e9a3f3dbc935999957 Mon Sep 17 00:00:00 2001
From: "alexander.karpetc" <alexander.karpetc@gmail.com>
Date: Tue, 3 Apr 2018 16:21:54 +0300
Subject: [PATCH 069/253] Move styles from menus to menu component

---
 .../menu/meal-order-vendor-menu.html          | 29 +++----
 .../menu/meal-order-vendor-menus.html         | 77 +++++++++----------
 2 files changed, 50 insertions(+), 56 deletions(-)

diff --git a/client/user/src/mealorder/menu/meal-order-vendor-menu.html b/client/user/src/mealorder/menu/meal-order-vendor-menu.html
index c44fd4f3..b77773b5 100644
--- a/client/user/src/mealorder/menu/meal-order-vendor-menu.html
+++ b/client/user/src/mealorder/menu/meal-order-vendor-menu.html
@@ -27,6 +27,7 @@
 <link rel="import" href="../../../bower_components/iron-icons/iron-icons.html">
 <link rel="import" href="../../../bower_components/paper-input/paper-input.html">
 <link rel="import" href="../../../bower_components/paper-search/paper-search-bar.html">
+<link rel="import" href="../../../bower_components/paper-item/paper-item.html">
 
 <dom-module id="meal-order-vendor-menu">
     <template>
@@ -55,15 +56,6 @@
 
             }
 
-            .vendor {
-                color: #4f4f4f;
-                display: none;
-            }
-
-            .item.expand .vendor {
-                display: block;
-            }
-
             .menu-dashboard {
                 display: flex;
                 justify-content: space-between;
@@ -100,17 +92,17 @@
             }
         </style>
 
-
-        <dom-repeat items="[[items]]" as="category">
+        <dom-repeat items="[[items]]" as="item">
+            [[item.categoryName]]
             <template>
-                <dom-if if="[[categoryExists(category)]]">
+                <dom-if if="[[item.dishes.length]]">
                     <template>
                         <div class="vendor">
 
                             <div class="category">
                                 <paper-item>
                                     <div class="dish-title bolder">
-                                        [[category.categoryName]]
+                                        [[item.categoryName]]
                                     </div>
                                     <div class="dish-price bolder">
                                         Цена
@@ -122,7 +114,7 @@
                                 </paper-item>
                             </div>
 
-                            <dom-repeat items="[[category.dishes]]" as="dish">
+                            <dom-repeat items="[[item.dishes]]" as="dish">
                                 <template>
                                     <div class="menu-dashboard">
                                         <paper-item>
@@ -145,7 +137,6 @@
                 </dom-if>
             </template>
         </dom-repeat>
-
     </template>
     <script>
 
@@ -155,10 +146,14 @@
             }
 
             static get properties() {
-                return {}
+                return {
+                    items: {
+                        type: Array
+                    }
+                }
             };
         }
 
-        window.customElements.define(MealOrderVendorMenus.is, MealOrderVendorMenus);
+        window.customElements.define(MealOrderVendorMenu.is, MealOrderVendorMenu);
     </script>
 </dom-module>
diff --git a/client/user/src/mealorder/menu/meal-order-vendor-menus.html b/client/user/src/mealorder/menu/meal-order-vendor-menus.html
index 7a01f9ed..0a4d97ab 100644
--- a/client/user/src/mealorder/menu/meal-order-vendor-menus.html
+++ b/client/user/src/mealorder/menu/meal-order-vendor-menus.html
@@ -29,7 +29,6 @@
 <link rel="import" href="../../../bower_components/paper-search/paper-search-bar.html">
 
 <link rel="import" href="meal-order-vendor-menu.html">
-
 <dom-module id="meal-order-vendor-menus">
     <template>
         <style>
@@ -39,31 +38,6 @@
                 padding: 0;
             }
 
-            @media only screen and (max-width: 600px) {
-                paper-search-bar {
-                    margin: 0 auto;
-                    width: 100%;
-                }
-
-                iron-list {
-                    --iron-list-items-container: {
-                        margin: 4% auto;
-                        width: 100%;
-                    }
-                }
-
-                .dish-price {
-                    padding-left: 30px;
-                }
-
-            }
-
-            @media (max-width: 460px) {
-                paper-toolbar .bottom.title {
-                    font-size: 14px;
-                }
-            }
-
             body {
                 height: 100vh;
                 margin: 0;
@@ -107,11 +81,13 @@
                 background-color: #ffffff;
             }
 
-            paper-item {
-                font-size: 15px;
-                padding: 0;
-                width: 100%;
-
+            .item {
+                @apply --layout-horizontal;
+                /*padding: 20px;*/
+                background-color: white;
+                border: 1px solid #ddd;
+                cursor: pointer;
+                margin-bottom: 10px;
             }
 
             .pad {
@@ -121,11 +97,21 @@
                 font-size: 15px;
             }
 
+            .vendor {
+                color: #4f4f4f;
+                display: none;
+            }
 
             .item.expand .vendor {
                 display: block;
             }
 
+            @media (max-width: 460px) {
+                paper-toolbar .bottom.title {
+                    font-size: 14px;
+                }
+            }
+
             #expand-button {
                 position: absolute;
                 right: 0;
@@ -146,6 +132,20 @@
                 /* Non-prefixed version, currently supported by Chrome and Opera */
             }
 
+            @media only screen and (max-width: 600px) {
+
+                paper-search-bar {
+                    margin: 0 auto;
+                    width: 100%;
+                }
+
+                iron-list {
+                    --iron-list-items-container: {
+                        margin: 4% auto;
+                        width: 100%;
+                    }
+                }
+            }
         </style>
 
         <paper-search-bar query="{{filter}}" hide-filter-button="true"
@@ -163,8 +163,11 @@
                                 <paper-icon-button id="expand-button" icon="[[getIcon(selected)]]"
                                                    on-click="_reSelect"></paper-icon-button>
                             </div>
-                            <meal-order-vendor-menu
-                                    items="[[item.categories]]"></meal-order-vendor-menu>
+                            <div class="expand vendor">
+                                <meal-order-vendor-menu
+                                        items="[[item.categories]]"></meal-order-vendor-menu>
+                            </div>
+
                         </div>
                     </div>
                 </div>
@@ -260,12 +263,7 @@
                     let newVendorCategories = [];
                     for (let j = 0; j < vendorCategories.length; j++) {
                         let vendorDishes = vendorCategories[j].dishes;
-                        let newVendorDishes = [];
-                        for (let k = 0; k < vendorDishes.length; k++) {
-                            if (vendorDishes[k].title.toLowerCase().includes(predicate.toLowerCase())) {
-                                newVendorDishes.push(vendorDishes[k]);
-                            }
-                        }
+                        let newVendorDishes = vendorDishes.filter(dish => dish.title.toLowerCase().includes(predicate.toLowerCase()));
                         newVendorCategories.push({
                             categoryName: vendorCategories[j].categoryName,
                             dishes: newVendorDishes
@@ -286,6 +284,7 @@
                 }
                 else {
                     return 'expand-more';
+
                 }
             }
 

From 0e5afebca341b7ab72e67a6468f2f02825bdf568 Mon Sep 17 00:00:00 2001
From: "alexander.karpetc" <alexander.karpetc@gmail.com>
Date: Tue, 3 Apr 2018 16:35:32 +0300
Subject: [PATCH 070/253] `vendor-menu` now dispatches custom event

---
 .../user/src/mealorder/menu/meal-order-vendor-menu.html  | 8 ++++++++
 .../user/src/mealorder/menu/meal-order-vendor-menus.html | 9 +++------
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/client/user/src/mealorder/menu/meal-order-vendor-menu.html b/client/user/src/mealorder/menu/meal-order-vendor-menu.html
index b77773b5..c897606a 100644
--- a/client/user/src/mealorder/menu/meal-order-vendor-menu.html
+++ b/client/user/src/mealorder/menu/meal-order-vendor-menu.html
@@ -152,6 +152,14 @@
                     }
                 }
             };
+
+            addDish(e) {
+                const dish = {};
+                dish.vendor = this.vendor;
+                dish.name = e.model.__data.dish.title;
+                dish.price = e.model.__data.dish.price;
+                this.dispatchEvent(new CustomEvent('dish-added', {detail: dish}));
+            }
         }
 
         window.customElements.define(MealOrderVendorMenu.is, MealOrderVendorMenu);
diff --git a/client/user/src/mealorder/menu/meal-order-vendor-menus.html b/client/user/src/mealorder/menu/meal-order-vendor-menus.html
index 0a4d97ab..bc9f9fc6 100644
--- a/client/user/src/mealorder/menu/meal-order-vendor-menus.html
+++ b/client/user/src/mealorder/menu/meal-order-vendor-menus.html
@@ -165,7 +165,8 @@
                             </div>
                             <div class="expand vendor">
                                 <meal-order-vendor-menu
-                                        items="[[item.categories]]"></meal-order-vendor-menu>
+                                        items="[[item.categories]]" vendor="[[item.name]]"
+                                        on-dish-added="addDish"></meal-order-vendor-menu>
                             </div>
 
                         </div>
@@ -238,11 +239,7 @@
             }
 
             addDish(e) {
-                const dish = {};
-                dish.vendor = e.model.parentModel.parentModel.__data.item.name;
-                dish.name = e.model.__data.dish.title;
-                dish.price = e.model.__data.dish.price;
-                this.dispatchEvent(new CustomEvent('dish-added', {detail: dish}));
+                this.dispatchEvent(new CustomEvent('dish-added', {detail: e.detail}));
             }
 
             _handleInput() {

From c0da16f30961737d0c263b5dc08d7e99335e85c7 Mon Sep 17 00:00:00 2001
From: Paul <paulageyev@gmail.com>
Date: Tue, 3 Apr 2018 16:42:52 +0300
Subject: [PATCH 071/253] Rename `meal-order` to `meal-order-menu-order`

---
 .../{menu-order.html => meal-order-menu-order.html}  | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
 rename client/user/src/mealorder/menu/{menu-order.html => meal-order-menu-order.html} (95%)

diff --git a/client/user/src/mealorder/menu/menu-order.html b/client/user/src/mealorder/menu/meal-order-menu-order.html
similarity index 95%
rename from client/user/src/mealorder/menu/menu-order.html
rename to client/user/src/mealorder/menu/meal-order-menu-order.html
index a968f164..07ed542d 100644
--- a/client/user/src/mealorder/menu/menu-order.html
+++ b/client/user/src/mealorder/menu/meal-order-menu-order.html
@@ -26,7 +26,7 @@
 <link rel="import" href="../shell/redux-store.html">
 <link rel="import" href="../../../bower_components/polymer/lib/elements/dom-repeat.html">
 <link rel="import" href="../menu/meal-order-vendor-menus.html">
-<dom-module id="menu-order">
+<dom-module id="meal-order-menu-order">
     <template>
         <style>
             body {
@@ -113,8 +113,8 @@
                 fallback-selection="view404"
                 role="main">
 
-            <vendor-menus name="[[routeData.menu]]"
-                          items="[[menu]]" route="[[subroute]]" on-dish-added="addDishToOrder"></vendor-menus>
+            <meal-order-vendor-menus name="[[routeData.menu]]"
+                          items="[[menu]]" route="[[subroute]]" on-dish-added="addDishToOrder"></meal-order-vendor-menus>
         </iron-pages>
     </template>
     <script>
@@ -129,9 +129,9 @@
          * @polymer
          * @ReduxMixin
          */
-        class MenuOrder extends ReduxMixin(Polymer.Element) {
+        class MealOrderMenuOrder extends ReduxMixin(Polymer.Element) {
             static get is() {
-                return 'menu-order';
+                return 'meal-order-menu-order';
             }
 
             static get properties() {
@@ -200,6 +200,6 @@
             }
 
         }
-        window.customElements.define(MenuOrder.is, MenuOrder);
+        window.customElements.define(MealOrderMenuOrder.is, MealOrderMenuOrder);
     </script>
 </dom-module>

From 252fd75fd2ab130c7663cc7bb86d875c0e94a570 Mon Sep 17 00:00:00 2001
From: "alexander.karpetc" <alexander.karpetc@gmail.com>
Date: Tue, 3 Apr 2018 16:45:40 +0300
Subject: [PATCH 072/253] Add docs for `vendor-menu`

---
 .../mealorder/menu/meal-order-vendor-menu.html | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/client/user/src/mealorder/menu/meal-order-vendor-menu.html b/client/user/src/mealorder/menu/meal-order-vendor-menu.html
index c897606a..47e242ae 100644
--- a/client/user/src/mealorder/menu/meal-order-vendor-menu.html
+++ b/client/user/src/mealorder/menu/meal-order-vendor-menu.html
@@ -126,7 +126,7 @@
                                             </div>
                                             <div class="add-dish-icon">
                                                 <paper-icon-button icon="add"
-                                                                   on-click="addDish"></paper-icon-button>
+                                                                   on-click="_addDish"></paper-icon-button>
                                             </div>
                                         </paper-item>
                                     </div>
@@ -139,7 +139,11 @@
         </dom-repeat>
     </template>
     <script>
-
+        /**
+         * vendor-menu represents a menu of a vendor for current date
+         *
+         * <p>Is adopted for both desktop and mobile.
+         */
         class MealOrderVendorMenu extends Polymer.Element {
             static get is() {
                 return 'meal-order-vendor-menu';
@@ -147,13 +151,19 @@
 
             static get properties() {
                 return {
+                    /**
+                     * Menu of a vendor.
+                     *
+                     * Initial state represents its structure.
+                     */
                     items: {
-                        type: Array
+                        type: Array,
+                        value: [{categoryName: '', dishes: [{title: '', price: ''}, {}]}, {}]
                     }
                 }
             };
 
-            addDish(e) {
+            _addDish(e) {
                 const dish = {};
                 dish.vendor = this.vendor;
                 dish.name = e.model.__data.dish.title;

From db4ae5496e86f3d129c06de7f1de0ab2239c44f7 Mon Sep 17 00:00:00 2001
From: Paul <paulageyev@gmail.com>
Date: Tue, 3 Apr 2018 17:11:21 +0300
Subject: [PATCH 073/253] Rename the `user-history` to the
 `meal-order-user-history` component

---
 .../{user-history.html => meal-order-user-history.html}   | 8 ++++----
 client/user/src/mealorder/menu/menu-order.html            | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)
 rename client/user/src/mealorder/menu/{user-history.html => meal-order-user-history.html} (95%)

diff --git a/client/user/src/mealorder/menu/user-history.html b/client/user/src/mealorder/menu/meal-order-user-history.html
similarity index 95%
rename from client/user/src/mealorder/menu/user-history.html
rename to client/user/src/mealorder/menu/meal-order-user-history.html
index bc8775f4..69f50d97 100644
--- a/client/user/src/mealorder/menu/user-history.html
+++ b/client/user/src/mealorder/menu/meal-order-user-history.html
@@ -22,7 +22,7 @@
 
 <link rel="import" href="../../../bower_components/paper-card/paper-card.html">
 <link rel="import" href="../../../bower_components/vaadin-grid/vaadin-grid.html">
-<dom-module id="user-history">
+<dom-module id="meal-order-user-history">
     <template>
         <style>
             :host {
@@ -118,9 +118,9 @@
          * @customElement
          * @polymer
          */
-        class UserHistory extends Polymer.Element {
+        class MealOrderUserHistory extends Polymer.Element {
             static get is() {
-                return 'user-history';
+                return 'meal-order-user-history';
             }
 
             static get properties() {
@@ -142,6 +142,6 @@
             }
         }
 
-        window.customElements.define(UserHistory.is, UserHistory);
+        window.customElements.define(MealOrderUserHistory.is, MealOrderUserHistory);
     </script>
 </dom-module>
diff --git a/client/user/src/mealorder/menu/menu-order.html b/client/user/src/mealorder/menu/menu-order.html
index 683c53c1..e79c6bd7 100644
--- a/client/user/src/mealorder/menu/menu-order.html
+++ b/client/user/src/mealorder/menu/menu-order.html
@@ -27,7 +27,7 @@
 <link rel="import" href="../../../bower_components/polymer/lib/elements/dom-repeat.html">
 
 <link rel="import" href="vendor-menus.html">
-<link rel="import" href="user-history.html">
+<link rel="import" href="meal-order-user-history.html">
 <dom-module id="menu-order">
     <template>
         <style>

From 7b4cb46cf4922581e87a870d530aa7b42ef40a40 Mon Sep 17 00:00:00 2001
From: Paul <paulageyev@gmail.com>
Date: Tue, 3 Apr 2018 17:12:30 +0300
Subject: [PATCH 074/253] Rename the `user-cart` to the `meal-order-user-cart`
 component

---
 .../menu/{user-cart.html => meal-order-user-cart.html}    | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
 rename client/user/src/mealorder/menu/{user-cart.html => meal-order-user-cart.html} (96%)

diff --git a/client/user/src/mealorder/menu/user-cart.html b/client/user/src/mealorder/menu/meal-order-user-cart.html
similarity index 96%
rename from client/user/src/mealorder/menu/user-cart.html
rename to client/user/src/mealorder/menu/meal-order-user-cart.html
index 6a35763f..058f16c5 100644
--- a/client/user/src/mealorder/menu/user-cart.html
+++ b/client/user/src/mealorder/menu/meal-order-user-cart.html
@@ -31,7 +31,7 @@
 <link rel="import" href="../../../bower_components/app-layout/app-scroll-effects/app-scroll-effects.html">
 <link rel="import" href="../../../bower_components/app-layout/app-toolbar/app-toolbar.html">
 <link rel="import" href="../../../bower_components/iron-flex-layout/iron-flex-layout.html">
-<dom-module id="user-cart">
+<dom-module id="meal-order-user-cart">
     <template>
         <style>
             :host {
@@ -138,9 +138,9 @@
          * @customElement
          * @polymer
          */
-        class UserCart extends Polymer.Element {
+        class MealOrderUserCart extends Polymer.Element {
             static get is() {
-                return 'user-cart';
+                return 'meal-order-user-cart';
             }
 
             static get properties() {
@@ -174,6 +174,6 @@
                 this.dispatchEvent(new CustomEvent('dish-removed', {detail: dish}));
             }
         }
-        window.customElements.define(UserCart.is, UserCart);
+        window.customElements.define(MealOrderUserCart.is, MealOrderUserCart);
     </script>
 </dom-module>

From 5978755c27e0320eb1a433dd6cab0819afd3b2cc Mon Sep 17 00:00:00 2001
From: Paul <paulageyev@gmail.com>
Date: Tue, 3 Apr 2018 18:31:54 +0300
Subject: [PATCH 075/253] Add `app-datepicker` to the `meal-order-drawer`
 component

---
 client/user/bower.json                                | 3 ++-
 client/user/src/mealorder/menu/meal-order-drawer.html | 7 +++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/client/user/bower.json b/client/user/bower.json
index b4057631..c54801ed 100644
--- a/client/user/bower.json
+++ b/client/user/bower.json
@@ -20,7 +20,8 @@
     "iron-icons": "PolymerElements/iron-icons#^2.1.1",
     "iron-list": "PolymerElements/iron-list#^2.0.14",
     "paper-item": "PolymerElements/paper-item#^2.1.0",
-    "paper-button": "PolymerElements/paper-button#^2.1.0"
+    "paper-button": "PolymerElements/paper-button#^2.1.0",
+    "app-datepicker": "motss/app-datepicker#^2.12.0"
   },
   "devDependencies": {
     "web-component-tester": "Polymer/web-component-tester#^6.0.0",
diff --git a/client/user/src/mealorder/menu/meal-order-drawer.html b/client/user/src/mealorder/menu/meal-order-drawer.html
index e219ec4e..488254f8 100644
--- a/client/user/src/mealorder/menu/meal-order-drawer.html
+++ b/client/user/src/mealorder/menu/meal-order-drawer.html
@@ -20,6 +20,9 @@
 <link rel="import" href="../../../bower_components/app-route/app-location.html">
 <link rel="import" href="../../../bower_components/app-route/app-route.html">
 <link rel="import" href="../../../bower_components/iron-pages/iron-pages.html">
+<link rel="import" href="../../../bower_components/app-datepicker/app-datepicker.html">
+
+<link rel="import" href="meal-order-user-cart.html">
 
 <dom-module id="meal-order-drawer">
     <template>
@@ -47,8 +50,8 @@
                 attr-for-selected="name"
                 fallback-selection="view404"
                 role="main">
-            <user-cart name="menu" order="[[order]]"
-                       on-dish-removed="_removeDishFromOrder"></user-cart>
+            <meal-order-user-cart name="menu" order="[[order]]"
+                                  on-dish-removed="_removeDishFromOrder"></meal-order-user-cart>
             <app-datepicker name="history" id="date-picker" view="vertical"
                             date="{{currentDate}}" auto-update-date="true"></app-datepicker>
         </iron-pages>

From 5b769c2d86dfad69d049b3bc47aa89bd2c34c1fd Mon Sep 17 00:00:00 2001
From: Paul <paulageyev@gmail.com>
Date: Tue, 3 Apr 2018 20:08:37 +0300
Subject: [PATCH 076/253] Add event `changed-history-date` for the
 `meal-order-drawer` component

---
 client/user/src/mealorder/menu/meal-order-drawer.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/user/src/mealorder/menu/meal-order-drawer.html b/client/user/src/mealorder/menu/meal-order-drawer.html
index 488254f8..6a7f8c2e 100644
--- a/client/user/src/mealorder/menu/meal-order-drawer.html
+++ b/client/user/src/mealorder/menu/meal-order-drawer.html
@@ -101,7 +101,7 @@
                 date.year = arr[0];
                 date.month = arr[1];
                 date.day = arr[2];
-                this.dispatch('changeHistoryDate', date);
+                this.dispatchEvent(new CustomEvent('changed-history-date', {detail: date}));
             }
         }
 

From 1c242fca48b90ae952066cf7c8ecbfb0ecc75209 Mon Sep 17 00:00:00 2001
From: Paul <paulageyev@gmail.com>
Date: Tue, 3 Apr 2018 23:05:39 +0300
Subject: [PATCH 077/253] Refactor `paper-tabs` and docs

---
 .../mealorder/menu/meal-order-menu-order.html | 26 +++++++------------
 1 file changed, 10 insertions(+), 16 deletions(-)

diff --git a/client/user/src/mealorder/menu/meal-order-menu-order.html b/client/user/src/mealorder/menu/meal-order-menu-order.html
index 07ed542d..ff240a8a 100644
--- a/client/user/src/mealorder/menu/meal-order-menu-order.html
+++ b/client/user/src/mealorder/menu/meal-order-menu-order.html
@@ -88,14 +88,13 @@
         <app-route
                 route="{{route}}"
                 pattern="/:menu"
-                data="{{routeData}}"
-                tail="{{subroute}}">
+                data="{{routeData}}">
         </app-route>
 
-        <paper-tabs class="tabs" selected="[[routeData.menu]]" attr-for-selected='key'>
+        <paper-tabs class="tabs" selected="0">
             <template is="dom-repeat" items="{{menuForDates}}" as="calendar">
-                <paper-tab key="[[calendar.date.year]]-[[calendar.date.month]]-[[calendar.date.day]]" link>
-                    <a class="link" name="[[calendar.date.year]]/[[calendar.date.month]]/[[calendar.date.day]]"
+                <paper-tab link>
+                    <a class="link"
                        href="/#/menu/#/[[calendar.date.year]]/[[calendar.date.month]]/[[calendar.date.day]]"
                        on-click="_handleClick">
                         <div>
@@ -107,15 +106,8 @@
             </template>
         </paper-tabs>
 
-        <iron-pages
-                selected="[[routeData.menu]]"
-                attr-for-selected="name"
-                fallback-selection="view404"
-                role="main">
+        <meal-order-vendor-menus items="[[menu]]" on-dish-added="addDishToOrder"></meal-order-vendor-menus>
 
-            <meal-order-vendor-menus name="[[routeData.menu]]"
-                          items="[[menu]]" route="[[subroute]]" on-dish-added="addDishToOrder"></meal-order-vendor-menus>
-        </iron-pages>
     </template>
     <script>
         /**
@@ -144,7 +136,7 @@
                      */
 
                     /**
-                     * Array of dates with existing menu.
+                     * Array of dates with menu which may not exist.
                      */
                     menuForDates: {
                         type: Array,
@@ -157,7 +149,7 @@
                     menu: {
                         type: Array,
                         statePath: 'menuForDay'
-                    }
+                    },
                 };
             }
 
@@ -187,7 +179,8 @@
 
             _pageChanged() {
                 if (!this.route.path) {
-                    this.set('route.path', '/menu/#/2018/03/21');
+                    this.set('route.path', '/menu/#/' + this.menuForDates[0].date.year + "/" +
+                        this.menuForDates[0].date.month + "/" + this.menuForDates[0].date.day);
                 }
             }
 
@@ -200,6 +193,7 @@
             }
 
         }
+
         window.customElements.define(MealOrderMenuOrder.is, MealOrderMenuOrder);
     </script>
 </dom-module>

From f7e25cdb817b8623c6e57c4f102cbbc14000772d Mon Sep 17 00:00:00 2001
From: Paul <paulageyev@gmail.com>
Date: Wed, 4 Apr 2018 13:57:25 +0300
Subject: [PATCH 078/253] Refactor `routeData` in the `meal-order-drawer`

---
 client/user/src/mealorder/menu/meal-order-drawer.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/user/src/mealorder/menu/meal-order-drawer.html b/client/user/src/mealorder/menu/meal-order-drawer.html
index 6a7f8c2e..6738aef9 100644
--- a/client/user/src/mealorder/menu/meal-order-drawer.html
+++ b/client/user/src/mealorder/menu/meal-order-drawer.html
@@ -88,7 +88,7 @@
             }
 
             _changehistoryUrl() {
-                if (this.routeData.page.startsWith('history')) {
+                if (this.routeData.page) {
                     const newRouteData = {};
                     newRouteData.page = 'history/' + '#/' + this.currentDate;
                     this.set('routeData', newRouteData);

From f97ef9eac10da9094ff3dc075a2143abfa504be7 Mon Sep 17 00:00:00 2001
From: "alexander.karpetc" <alexander.karpetc@gmail.com>
Date: Wed, 4 Apr 2018 14:12:05 +0300
Subject: [PATCH 079/253] Add change user cart action

---
 .../mealorder/menu/meal-order-menu-order.html |  8 ++++
 .../mealorder/shell/actions/user-actions.html |  1 +
 .../mealorder/shell/reducers/reducers.html    | 13 +++++++
 .../user/src/mealorder/shell/redux-store.html | 39 ++++++++++++++++++-
 4 files changed, 60 insertions(+), 1 deletion(-)

diff --git a/client/user/src/mealorder/menu/meal-order-menu-order.html b/client/user/src/mealorder/menu/meal-order-menu-order.html
index ff240a8a..c140d8fd 100644
--- a/client/user/src/mealorder/menu/meal-order-menu-order.html
+++ b/client/user/src/mealorder/menu/meal-order-menu-order.html
@@ -161,6 +161,12 @@
                             date: date
                         }
                     },
+                    cartForDay(date) {
+                        return {
+                            type: ArrayAction.CART_FOR_DAY,
+                            date: date
+                        }
+                    },
                 }
             }
 
@@ -168,6 +174,7 @@
                 super.connectedCallback();
                 if (this.menuForDates[0].hasMenu) {
                     this.dispatch('menuForDay', this.menuForDates[0]);
+                    this.dispatch('cartForDay', this.menuForDates[0].date);
                 }
             }
 
@@ -186,6 +193,7 @@
 
             _handleClick(e) {
                 this.dispatch('menuForDay', this.menuForDates[e.model.index]);
+                this.dispatch('cartForDay', this.menuForDates[e.model.index].date);
             }
 
             addDishToOrder(e) {
diff --git a/client/user/src/mealorder/shell/actions/user-actions.html b/client/user/src/mealorder/shell/actions/user-actions.html
index e95f16a6..cd231ebf 100644
--- a/client/user/src/mealorder/shell/actions/user-actions.html
+++ b/client/user/src/mealorder/shell/actions/user-actions.html
@@ -21,6 +21,7 @@
 <script>
     const UserAction = {
         MENU_FOR_DAY: "MENU_FOR_DAY",
+        CART_FOR_DAY: 'CART_FOR_DAY',
         REMOVE_DISH : "REMOVE_DISH"
     }
 </script>
diff --git a/client/user/src/mealorder/shell/reducers/reducers.html b/client/user/src/mealorder/shell/reducers/reducers.html
index a455a4f7..48d4ce71 100644
--- a/client/user/src/mealorder/shell/reducers/reducers.html
+++ b/client/user/src/mealorder/shell/reducers/reducers.html
@@ -44,6 +44,19 @@
                     }
                 );
             }
+            case UserAction.CART_FOR_DAY: {
+                let newOrder = [];
+                for (let i = 0; i < initialState.orders.length; i++) {
+                    if (Utils.compareObjects(action.date, initialState.orders[i].date)) {
+                        newOrder = initialState.orders[i].cart;
+                        break;
+                    }
+                }
+                return Object.assign({}, state, {
+                        currentOrder: newOrder
+                    }
+                );
+            }
             default : {
                 return state;
             }
diff --git a/client/user/src/mealorder/shell/redux-store.html b/client/user/src/mealorder/shell/redux-store.html
index 302732a8..c58837fb 100644
--- a/client/user/src/mealorder/shell/redux-store.html
+++ b/client/user/src/mealorder/shell/redux-store.html
@@ -186,7 +186,44 @@
                     }
                 ]
             }],
-
+        currentOrder: [],
+        orders: [{
+            date: {day: '21', month: '03', year: '2018'}, cart: [{
+                vendor: "Пюре",
+                dishes: [
+                    {title: 'Борщ украинский', price: 35, quantity: 1},
+                    {title: 'Солянка', price: 40, quantity: 1},
+                    {title: 'Суп гороховый', price: 40, quantity: 1},
+                    {title: 'Уха', price: 35, quantity: 1},
+                    {title: 'Суп-пюре грибной', price: 40, quantity: 1},
+                    {title: 'Суп куриный', price: 40, quantity: 1},]
+            }, {
+                vendor: 'Позитив',
+                dishes: [{title: 'Суп куриный', price: 35, quantity: 1}, {
+                    title: 'Стейк из лосося',
+                    price: 35,
+                    quantity: 1
+                }]
+            }]
+        }, {
+            date: {day: '22', month: '03', year: '2018'}, cart: [{
+                vendor: "Пюре",
+                dishes: [
+                    {title: 'Щи русские', price: 48, quantity: 1},
+                    {title: 'Солянка', price: 40, quantity: 1},
+                    {title: 'Суп гороховый', price: 40, quantity: 1},
+                    {title: 'Уха', price: 35, quantity: 1},
+                    {title: 'Суп-пюре грибной', price: 40, quantity: 1},
+                    {title: 'Суп куриный', price: 40, quantity: 1},]
+            }, {
+                vendor: 'Позитив',
+                dishes: [{title: 'Лапша по армянски', price: 35, quantity: 1}, {
+                    title: 'Стейк из лосося',
+                    price: 35,
+                    quantity: 1
+                }]
+            }]
+        }]
     };
 
     const store = Redux.createStore(reducer);

From 9cbd1063c9f50ae4639563f4b517f1e059809328 Mon Sep 17 00:00:00 2001
From: Paul <paulageyev@gmail.com>
Date: Wed, 4 Apr 2018 14:17:10 +0300
Subject: [PATCH 080/253] Rename the `ArrayAction` to the `UserAction` action

---
 client/user/src/mealorder/menu/meal-order-menu-order.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/user/src/mealorder/menu/meal-order-menu-order.html b/client/user/src/mealorder/menu/meal-order-menu-order.html
index c140d8fd..dba4f608 100644
--- a/client/user/src/mealorder/menu/meal-order-menu-order.html
+++ b/client/user/src/mealorder/menu/meal-order-menu-order.html
@@ -163,7 +163,7 @@
                     },
                     cartForDay(date) {
                         return {
-                            type: ArrayAction.CART_FOR_DAY,
+                            type: UserAction.CART_FOR_DAY,
                             date: date
                         }
                     },

From 57cb2f385538f9d1cf2f268ffe36da597b50f4aa Mon Sep 17 00:00:00 2001
From: "alexander.karpetc" <alexander.karpetc@gmail.com>
Date: Wed, 4 Apr 2018 15:17:04 +0300
Subject: [PATCH 081/253] Remove unused util method

---
 .../user/src/mealorder/shell/utils/Utils.js   | 19 -------------------
 1 file changed, 19 deletions(-)
 delete mode 100644 client/user/src/mealorder/shell/utils/Utils.js

diff --git a/client/user/src/mealorder/shell/utils/Utils.js b/client/user/src/mealorder/shell/utils/Utils.js
deleted file mode 100644
index 943adb30..00000000
--- a/client/user/src/mealorder/shell/utils/Utils.js
+++ /dev/null
@@ -1,19 +0,0 @@
-class Utils {
-    static compareObjects(o1, o2) {
-        for (let p in o1) {
-            if (o1.hasOwnProperty(p)) {
-                if (o1[p] !== o2[p]) {
-                    return false;
-                }
-            }
-        }
-        for (let p in o2) {
-            if (o2.hasOwnProperty(p)) {
-                if (o1[p] !== o2[p]) {
-                    return false;
-                }
-            }
-        }
-        return true;
-    };
-}

From c562ce930deb8aa3c0bfdb23c80eb06d1cf74067 Mon Sep 17 00:00:00 2001
From: Paul <paulageyev@gmail.com>
Date: Wed, 4 Apr 2018 16:35:52 +0300
Subject: [PATCH 082/253] Add `routeData` to properties

---
 client/user/src/mealorder/menu/meal-order-menu-order.html | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/client/user/src/mealorder/menu/meal-order-menu-order.html b/client/user/src/mealorder/menu/meal-order-menu-order.html
index ff240a8a..6a130160 100644
--- a/client/user/src/mealorder/menu/meal-order-menu-order.html
+++ b/client/user/src/mealorder/menu/meal-order-menu-order.html
@@ -150,6 +150,9 @@
                         type: Array,
                         statePath: 'menuForDay'
                     },
+                    routeData: {
+                        type: Object,
+                    }
                 };
             }
 

From 44e97ef3e2f5ccd9b799c8ab572b245ad8ea3bd4 Mon Sep 17 00:00:00 2001
From: Paul <paulageyev@gmail.com>
Date: Wed, 4 Apr 2018 16:56:55 +0300
Subject: [PATCH 083/253] Add locale `ru-RU` for `app-datepicker`

---
 client/user/src/mealorder/menu/meal-order-drawer.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/user/src/mealorder/menu/meal-order-drawer.html b/client/user/src/mealorder/menu/meal-order-drawer.html
index 6738aef9..9dcf2d4d 100644
--- a/client/user/src/mealorder/menu/meal-order-drawer.html
+++ b/client/user/src/mealorder/menu/meal-order-drawer.html
@@ -53,7 +53,7 @@
             <meal-order-user-cart name="menu" order="[[order]]"
                                   on-dish-removed="_removeDishFromOrder"></meal-order-user-cart>
             <app-datepicker name="history" id="date-picker" view="vertical"
-                            date="{{currentDate}}" auto-update-date="true"></app-datepicker>
+                            date="{{currentDate}}" auto-update-date="true" locale="ru-RU"></app-datepicker>
         </iron-pages>
     </template>
 

From 14bedd309a935ac541bfa427fc6a9deb22252973 Mon Sep 17 00:00:00 2001
From: "alexander.karpetc" <alexander.karpetc@gmail.com>
Date: Wed, 4 Apr 2018 17:22:30 +0300
Subject: [PATCH 084/253] Add function to calculate total cost

---
 .../mealorder/menu/meal-order-user-cart.html  | 26 +++++++++++++------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/client/user/src/mealorder/menu/meal-order-user-cart.html b/client/user/src/mealorder/menu/meal-order-user-cart.html
index 058f16c5..44c544a2 100644
--- a/client/user/src/mealorder/menu/meal-order-user-cart.html
+++ b/client/user/src/mealorder/menu/meal-order-user-cart.html
@@ -112,19 +112,12 @@
                             </div>
                         </template>
                     </dom-repeat>
-
-                    <div class="order-details">
-                        <div class="amount-title">Сумма:</div>
-                        <div class="amount-order-price">500 ₴</div>
-                        <div class="order-quantity"></div>
-                        <paper-icon-button></paper-icon-button>
-                    </div>
                 </template>
             </dom-repeat>
 
             <div class="total">
                 <div class="amount">Общая сумма:</div>
-                <div class="price">1400 ₴</div>
+                <div class="price">[[total]]</div>
             </div>
 
         </div>
@@ -164,6 +157,13 @@
                      */
                     order: {
                         type: Array,
+                    },
+                    /**
+                     * Total cost of an order for current day.
+                     */
+                    total: {
+                        type: Number,
+                        computed: '_getTotalAmount(order)'
                     }
                 }
             };
@@ -173,6 +173,16 @@
                 dish.name = e.model.__data.d.title;
                 this.dispatchEvent(new CustomEvent('dish-removed', {detail: dish}));
             }
+
+            _getTotalAmount() {
+                let sum = 0;
+                for (let i = 0; i < this.order.length; i++) {
+                    for (let j = 0; j < this.order[i].dishes.length; j++) {
+                        sum += this.order[i].dishes[j].price * this.order[i].dishes[j].quantity;
+                    }
+                }
+                return sum;
+            }
         }
         window.customElements.define(MealOrderUserCart.is, MealOrderUserCart);
     </script>

From ec86431cb81698ab377b81bc16ff6dcb665cb040 Mon Sep 17 00:00:00 2001
From: Paul <paulageyev@gmail.com>
Date: Wed, 4 Apr 2018 20:53:38 +0300
Subject: [PATCH 085/253] Remove `vaadin-grid`, create `iron-list` for the
 `user-history`

---
 .../menu/meal-order-user-history.html         | 166 +++++++++++-------
 1 file changed, 106 insertions(+), 60 deletions(-)

diff --git a/client/user/src/mealorder/menu/meal-order-user-history.html b/client/user/src/mealorder/menu/meal-order-user-history.html
index 69f50d97..72cbbc78 100644
--- a/client/user/src/mealorder/menu/meal-order-user-history.html
+++ b/client/user/src/mealorder/menu/meal-order-user-history.html
@@ -19,94 +19,132 @@
   -->
 <script src="../../../bower_components/webcomponentsjs/webcomponents-lite.js"></script>
 <link rel="import" href="../../../bower_components/polymer/polymer-element.html">
-
+<link rel="import" href="../../../bower_components/iron-list/iron-list.html">
 <link rel="import" href="../../../bower_components/paper-card/paper-card.html">
 <link rel="import" href="../../../bower_components/vaadin-grid/vaadin-grid.html">
 <dom-module id="meal-order-user-history">
     <template>
         <style>
             :host {
+                font-family: 'Roboto', 'Noto', sans-serif;
                 color: #4f4f4f;
             }
 
-            paper-card {
-                display: block;
-            }
-
-            vaadin-grid {
-                height: max-content;
-
+            .history {
                 width: 70%;
-                display: block;
-                margin-left: 15%;
+                margin: 3% auto;
             }
 
-            .vendor {
-                margin-left: 15%;
-                font: bold 24px/1.5 Times, 'New Century Schoolbook', serif;
+            .history-title {
+                width: 35%;
+                text-align: left;
+                margin-left: 2%;
             }
 
-            .quantity {
+            .history-price {
+                width: 20%;
                 text-align: right;
-                padding-right: 10%;
             }
 
-            .price {
+            .history-quantity {
                 text-align: right;
-                padding-right: 10%;
+                width: 45%;
+                margin-right: 2%;
+            }
+
+            .header {
+                display: flex;
+                justify-content: space-between;
+                background-color: #e2e2e2;
+                height: 40px;
+                align-items: center;
+            }
+
+            .dishes {
+                display: flex;
+                justify-content: space-between;
+                background-color: white;
+                height: 40px;
+                margin-bottom: 2px;
+                align-items: center;
             }
 
-            .dish {
-                padding-left: 5%;
+            .total-sum {
+                display: flex;
+                justify-content: flex-end;
+                align-items: center;
+                background-color: white;
+                font-weight: bolder;
+                height: 40px;
+                padding-right: 2%;
+            }
+
+            .title-for-mobile {
+                display: none;
             }
 
             @media only screen and (max-width: 600px) {
-                .vendor {
-                    margin-left: 5%;
+
+                .history-title {
+                    width: 40%;
                 }
 
-                vaadin-grid {
-                    width: 90%;
-                    display: block;
-                    margin-left: 5%;
-                    margin-right: 5%;
-                    padding-right: 0;
+                .history-quantity {
+                    width: 40%;
+
                 }
+
+                .history {
+                    width: 100%;
+                }
+
+                .title-for-mobile {
+                    color: #969696;
+
+                    display: flex;
+                    justify-content: flex-end;
+                    margin-right: 2%;
+                }
+
             }
+
+
+            .vendor-title {
+                font-size: 22px;
+                font-weight: bolder;
+                margin-top: 2%;
+                margin-bottom: 2px;
+            }
+
         </style>
         <div class="history">
-            <dom-repeat items="[[cart]]" as="vendor">
+
+            <div class="title-for-mobile">История заказов</div>
+
+            <iron-list items="[[cart]]" as="item">
                 <template>
-                    <div class="vendor">[[vendor.vendor]]</div>
-                    <vaadin-grid title="vendor" aria-label="Basic Binding Example"
-                                 items="[[vendor.dishes]]"
-                                 as="vendor">
-                        <vaadin-grid-column>
-                            <template class="header">
-                                <p class="dish">Наименование</p>
-                            </template>
-                            <template>
-                                <p class="dish">[[item.title]]</p>
-                            </template>
-                        </vaadin-grid-column>
+                    <div>
+                        <div class="vendor-title">[[item.vendor]]</div>
 
-                        <vaadin-grid-column width="15px">
-                            <template class="header"><p class="price">Цена</p></template>
-                            <template>
-                                <p class="price">[[item.price]]</p>
-                            </template>
-                        </vaadin-grid-column>
+                        <div class="header">
+                            <div class="history-title">Наименование</div>
+                            <div class="history-price">Цена</div>
+                            <div class="history-quantity">Количество</div>
+                        </div>
 
-                        <vaadin-grid-column width="50px">
-                            <template class="header"><p class="quantity">Количество</p></template>
+                        <dom-repeat items="[[item.dishes]]" as="dish">
                             <template>
-                                <p class="quantity">[[item.quantity]]</p>
+                                <div class="dishes">
+                                    <div class="history-title">[[dish.title]]</div>
+                                    <div class="history-price">[[dish.price]]</div>
+                                    <div class="history-quantity">[[dish.quantity]]</div>
+                                </div>
                             </template>
-                            <template class="footer">Итого: [[_getTotal(vendor)]]</template>
-                        </vaadin-grid-column>
-                    </vaadin-grid>
+                        </dom-repeat>
+                    </div>
                 </template>
-            </dom-repeat>
+            </iron-list>
+            <div class="total-sum">Общая сумма: [[totalSum]]</div>
         </div>
     </template>
     <script>
@@ -128,17 +166,25 @@
                     /**
                      * An array containing items to be displayed.
                      */
-                    cart: {type: Array}
+                    cart: {type: Array},
+                    totalSum: {
+                        type: Number,
+                        computed: 'getTotalSum(cart)',
+                    }
                 }
             };
 
-            _getTotal(vendor) {
-                const dishes = vendor.dishes;
-                let sum = 0;
-                for (let i = 0; i < dishes.length; i++) {
-                    sum += (dishes[i].price) * dishes[i].quantity;
+            getTotalSum(cart) {
+                let total_sum = 0;
+                for (let i = 0; i < cart.length; i++) {
+                    const dishes = cart[i].dishes;
+                    let sum = 0;
+                    for (let i = 0; i < dishes.length; i++) {
+                        sum += (dishes[i].price) * dishes[i].quantity;
+                    }
+                    total_sum += sum;
                 }
-                return sum;
+                return total_sum;
             }
         }
 

From 334800e9c9e9b4552653708b341e69070cad068b Mon Sep 17 00:00:00 2001
From: "alexander.karpetc" <alexander.karpetc@gmail.com>
Date: Thu, 5 Apr 2018 13:10:37 +0300
Subject: [PATCH 086/253] Rename function `reselect` -> toggle

---
 client/user/src/mealorder/menu/meal-order-vendor-menus.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/user/src/mealorder/menu/meal-order-vendor-menus.html b/client/user/src/mealorder/menu/meal-order-vendor-menus.html
index bc9f9fc6..ad77d003 100644
--- a/client/user/src/mealorder/menu/meal-order-vendor-menus.html
+++ b/client/user/src/mealorder/menu/meal-order-vendor-menus.html
@@ -161,7 +161,7 @@
                             <div class="primary">
                                 [[item.name]]
                                 <paper-icon-button id="expand-button" icon="[[getIcon(selected)]]"
-                                                   on-click="_reSelect"></paper-icon-button>
+                                                   on-click="_toggle"></paper-icon-button>
                             </div>
                             <div class="expand vendor">
                                 <meal-order-vendor-menu
@@ -285,7 +285,7 @@
                 }
             }
 
-            _reSelect(e) {
+            _toggle(e) {
                 const div = this.shadowRoot.querySelector("#list");
                 if (!e.model.selected) {
                     div.selectIndex(e.model.index);

From a57bcfed2c808eb010c5f33f33fc61a758e17d8e Mon Sep 17 00:00:00 2001
From: "alexander.karpetc" <alexander.karpetc@gmail.com>
Date: Thu, 5 Apr 2018 13:28:00 +0300
Subject: [PATCH 087/253] Refactor naming and styles

---
 client/user/index.html                               |  1 +
 .../src/mealorder/menu/meal-order-vendor-menu.html   |  1 -
 .../src/mealorder/menu/meal-order-vendor-menus.html  | 12 +++---------
 3 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/client/user/index.html b/client/user/index.html
index c1e67204..6c7d971d 100644
--- a/client/user/index.html
+++ b/client/user/index.html
@@ -30,6 +30,7 @@
     <title>MealOrder</title>
     <style>
         body {
+            font-family: 'Roboto', 'Noto', sans-serif;
             background-color: #F2F2F2;
         }
     </style>
diff --git a/client/user/src/mealorder/menu/meal-order-vendor-menu.html b/client/user/src/mealorder/menu/meal-order-vendor-menu.html
index 47e242ae..3d8f7bac 100644
--- a/client/user/src/mealorder/menu/meal-order-vendor-menu.html
+++ b/client/user/src/mealorder/menu/meal-order-vendor-menu.html
@@ -33,7 +33,6 @@
     <template>
         <style>
             :host {
-                font-family: 'Roboto', 'Noto', sans-serif;
                 display: block;
                 padding: 0;
             }
diff --git a/client/user/src/mealorder/menu/meal-order-vendor-menus.html b/client/user/src/mealorder/menu/meal-order-vendor-menus.html
index ad77d003..dcae2539 100644
--- a/client/user/src/mealorder/menu/meal-order-vendor-menus.html
+++ b/client/user/src/mealorder/menu/meal-order-vendor-menus.html
@@ -33,7 +33,6 @@
     <template>
         <style>
             :host {
-                font-family: 'Roboto', 'Noto', sans-serif;
                 display: block;
                 padding: 0;
             }
@@ -70,10 +69,6 @@
                 };
             }
 
-            div[role="listbox"] {
-                border: 1px solid #e5e5e5;
-            }
-
             paper-search-bar {
                 margin: 0 auto;
                 width: 70%;
@@ -83,7 +78,6 @@
 
             .item {
                 @apply --layout-horizontal;
-                /*padding: 20px;*/
                 background-color: white;
                 border: 1px solid #ddd;
                 cursor: pointer;
@@ -286,12 +280,12 @@
             }
 
             _toggle(e) {
-                const div = this.shadowRoot.querySelector("#list");
+                const list = this.$.list;
                 if (!e.model.selected) {
-                    div.selectIndex(e.model.index);
+                    list.selectIndex(e.model.index);
                 }
                 else {
-                    div.deselectIndex(e.model.index);
+                    list.deselectIndex(e.model.index);
                 }
             }
         }

From fa81c8a850f5af6b13396b785b0b5d52105aa87d Mon Sep 17 00:00:00 2001
From: "alexander.karpetc" <alexander.karpetc@gmail.com>
Date: Thu, 5 Apr 2018 13:38:12 +0300
Subject: [PATCH 088/253] Move style flex-direction to index.html

---
 client/user/index.html                                     | 1 +
 client/user/src/mealorder/menu/meal-order-vendor-menu.html | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/user/index.html b/client/user/index.html
index 6c7d971d..8e538d8d 100644
--- a/client/user/index.html
+++ b/client/user/index.html
@@ -32,6 +32,7 @@
         body {
             font-family: 'Roboto', 'Noto', sans-serif;
             background-color: #F2F2F2;
+            flex-direction: column;
         }
     </style>
 </head>
diff --git a/client/user/src/mealorder/menu/meal-order-vendor-menu.html b/client/user/src/mealorder/menu/meal-order-vendor-menu.html
index 3d8f7bac..585320f1 100644
--- a/client/user/src/mealorder/menu/meal-order-vendor-menu.html
+++ b/client/user/src/mealorder/menu/meal-order-vendor-menu.html
@@ -41,7 +41,6 @@
                 height: 100vh;
                 margin: 0;
                 display: flex;
-                flex-direction: column;
             }
 
             div[role="listbox"] {

From d3603436e6301217f6b050b7c8de94ece78271b4 Mon Sep 17 00:00:00 2001
From: Paul <paulageyev@gmail.com>
Date: Thu, 5 Apr 2018 14:04:51 +0300
Subject: [PATCH 089/253] Add `dom-if` for the total amount

---
 client/user/src/mealorder/menu/meal-order-user-history.html | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/client/user/src/mealorder/menu/meal-order-user-history.html b/client/user/src/mealorder/menu/meal-order-user-history.html
index 72cbbc78..ef77d437 100644
--- a/client/user/src/mealorder/menu/meal-order-user-history.html
+++ b/client/user/src/mealorder/menu/meal-order-user-history.html
@@ -144,7 +144,11 @@
                     </div>
                 </template>
             </iron-list>
-            <div class="total-sum">Общая сумма: [[totalSum]]</div>
+            <dom-if if="[[totalSum]]">
+                <template>
+                    <div class="total-sum">Общая сумма: [[totalSum]]</div>
+                </template>
+            </dom-if>
         </div>
     </template>
     <script>

From 2f08bd80e0b6a5cb15be029310bc0ec9c5d93d86 Mon Sep 17 00:00:00 2001
From: "alexander.karpetc" <alexander.karpetc@gmail.com>
Date: Thu, 5 Apr 2018 14:15:29 +0300
Subject: [PATCH 090/253] Fix lint error

---
 client/user/src/mealorder/shell/redux-store.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/user/src/mealorder/shell/redux-store.html b/client/user/src/mealorder/shell/redux-store.html
index 7601c428..f8c85006 100644
--- a/client/user/src/mealorder/shell/redux-store.html
+++ b/client/user/src/mealorder/shell/redux-store.html
@@ -194,5 +194,5 @@
         window.MealOrderApp = {};
         MealOrderApp.store = store;
         MealOrderApp.ReduxMixin = PolymerRedux(MealOrderApp.store);
-    }
+
 </script>

From d3c6b8d092f826e666d08c7b3bd5f12e4696800d Mon Sep 17 00:00:00 2001
From: Paul <paulageyev@gmail.com>
Date: Thu, 5 Apr 2018 14:36:10 +0300
Subject: [PATCH 091/253] Refactor actions for the `meal-order-menu-order`
 component

---
 .../src/mealorder/meal-order-main-app.html    |  21 +-
 .../src/mealorder/menu/meal-order-drawer.html | 110 -------
 .../mealorder/menu/meal-order-menu-order.html |   3 -
 .../mealorder/menu/meal-order-user-cart.html  | 189 -----------
 .../menu/meal-order-vendor-menu.html          | 177 ----------
 .../menu/meal-order-vendor-menus.html         | 301 ------------------
 .../mealorder/shell/actions/user-actions.html |   1 -
 .../mealorder/shell/reducers/reducers.html    |  54 ++--
 .../user/src/mealorder/shell/redux-store.html |   1 -
 .../user/src/mealorder/shell/utils/Utils.js   |  32 ++
 10 files changed, 59 insertions(+), 830 deletions(-)
 delete mode 100644 client/user/src/mealorder/menu/meal-order-drawer.html
 delete mode 100644 client/user/src/mealorder/menu/meal-order-user-cart.html
 delete mode 100644 client/user/src/mealorder/menu/meal-order-vendor-menu.html
 delete mode 100644 client/user/src/mealorder/menu/meal-order-vendor-menus.html
 create mode 100644 client/user/src/mealorder/shell/utils/Utils.js

diff --git a/client/user/src/mealorder/meal-order-main-app.html b/client/user/src/mealorder/meal-order-main-app.html
index 0d62e0c9..719d6c63 100644
--- a/client/user/src/mealorder/meal-order-main-app.html
+++ b/client/user/src/mealorder/meal-order-main-app.html
@@ -34,7 +34,7 @@
 <link rel="import" href="../../bower_components/paper-tabs/paper-tabs.html">
 <link rel="import" href="../../bower_components/iron-icons/iron-icons.html">
 <link rel="import" href="../../bower_components/iron-icons/maps-icons.html">
-
+<link rel="import" href="../mealorder/meal-order-main-app.html">
 <link rel="import" href="shell/redux-store.html">
 <dom-module id="meal-order-main-app">
     <template>
@@ -187,10 +187,6 @@
                     <app-toolbar name="menu">
                         <div class="order-date">
                             <div class="order">Заказ</div>
-                            <div>
-                                <div class="day">Пн</div>
-                                <div class="day-of-the-week">21</div>
-                            </div>
                         </div>
                     </app-toolbar>
 
@@ -255,8 +251,7 @@
                         attr-for-selected="name"
                         fallback-selection="view404"
                         role="main">
-                    <menu-order></menu-order>
-                    <user-history></user-history>
+                    <meal-order-menu-order></meal-order-menu-order>
                 </iron-pages>
 
             </app-header-layout>
@@ -319,24 +314,12 @@
 
             static get actions() {
                 return {
-                    addDish(dish) {
-                        return {
-                            type: UserAction.ADD_DISH,
-                            dish: dish
-                        }
-                    },
                     removeDish(dish) {
                         return {
                             type: UserAction.REMOVE_DISH,
                             dish: dish
                         }
                     },
-                    changeHistoryDate(date) {
-                        return {
-                            type: UserAction.CHANGE_HISTORY_DAY,
-                            date: date
-                        }
-                    }
                 }
             }
             _addDishToOrder(e) {
diff --git a/client/user/src/mealorder/menu/meal-order-drawer.html b/client/user/src/mealorder/menu/meal-order-drawer.html
deleted file mode 100644
index 9dcf2d4d..00000000
--- a/client/user/src/mealorder/menu/meal-order-drawer.html
+++ /dev/null
@@ -1,110 +0,0 @@
-<!--
-  ~ Copyright 2018, TeamDev Ltd. All rights reserved.
-  ~
-  ~ Redistribution and use in source and/or binary forms, with or without
-  ~ modification, must retain the above copyright notice and the following
-  ~ disclaimer.
-  ~
-  ~ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-  ~ "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-  ~ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-  ~ A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-  ~ OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-  ~ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-  ~ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-  ~ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-  ~ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-  ~ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-  ~ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-  -->
-<link rel="import" href="../../../bower_components/app-route/app-location.html">
-<link rel="import" href="../../../bower_components/app-route/app-route.html">
-<link rel="import" href="../../../bower_components/iron-pages/iron-pages.html">
-<link rel="import" href="../../../bower_components/app-datepicker/app-datepicker.html">
-
-<link rel="import" href="meal-order-user-cart.html">
-
-<dom-module id="meal-order-drawer">
-    <template>
-        <style>
-            #date-picker {
-                --app-datepicker-selection-bg: #fafafa;
-                --app-datepicker-selection-color: #616161;
-                --app-datepicker-iron-selected: #616161;
-                --app-datepicker-selected-day-bg: #179EFF;
-                --app-datepicker-today-color: #179EFF;
-                --app-datepicker-date-hover-background-color: #179EFF;
-            }
-        </style>
-
-        <app-location route="{{route}}"
-                      use-hash-as-path></app-location>
-
-        <app-route
-                route="{{route}}"
-                pattern="/:page"
-                data="{{routeData}}"></app-route>
-
-        <iron-pages
-                selected="[[routeData.page]]"
-                attr-for-selected="name"
-                fallback-selection="view404"
-                role="main">
-            <meal-order-user-cart name="menu" order="[[order]]"
-                                  on-dish-removed="_removeDishFromOrder"></meal-order-user-cart>
-            <app-datepicker name="history" id="date-picker" view="vertical"
-                            date="{{currentDate}}" auto-update-date="true" locale="ru-RU"></app-datepicker>
-        </iron-pages>
-    </template>
-
-    <script>
-        class MealOrderDrawer extends ReduxMixin(Polymer.Element) {
-            static get is() {
-                return 'meal-order-drawer';
-            }
-
-            static get properties() {
-                return {
-                    /**
-                     * Current user's meal order.
-                     */
-                    order: {
-                        type: Array,
-                        statePath: 'currentOrder'
-                    },
-
-                    /**
-                     * Chosen date.
-                     */
-                    currentDate: {},
-                }
-            };
-
-            static get observers() {
-                return [
-                    '_updateDate(currentDate)',
-                    '_changehistoryUrl(currentDate)'
-                ];
-            }
-
-            _changehistoryUrl() {
-                if (this.routeData.page) {
-                    const newRouteData = {};
-                    newRouteData.page = 'history/' + '#/' + this.currentDate;
-                    this.set('routeData', newRouteData);
-                }
-            }
-
-            _updateDate() {
-                const arr = this.currentDate.split('/');
-                const date = {};
-                date.year = arr[0];
-                date.month = arr[1];
-                date.day = arr[2];
-                this.dispatchEvent(new CustomEvent('changed-history-date', {detail: date}));
-            }
-        }
-
-        window.customElements.define(MealOrderDrawer.is, MealOrderDrawer);
-    </script>
-</dom-module>
diff --git a/client/user/src/mealorder/menu/meal-order-menu-order.html b/client/user/src/mealorder/menu/meal-order-menu-order.html
index 9f91041e..ac384926 100644
--- a/client/user/src/mealorder/menu/meal-order-menu-order.html
+++ b/client/user/src/mealorder/menu/meal-order-menu-order.html
@@ -25,7 +25,6 @@
 <link rel="import" href="../../../bower_components/iron-pages/iron-pages.html">
 <link rel="import" href="../shell/redux-store.html">
 <link rel="import" href="../../../bower_components/polymer/lib/elements/dom-repeat.html">
-<link rel="import" href="../menu/meal-order-vendor-menus.html">
 <dom-module id="meal-order-menu-order">
     <template>
         <style>
@@ -106,8 +105,6 @@
             </template>
         </paper-tabs>
 
-        <meal-order-vendor-menus items="[[menu]]" on-dish-added="addDishToOrder"></meal-order-vendor-menus>
-
     </template>
     <script>
         /**
diff --git a/client/user/src/mealorder/menu/meal-order-user-cart.html b/client/user/src/mealorder/menu/meal-order-user-cart.html
deleted file mode 100644
index 44c544a2..00000000
--- a/client/user/src/mealorder/menu/meal-order-user-cart.html
+++ /dev/null
@@ -1,189 +0,0 @@
-<!--
-  ~ Copyright 2018, TeamDev Ltd. All rights reserved.
-  ~
-  ~ Redistribution and use in source and/or binary forms, with or without
-  ~ modification, must retain the above copyright notice and the following
-  ~ disclaimer.
-  ~
-  ~ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-  ~ "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-  ~ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-  ~ A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-  ~ OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-  ~ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-  ~ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-  ~ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-  ~ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-  ~ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-  ~ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-  -->
-<script src="../../../bower_components/webcomponentsjs/webcomponents-lite.js"></script>
-<link rel="import" href="../../../bower_components/polymer/polymer-element.html">
-<link rel="import" href="../../../bower_components/iron-list/iron-list.html">
-<link rel="import" href="../../../bower_components/paper-item/paper-item.html">
-<link rel="import" href="../../../bower_components/paper-icon-button/paper-icon-button.html">
-<link rel="import" href="../../../bower_components/paper-button/paper-button.html">
-<link rel="import" href="../../../bower_components/iron-icons/iron-icons.html">
-<link rel="import" href="../../../bower_components/app-layout/app-drawer-layout/app-drawer-layout.html">
-<link rel="import" href="../../../bower_components/app-layout/app-drawer/app-drawer.html">
-<link rel="import" href="../../../bower_components/app-layout/app-header/app-header.html">
-<link rel="import" href="../../../bower_components/app-layout/app-header-layout/app-header-layout.html">
-<link rel="import" href="../../../bower_components/app-layout/app-scroll-effects/app-scroll-effects.html">
-<link rel="import" href="../../../bower_components/app-layout/app-toolbar/app-toolbar.html">
-<link rel="import" href="../../../bower_components/iron-flex-layout/iron-flex-layout.html">
-<dom-module id="meal-order-user-cart">
-    <template>
-        <style>
-            :host {
-                color: #4f4f4f;
-            }
-
-            .order-details {
-                display: flex;
-                font-size: 15px;
-                align-items: center;
-                border-bottom: 2px solid #fcfcfc;
-            }
-
-            .vendor {
-                display: flex;
-                justify-content: space-between;
-                align-items: center;
-                padding-left: 4%;
-                background-color: #fcfcfc;
-            }
-
-            .cart {
-                overflow-x: hidden;
-                overflow-y: auto;
-                max-height: 93vh;
-            }
-
-            .order-title {
-                width: 50%;
-                text-align: left;
-                padding-left: 4%;
-            }
-
-            .order-price {
-                width: 20%;
-                text-align: right;
-            }
-
-            .order-quantity {
-                width: 15%;
-            }
-
-            .amount-title {
-                width: 50%;
-                text-align: left;
-                padding-left: 4%;
-                font-weight: bolder;
-            }
-
-            .amount-order-price {
-                width: 20%;
-                text-align: right;
-
-            }
-
-            .total {
-                display: flex;
-                justify-content: space-between;
-                margin: 6% 4% 10% 4%;
-                font-weight: bolder;
-            }
-        </style>
-        <div class="cart">
-
-            <dom-repeat items="[[order]]" as="dish">
-                <template>
-                    <div class="vendor">
-                        <div>[[dish.vendor]]</div>
-                        <paper-icon-button icon="delete" class="icon-delete"></paper-icon-button>
-                    </div>
-                    <dom-repeat items="[[dish.dishes]]" as="d">
-                        <template>
-                            <div class="order-details">
-                                <div class="order-title">[[d.title]]</div>
-                                <div class="order-price">[[d.price]] ₴</div>
-                                <div class="order-quantity">[[d.quantity]]</div>
-                                <paper-icon-button icon="remove" on-click="_removeDish"></paper-icon-button>
-                            </div>
-                        </template>
-                    </dom-repeat>
-                </template>
-            </dom-repeat>
-
-            <div class="total">
-                <div class="amount">Общая сумма:</div>
-                <div class="price">[[total]]</div>
-            </div>
-
-        </div>
-    </template>
-    <script>
-        /**
-         * user-cart is user's order for current date.
-         *
-         * <p>Is adopted for both desktop and mobile.
-         *
-         * @customElement
-         * @polymer
-         */
-        class MealOrderUserCart extends Polymer.Element {
-            static get is() {
-                return 'meal-order-user-cart';
-            }
-
-            static get properties() {
-                return {
-                    /**
-                     * Fired on dish remove button tap.
-                     *
-                     * @event `dish-removed`
-                     * @param {dish} contains vendor, title.
-                     */
-
-                    /**
-                     * Fired when a dish add button is tapped.
-                     *
-                     * @event `order-removed`
-                     * @param {order} contains vendor.
-                     */
-
-                    /**
-                     * Array to be displayed in a user cart.
-                     */
-                    order: {
-                        type: Array,
-                    },
-                    /**
-                     * Total cost of an order for current day.
-                     */
-                    total: {
-                        type: Number,
-                        computed: '_getTotalAmount(order)'
-                    }
-                }
-            };
-            _removeDish(e) {
-                const dish = {};
-                dish.vendor = e.model.parentModel.__data.dish.vendor;
-                dish.name = e.model.__data.d.title;
-                this.dispatchEvent(new CustomEvent('dish-removed', {detail: dish}));
-            }
-
-            _getTotalAmount() {
-                let sum = 0;
-                for (let i = 0; i < this.order.length; i++) {
-                    for (let j = 0; j < this.order[i].dishes.length; j++) {
-                        sum += this.order[i].dishes[j].price * this.order[i].dishes[j].quantity;
-                    }
-                }
-                return sum;
-            }
-        }
-        window.customElements.define(MealOrderUserCart.is, MealOrderUserCart);
-    </script>
-</dom-module>
diff --git a/client/user/src/mealorder/menu/meal-order-vendor-menu.html b/client/user/src/mealorder/menu/meal-order-vendor-menu.html
deleted file mode 100644
index 47e242ae..00000000
--- a/client/user/src/mealorder/menu/meal-order-vendor-menu.html
+++ /dev/null
@@ -1,177 +0,0 @@
-<!--
-  ~ Copyright 2018, TeamDev Ltd. All rights reserved.
-  ~
-  ~ Redistribution and use in source and/or binary forms, with or without
-  ~ modification, must retain the above copyright notice and the following
-  ~ disclaimer.
-  ~
-  ~ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-  ~ "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-  ~ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-  ~ A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-  ~ OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-  ~ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-  ~ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-  ~ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-  ~ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-  ~ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-  ~ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-  -->
-
-<script src="../../../bower_components/webcomponentsjs/webcomponents-lite.js"></script>
-<link rel="import" href="../../../bower_components/polymer/polymer-element.html">
-<link rel="import" href="../../../bower_components/iron-list/iron-list.html">
-<link rel="import" href="../../../bower_components/paper-item/paper-item.html">
-<link rel="import" href="../../../bower_components/paper-icon-button/paper-icon-button.html">
-<link rel="import" href="../../../bower_components/paper-button/paper-button.html">
-<link rel="import" href="../../../bower_components/iron-icons/iron-icons.html">
-<link rel="import" href="../../../bower_components/paper-input/paper-input.html">
-<link rel="import" href="../../../bower_components/paper-search/paper-search-bar.html">
-<link rel="import" href="../../../bower_components/paper-item/paper-item.html">
-
-<dom-module id="meal-order-vendor-menu">
-    <template>
-        <style>
-            :host {
-                font-family: 'Roboto', 'Noto', sans-serif;
-                display: block;
-                padding: 0;
-            }
-
-            body {
-                height: 100vh;
-                margin: 0;
-                display: flex;
-                flex-direction: column;
-            }
-
-            div[role="listbox"] {
-                border: 1px solid #e5e5e5;
-            }
-
-            paper-item {
-                font-size: 15px;
-                padding: 0;
-                width: 100%;
-
-            }
-
-            .menu-dashboard {
-                display: flex;
-                justify-content: space-between;
-                align-items: center;
-                border-top: 1px solid #fcfcfc;
-                border-bottom: 1px solid #fcfcfc;
-            }
-
-            .category {
-                display: flex;
-                justify-content: space-between;
-                align-items: center;
-            }
-
-            .bolder {
-                font-weight: bolder;
-            }
-
-            .dish-title {
-                width: 55%;
-                padding-left: 10px;
-                text-align: left;
-            }
-
-            .dish-price {
-                width: 50px;
-                text-align: right;
-            }
-
-            .add-dish-icon {
-                margin-bottom: 2px;
-                width: 45%;
-                text-align: right;
-            }
-        </style>
-
-        <dom-repeat items="[[items]]" as="item">
-            [[item.categoryName]]
-            <template>
-                <dom-if if="[[item.dishes.length]]">
-                    <template>
-                        <div class="vendor">
-
-                            <div class="category">
-                                <paper-item>
-                                    <div class="dish-title bolder">
-                                        [[item.categoryName]]
-                                    </div>
-                                    <div class="dish-price bolder">
-                                        Цена
-                                    </div>
-                                    <div class="add-dish-icon">
-                                        <paper-icon-button
-                                                icon=""></paper-icon-button>
-                                    </div>
-                                </paper-item>
-                            </div>
-
-                            <dom-repeat items="[[item.dishes]]" as="dish">
-                                <template>
-                                    <div class="menu-dashboard">
-                                        <paper-item>
-                                            <div class="dish-title">
-                                                [[dish.title]]
-                                            </div>
-                                            <div class="dish-price">
-                                                [[dish.price]]₴
-                                            </div>
-                                            <div class="add-dish-icon">
-                                                <paper-icon-button icon="add"
-                                                                   on-click="_addDish"></paper-icon-button>
-                                            </div>
-                                        </paper-item>
-                                    </div>
-                                </template>
-                            </dom-repeat>
-                        </div>
-                    </template>
-                </dom-if>
-            </template>
-        </dom-repeat>
-    </template>
-    <script>
-        /**
-         * vendor-menu represents a menu of a vendor for current date
-         *
-         * <p>Is adopted for both desktop and mobile.
-         */
-        class MealOrderVendorMenu extends Polymer.Element {
-            static get is() {
-                return 'meal-order-vendor-menu';
-            }
-
-            static get properties() {
-                return {
-                    /**
-                     * Menu of a vendor.
-                     *
-                     * Initial state represents its structure.
-                     */
-                    items: {
-                        type: Array,
-                        value: [{categoryName: '', dishes: [{title: '', price: ''}, {}]}, {}]
-                    }
-                }
-            };
-
-            _addDish(e) {
-                const dish = {};
-                dish.vendor = this.vendor;
-                dish.name = e.model.__data.dish.title;
-                dish.price = e.model.__data.dish.price;
-                this.dispatchEvent(new CustomEvent('dish-added', {detail: dish}));
-            }
-        }
-
-        window.customElements.define(MealOrderVendorMenu.is, MealOrderVendorMenu);
-    </script>
-</dom-module>
diff --git a/client/user/src/mealorder/menu/meal-order-vendor-menus.html b/client/user/src/mealorder/menu/meal-order-vendor-menus.html
deleted file mode 100644
index bc9f9fc6..00000000
--- a/client/user/src/mealorder/menu/meal-order-vendor-menus.html
+++ /dev/null
@@ -1,301 +0,0 @@
-<!--
-  ~ Copyright 2018, TeamDev Ltd. All rights reserved.
-  ~
-  ~ Redistribution and use in source and/or binary forms, with or without
-  ~ modification, must retain the above copyright notice and the following
-  ~ disclaimer.
-  ~
-  ~ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-  ~ "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-  ~ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-  ~ A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-  ~ OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-  ~ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-  ~ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-  ~ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-  ~ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-  ~ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-  ~ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-  -->
-
-<script src="../../../bower_components/webcomponentsjs/webcomponents-lite.js"></script>
-<link rel="import" href="../../../bower_components/polymer/polymer-element.html">
-<link rel="import" href="../../../bower_components/iron-list/iron-list.html">
-<link rel="import" href="../../../bower_components/paper-item/paper-item.html">
-<link rel="import" href="../../../bower_components/paper-icon-button/paper-icon-button.html">
-<link rel="import" href="../../../bower_components/paper-button/paper-button.html">
-<link rel="import" href="../../../bower_components/iron-icons/iron-icons.html">
-<link rel="import" href="../../../bower_components/paper-input/paper-input.html">
-<link rel="import" href="../../../bower_components/paper-search/paper-search-bar.html">
-
-<link rel="import" href="meal-order-vendor-menu.html">
-<dom-module id="meal-order-vendor-menus">
-    <template>
-        <style>
-            :host {
-                font-family: 'Roboto', 'Noto', sans-serif;
-                display: block;
-                padding: 0;
-            }
-
-            body {
-                height: 100vh;
-                margin: 0;
-                display: flex;
-                flex-direction: column;
-            }
-
-            app-toolbar {
-                background-color: var(--google-green-700);
-                box-shadow: 0 2px 5px 0 rgba(0, 0, 0, 0.3);
-                font-weight: bold;
-                color: white;
-                font-size: 18px;
-                z-index: 1;
-                position: fixed;
-                top: 0;
-                left: 0;
-                right: 0;
-            }
-
-            app-toolbar paper-icon-button {
-                --paper-icon-button-ink-color: white;
-            }
-
-            iron-list {
-                --iron-list-items-container: {
-                    width: 70%;
-                    margin: 2% auto;
-                    border-bottom: 1px solid #ddd;
-                };
-            }
-
-            div[role="listbox"] {
-                border: 1px solid #e5e5e5;
-            }
-
-            paper-search-bar {
-                margin: 0 auto;
-                width: 70%;
-                border-radius: 5px;
-                background-color: #ffffff;
-            }
-
-            .item {
-                @apply --layout-horizontal;
-                /*padding: 20px;*/
-                background-color: white;
-                border: 1px solid #ddd;
-                cursor: pointer;
-                margin-bottom: 10px;
-            }
-
-            .pad {
-                padding: 15px;
-                @apply --layout-flex;
-                @apply --layout-vertical;
-                font-size: 15px;
-            }
-
-            .vendor {
-                color: #4f4f4f;
-                display: none;
-            }
-
-            .item.expand .vendor {
-                display: block;
-            }
-
-            @media (max-width: 460px) {
-                paper-toolbar .bottom.title {
-                    font-size: 14px;
-                }
-            }
-
-            #expand-button {
-                position: absolute;
-                right: 0;
-                top: 7px;
-            }
-
-            .primary {
-                font-size: 16px;
-            }
-
-            .non-select {
-                -webkit-touch-callout: none; /* iOS Safari */
-                -webkit-user-select: none; /* Safari */
-                -khtml-user-select: none; /* Konqueror HTML */
-                -moz-user-select: none; /* Firefox */
-                -ms-user-select: none; /* Internet Explorer/Edge */
-                user-select: none;
-                /* Non-prefixed version, currently supported by Chrome and Opera */
-            }
-
-            @media only screen and (max-width: 600px) {
-
-                paper-search-bar {
-                    margin: 0 auto;
-                    width: 100%;
-                }
-
-                iron-list {
-                    --iron-list-items-container: {
-                        margin: 4% auto;
-                        width: 100%;
-                    }
-                }
-            }
-        </style>
-
-        <paper-search-bar query="{{filter}}" hide-filter-button="true"
-                          placeholder="Поиск"></paper-search-bar>
-
-        <iron-list scroll-target="document" id="list" items="[[filtered]]" as="item"
-                   selection-enabled
-                   multi-selection>
-            <template>
-                <div class="non-select">
-                    <div class$="[[getClassForItem(selected)]]" tabindex$="[[tabIndex]]">
-                        <div class="pad">
-                            <div class="primary">
-                                [[item.name]]
-                                <paper-icon-button id="expand-button" icon="[[getIcon(selected)]]"
-                                                   on-click="_reSelect"></paper-icon-button>
-                            </div>
-                            <div class="expand vendor">
-                                <meal-order-vendor-menu
-                                        items="[[item.categories]]" vendor="[[item.name]]"
-                                        on-dish-added="addDish"></meal-order-vendor-menu>
-                            </div>
-
-                        </div>
-                    </div>
-                </div>
-            </template>
-        </iron-list>
-    </template>
-    <script>
-        /**
-         * vendor-menus represents an expanding list of menus for current date and filter.
-         *
-         * <p>Is adopted for both desktop and mobile.
-         * Contains search by dish keywords.
-         *
-         * @customElement
-         * @polymer
-         */
-        class MealOrderVendorMenus extends Polymer.Element {
-            static get is() {
-                return 'meal-order-vendor-menus';
-            }
-
-            static get properties() {
-                return {
-                    /**
-                     * Fired when a dish add button is tapped.
-                     *
-                     * @event `dish-added`
-                     * @param {dish} contains vendor, category, title.
-                     */
-
-                    /**
-                     * Full menu for day.
-                     * For structure details see {@code redux-store.html} or inner template.
-                     */
-                    items: {
-                        type: Array,
-                    },
-
-                    /**
-                     * Menu with filter applied.
-                     */
-                    filtered: {
-                        type: Array,
-                        computed: 'filteredItems(items,filter)',
-                        reflectToAttribute: true
-                    },
-
-                    /**
-                     * Inputted key word or word part to search in menu.
-                     */
-                    filter: {
-                        type: String,
-                        value: '',
-                        notify: true
-                    }
-
-                }
-            };
-
-            static get observers() {
-                return [
-                    '_handleInput(filter)'
-                ];
-            }
-
-            categoryExists(item) {
-                return item.dishes.length > 0;
-            }
-
-            addDish(e) {
-                this.dispatchEvent(new CustomEvent('dish-added', {detail: e.detail}));
-            }
-
-            _handleInput() {
-                const div = this.shadowRoot.querySelector("#list");
-                for (let i = 0; i < this.items.length; i++) {
-                    if (this.filter !== '') {
-                        div.selectIndex(i);
-                        div.selectIndex(i);
-                    }
-                }
-            }
-
-            filteredItems() {
-                const predicate = this.filter;
-                const filtered = [];
-                for (let i = 0; i < this.items.length; i++) {
-                    const vendorCategories = this.items[i].categories;
-                    let newVendorCategories = [];
-                    for (let j = 0; j < vendorCategories.length; j++) {
-                        let vendorDishes = vendorCategories[j].dishes;
-                        let newVendorDishes = vendorDishes.filter(dish => dish.title.toLowerCase().includes(predicate.toLowerCase()));
-                        newVendorCategories.push({
-                            categoryName: vendorCategories[j].categoryName,
-                            dishes: newVendorDishes
-                        });
-                    }
-                    filtered.push({name: this.items[i].name, categories: newVendorCategories});
-                }
-                return filtered;
-            }
-
-            getClassForItem(selected) {
-                return selected ? 'item expand' : 'item';
-            };
-
-            getIcon(selected) {
-                if (selected) {
-                    return 'expand-less';
-                }
-                else {
-                    return 'expand-more';
-
-                }
-            }
-
-            _reSelect(e) {
-                const div = this.shadowRoot.querySelector("#list");
-                if (!e.model.selected) {
-                    div.selectIndex(e.model.index);
-                }
-                else {
-                    div.deselectIndex(e.model.index);
-                }
-            }
-        }
-
-        window.customElements.define(MealOrderVendorMenus.is, MealOrderVendorMenus);
-    </script>
-</dom-module>
diff --git a/client/user/src/mealorder/shell/actions/user-actions.html b/client/user/src/mealorder/shell/actions/user-actions.html
index cd231ebf..5e3da17e 100644
--- a/client/user/src/mealorder/shell/actions/user-actions.html
+++ b/client/user/src/mealorder/shell/actions/user-actions.html
@@ -22,6 +22,5 @@
     const UserAction = {
         MENU_FOR_DAY: "MENU_FOR_DAY",
         CART_FOR_DAY: 'CART_FOR_DAY',
-        REMOVE_DISH : "REMOVE_DISH"
     }
 </script>
diff --git a/client/user/src/mealorder/shell/reducers/reducers.html b/client/user/src/mealorder/shell/reducers/reducers.html
index 2b3f0d33..b39dd6a5 100644
--- a/client/user/src/mealorder/shell/reducers/reducers.html
+++ b/client/user/src/mealorder/shell/reducers/reducers.html
@@ -17,50 +17,46 @@
   ~ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
   ~ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   -->
+<script src="../utils/Utils.js"></script>
 <script>
-    {
         MealOrderApp.reducer = (state, action) => {
             if (!state) {
                 return initialState;
             }
             switch (action.type) {
 
-                case UserAction.REMOVE_DISH: {
-                    return state;
-                }
-
                 case UserAction.MENU_FOR_DAY: {
                     let arr = [];
                     let k = 0;
 
-                for (let i = 0; i < initialState.menu.length; i++) {
-                    if (initialState.menu[i].date.day === action.date.date.day) {
-                        arr[k] = initialState.menu[i];
-                        k++;
+                    for (let i = 0; i < initialState.menu.length; i++) {
+                        if (initialState.menu[i].date.day === action.date.date.day) {
+                            arr[k] = initialState.menu[i];
+                            k++;
+                        }
                     }
+                    return Object.assign({}, state, {
+                            dateForMenu: initialState.dateForMenu,
+                            menuForDay: arr
+                        }
+                    );
                 }
-                return Object.assign({}, state, {
-                        dateForMenu: initialState.dateForMenu,
-                        menuForDay: arr
-                    }
-                );
-            }
-            case UserAction.CART_FOR_DAY: {
-                let newOrder = [];
-                for (let i = 0; i < initialState.orders.length; i++) {
-                    if (Utils.compareObjects(action.date, initialState.orders[i].date)) {
-                        newOrder = initialState.orders[i].cart;
-                        break;
+                case UserAction.CART_FOR_DAY: {
+                    let newOrder = [];
+                    for (let i = 0; i < initialState.orders.length; i++) {
+                        if (Utils.compareObjects(action.date, initialState.orders[i].date)) {
+                            newOrder = initialState.orders[i].cart;
+                            break;
+                        }
                     }
+                    return Object.assign({}, state, {
+                            currentOrder: newOrder
+                        }
+                    );
+                }
+                default : {
+                    return state;
                 }
-                return Object.assign({}, state, {
-                        currentOrder: newOrder
-                    }
-                );
-            }
-            default : {
-                return state;
             }
         }
-    }
 </script>
diff --git a/client/user/src/mealorder/shell/redux-store.html b/client/user/src/mealorder/shell/redux-store.html
index 0472f129..e8f3c3ac 100644
--- a/client/user/src/mealorder/shell/redux-store.html
+++ b/client/user/src/mealorder/shell/redux-store.html
@@ -227,7 +227,6 @@
     };
 
     const store = Redux.createStore(reducer);
-
         window.MealOrderApp = {};
         MealOrderApp.store = store;
         MealOrderApp.ReduxMixin = PolymerRedux(MealOrderApp.store);
diff --git a/client/user/src/mealorder/shell/utils/Utils.js b/client/user/src/mealorder/shell/utils/Utils.js
new file mode 100644
index 00000000..6698c31e
--- /dev/null
+++ b/client/user/src/mealorder/shell/utils/Utils.js
@@ -0,0 +1,32 @@
+/*
+ * Copyright 2018, TeamDev Ltd. All rights reserved.
+ *
+ * Redistribution and use in source and/or binary forms, with or without
+ * modification, must retain the above copyright notice and the following
+ * disclaimer.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+class Utils {
+    static compareObjects(o1, o2) {
+        for (let p in o1) {
+            if (o1.hasOwnProperty(p)) {
+                if (o1[p] !== o2[p]) {
+                    return false;
+                }
+            }
+        }
+        return true;
+    };
+}

From 0b8ffee854bf9c5953ddc1f3236a50bb3991f98f Mon Sep 17 00:00:00 2001
From: Paul <paulageyev@gmail.com>
Date: Thu, 5 Apr 2018 14:52:36 +0300
Subject: [PATCH 092/253] Refactor imports for redux

---
 client/user/src/mealorder/meal-order-main-app.html    | 11 ++++-------
 .../src/mealorder/menu/meal-order-menu-order.html     |  8 +++++---
 .../src/mealorder/shell/actions/user-actions.html     |  1 +
 .../user/src/mealorder/shell/reducers/reducers.html   |  6 ++++++
 4 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/client/user/src/mealorder/meal-order-main-app.html b/client/user/src/mealorder/meal-order-main-app.html
index 719d6c63..4a4e083b 100644
--- a/client/user/src/mealorder/meal-order-main-app.html
+++ b/client/user/src/mealorder/meal-order-main-app.html
@@ -36,6 +36,7 @@
 <link rel="import" href="../../bower_components/iron-icons/maps-icons.html">
 <link rel="import" href="../mealorder/meal-order-main-app.html">
 <link rel="import" href="shell/redux-store.html">
+<link rel="import" href="shell/actions/user-actions.html">
 <dom-module id="meal-order-main-app">
     <template>
         <style>
@@ -277,7 +278,7 @@
          * @polymer
          * @ReduxMixin
          */
-        class MealOrderMainApp extends ReduxMixin(Polymer.Element) {
+        class MealOrderMainApp extends MealOrderApp.ReduxMixin(Polymer.Element) {
             static get is() {
                 return 'meal-order-main-app';
             }
@@ -314,9 +315,9 @@
 
             static get actions() {
                 return {
-                    removeDish(dish) {
+                    addDish(dish) {
                         return {
-                            type: UserAction.REMOVE_DISH,
+                            type: UserAction.ADD_DISH,
                             dish: dish
                         }
                     },
@@ -326,10 +327,6 @@
                 this.dispatch('addDish', e.detail);
             }
 
-            _removeDishFromOrder(e) {
-                this.dispatch('removeDish', e.detail);
-            }
-
             _getClassForDrawer(page) {
                 return page;
             }
diff --git a/client/user/src/mealorder/menu/meal-order-menu-order.html b/client/user/src/mealorder/menu/meal-order-menu-order.html
index ac384926..9b75937c 100644
--- a/client/user/src/mealorder/menu/meal-order-menu-order.html
+++ b/client/user/src/mealorder/menu/meal-order-menu-order.html
@@ -24,6 +24,8 @@
 <link rel="import" href="../../../bower_components/app-route/app-route.html">
 <link rel="import" href="../../../bower_components/iron-pages/iron-pages.html">
 <link rel="import" href="../shell/redux-store.html">
+<link rel="import" href="../shell/actions/user-actions.html">
+
 <link rel="import" href="../../../bower_components/polymer/lib/elements/dom-repeat.html">
 <dom-module id="meal-order-menu-order">
     <template>
@@ -104,7 +106,7 @@
                 </paper-tab>
             </template>
         </paper-tabs>
-
+        <meal-order-vendor-menus items="[[menu]]" on-dish-added="_addDishToOrder"></meal-order-vendor-menus>
     </template>
     <script>
         /**
@@ -118,7 +120,7 @@
          * @polymer
          * @ReduxMixin
          */
-        class MealOrderMenuOrder extends ReduxMixin(Polymer.Element) {
+        class MealOrderMenuOrder extends  MealOrderApp.ReduxMixin(Polymer.Element) {
             static get is() {
                 return 'meal-order-menu-order';
             }
@@ -196,7 +198,7 @@
                 this.dispatch('cartForDay', this.menuForDates[e.model.index].date);
             }
 
-            addDishToOrder(e) {
+            _addDishToOrder(e) {
                 this.dispatchEvent(new CustomEvent('dish-added', {detail: e.detail}));
             }
 
diff --git a/client/user/src/mealorder/shell/actions/user-actions.html b/client/user/src/mealorder/shell/actions/user-actions.html
index 5e3da17e..20111d6f 100644
--- a/client/user/src/mealorder/shell/actions/user-actions.html
+++ b/client/user/src/mealorder/shell/actions/user-actions.html
@@ -22,5 +22,6 @@
     const UserAction = {
         MENU_FOR_DAY: "MENU_FOR_DAY",
         CART_FOR_DAY: 'CART_FOR_DAY',
+        ADD_DISH: "ADD_DISH",
     }
 </script>
diff --git a/client/user/src/mealorder/shell/reducers/reducers.html b/client/user/src/mealorder/shell/reducers/reducers.html
index b39dd6a5..f7228b0a 100644
--- a/client/user/src/mealorder/shell/reducers/reducers.html
+++ b/client/user/src/mealorder/shell/reducers/reducers.html
@@ -17,6 +17,8 @@
   ~ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
   ~ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   -->
+<link rel="import" href="../redux-store.html">
+<link rel="import" href="../actions/user-actions.html">
 <script src="../utils/Utils.js"></script>
 <script>
         MealOrderApp.reducer = (state, action) => {
@@ -25,6 +27,10 @@
             }
             switch (action.type) {
 
+                case UserAction.ADD_DISH: {
+                    return state;
+                }
+
                 case UserAction.MENU_FOR_DAY: {
                     let arr = [];
                     let k = 0;

From 1af91dadcc0b8945781e22b92723e2774f0916ef Mon Sep 17 00:00:00 2001
From: Paul <paulageyev@gmail.com>
Date: Thu, 5 Apr 2018 15:10:31 +0300
Subject: [PATCH 093/253] Refactor global vars

---
 .eslintrc.json                                            | 4 +++-
 client/user/src/mealorder/shell/actions/user-actions.html | 1 +
 client/user/src/mealorder/shell/utils/Utils.js            | 1 +
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/.eslintrc.json b/.eslintrc.json
index e7160a39..99a8b966 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -43,6 +43,8 @@
   ],
   "globals": {
     "Polymer": false,
-    "MealOrderApp": true
+    "MealOrderApp": true,
+    "UserAction": true,
+    "initialState": true
   }
 }
diff --git a/client/user/src/mealorder/shell/actions/user-actions.html b/client/user/src/mealorder/shell/actions/user-actions.html
index 20111d6f..09fd0a6d 100644
--- a/client/user/src/mealorder/shell/actions/user-actions.html
+++ b/client/user/src/mealorder/shell/actions/user-actions.html
@@ -19,6 +19,7 @@
   -->
 
 <script>
+    /global
     const UserAction = {
         MENU_FOR_DAY: "MENU_FOR_DAY",
         CART_FOR_DAY: 'CART_FOR_DAY',
diff --git a/client/user/src/mealorder/shell/utils/Utils.js b/client/user/src/mealorder/shell/utils/Utils.js
index 6698c31e..05999ae3 100644
--- a/client/user/src/mealorder/shell/utils/Utils.js
+++ b/client/user/src/mealorder/shell/utils/Utils.js
@@ -18,6 +18,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+/*exported*/
 class Utils {
     static compareObjects(o1, o2) {
         for (let p in o1) {

From c6f1636607ba30bf60b1d9a0e55f872a9f38a83c Mon Sep 17 00:00:00 2001
From: Paul <paulageyev@gmail.com>
Date: Thu, 5 Apr 2018 15:35:15 +0300
Subject: [PATCH 094/253] Refactor `Utils.js` as exported

---
 .eslintrc.json                                            | 4 +++-
 client/user/src/mealorder/meal-order-main-app.html        | 1 -
 client/user/src/mealorder/menu/meal-order-menu-order.html | 4 +---
 client/user/src/mealorder/shell/actions/user-actions.html | 1 -
 client/user/src/mealorder/shell/reducers/reducers.html    | 1 -
 client/user/src/mealorder/shell/redux-store.html          | 2 --
 client/user/src/mealorder/shell/utils/Utils.js            | 2 +-
 7 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/.eslintrc.json b/.eslintrc.json
index 99a8b966..667ed03c 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -45,6 +45,8 @@
     "Polymer": false,
     "MealOrderApp": true,
     "UserAction": true,
-    "initialState": true
+    "initialState": true,
+    "Redux": true,
+    "PolymerRedux": true,
   }
 }
diff --git a/client/user/src/mealorder/meal-order-main-app.html b/client/user/src/mealorder/meal-order-main-app.html
index 4a4e083b..959492e8 100644
--- a/client/user/src/mealorder/meal-order-main-app.html
+++ b/client/user/src/mealorder/meal-order-main-app.html
@@ -36,7 +36,6 @@
 <link rel="import" href="../../bower_components/iron-icons/maps-icons.html">
 <link rel="import" href="../mealorder/meal-order-main-app.html">
 <link rel="import" href="shell/redux-store.html">
-<link rel="import" href="shell/actions/user-actions.html">
 <dom-module id="meal-order-main-app">
     <template>
         <style>
diff --git a/client/user/src/mealorder/menu/meal-order-menu-order.html b/client/user/src/mealorder/menu/meal-order-menu-order.html
index 9b75937c..18998cb0 100644
--- a/client/user/src/mealorder/menu/meal-order-menu-order.html
+++ b/client/user/src/mealorder/menu/meal-order-menu-order.html
@@ -24,8 +24,6 @@
 <link rel="import" href="../../../bower_components/app-route/app-route.html">
 <link rel="import" href="../../../bower_components/iron-pages/iron-pages.html">
 <link rel="import" href="../shell/redux-store.html">
-<link rel="import" href="../shell/actions/user-actions.html">
-
 <link rel="import" href="../../../bower_components/polymer/lib/elements/dom-repeat.html">
 <dom-module id="meal-order-menu-order">
     <template>
@@ -120,7 +118,7 @@
          * @polymer
          * @ReduxMixin
          */
-        class MealOrderMenuOrder extends  MealOrderApp.ReduxMixin(Polymer.Element) {
+        class MealOrderMenuOrder extends MealOrderApp.ReduxMixin(Polymer.Element) {
             static get is() {
                 return 'meal-order-menu-order';
             }
diff --git a/client/user/src/mealorder/shell/actions/user-actions.html b/client/user/src/mealorder/shell/actions/user-actions.html
index 09fd0a6d..20111d6f 100644
--- a/client/user/src/mealorder/shell/actions/user-actions.html
+++ b/client/user/src/mealorder/shell/actions/user-actions.html
@@ -19,7 +19,6 @@
   -->
 
 <script>
-    /global
     const UserAction = {
         MENU_FOR_DAY: "MENU_FOR_DAY",
         CART_FOR_DAY: 'CART_FOR_DAY',
diff --git a/client/user/src/mealorder/shell/reducers/reducers.html b/client/user/src/mealorder/shell/reducers/reducers.html
index f7228b0a..acd1a0d5 100644
--- a/client/user/src/mealorder/shell/reducers/reducers.html
+++ b/client/user/src/mealorder/shell/reducers/reducers.html
@@ -18,7 +18,6 @@
   ~ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   -->
 <link rel="import" href="../redux-store.html">
-<link rel="import" href="../actions/user-actions.html">
 <script src="../utils/Utils.js"></script>
 <script>
         MealOrderApp.reducer = (state, action) => {
diff --git a/client/user/src/mealorder/shell/redux-store.html b/client/user/src/mealorder/shell/redux-store.html
index e8f3c3ac..ba519602 100644
--- a/client/user/src/mealorder/shell/redux-store.html
+++ b/client/user/src/mealorder/shell/redux-store.html
@@ -19,8 +19,6 @@
   -->
 
 <link rel="import" href="../../../bower_components/polymer-redux/polymer-redux.html">
-<link rel="import" href="reducers/reducers.html">
-<link rel="import" href="actions/user-actions.html">
 <script>
     const arrayOfDates = [{
         date: {
diff --git a/client/user/src/mealorder/shell/utils/Utils.js b/client/user/src/mealorder/shell/utils/Utils.js
index 05999ae3..74ede719 100644
--- a/client/user/src/mealorder/shell/utils/Utils.js
+++ b/client/user/src/mealorder/shell/utils/Utils.js
@@ -18,7 +18,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-/*exported*/
+/*exported Utils */
 class Utils {
     static compareObjects(o1, o2) {
         for (let p in o1) {

From 60f98cdd416f1ef2c46c3e69e21c2a801588d05c Mon Sep 17 00:00:00 2001
From: Paul <paulageyev@gmail.com>
Date: Thu, 5 Apr 2018 15:46:57 +0300
Subject: [PATCH 095/253] Refactor globals var

---
 .eslintrc.json                                           | 9 +++++----
 client/user/src/mealorder/meal-order-main-app.html       | 2 +-
 .../user/src/mealorder/menu/meal-order-menu-order.html   | 3 ++-
 client/user/src/mealorder/shell/utils/Utils.js           | 2 +-
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/.eslintrc.json b/.eslintrc.json
index 667ed03c..18bc8485 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -43,10 +43,11 @@
   ],
   "globals": {
     "Polymer": false,
-    "MealOrderApp": true,
-    "UserAction": true,
-    "initialState": true,
+    "MealOrderApp": false,
+    "UserAction": false,
+    "initialState": false,
     "Redux": true,
-    "PolymerRedux": true,
+    "PolymerRedux": false,
+    "Utils": false
   }
 }
diff --git a/client/user/src/mealorder/meal-order-main-app.html b/client/user/src/mealorder/meal-order-main-app.html
index 959492e8..5cb20399 100644
--- a/client/user/src/mealorder/meal-order-main-app.html
+++ b/client/user/src/mealorder/meal-order-main-app.html
@@ -310,7 +310,7 @@
                         statePath: 'currentHistory'
                     }
                 }
-            };
+            }
 
             static get actions() {
                 return {
diff --git a/client/user/src/mealorder/menu/meal-order-menu-order.html b/client/user/src/mealorder/menu/meal-order-menu-order.html
index 18998cb0..cf72ad9a 100644
--- a/client/user/src/mealorder/menu/meal-order-menu-order.html
+++ b/client/user/src/mealorder/menu/meal-order-menu-order.html
@@ -104,7 +104,8 @@
                 </paper-tab>
             </template>
         </paper-tabs>
-        <meal-order-vendor-menus items="[[menu]]" on-dish-added="_addDishToOrder"></meal-order-vendor-menus>
+        <meal-order-vendor-menus items="[[menu]]"
+                                 on-dish-added="_addDishToOrder"></meal-order-vendor-menus>
     </template>
     <script>
         /**
diff --git a/client/user/src/mealorder/shell/utils/Utils.js b/client/user/src/mealorder/shell/utils/Utils.js
index 74ede719..5aa9f53d 100644
--- a/client/user/src/mealorder/shell/utils/Utils.js
+++ b/client/user/src/mealorder/shell/utils/Utils.js
@@ -29,5 +29,5 @@ class Utils {
             }
         }
         return true;
-    };
+    }
 }

From 5ea7c963acba1f7aecd85cfb0ae680b61b96165c Mon Sep 17 00:00:00 2001
From: Paul <paulageyev@gmail.com>
Date: Thu, 5 Apr 2018 16:14:17 +0300
Subject: [PATCH 096/253] Refactor redux store

---
 .../mealorder/shell/actions/user-actions.html |   1 +
 .../mealorder/shell/reducers/reducers.html    | 208 ++++++++++++++++-
 .../user/src/mealorder/shell/redux-store.html | 209 +-----------------
 3 files changed, 211 insertions(+), 207 deletions(-)

diff --git a/client/user/src/mealorder/shell/actions/user-actions.html b/client/user/src/mealorder/shell/actions/user-actions.html
index 20111d6f..81e654c5 100644
--- a/client/user/src/mealorder/shell/actions/user-actions.html
+++ b/client/user/src/mealorder/shell/actions/user-actions.html
@@ -19,6 +19,7 @@
   -->
 
 <script>
+    /*exported UserAction*/
     const UserAction = {
         MENU_FOR_DAY: "MENU_FOR_DAY",
         CART_FOR_DAY: 'CART_FOR_DAY',
diff --git a/client/user/src/mealorder/shell/reducers/reducers.html b/client/user/src/mealorder/shell/reducers/reducers.html
index acd1a0d5..340a8fd4 100644
--- a/client/user/src/mealorder/shell/reducers/reducers.html
+++ b/client/user/src/mealorder/shell/reducers/reducers.html
@@ -20,7 +20,212 @@
 <link rel="import" href="../redux-store.html">
 <script src="../utils/Utils.js"></script>
 <script>
-        MealOrderApp.reducer = (state, action) => {
+    {
+        const arrayOfDates = [{
+            date: {
+                year: '2018',
+                month: '03',
+                day: '21',
+            },
+            hasMenu: true
+        },
+            {
+                date: {
+                    year: '2018',
+                    month: '03',
+                    day: '22',
+                },
+                hasMenu: true
+            },
+            {
+                date: {
+                    year: '2018',
+                    month: '03',
+                    day: '23',
+                },
+                hasMenu: true
+            },
+            {
+                date: {
+                    year: '2018',
+                    month: '03',
+                    day: '24',
+                },
+                hasMenu: false
+            },
+            {
+                date: {
+                    year: '2018',
+                    month: '03',
+                    day: '25',
+                },
+                hasMenu: false
+            }
+            , {
+                date: {
+                    year: '2018',
+                    month: '03',
+                    day: '26',
+                },
+                hasMenu: true
+            }
+            , {
+                date: {
+                    year: '2018',
+                    month: '03',
+                    day: '27',
+                },
+                hasMenu: true
+            }
+            , {
+                date: {
+                    year: '2018',
+                    month: '03',
+                    day: '28',
+                },
+                hasMenu: true
+            }];
+
+        MealOrderApp.initialState = {
+            menuForDates: arrayOfDates,
+            menuForDay: [],
+
+            menu: [
+                {
+                    name: 'Пюре',
+                    date: {
+                        year: '2018',
+                        month: '03',
+                        day: '21',
+                    },
+                    categories: [{
+                        categoryName: 'Первое блюдо', dishes: [
+                            {title: 'Борщ украинский', price: 35},
+                            {title: 'Солянка', price: 40},
+                            {title: 'Суп гороховый', price: 140},
+                            {title: 'Уха', price: 35},
+                            {title: 'Суп-пюре грибной', price: 40}]
+                    }
+                        , {
+                            categoryName: 'Второе блюдо', dishes: [
+                                {title: 'Утиные крылышки', price: 40},
+                                {title: 'Куриные крылышки', price: 45}]
+                        }
+                    ]
+                },
+                {
+                    name: 'Позитив',
+                    date: {
+                        year: '2018',
+                        month: '03',
+                        day: '21',
+                    },
+                    categories: [{
+                        categoryName: 'Первое блюдо', dishes: [
+                            {title: 'Борщ украинский', price: 35},
+                            {title: 'Суп с лапшой', price: 40},
+                            {title: 'Борщ красный', price: 40},
+                            {title: 'Борщ зеленый', price: 35}]
+                    }
+                        , {
+                            categoryName: 'Второе блюдо', dishes: [
+                                {title: 'Стейк из лосося', price: 40},
+                                {title: 'Стейк из говядины', price: 45}]
+                        },
+                        {
+                            categoryName: 'Напитки', dishes: [
+                                {title: 'Лимонад', price: 40}]
+                        }
+                    ]
+                },
+                {
+                    name: 'Пюре',
+                    date: {
+                        year: '2018',
+                        month: '03',
+                        day: '22',
+                    },
+                    categories: [{
+                        categoryName: 'Первое блюдо', dishes: [
+                            {title: 'Суп гречневый', price: 35},
+                            {title: 'Солянка', price: 40},
+                            {title: 'Суп гороховый', price: 140},
+                            {title: 'Уха', price: 35},
+                            {title: 'Суп-пюре грибной', price: 40}]
+                    }
+                        , {
+                            categoryName: 'Второе блюдо', dishes: [
+                                {title: 'Утиные крылышки', price: 40},
+                                {title: 'Куриные крылышки', price: 45}]
+                        }
+                    ]
+                },
+                {
+                    name: 'Позитив',
+                    date: {
+                        year: '2018',
+                        month: '03',
+                        day: '22',
+                    },
+                    categories: [{
+                        categoryName: 'Первое блюдо', dishes: [
+                            {title: 'Суп сырный', price: 35},
+                            {title: 'Суп с лапшой', price: 40},
+                            {title: 'Борщ красный', price: 40},
+                            {title: 'Борщ зеленый', price: 35}]
+                    }
+                        , {
+                            categoryName: 'Второе блюдо', dishes: [
+                                {title: 'Стейк из лосося', price: 40},
+                                {title: 'Стейк из говядины', price: 45}]
+                        },
+                        {
+                            categoryName: 'Напитки', dishes: [
+                                {title: 'Лимонад', price: 40}]
+                        }
+                    ]
+                }],
+            currentOrder: [],
+            orders: [{
+                date: {day: '21', month: '03', year: '2018'}, cart: [{
+                    vendor: "Пюре",
+                    dishes: [
+                        {title: 'Борщ украинский', price: 35, quantity: 1},
+                        {title: 'Солянка', price: 40, quantity: 1},
+                        {title: 'Суп гороховый', price: 40, quantity: 1},
+                        {title: 'Уха', price: 35, quantity: 1},
+                        {title: 'Суп-пюре грибной', price: 40, quantity: 1},
+                        {title: 'Суп куриный', price: 40, quantity: 1},]
+                }, {
+                    vendor: 'Позитив',
+                    dishes: [{title: 'Суп куриный', price: 35, quantity: 1}, {
+                        title: 'Стейк из лосося',
+                        price: 35,
+                        quantity: 1
+                    }]
+                }]
+            }, {
+                date: {day: '22', month: '03', year: '2018'}, cart: [{
+                    vendor: "Пюре",
+                    dishes: [
+                        {title: 'Щи русские', price: 48, quantity: 1},
+                        {title: 'Солянка', price: 40, quantity: 1},
+                        {title: 'Суп гороховый', price: 40, quantity: 1},
+                        {title: 'Уха', price: 35, quantity: 1},
+                        {title: 'Суп-пюре грибной', price: 40, quantity: 1},
+                        {title: 'Суп куриный', price: 40, quantity: 1},]
+                }, {
+                    vendor: 'Позитив',
+                    dishes: [{title: 'Лапша по армянски', price: 35, quantity: 1}, {
+                        title: 'Стейк из лосося',
+                        price: 35,
+                        quantity: 1
+                    }]
+                }]
+            }]
+        };
+
+        reducer = (state, action) => {
             if (!state) {
                 return initialState;
             }
@@ -64,4 +269,5 @@
                 }
             }
         }
+    }
 </script>
diff --git a/client/user/src/mealorder/shell/redux-store.html b/client/user/src/mealorder/shell/redux-store.html
index ba519602..4c885a25 100644
--- a/client/user/src/mealorder/shell/redux-store.html
+++ b/client/user/src/mealorder/shell/redux-store.html
@@ -20,213 +20,10 @@
 
 <link rel="import" href="../../../bower_components/polymer-redux/polymer-redux.html">
 <script>
-    const arrayOfDates = [{
-        date: {
-            year: '2018',
-            month: '03',
-            day: '21',
-        },
-        hasMenu: true
-    },
-        {
-            date: {
-                year: '2018',
-                month: '03',
-                day: '22',
-            },
-            hasMenu: true
-        },
-        {
-            date: {
-                year: '2018',
-                month: '03',
-                day: '23',
-            },
-            hasMenu: true
-        },
-        {
-            date: {
-                year: '2018',
-                month: '03',
-                day: '24',
-            },
-            hasMenu: false
-        },
-        {
-            date: {
-                year: '2018',
-                month: '03',
-                day: '25',
-            },
-            hasMenu: false
-        }
-        , {
-            date: {
-                year: '2018',
-                month: '03',
-                day: '26',
-            },
-            hasMenu: true
-        }
-        , {
-            date: {
-                year: '2018',
-                month: '03',
-                day: '27',
-            },
-            hasMenu: true
-        }
-        , {
-            date: {
-                year: '2018',
-                month: '03',
-                day: '28',
-            },
-            hasMenu: true
-        }];
-
-    MealOrderApp.initialState = {
-        menuForDates: arrayOfDates,
-        menuForDay: [],
-
-        menu: [
-            {
-                name: 'Пюре',
-                date: {
-                    year: '2018',
-                    month: '03',
-                    day: '21',
-                },
-                categories: [{
-                    categoryName: 'Первое блюдо', dishes: [
-                        {title: 'Борщ украинский', price: 35},
-                        {title: 'Солянка', price: 40},
-                        {title: 'Суп гороховый', price: 140},
-                        {title: 'Уха', price: 35},
-                        {title: 'Суп-пюре грибной', price: 40}]
-                }
-                    , {
-                        categoryName: 'Второе блюдо', dishes: [
-                            {title: 'Утиные крылышки', price: 40},
-                            {title: 'Куриные крылышки', price: 45}]
-                    }
-                ]
-            },
-            {
-                name: 'Позитив',
-                date: {
-                    year: '2018',
-                    month: '03',
-                    day: '21',
-                },
-                categories: [{
-                    categoryName: 'Первое блюдо', dishes: [
-                        {title: 'Борщ украинский', price: 35},
-                        {title: 'Суп с лапшой', price: 40},
-                        {title: 'Борщ красный', price: 40},
-                        {title: 'Борщ зеленый', price: 35}]
-                }
-                    , {
-                        categoryName: 'Второе блюдо', dishes: [
-                            {title: 'Стейк из лосося', price: 40},
-                            {title: 'Стейк из говядины', price: 45}]
-                    },
-                    {
-                        categoryName: 'Напитки', dishes: [
-                            {title: 'Лимонад', price: 40}]
-                    }
-                ]
-            },
-            {
-                name: 'Пюре',
-                date: {
-                    year: '2018',
-                    month: '03',
-                    day: '22',
-                },
-                categories: [{
-                    categoryName: 'Первое блюдо', dishes: [
-                        {title: 'Суп гречневый', price: 35},
-                        {title: 'Солянка', price: 40},
-                        {title: 'Суп гороховый', price: 140},
-                        {title: 'Уха', price: 35},
-                        {title: 'Суп-пюре грибной', price: 40}]
-                }
-                    , {
-                        categoryName: 'Второе блюдо', dishes: [
-                            {title: 'Утиные крылышки', price: 40},
-                            {title: 'Куриные крылышки', price: 45}]
-                    }
-                ]
-            },
-            {
-                name: 'Позитив',
-                date: {
-                    year: '2018',
-                    month: '03',
-                    day: '22',
-                },
-                categories: [{
-                    categoryName: 'Первое блюдо', dishes: [
-                        {title: 'Суп сырный', price: 35},
-                        {title: 'Суп с лапшой', price: 40},
-                        {title: 'Борщ красный', price: 40},
-                        {title: 'Борщ зеленый', price: 35}]
-                }
-                    , {
-                        categoryName: 'Второе блюдо', dishes: [
-                            {title: 'Стейк из лосося', price: 40},
-                            {title: 'Стейк из говядины', price: 45}]
-                    },
-                    {
-                        categoryName: 'Напитки', dishes: [
-                            {title: 'Лимонад', price: 40}]
-                    }
-                ]
-            }],
-        currentOrder: [],
-        orders: [{
-            date: {day: '21', month: '03', year: '2018'}, cart: [{
-                vendor: "Пюре",
-                dishes: [
-                    {title: 'Борщ украинский', price: 35, quantity: 1},
-                    {title: 'Солянка', price: 40, quantity: 1},
-                    {title: 'Суп гороховый', price: 40, quantity: 1},
-                    {title: 'Уха', price: 35, quantity: 1},
-                    {title: 'Суп-пюре грибной', price: 40, quantity: 1},
-                    {title: 'Суп куриный', price: 40, quantity: 1},]
-            }, {
-                vendor: 'Позитив',
-                dishes: [{title: 'Суп куриный', price: 35, quantity: 1}, {
-                    title: 'Стейк из лосося',
-                    price: 35,
-                    quantity: 1
-                }]
-            }]
-        }, {
-            date: {day: '22', month: '03', year: '2018'}, cart: [{
-                vendor: "Пюре",
-                dishes: [
-                    {title: 'Щи русские', price: 48, quantity: 1},
-                    {title: 'Солянка', price: 40, quantity: 1},
-                    {title: 'Суп гороховый', price: 40, quantity: 1},
-                    {title: 'Уха', price: 35, quantity: 1},
-                    {title: 'Суп-пюре грибной', price: 40, quantity: 1},
-                    {title: 'Суп куриный', price: 40, quantity: 1},]
-            }, {
-                vendor: 'Позитив',
-                dishes: [{title: 'Лапша по армянски', price: 35, quantity: 1}, {
-                    title: 'Стейк из лосося',
-                    price: 35,
-                    quantity: 1
-                }]
-            }]
-        }]
-    };
-
-    const store = Redux.createStore(reducer);
+    {
+        const store = Redux.createStore(reducer);
         window.MealOrderApp = {};
         MealOrderApp.store = store;
         MealOrderApp.ReduxMixin = PolymerRedux(MealOrderApp.store);
-
+    }
 </script>

From a6521189caeae304b1842a94a4cc1a5bb72d758d Mon Sep 17 00:00:00 2001
From: Paul <paulageyev@gmail.com>
Date: Thu, 5 Apr 2018 16:30:56 +0300
Subject: [PATCH 097/253] Refactor `dish-add` custom event to action

---
 .eslintrc.json                                           | 1 +
 client/user/src/mealorder/meal-order-main-app.html       | 9 ---------
 .../user/src/mealorder/menu/meal-order-menu-order.html   | 8 +++++++-
 client/user/src/mealorder/shell/redux-store.html         | 1 +
 4 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/.eslintrc.json b/.eslintrc.json
index 18bc8485..9dc43afa 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -46,6 +46,7 @@
     "MealOrderApp": false,
     "UserAction": false,
     "initialState": false,
+    "reducer": false,
     "Redux": true,
     "PolymerRedux": false,
     "Utils": false
diff --git a/client/user/src/mealorder/meal-order-main-app.html b/client/user/src/mealorder/meal-order-main-app.html
index 5cb20399..63bc8d93 100644
--- a/client/user/src/mealorder/meal-order-main-app.html
+++ b/client/user/src/mealorder/meal-order-main-app.html
@@ -314,17 +314,8 @@
 
             static get actions() {
                 return {
-                    addDish(dish) {
-                        return {
-                            type: UserAction.ADD_DISH,
-                            dish: dish
-                        }
-                    },
                 }
             }
-            _addDishToOrder(e) {
-                this.dispatch('addDish', e.detail);
-            }
 
             _getClassForDrawer(page) {
                 return page;
diff --git a/client/user/src/mealorder/menu/meal-order-menu-order.html b/client/user/src/mealorder/menu/meal-order-menu-order.html
index cf72ad9a..841a78cd 100644
--- a/client/user/src/mealorder/menu/meal-order-menu-order.html
+++ b/client/user/src/mealorder/menu/meal-order-menu-order.html
@@ -168,6 +168,12 @@
                             date: date
                         }
                     },
+                    addDish(dish) {
+                        return {
+                            type: UserAction.ADD_DISH,
+                            dish: dish
+                        }
+                    },
                 }
             }
 
@@ -198,7 +204,7 @@
             }
 
             _addDishToOrder(e) {
-                this.dispatchEvent(new CustomEvent('dish-added', {detail: e.detail}));
+                this.dispatch('addDish', e.detail);
             }
 
         }
diff --git a/client/user/src/mealorder/shell/redux-store.html b/client/user/src/mealorder/shell/redux-store.html
index 4c885a25..b2a2f30a 100644
--- a/client/user/src/mealorder/shell/redux-store.html
+++ b/client/user/src/mealorder/shell/redux-store.html
@@ -20,6 +20,7 @@
 
 <link rel="import" href="../../../bower_components/polymer-redux/polymer-redux.html">
 <script>
+    /* global Redux */
     {
         const store = Redux.createStore(reducer);
         window.MealOrderApp = {};

From 98482678f0e17cdeb19846feafba1f427ebd1db1 Mon Sep 17 00:00:00 2001
From: Paul <paulageyev@gmail.com>
Date: Thu, 5 Apr 2018 16:38:47 +0300
Subject: [PATCH 098/253] Refactor reducer in globals property as modified

---
 .eslintrc.json                                   | 2 +-
 client/user/src/mealorder/shell/redux-store.html | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/.eslintrc.json b/.eslintrc.json
index 9dc43afa..1e82bcd1 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -46,7 +46,7 @@
     "MealOrderApp": false,
     "UserAction": false,
     "initialState": false,
-    "reducer": false,
+    "reducer": true,
     "Redux": true,
     "PolymerRedux": false,
     "Utils": false
diff --git a/client/user/src/mealorder/shell/redux-store.html b/client/user/src/mealorder/shell/redux-store.html
index b2a2f30a..4c885a25 100644
--- a/client/user/src/mealorder/shell/redux-store.html
+++ b/client/user/src/mealorder/shell/redux-store.html
@@ -20,7 +20,6 @@
 
 <link rel="import" href="../../../bower_components/polymer-redux/polymer-redux.html">
 <script>
-    /* global Redux */
     {
         const store = Redux.createStore(reducer);
         window.MealOrderApp = {};

From 6bb368e3517e819121d97c58e423d702ad90f884 Mon Sep 17 00:00:00 2001
From: Paul <paulageyev@gmail.com>
Date: Thu, 5 Apr 2018 19:31:06 +0300
Subject: [PATCH 099/253] Refactor `UserAction`

---
 .eslintrc.json                                            | 2 --
 client/user/src/mealorder/shell/actions/user-actions.html | 3 +--
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/.eslintrc.json b/.eslintrc.json
index 1e82bcd1..4b986f87 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -47,8 +47,6 @@
     "UserAction": false,
     "initialState": false,
     "reducer": true,
-    "Redux": true,
-    "PolymerRedux": false,
     "Utils": false
   }
 }
diff --git a/client/user/src/mealorder/shell/actions/user-actions.html b/client/user/src/mealorder/shell/actions/user-actions.html
index 81e654c5..86844494 100644
--- a/client/user/src/mealorder/shell/actions/user-actions.html
+++ b/client/user/src/mealorder/shell/actions/user-actions.html
@@ -19,8 +19,7 @@
   -->
 
 <script>
-    /*exported UserAction*/
-    const UserAction = {
+    MealOrderApp.UserAction = {
         MENU_FOR_DAY: "MENU_FOR_DAY",
         CART_FOR_DAY: 'CART_FOR_DAY',
         ADD_DISH: "ADD_DISH",

From 21716592b492aa414c1a1f35091a2340f4a8f5f7 Mon Sep 17 00:00:00 2001
From: Paul <paulageyev@gmail.com>
Date: Thu, 5 Apr 2018 19:36:48 +0300
Subject: [PATCH 100/253] Refactor `UserAction` as MealOrderApp global

---
 client/user/src/mealorder/meal-order-main-app.html        | 3 +--
 client/user/src/mealorder/menu/meal-order-menu-order.html | 6 +++---
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/client/user/src/mealorder/meal-order-main-app.html b/client/user/src/mealorder/meal-order-main-app.html
index 5fd464f1..a5fba373 100644
--- a/client/user/src/mealorder/meal-order-main-app.html
+++ b/client/user/src/mealorder/meal-order-main-app.html
@@ -259,7 +259,6 @@
         </app-drawer-layout>
     </template>
     <script>
-        class MealOrderMainApp extends MealOrderMainApp.ReduxMixin(Polymer.Element) {
         /**
          * Main user meal order component.
          *
@@ -278,7 +277,7 @@
          * @polymer
          * @ReduxMixin
          */
-        class MealOrderMainApp extends MealOrderApp.ReduxMixin(Polymer.Element) {
+        class MealOrderMainApp extends MealOrderMainApp.ReduxMixin(Polymer.Element) {
             static get is() {
                 return 'meal-order-main-app';
             }
diff --git a/client/user/src/mealorder/menu/meal-order-menu-order.html b/client/user/src/mealorder/menu/meal-order-menu-order.html
index 841a78cd..92aafee1 100644
--- a/client/user/src/mealorder/menu/meal-order-menu-order.html
+++ b/client/user/src/mealorder/menu/meal-order-menu-order.html
@@ -158,19 +158,19 @@
                 return {
                     menuForDay(date) {
                         return {
-                            type: UserAction.MENU_FOR_DAY,
+                            type: MealOrderApp.UserAction.MENU_FOR_DAY,
                             date: date
                         }
                     },
                     cartForDay(date) {
                         return {
-                            type: UserAction.CART_FOR_DAY,
+                            type: MealOrderApp.UserAction.CART_FOR_DAY,
                             date: date
                         }
                     },
                     addDish(dish) {
                         return {
-                            type: UserAction.ADD_DISH,
+                            type: MealOrderApp.UserAction.ADD_DISH,
                             dish: dish
                         }
                     },

From 3dcf0d8853886aefff58b6750bbbfe5ff7555567 Mon Sep 17 00:00:00 2001
From: Paul <paulageyev@gmail.com>
Date: Fri, 6 Apr 2018 12:53:06 +0300
Subject: [PATCH 101/253] Refactor `reducer` as MealOrderApp global

---
 client/user/src/mealorder/meal-order-client-app.html | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/client/user/src/mealorder/meal-order-client-app.html b/client/user/src/mealorder/meal-order-client-app.html
index 4a0eb3af..26909aab 100644
--- a/client/user/src/mealorder/meal-order-client-app.html
+++ b/client/user/src/mealorder/meal-order-client-app.html
@@ -35,6 +35,7 @@
 <link rel="import" href="../../bower_components/iron-icons/iron-icons.html">
 <link rel="import" href="../../bower_components/iron-icons/maps-icons.html">
 <link rel="import" href="shell/redux-store.html">
+<link rel="import" href="menu/meal-order-menu-order.html">
 <dom-module id="meal-order-client-app">
     <template>
         <style>
@@ -276,7 +277,7 @@
          * @polymer
          * @ReduxMixin
          */
-        class MealOrderClientApp extends MealOrderMainApp.ReduxMixin(Polymer.Element) {
+        class MealOrderClientApp extends MealOrderApp.ReduxMixin(Polymer.Element) {
             static get is() {
                 return 'meal-order-client-app';
             }

From fe4bed729e4ee9fe7478ffbeaa6022fc2f4c0e10 Mon Sep 17 00:00:00 2001
From: "alexander.karpetc" <alexander.karpetc@gmail.com>
Date: Fri, 6 Apr 2018 12:55:05 +0300
Subject: [PATCH 102/253] Move all expand logic to `vendor-menu`

---
 .../menu/meal-order-vendor-menus.html         | 89 ++-----------------
 1 file changed, 6 insertions(+), 83 deletions(-)

diff --git a/client/user/src/mealorder/menu/meal-order-vendor-menus.html b/client/user/src/mealorder/menu/meal-order-vendor-menus.html
index dcae2539..fc939f62 100644
--- a/client/user/src/mealorder/menu/meal-order-vendor-menus.html
+++ b/client/user/src/mealorder/menu/meal-order-vendor-menus.html
@@ -37,13 +37,6 @@
                 padding: 0;
             }
 
-            body {
-                height: 100vh;
-                margin: 0;
-                display: flex;
-                flex-direction: column;
-            }
-
             app-toolbar {
                 background-color: var(--google-green-700);
                 box-shadow: 0 2px 5px 0 rgba(0, 0, 0, 0.3);
@@ -65,7 +58,6 @@
                 --iron-list-items-container: {
                     width: 70%;
                     margin: 2% auto;
-                    border-bottom: 1px solid #ddd;
                 };
             }
 
@@ -85,35 +77,10 @@
             }
 
             .pad {
-                padding: 15px;
                 @apply --layout-flex;
                 @apply --layout-vertical;
                 font-size: 15px;
-            }
-
-            .vendor {
-                color: #4f4f4f;
-                display: none;
-            }
-
-            .item.expand .vendor {
-                display: block;
-            }
-
-            @media (max-width: 460px) {
-                paper-toolbar .bottom.title {
-                    font-size: 14px;
-                }
-            }
-
-            #expand-button {
-                position: absolute;
-                right: 0;
-                top: 7px;
-            }
-
-            .primary {
-                font-size: 16px;
+                border-radius: 15px;
             }
 
             .non-select {
@@ -150,19 +117,10 @@
                    multi-selection>
             <template>
                 <div class="non-select">
-                    <div class$="[[getClassForItem(selected)]]" tabindex$="[[tabIndex]]">
+                    <div class="item">
                         <div class="pad">
-                            <div class="primary">
-                                [[item.name]]
-                                <paper-icon-button id="expand-button" icon="[[getIcon(selected)]]"
-                                                   on-click="_toggle"></paper-icon-button>
-                            </div>
-                            <div class="expand vendor">
-                                <meal-order-vendor-menu
-                                        items="[[item.categories]]" vendor="[[item.name]]"
-                                        on-dish-added="addDish"></meal-order-vendor-menu>
-                            </div>
-
+                            <meal-order-vendor-menu menu="[[item]]" on-dish-added="addDish"
+                                                    on-vendor-menu-resize="_resize"></meal-order-vendor-menu>
                         </div>
                     </div>
                 </div>
@@ -228,24 +186,13 @@
                 ];
             }
 
-            categoryExists(item) {
-                return item.dishes.length > 0;
+            _resize() {
+                this.shadowRoot.querySelector("#list").notifyResize();
             }
-
             addDish(e) {
                 this.dispatchEvent(new CustomEvent('dish-added', {detail: e.detail}));
             }
 
-            _handleInput() {
-                const div = this.shadowRoot.querySelector("#list");
-                for (let i = 0; i < this.items.length; i++) {
-                    if (this.filter !== '') {
-                        div.selectIndex(i);
-                        div.selectIndex(i);
-                    }
-                }
-            }
-
             filteredItems() {
                 const predicate = this.filter;
                 const filtered = [];
@@ -264,30 +211,6 @@
                 }
                 return filtered;
             }
-
-            getClassForItem(selected) {
-                return selected ? 'item expand' : 'item';
-            };
-
-            getIcon(selected) {
-                if (selected) {
-                    return 'expand-less';
-                }
-                else {
-                    return 'expand-more';
-
-                }
-            }
-
-            _toggle(e) {
-                const list = this.$.list;
-                if (!e.model.selected) {
-                    list.selectIndex(e.model.index);
-                }
-                else {
-                    list.deselectIndex(e.model.index);
-                }
-            }
         }
 
         window.customElements.define(MealOrderVendorMenus.is, MealOrderVendorMenus);

From 29035f8f6d17d0b7d9a7ba8bd24bf6f9486c8bff Mon Sep 17 00:00:00 2001
From: "alexander.karpetc" <alexander.karpetc@gmail.com>
Date: Fri, 6 Apr 2018 12:57:35 +0300
Subject: [PATCH 103/253] `vendor-menu` handles all expand logic and styles for
 menu

---
 .../menu/meal-order-vendor-menu.html          | 170 +++++++++++-------
 1 file changed, 107 insertions(+), 63 deletions(-)

diff --git a/client/user/src/mealorder/menu/meal-order-vendor-menu.html b/client/user/src/mealorder/menu/meal-order-vendor-menu.html
index 585320f1..6179dceb 100644
--- a/client/user/src/mealorder/menu/meal-order-vendor-menu.html
+++ b/client/user/src/mealorder/menu/meal-order-vendor-menu.html
@@ -43,18 +43,13 @@
                 display: flex;
             }
 
-            div[role="listbox"] {
-                border: 1px solid #e5e5e5;
-            }
-
             paper-item {
                 font-size: 15px;
-                padding: 0;
-                width: 100%;
-
+                padding: 5px 5%;
+                width: 90%;
             }
 
-            .menu-dashboard {
+            .menu-dishes {
                 display: flex;
                 justify-content: space-between;
                 align-items: center;
@@ -62,7 +57,7 @@
                 border-bottom: 1px solid #fcfcfc;
             }
 
-            .category {
+            .wrapper {
                 display: flex;
                 justify-content: space-between;
                 align-items: center;
@@ -88,60 +83,85 @@
                 width: 45%;
                 text-align: right;
             }
-        </style>
 
-        <dom-repeat items="[[items]]" as="item">
-            [[item.categoryName]]
-            <template>
-                <dom-if if="[[item.dishes.length]]">
-                    <template>
-                        <div class="vendor">
-
-                            <div class="category">
-                                <paper-item>
-                                    <div class="dish-title bolder">
-                                        [[item.categoryName]]
-                                    </div>
-                                    <div class="dish-price bolder">
-                                        Цена
-                                    </div>
-                                    <div class="add-dish-icon">
-                                        <paper-icon-button
-                                                icon=""></paper-icon-button>
-                                    </div>
-                                </paper-item>
-                            </div>
+            .collapsed {
+                display: none;
+            }
+
+            .expanded {
+                display: block;
+                transition: background-color 1s linear;
+            }
+
+            .menu-caption {
+                display: flex;
+                justify-content: space-between;
+                align-items: center;
+                font-size: 16px;
+                width: 100%;
+            }
 
-                            <dom-repeat items="[[item.dishes]]" as="dish">
-                                <template>
-                                    <div class="menu-dashboard">
-                                        <paper-item>
-                                            <div class="dish-title">
-                                                [[dish.title]]
-                                            </div>
-                                            <div class="dish-price">
-                                                [[dish.price]]₴
-                                            </div>
-                                            <div class="add-dish-icon">
-                                                <paper-icon-button icon="add"
-                                                                   on-click="_addDish"></paper-icon-button>
-                                            </div>
-                                        </paper-item>
-                                    </div>
-                                </template>
-                            </dom-repeat>
-                        </div>
-                    </template>
-                </dom-if>
-            </template>
-        </dom-repeat>
+            @media only screen and (max-width: 600px) {
+                paper-item {
+                    padding: 2px 2%;
+                }
+            }
+        </style>
+        <div class="wrapper">
+            <paper-item on-click="_toggle" class="menu-caption">
+                <div class="menu-caption">
+                    [[menu.name]]
+                    <paper-icon-button id="expand" icon="expand-less"></paper-icon-button>
+                </div>
+            </paper-item>
+        </div>
+        <div id="menu" class="expanded">
+            <dom-repeat items="[[menu.categories]]" as="item">
+                <template>
+                    <dom-if if="[[item.dishes.length]]">
+                        <template>
+                            <div>
+                                <div class="wrapper">
+                                    <paper-item>
+                                        <div class="dish-title bolder">
+                                            [[item.categoryName]]
+                                        </div>
+                                        <div class="dish-price bolder">
+                                            Цена
+                                        </div>
+                                        <div class="add-dish-icon">
+
+                                        </div>
+                                    </paper-item>
+                                </div>
+
+                                <dom-repeat items="[[item.dishes]]" as="dish">
+                                    <template>
+                                        <div class="menu-dishes">
+                                            <paper-item>
+                                                <div class="dish-title">
+                                                    [[dish.title]]
+                                                </div>
+                                                <div class="dish-price">
+                                                    [[dish.price]]₴
+                                                </div>
+                                                <div class="add-dish-icon">
+                                                    <paper-icon-button icon="add"
+                                                                       on-click="addDish"></paper-icon-button>
+                                                </div>
+                                            </paper-item>
+                                        </div>
+                                    </template>
+                                </dom-repeat>
+                            </div>
+                        </template>
+                    </dom-if>
+                </template>
+            </dom-repeat>
+        </div>
     </template>
     <script>
-        /**
-         * vendor-menu represents a menu of a vendor for current date
-         *
-         * <p>Is adopted for both desktop and mobile.
-         */
+
         class MealOrderVendorMenu extends Polymer.Element {
             static get is() {
                 return 'meal-order-vendor-menu';
@@ -154,14 +174,37 @@
                      *
                      * Initial state represents its structure.
                      */
-                    items: {
-                        type: Array,
-                        value: [{categoryName: '', dishes: [{title: '', price: ''}, {}]}, {}]
+                    menu: {
+                        type: Array
                     }
                 }
             };
 
-            _addDish(e) {
+            _getExpandIcon() {
+                if (this.$.menu.className === 'expanded') {
+                    console.log('expanded');
+                    return 'expand-less';
+                }
+                else {
+                    console.log('collapsed');
+
+                    return 'expand-more';
+                }
+            }
+
+            _toggle(e) {
+                if (this.$.menu.className === 'collapsed') {
+                    this.$.menu.className = 'expanded';
+                    this.$.expand.icon = 'expand-less';
+                }
+                else {
+                    this.$.menu.className = 'collapsed';
+                    this.$.expand.icon = 'expand-more';
+                }
+                this.dispatchEvent(new CustomEvent('vendor-menu-resize'));
+            }
+
+            addDish(e) {
                 const dish = {};
                 dish.vendor = this.vendor;
                 dish.name = e.model.__data.dish.title;
@@ -173,3 +216,4 @@
         window.customElements.define(MealOrderVendorMenu.is, MealOrderVendorMenu);
     </script>
 </dom-module>
+

From 61763ddf4b3ea1373f224eb220df228f18104726 Mon Sep 17 00:00:00 2001
From: Paul <paulageyev@gmail.com>
Date: Fri, 6 Apr 2018 13:01:20 +0300
Subject: [PATCH 104/253] Refactor initialState for reducer

---
 .../mealorder/shell/reducers/reducers.html    | 22 +++++++++----------
 .../user/src/mealorder/shell/utils/Utils.js   |  2 +-
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/client/user/src/mealorder/shell/reducers/reducers.html b/client/user/src/mealorder/shell/reducers/reducers.html
index b01cad35..6fe1d07c 100644
--- a/client/user/src/mealorder/shell/reducers/reducers.html
+++ b/client/user/src/mealorder/shell/reducers/reducers.html
@@ -227,35 +227,35 @@
 
         MealOrderApp.reducer = (state, action) => {
             if (!state) {
-                return initialState;
+                return MealOrderApp.initialState;
             }
             switch (action.type) {
 
-                case UserAction.ADD_DISH: {
+                case MealOrderApp.UserAction.ADD_DISH: {
                     return state;
                 }
 
-                case UserAction.MENU_FOR_DAY: {
+                case MealOrderApp.UserAction.MENU_FOR_DAY: {
                     let arr = [];
                     let k = 0;
 
-                    for (let i = 0; i < initialState.menu.length; i++) {
-                        if (initialState.menu[i].date.day === action.date.date.day) {
-                            arr[k] = initialState.menu[i];
+                    for (let i = 0; i < state.menu.length; i++) {
+                        if (state.menu[i].date.day === action.date.date.day) {
+                            arr[k] = state.menu[i];
                             k++;
                         }
                     }
                     return Object.assign({}, state, {
-                            dateForMenu: initialState.dateForMenu,
+                            dateForMenu: state.dateForMenu,
                             menuForDay: arr
                         }
                     );
                 }
-                case UserAction.CART_FOR_DAY: {
+                case MealOrderApp.UserAction.CART_FOR_DAY: {
                     let newOrder = [];
-                    for (let i = 0; i < initialState.orders.length; i++) {
-                        if (Utils.compareObjects(action.date, initialState.orders[i].date)) {
-                            newOrder = initialState.orders[i].cart;
+                    for (let i = 0; i < state.orders.length; i++) {
+                        if (Utils.compareObjects(action.date, state.orders[i].date)) {
+                            newOrder = state.orders[i].cart;
                             break;
                         }
                     }
diff --git a/client/user/src/mealorder/shell/utils/Utils.js b/client/user/src/mealorder/shell/utils/Utils.js
index 5aa9f53d..94d40189 100644
--- a/client/user/src/mealorder/shell/utils/Utils.js
+++ b/client/user/src/mealorder/shell/utils/Utils.js
@@ -18,7 +18,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-/*exported Utils */
+/*global Utils */
 class Utils {
     static compareObjects(o1, o2) {
         for (let p in o1) {

From ff476916c71c33728feb413cbdde67cfa0f4be1e Mon Sep 17 00:00:00 2001
From: Paul <paulageyev@gmail.com>
Date: Fri, 6 Apr 2018 13:07:25 +0300
Subject: [PATCH 105/253] Refactor Utils as global for reducer

---
 client/user/src/mealorder/shell/reducers/reducers.html | 1 +
 client/user/src/mealorder/shell/utils/Utils.js         | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/client/user/src/mealorder/shell/reducers/reducers.html b/client/user/src/mealorder/shell/reducers/reducers.html
index 6fe1d07c..1f53fedd 100644
--- a/client/user/src/mealorder/shell/reducers/reducers.html
+++ b/client/user/src/mealorder/shell/reducers/reducers.html
@@ -21,6 +21,7 @@
 <script src="../utils/Utils.js"></script>
 <script>
     {
+        /*global Utils */
         const arrayOfDates = [{
             date: {
                 year: '2018',
diff --git a/client/user/src/mealorder/shell/utils/Utils.js b/client/user/src/mealorder/shell/utils/Utils.js
index 94d40189..5aa9f53d 100644
--- a/client/user/src/mealorder/shell/utils/Utils.js
+++ b/client/user/src/mealorder/shell/utils/Utils.js
@@ -18,7 +18,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-/*global Utils */
+/*exported Utils */
 class Utils {
     static compareObjects(o1, o2) {
         for (let p in o1) {

From 742b106bf3dbdf46c77cc373ff50d8790800ce96 Mon Sep 17 00:00:00 2001
From: Paul <paulageyev@gmail.com>
Date: Fri, 6 Apr 2018 13:39:02 +0300
Subject: [PATCH 106/253] Rename `meal-order-menu-order` to
 `meal-order-menu-container`

---
 client/user/src/mealorder/meal-order-client-app.html      | 4 ++--
 ...der-menu-order.html => meal-order-menu-container.html} | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)
 rename client/user/src/mealorder/menu/{meal-order-menu-order.html => meal-order-menu-container.html} (96%)

diff --git a/client/user/src/mealorder/meal-order-client-app.html b/client/user/src/mealorder/meal-order-client-app.html
index 26909aab..e855fa23 100644
--- a/client/user/src/mealorder/meal-order-client-app.html
+++ b/client/user/src/mealorder/meal-order-client-app.html
@@ -35,7 +35,7 @@
 <link rel="import" href="../../bower_components/iron-icons/iron-icons.html">
 <link rel="import" href="../../bower_components/iron-icons/maps-icons.html">
 <link rel="import" href="shell/redux-store.html">
-<link rel="import" href="menu/meal-order-menu-order.html">
+<link rel="import" href="menu/meal-order-menu-container.html">
 <dom-module id="meal-order-client-app">
     <template>
         <style>
@@ -251,7 +251,7 @@
                         attr-for-selected="name"
                         fallback-selection="view404"
                         role="main">
-                    <meal-order-menu-order></meal-order-menu-order>
+                    <meal-order-menu-container></meal-order-menu-container>
                 </iron-pages>
 
             </app-header-layout>
diff --git a/client/user/src/mealorder/menu/meal-order-menu-order.html b/client/user/src/mealorder/menu/meal-order-menu-container.html
similarity index 96%
rename from client/user/src/mealorder/menu/meal-order-menu-order.html
rename to client/user/src/mealorder/menu/meal-order-menu-container.html
index 92aafee1..82278715 100644
--- a/client/user/src/mealorder/menu/meal-order-menu-order.html
+++ b/client/user/src/mealorder/menu/meal-order-menu-container.html
@@ -25,7 +25,7 @@
 <link rel="import" href="../../../bower_components/iron-pages/iron-pages.html">
 <link rel="import" href="../shell/redux-store.html">
 <link rel="import" href="../../../bower_components/polymer/lib/elements/dom-repeat.html">
-<dom-module id="meal-order-menu-order">
+<dom-module id="meal-order-menu-container">
     <template>
         <style>
             body {
@@ -119,9 +119,9 @@
          * @polymer
          * @ReduxMixin
          */
-        class MealOrderMenuOrder extends MealOrderApp.ReduxMixin(Polymer.Element) {
+        class MealOrderMenuContainer extends MealOrderApp.ReduxMixin(Polymer.Element) {
             static get is() {
-                return 'meal-order-menu-order';
+                return 'meal-order-menu-container';
             }
 
             static get properties() {
@@ -209,6 +209,6 @@
 
         }
 
-        window.customElements.define(MealOrderMenuOrder.is, MealOrderMenuOrder);
+        window.customElements.define(MealOrderMenuContainer.is, MealOrderMenuContainer);
     </script>
 </dom-module>

From eb2e5acefb36030537b2a8ff6474c9c3c682534e Mon Sep 17 00:00:00 2001
From: "alexander.karpetc" <alexander.karpetc@gmail.com>
Date: Fri, 6 Apr 2018 13:46:13 +0300
Subject: [PATCH 107/253] Refactor `vendor-menus` CSS

---
 .../mealorder/menu/meal-order-vendor-menu.html | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/client/user/src/mealorder/menu/meal-order-vendor-menu.html b/client/user/src/mealorder/menu/meal-order-vendor-menu.html
index 6179dceb..3c00cfd3 100644
--- a/client/user/src/mealorder/menu/meal-order-vendor-menu.html
+++ b/client/user/src/mealorder/menu/meal-order-vendor-menu.html
@@ -37,16 +37,11 @@
                 padding: 0;
             }
 
-            body {
-                height: 100vh;
-                margin: 0;
-                display: flex;
-            }
-
             paper-item {
                 font-size: 15px;
-                padding: 5px 5%;
+                padding: 2px 5%;
                 width: 90%;
+                border-bottom: 1px solid #ddd;
             }
 
             .menu-dishes {
@@ -63,8 +58,8 @@
                 align-items: center;
             }
 
-            .bolder {
-                font-weight: bolder;
+            .bold {
+                font-weight: bold;
             }
 
             .dish-title {
@@ -123,10 +118,10 @@
                             <div>
                                 <div class="wrapper">
                                     <paper-item>
-                                        <div class="dish-title bolder">
+                                        <div class="dish-title bold">
                                             [[item.categoryName]]
                                         </div>
-                                        <div class="dish-price bolder">
+                                        <div class="dish-price bold">
                                             Цена
                                         </div>
                                         <div class="add-dish-icon">
@@ -216,4 +211,3 @@
         window.customElements.define(MealOrderVendorMenu.is, MealOrderVendorMenu);
     </script>
 </dom-module>
-

From 02170137ef936874893db4c6478607af917f5c88 Mon Sep 17 00:00:00 2001
From: "alexander.karpetc" <alexander.karpetc@gmail.com>
Date: Fri, 6 Apr 2018 14:15:56 +0300
Subject: [PATCH 108/253] Add border for menu

---
 .../user/src/mealorder/menu/meal-order-vendor-menu.html   | 8 ++++----
 .../user/src/mealorder/menu/meal-order-vendor-menus.html  | 1 +
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/client/user/src/mealorder/menu/meal-order-vendor-menu.html b/client/user/src/mealorder/menu/meal-order-vendor-menu.html
index 3c00cfd3..be7bf6f7 100644
--- a/client/user/src/mealorder/menu/meal-order-vendor-menu.html
+++ b/client/user/src/mealorder/menu/meal-order-vendor-menu.html
@@ -39,8 +39,8 @@
 
             paper-item {
                 font-size: 15px;
-                padding: 2px 5%;
-                width: 90%;
+                padding: 2px 2%;
+                width: 96%;
                 border-bottom: 1px solid #ddd;
             }
 
@@ -106,11 +106,11 @@
             <paper-item on-click="_toggle" class="menu-caption">
                 <div class="menu-caption">
                     [[menu.name]]
-                    <paper-icon-button id="expand" icon="expand-less"></paper-icon-button>
+                    <paper-icon-button id="expand" icon="expand-more"></paper-icon-button>
                 </div>
             </paper-item>
         </div>
-        <div id="menu" class="expanded">
+        <div id="menu" class="collapsed">
             <dom-repeat items="[[menu.categories]]" as="item">
                 <template>
                     <dom-if if="[[item.dishes.length]]">
diff --git a/client/user/src/mealorder/menu/meal-order-vendor-menus.html b/client/user/src/mealorder/menu/meal-order-vendor-menus.html
index fc939f62..b1bd28cb 100644
--- a/client/user/src/mealorder/menu/meal-order-vendor-menus.html
+++ b/client/user/src/mealorder/menu/meal-order-vendor-menus.html
@@ -58,6 +58,7 @@
                 --iron-list-items-container: {
                     width: 70%;
                     margin: 2% auto;
+                    border-bottom: 1px solid #ddd;
                 };
             }
 

From fc3fbea75ff5668efb6dfe482e2f8fb1a5b52236 Mon Sep 17 00:00:00 2001
From: Paul <paulageyev@gmail.com>
Date: Fri, 6 Apr 2018 14:23:43 +0300
Subject: [PATCH 109/253] Refactor CSS for the`meal-order-menu-container`
 component

---
 .../menu/meal-order-menu-container.html       | 19 ++-----------------
 1 file changed, 2 insertions(+), 17 deletions(-)

diff --git a/client/user/src/mealorder/menu/meal-order-menu-container.html b/client/user/src/mealorder/menu/meal-order-menu-container.html
index 82278715..b8db3cf4 100644
--- a/client/user/src/mealorder/menu/meal-order-menu-container.html
+++ b/client/user/src/mealorder/menu/meal-order-menu-container.html
@@ -28,16 +28,6 @@
 <dom-module id="meal-order-menu-container">
     <template>
         <style>
-            body {
-                font-family: 'Roboto', 'Noto', sans-serif;
-                margin: 0;
-                display: flex;
-                align-items: flex-end;
-                height: 80px;
-                background: #009688;
-                color: white;
-            }
-
             paper-tabs {
                 -webkit-font-smoothing: antialiased;
                 width: 100%;
@@ -59,7 +49,7 @@
                 color: #179EFF;
             }
 
-            .link {
+            paper-tab .link {
                 @apply --layout-horizontal;
                 @apply --layout-center-center;
                 text-decoration: none;
@@ -73,12 +63,10 @@
             }
 
             @media only screen and (max-width: 600px) {
-
                 paper-tabs {
                     margin-top: 3%;
                     width: 100%;
                 }
-
             }
         </style>
         <app-location route="{{route}}"
@@ -104,8 +92,7 @@
                 </paper-tab>
             </template>
         </paper-tabs>
-        <meal-order-vendor-menus items="[[menu]]"
-                                 on-dish-added="_addDishToOrder"></meal-order-vendor-menus>
+
     </template>
     <script>
         /**
@@ -206,9 +193,7 @@
             _addDishToOrder(e) {
                 this.dispatch('addDish', e.detail);
             }
-
         }
-
         window.customElements.define(MealOrderMenuContainer.is, MealOrderMenuContainer);
     </script>
 </dom-module>

From ff6fa63653616aacbe263f5b319f01c389f0b1ac Mon Sep 17 00:00:00 2001
From: "alexander.karpetc" <alexander.karpetc@gmail.com>
Date: Fri, 6 Apr 2018 14:30:39 +0300
Subject: [PATCH 110/253] Use element properties to set custom event fields

---
 client/user/src/mealorder/menu/meal-order-vendor-menu.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/client/user/src/mealorder/menu/meal-order-vendor-menu.html b/client/user/src/mealorder/menu/meal-order-vendor-menu.html
index be7bf6f7..044462ab 100644
--- a/client/user/src/mealorder/menu/meal-order-vendor-menu.html
+++ b/client/user/src/mealorder/menu/meal-order-vendor-menu.html
@@ -201,9 +201,9 @@
 
             addDish(e) {
                 const dish = {};
-                dish.vendor = this.vendor;
-                dish.name = e.model.__data.dish.title;
-                dish.price = e.model.__data.dish.price;
+                dish.vendor = this.menu.name;
+                dish.price = this.menu.categories[e.model.parentModel.index].dishes[e.model.index].price;
+                dish.title = this.menu.categories[e.model.parentModel.index].dishes[e.model.index].title;
                 this.dispatchEvent(new CustomEvent('dish-added', {detail: dish}));
             }
         }

From befb47fb01679a76d1244e317f13f1311716e9e9 Mon Sep 17 00:00:00 2001
From: Paul <paulageyev@gmail.com>
Date: Fri, 6 Apr 2018 14:38:12 +0300
Subject: [PATCH 111/253] Rename actions

---
 .../mealorder/menu/meal-order-menu-container.html  |  8 ++++----
 .../src/mealorder/shell/actions/user-actions.html  |  6 +++---
 .../src/mealorder/shell/reducers/reducers.html     | 14 +++++++-------
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/client/user/src/mealorder/menu/meal-order-menu-container.html b/client/user/src/mealorder/menu/meal-order-menu-container.html
index b8db3cf4..43ada3f3 100644
--- a/client/user/src/mealorder/menu/meal-order-menu-container.html
+++ b/client/user/src/mealorder/menu/meal-order-menu-container.html
@@ -145,19 +145,19 @@
                 return {
                     menuForDay(date) {
                         return {
-                            type: MealOrderApp.UserAction.MENU_FOR_DAY,
+                            type: MealOrderApp.UserAction.CHANGE_CURRENT_MENU,
                             date: date
                         }
                     },
                     cartForDay(date) {
                         return {
-                            type: MealOrderApp.UserAction.CART_FOR_DAY,
+                            type: MealOrderApp.UserAction.CHANGE_CURRENT_CART,
                             date: date
                         }
                     },
                     addDish(dish) {
                         return {
-                            type: MealOrderApp.UserAction.ADD_DISH,
+                            type: MealOrderApp.UserAction.ADD_DISH_TO_CART,
                             dish: dish
                         }
                     },
@@ -186,7 +186,7 @@
             }
 
             _handleClick(e) {
-                this.dispatch('menuForDay', this.menuForDates[e.model.index]);
+                this.dispatch('menuForDay', this.menuForDates[e.model.index].date);
                 this.dispatch('cartForDay', this.menuForDates[e.model.index].date);
             }
 
diff --git a/client/user/src/mealorder/shell/actions/user-actions.html b/client/user/src/mealorder/shell/actions/user-actions.html
index 86844494..8e729795 100644
--- a/client/user/src/mealorder/shell/actions/user-actions.html
+++ b/client/user/src/mealorder/shell/actions/user-actions.html
@@ -20,8 +20,8 @@
 
 <script>
     MealOrderApp.UserAction = {
-        MENU_FOR_DAY: "MENU_FOR_DAY",
-        CART_FOR_DAY: 'CART_FOR_DAY',
-        ADD_DISH: "ADD_DISH",
+        CHANGE_CURRENT_MENU: "CHANGE_CURRENT_MENU",
+        CHANGE_CURRENT_CART: 'CHANGE_CURRENT_CART',
+        ADD_DISH_TO_CART: "ADD_DISH",
     }
 </script>
diff --git a/client/user/src/mealorder/shell/reducers/reducers.html b/client/user/src/mealorder/shell/reducers/reducers.html
index 1f53fedd..cc75b68f 100644
--- a/client/user/src/mealorder/shell/reducers/reducers.html
+++ b/client/user/src/mealorder/shell/reducers/reducers.html
@@ -232,18 +232,18 @@
             }
             switch (action.type) {
 
-                case MealOrderApp.UserAction.ADD_DISH: {
+                case MealOrderApp.UserAction.ADD_DISH_TO_CART: {
                     return state;
                 }
 
-                case MealOrderApp.UserAction.MENU_FOR_DAY: {
+                case MealOrderApp.UserAction.CHANGE_CURRENT_MENU: {
                     let arr = [];
-                    let k = 0;
+                    let j = 0;
 
                     for (let i = 0; i < state.menu.length; i++) {
-                        if (state.menu[i].date.day === action.date.date.day) {
-                            arr[k] = state.menu[i];
-                            k++;
+                        if (Utils.compareObjects(action.date, state.menu[i].date)) {
+                            arr[j] = state.menu[i];
+                            j++;
                         }
                     }
                     return Object.assign({}, state, {
@@ -252,7 +252,7 @@
                         }
                     );
                 }
-                case MealOrderApp.UserAction.CART_FOR_DAY: {
+                case MealOrderApp.UserAction.CHANGE_CURRENT_CART: {
                     let newOrder = [];
                     for (let i = 0; i < state.orders.length; i++) {
                         if (Utils.compareObjects(action.date, state.orders[i].date)) {

From bd6d910cfe1ef4058e2546689a12fe9e88b3c5c2 Mon Sep 17 00:00:00 2001
From: "alexander.karpetc" <alexander.karpetc@gmail.com>
Date: Fri, 6 Apr 2018 15:03:30 +0300
Subject: [PATCH 112/253] Remove unnecessary semicolons

---
 client/user/src/mealorder/menu/meal-order-vendor-menu.html | 7 ++-----
 .../user/src/mealorder/menu/meal-order-vendor-menus.html   | 2 +-
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/client/user/src/mealorder/menu/meal-order-vendor-menu.html b/client/user/src/mealorder/menu/meal-order-vendor-menu.html
index 044462ab..4debf75d 100644
--- a/client/user/src/mealorder/menu/meal-order-vendor-menu.html
+++ b/client/user/src/mealorder/menu/meal-order-vendor-menu.html
@@ -173,21 +173,18 @@
                         type: Array
                     }
                 }
-            };
+            }
 
             _getExpandIcon() {
                 if (this.$.menu.className === 'expanded') {
-                    console.log('expanded');
                     return 'expand-less';
                 }
                 else {
-                    console.log('collapsed');
-
                     return 'expand-more';
                 }
             }
 
-            _toggle(e) {
+            _toggle() {
                 if (this.$.menu.className === 'collapsed') {
                     this.$.menu.className = 'expanded';
                     this.$.expand.icon = 'expand-less';
diff --git a/client/user/src/mealorder/menu/meal-order-vendor-menus.html b/client/user/src/mealorder/menu/meal-order-vendor-menus.html
index b1bd28cb..07d48412 100644
--- a/client/user/src/mealorder/menu/meal-order-vendor-menus.html
+++ b/client/user/src/mealorder/menu/meal-order-vendor-menus.html
@@ -179,7 +179,7 @@
                     }
 
                 }
-            };
+            }
 
             static get observers() {
                 return [

From f3d5a2c901de902e7c8f00ca9036f576d42a60a0 Mon Sep 17 00:00:00 2001
From: Paul <paulageyev@gmail.com>
Date: Fri, 6 Apr 2018 15:15:49 +0300
Subject: [PATCH 113/253] Rename actions for the `meal-order-menu-container`
 component

---
 .../user/src/mealorder/meal-order-client-app.html  | 14 +++++++++++++-
 .../mealorder/menu/meal-order-menu-container.html  |  8 ++++----
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/client/user/src/mealorder/meal-order-client-app.html b/client/user/src/mealorder/meal-order-client-app.html
index e855fa23..aed7bf9d 100644
--- a/client/user/src/mealorder/meal-order-client-app.html
+++ b/client/user/src/mealorder/meal-order-client-app.html
@@ -251,7 +251,7 @@
                         attr-for-selected="name"
                         fallback-selection="view404"
                         role="main">
-                    <meal-order-menu-container></meal-order-menu-container>
+                    <meal-order-menu-container name="menu" on-dish-added="_addDishToOrder"></meal-order-menu-container>
                 </iron-pages>
 
             </app-header-layout>
@@ -314,9 +314,21 @@
 
             static get actions() {
                 return {
+                    addDish(dish) {
+                        return {
+                            type: MealOrderClientApp.UserAction.ADD_DISH_TO_CART,
+                            dish: dish
+                        }
+                    },
+                    removeDish(dish) {
+                    }
                 }
             }
 
+            _addDishToOrder(e) {
+                this.dispatch('addDish', e.detail);
+            }
+
             _getClassForDrawer(page) {
                 return page;
             }
diff --git a/client/user/src/mealorder/menu/meal-order-menu-container.html b/client/user/src/mealorder/menu/meal-order-menu-container.html
index 43ada3f3..7a1535f2 100644
--- a/client/user/src/mealorder/menu/meal-order-menu-container.html
+++ b/client/user/src/mealorder/menu/meal-order-menu-container.html
@@ -143,13 +143,13 @@
 
             static get actions() {
                 return {
-                    menuForDay(date) {
+                    changeCurrentMenu(date) {
                         return {
                             type: MealOrderApp.UserAction.CHANGE_CURRENT_MENU,
                             date: date
                         }
                     },
-                    cartForDay(date) {
+                    changeCurrentCart(date) {
                         return {
                             type: MealOrderApp.UserAction.CHANGE_CURRENT_CART,
                             date: date
@@ -186,8 +186,8 @@
             }
 
             _handleClick(e) {
-                this.dispatch('menuForDay', this.menuForDates[e.model.index].date);
-                this.dispatch('cartForDay', this.menuForDates[e.model.index].date);
+                this.dispatch('changeCurrentMenu', this.menuForDates[e.model.index].date);
+                this.dispatch('changeCurrentCart', this.menuForDates[e.model.index].date);
             }
 
             _addDishToOrder(e) {

From d386ebb6386dd1574e6e478c43a0e9354434869b Mon Sep 17 00:00:00 2001
From: "alexander.karpetc" <alexander.karpetc@gmail.com>
Date: Fri, 6 Apr 2018 15:38:19 +0300
Subject: [PATCH 114/253] Remove observer from input

---
 client/user/src/mealorder/menu/meal-order-vendor-menus.html | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/client/user/src/mealorder/menu/meal-order-vendor-menus.html b/client/user/src/mealorder/menu/meal-order-vendor-menus.html
index 07d48412..ec0fc8ae 100644
--- a/client/user/src/mealorder/menu/meal-order-vendor-menus.html
+++ b/client/user/src/mealorder/menu/meal-order-vendor-menus.html
@@ -181,12 +181,6 @@
                 }
             }
 
-            static get observers() {
-                return [
-                    '_handleInput(filter)'
-                ];
-            }
-
             _resize() {
                 this.shadowRoot.querySelector("#list").notifyResize();
             }

From 3f026a2b8525e8178cb8af83bfcf6e7e2870b252 Mon Sep 17 00:00:00 2001
From: "alexander.karpetc" <alexander.karpetc@gmail.com>
Date: Fri, 6 Apr 2018 15:47:22 +0300
Subject: [PATCH 115/253] Move user history to a separate component

---
 .../mealorder/menu/meal-order-user-cart.html  |  83 ++----------
 .../mealorder/menu/meal-order-user-order.html | 120 ++++++++++++++++++
 2 files changed, 132 insertions(+), 71 deletions(-)
 create mode 100644 client/user/src/mealorder/menu/meal-order-user-order.html

diff --git a/client/user/src/mealorder/menu/meal-order-user-cart.html b/client/user/src/mealorder/menu/meal-order-user-cart.html
index 44c544a2..f04aa314 100644
--- a/client/user/src/mealorder/menu/meal-order-user-cart.html
+++ b/client/user/src/mealorder/menu/meal-order-user-cart.html
@@ -31,87 +31,35 @@
 <link rel="import" href="../../../bower_components/app-layout/app-scroll-effects/app-scroll-effects.html">
 <link rel="import" href="../../../bower_components/app-layout/app-toolbar/app-toolbar.html">
 <link rel="import" href="../../../bower_components/iron-flex-layout/iron-flex-layout.html">
-<dom-module id="meal-order-user-cart">
+<link rel="import" href="meal-order-user-order.html">
+
+<dom-module id="user-cart">
     <template>
         <style>
             :host {
                 color: #4f4f4f;
             }
 
-            .order-details {
-                display: flex;
-                font-size: 15px;
-                align-items: center;
-                border-bottom: 2px solid #fcfcfc;
-            }
-
-            .vendor {
-                display: flex;
-                justify-content: space-between;
-                align-items: center;
-                padding-left: 4%;
-                background-color: #fcfcfc;
-            }
-
             .cart {
                 overflow-x: hidden;
                 overflow-y: auto;
                 max-height: 93vh;
             }
 
-            .order-title {
-                width: 50%;
-                text-align: left;
-                padding-left: 4%;
-            }
-
-            .order-price {
-                width: 20%;
-                text-align: right;
-            }
-
-            .order-quantity {
-                width: 15%;
-            }
-
-            .amount-title {
-                width: 50%;
-                text-align: left;
-                padding-left: 4%;
-                font-weight: bolder;
-            }
-
-            .amount-order-price {
-                width: 20%;
-                text-align: right;
-
-            }
-
             .total {
                 display: flex;
                 justify-content: space-between;
                 margin: 6% 4% 10% 4%;
                 font-weight: bolder;
             }
+
         </style>
+
         <div class="cart">
 
-            <dom-repeat items="[[order]]" as="dish">
+            <dom-repeat items="[[order]]" as="vendor">
                 <template>
-                    <div class="vendor">
-                        <div>[[dish.vendor]]</div>
-                        <paper-icon-button icon="delete" class="icon-delete"></paper-icon-button>
-                    </div>
-                    <dom-repeat items="[[dish.dishes]]" as="d">
-                        <template>
-                            <div class="order-details">
-                                <div class="order-title">[[d.title]]</div>
-                                <div class="order-price">[[d.price]] ₴</div>
-                                <div class="order-quantity">[[d.quantity]]</div>
-                                <paper-icon-button icon="remove" on-click="_removeDish"></paper-icon-button>
-                            </div>
-                        </template>
-                    </dom-repeat>
+                    <meal-order-user-order menu="[[vendor]]"></meal-order-user-order>
                 </template>
             </dom-repeat>
 
@@ -121,6 +69,7 @@
             </div>
 
         </div>
+
     </template>
     <script>
         /**
@@ -131,9 +80,9 @@
          * @customElement
          * @polymer
          */
-        class MealOrderUserCart extends Polymer.Element {
+        class UserCart extends Polymer.Element {
             static get is() {
-                return 'meal-order-user-cart';
+                return 'user-cart';
             }
 
             static get properties() {
@@ -158,21 +107,12 @@
                     order: {
                         type: Array,
                     },
-                    /**
-                     * Total cost of an order for current day.
-                     */
                     total: {
                         type: Number,
                         computed: '_getTotalAmount(order)'
                     }
                 }
             };
-            _removeDish(e) {
-                const dish = {};
-                dish.vendor = e.model.parentModel.__data.dish.vendor;
-                dish.name = e.model.__data.d.title;
-                this.dispatchEvent(new CustomEvent('dish-removed', {detail: dish}));
-            }
 
             _getTotalAmount() {
                 let sum = 0;
@@ -184,6 +124,7 @@
                 return sum;
             }
         }
-        window.customElements.define(MealOrderUserCart.is, MealOrderUserCart);
+
+        window.customElements.define(UserCart.is, UserCart);
     </script>
 </dom-module>
diff --git a/client/user/src/mealorder/menu/meal-order-user-order.html b/client/user/src/mealorder/menu/meal-order-user-order.html
new file mode 100644
index 00000000..f28158c7
--- /dev/null
+++ b/client/user/src/mealorder/menu/meal-order-user-order.html
@@ -0,0 +1,120 @@
+<!--
+  ~ Copyright 2018, TeamDev Ltd. All rights reserved.
+  ~
+  ~ Redistribution and use in source and/or binary forms, with or without
+  ~ modification, must retain the above copyright notice and the following
+  ~ disclaimer.
+  ~
+  ~ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+  ~ "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+  ~ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+  ~ A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+  ~ OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+  ~ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+  ~ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+  ~ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+  ~ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  ~ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+  ~ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+  -->
+<script src="../../../bower_components/webcomponentsjs/webcomponents-lite.js"></script>
+<link rel="import" href="../../../bower_components/polymer/polymer-element.html">
+<link rel="import" href="../../../bower_components/paper-icon-button/paper-icon-button.html">
+<link rel="import" href="../../../bower_components/paper-button/paper-button.html">
+<link rel="import" href="../../../bower_components/iron-icons/iron-icons.html">
+<link rel="import"
+      href="../../../bower_components/app-layout/app-drawer-layout/app-drawer-layout.html">
+<link rel="import" href="../../../bower_components/app-layout/app-drawer/app-drawer.html">
+<link rel="import" href="../../../bower_components/app-layout/app-header/app-header.html">
+<link rel="import"
+      href="../../../bower_components/app-layout/app-header-layout/app-header-layout.html">
+<link rel="import"
+      href="../../../bower_components/app-layout/app-scroll-effects/app-scroll-effects.html">
+
+<dom-module id="meal-order-user-order">
+    <template>
+        <style>
+            :host {
+                color: #4f4f4f;
+            }
+
+            .order-details {
+                display: flex;
+                font-size: 15px;
+                align-items: center;
+                border-bottom: 2px solid #fcfcfc;
+            }
+
+            .vendor {
+                display: flex;
+                justify-content: space-between;
+                align-items: center;
+                padding-left: 4%;
+                background-color: #fcfcfc;
+            }
+
+            .order-title {
+                width: 50%;
+                text-align: left;
+                padding-left: 4%;
+            }
+
+            .order-price {
+                width: 20%;
+                text-align: right;
+            }
+
+            .order-quantity {
+                width: 15%;
+            }
+
+        </style>
+        <div class="vendor">
+            <div>[[menu.vendor]]</div>
+            <paper-icon-button icon="delete" class="icon-delete"></paper-icon-button>
+        </div>
+        <dom-repeat items="[[menu.dishes]]" as="dish">
+            <template>
+                <div class="order-details">
+                    <div class="order-title">[[dish.title]]</div>
+                    <div class="order-price">[[dish.price]] ₴</div>
+                    <div class="order-quantity">[[dish.quantity]]</div>
+                    <paper-icon-button icon="remove" on-click="_removeDish"></paper-icon-button>
+                </div>
+            </template>
+        </dom-repeat>
+        <paper-button on-click="log"></paper-button>
+    </template>
+    <script>
+        /**
+         * user-cart is user's order for current date, for current vendor.
+         *
+         * <p>Is adopted for both desktop and mobile.
+         *
+         * @customElement
+         * @polymer
+         */
+        class MealOrderUserOrder extends Polymer.Element {
+            static get is() {
+                return 'meal-order-user-order';
+            }
+
+            static get properties() {
+                return {
+                    menu: {
+                        type: Array
+                    }
+                }
+            }
+
+            _removeDish(e) {
+                const dish = {};
+                dish.vendor = this.menu.vendor;
+                dish.name = this.menu.dishes[e.model.index].title;
+                this.dispatchEvent(new CustomEvent('dish-removed', {detail: dish}));
+            }
+        }
+
+        window.customElements.define(MealOrderUserOrder.is, MealOrderUserOrder);
+    </script>
+</dom-module>

From b307707aa6676b3eb000cff35327fe1b6e25680f Mon Sep 17 00:00:00 2001
From: "alexander.karpetc" <alexander.karpetc@gmail.com>
Date: Fri, 6 Apr 2018 15:50:49 +0300
Subject: [PATCH 116/253] Remove redundant imports

---
 .../mealorder/menu/meal-order-user-cart.html  | 10 --------
 .../mealorder/menu/meal-order-user-order.html | 24 +++++++------------
 2 files changed, 9 insertions(+), 25 deletions(-)

diff --git a/client/user/src/mealorder/menu/meal-order-user-cart.html b/client/user/src/mealorder/menu/meal-order-user-cart.html
index f04aa314..1486eafa 100644
--- a/client/user/src/mealorder/menu/meal-order-user-cart.html
+++ b/client/user/src/mealorder/menu/meal-order-user-cart.html
@@ -19,18 +19,8 @@
   -->
 <script src="../../../bower_components/webcomponentsjs/webcomponents-lite.js"></script>
 <link rel="import" href="../../../bower_components/polymer/polymer-element.html">
-<link rel="import" href="../../../bower_components/iron-list/iron-list.html">
-<link rel="import" href="../../../bower_components/paper-item/paper-item.html">
 <link rel="import" href="../../../bower_components/paper-icon-button/paper-icon-button.html">
-<link rel="import" href="../../../bower_components/paper-button/paper-button.html">
 <link rel="import" href="../../../bower_components/iron-icons/iron-icons.html">
-<link rel="import" href="../../../bower_components/app-layout/app-drawer-layout/app-drawer-layout.html">
-<link rel="import" href="../../../bower_components/app-layout/app-drawer/app-drawer.html">
-<link rel="import" href="../../../bower_components/app-layout/app-header/app-header.html">
-<link rel="import" href="../../../bower_components/app-layout/app-header-layout/app-header-layout.html">
-<link rel="import" href="../../../bower_components/app-layout/app-scroll-effects/app-scroll-effects.html">
-<link rel="import" href="../../../bower_components/app-layout/app-toolbar/app-toolbar.html">
-<link rel="import" href="../../../bower_components/iron-flex-layout/iron-flex-layout.html">
 <link rel="import" href="meal-order-user-order.html">
 
 <dom-module id="user-cart">
diff --git a/client/user/src/mealorder/menu/meal-order-user-order.html b/client/user/src/mealorder/menu/meal-order-user-order.html
index f28158c7..97f0dd75 100644
--- a/client/user/src/mealorder/menu/meal-order-user-order.html
+++ b/client/user/src/mealorder/menu/meal-order-user-order.html
@@ -20,16 +20,8 @@
 <script src="../../../bower_components/webcomponentsjs/webcomponents-lite.js"></script>
 <link rel="import" href="../../../bower_components/polymer/polymer-element.html">
 <link rel="import" href="../../../bower_components/paper-icon-button/paper-icon-button.html">
-<link rel="import" href="../../../bower_components/paper-button/paper-button.html">
 <link rel="import" href="../../../bower_components/iron-icons/iron-icons.html">
-<link rel="import"
-      href="../../../bower_components/app-layout/app-drawer-layout/app-drawer-layout.html">
-<link rel="import" href="../../../bower_components/app-layout/app-drawer/app-drawer.html">
-<link rel="import" href="../../../bower_components/app-layout/app-header/app-header.html">
-<link rel="import"
-      href="../../../bower_components/app-layout/app-header-layout/app-header-layout.html">
-<link rel="import"
-      href="../../../bower_components/app-layout/app-scroll-effects/app-scroll-effects.html">
+
 
 <dom-module id="meal-order-user-order">
     <template>
@@ -70,10 +62,10 @@
 
         </style>
         <div class="vendor">
-            <div>[[menu.vendor]]</div>
+            <div>[[order.vendor]]</div>
             <paper-icon-button icon="delete" class="icon-delete"></paper-icon-button>
         </div>
-        <dom-repeat items="[[menu.dishes]]" as="dish">
+        <dom-repeat items="[[order.dishes]]" as="dish">
             <template>
                 <div class="order-details">
                     <div class="order-title">[[dish.title]]</div>
@@ -83,7 +75,6 @@
                 </div>
             </template>
         </dom-repeat>
-        <paper-button on-click="log"></paper-button>
     </template>
     <script>
         /**
@@ -101,7 +92,10 @@
 
             static get properties() {
                 return {
-                    menu: {
+                    /**
+                     * Order for a current vendor.
+                     */
+                    order: {
                         type: Array
                     }
                 }
@@ -109,8 +103,8 @@
 
             _removeDish(e) {
                 const dish = {};
-                dish.vendor = this.menu.vendor;
-                dish.name = this.menu.dishes[e.model.index].title;
+                dish.vendor = this.order.vendor;
+                dish.name = this.order.dishes[e.model.index].title;
                 this.dispatchEvent(new CustomEvent('dish-removed', {detail: dish}));
             }
         }

From b1fb0e719366b3a9bcbcfadbdeda0cf29a3d0d20 Mon Sep 17 00:00:00 2001
From: Paul <paulageyev@gmail.com>
Date: Fri, 6 Apr 2018 15:53:10 +0300
Subject: [PATCH 117/253] Create observer for route

---
 .../menu/meal-order-menu-container.html       | 29 ++++++++++++++-----
 1 file changed, 21 insertions(+), 8 deletions(-)

diff --git a/client/user/src/mealorder/menu/meal-order-menu-container.html b/client/user/src/mealorder/menu/meal-order-menu-container.html
index 7a1535f2..8f4a3ef3 100644
--- a/client/user/src/mealorder/menu/meal-order-menu-container.html
+++ b/client/user/src/mealorder/menu/meal-order-menu-container.html
@@ -74,15 +74,19 @@
 
         <app-route
                 route="{{route}}"
-                pattern="/:menu"
-                data="{{routeData}}">
+                pattern="/:menu/:date"
+                data="{{routeData}}"
+                tail="{{subroute}}">
         </app-route>
 
-        <paper-tabs class="tabs" selected="0">
+        <paper-tabs class="tabs" selected="[[routeData.date]]" attr-for-selected='key'>
             <template is="dom-repeat" items="{{menuForDates}}" as="calendar">
-                <paper-tab link>
+                <paper-tab
+                        key="[[calendar.date.year]]-[[calendar.date.month]]-[[calendar.date.day]]"
+                        link>
                     <a class="link"
-                       href="/#/menu/#/[[calendar.date.year]]/[[calendar.date.month]]/[[calendar.date.day]]"
+                       name="[[calendar.date.year]]-[[calendar.date.month]]-[[calendar.date.day]]"
+                       href="/#/menu/[[calendar.date.year]]-[[calendar.date.month]]-[[calendar.date.day]]"
                        on-click="_handleClick">
                         <div>
                             <div class="day-of-the-week">Пн</div>
@@ -167,7 +171,7 @@
             connectedCallback() {
                 super.connectedCallback();
                 if (this.menuForDates[0].hasMenu) {
-                    this.dispatch('menuForDay', this.menuForDates[0]);
+                    this.dispatch('menuForDay', this.menuForDates[0].date);
                     this.dispatch('cartForDay', this.menuForDates[0].date);
                 }
             }
@@ -180,8 +184,17 @@
 
             _pageChanged() {
                 if (!this.route.path) {
-                    this.set('route.path', '/menu/#/' + this.menuForDates[0].date.year + "/" +
-                        this.menuForDates[0].date.month + "/" + this.menuForDates[0].date.day);
+                    this.set('route.path', '/menu/' + this.menuForDates[0].date.year + "-" +
+                        this.menuForDates[0].date.month + "-" + this.menuForDates[0].date.day);
+                }
+                else {
+                    const arr = this.routeData.date.split('-');
+                    const date = {};
+                    date.year = arr[0];
+                    date.month = arr[1];
+                    date.day = arr[2];
+                    this.dispatch('menuForDay', date);
+                    this.dispatch('cartForDay', date);
                 }
             }
 

From 85c420d5fa7272e333766e22c2019cbbd118b8f8 Mon Sep 17 00:00:00 2001
From: "alexander.karpetc" <alexander.karpetc@gmail.com>
Date: Fri, 6 Apr 2018 16:30:38 +0300
Subject: [PATCH 118/253] Edit styles for list

---
 .../src/mealorder/menu/meal-order-vendor-menu.html    | 11 ++++++++++-
 .../src/mealorder/menu/meal-order-vendor-menus.html   |  2 +-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/client/user/src/mealorder/menu/meal-order-vendor-menu.html b/client/user/src/mealorder/menu/meal-order-vendor-menu.html
index 4debf75d..26166765 100644
--- a/client/user/src/mealorder/menu/meal-order-vendor-menu.html
+++ b/client/user/src/mealorder/menu/meal-order-vendor-menu.html
@@ -58,6 +58,15 @@
                 align-items: center;
             }
 
+            .header {
+                display: flex;
+                justify-content: space-between;
+                align-items: center;
+            }
+
+            .header paper-item {
+                padding: 2px 1% 2px 2%;
+            }
             .bold {
                 font-weight: bold;
             }
@@ -102,7 +111,7 @@
                 }
             }
         </style>
-        <div class="wrapper">
+        <div class="header">
             <paper-item on-click="_toggle" class="menu-caption">
                 <div class="menu-caption">
                     [[menu.name]]
diff --git a/client/user/src/mealorder/menu/meal-order-vendor-menus.html b/client/user/src/mealorder/menu/meal-order-vendor-menus.html
index ec0fc8ae..6a352f32 100644
--- a/client/user/src/mealorder/menu/meal-order-vendor-menus.html
+++ b/client/user/src/mealorder/menu/meal-order-vendor-menus.html
@@ -74,7 +74,7 @@
                 background-color: white;
                 border: 1px solid #ddd;
                 cursor: pointer;
-                margin-bottom: 10px;
+                margin-bottom: 5px;
             }
 
             .pad {

From 1343d7ecc6857b75342620c1fb60f77dd8ba596f Mon Sep 17 00:00:00 2001
From: Paul <paulageyev@gmail.com>
Date: Fri, 6 Apr 2018 16:38:50 +0300
Subject: [PATCH 119/253] Refactor CSS, classes are replaced by id

---
 .../src/mealorder/meal-order-client-app.html  | 124 +++++++-----------
 1 file changed, 50 insertions(+), 74 deletions(-)

diff --git a/client/user/src/mealorder/meal-order-client-app.html b/client/user/src/mealorder/meal-order-client-app.html
index aed7bf9d..ece61c26 100644
--- a/client/user/src/mealorder/meal-order-client-app.html
+++ b/client/user/src/mealorder/meal-order-client-app.html
@@ -52,7 +52,7 @@
                 right: 300px;
             }
 
-            app-header .main-title {
+            #main-title {
                 font-size: 1.375em;
             }
 
@@ -64,30 +64,20 @@
                 display: none;
             }
 
-            app-header app-toolbar .container {
+            app-header app-toolbar .route-title {
                 display: flex;
                 width: 100%;
                 align-items: center;
                 justify-content: space-between;
             }
 
-            app-header app-toolbar .container .order-container {
-                display: flex;
-            }
-
-            app-header app-toolbar .container .date-container {
-                display: flex;
-                margin-left: 10px;
-                align-items: center;
-            }
-
-            app-header .history-of-orders a {
+            app-header .route-title a {
                 font-size: 0.8em;
                 text-decoration: none;
                 color: white;
             }
 
-            app-header .history-of-orders a:hover {
+            app-header .route-title a:hover {
                 color: #179EFF;
             }
 
@@ -96,68 +86,38 @@
                 color: white;
             }
 
-            app-header .calendar {
-                font-weight: lighter;
+            app-header .app-toolbar-content {
                 font-size: 0.75em;
             }
 
-            app-header .order {
-                font-size: 0.75em;
+            app-drawer {
+                --app-drawer-content-container: {
+                    background-color: #fafafa;
+                }
             }
 
-            .order-date {
+            .app-toolbar-header {
                 display: flex;
                 justify-content: space-between;
                 align-items: center;
                 width: 100%
             }
 
-            .order-date .order {
+            .app-toolbar-header .app-toolbar-content {
                 font-size: 24px;
             }
 
-            .order-date .day {
+            #day {
                 font-size: 0.7em;
                 font-weight: lighter;
                 text-align: center;
             }
 
-            .order-date .day-of-the-week {
+            #day-of-the-week {
                 font-size: 22px;
             }
 
-            @media only screen and (max-width: 600px) {
-
-                .history-of-orders {
-                    display: none;
-                }
-
-                app-header .history-icon {
-                    display: block;
-                }
-
-                app-header .date-container .date-range-icon {
-                    display: none;
-                }
-
-                app-header .date-container .calendar {
-                    display: none;
-                }
-
-            }
-
-            app-drawer.history {
-                --app-drawer-width: 300px;
-            }
-
-
-            app-drawer {
-                --app-drawer-content-container: {
-                    background-color: #fafafa;
-                }
-            }
-
-            .menu-history {
+            #menu-history {
                 margin-right: 44px;
             }
 
@@ -167,6 +127,16 @@
                 justify-content: space-around;
                 align-items: center;
             }
+
+            @media only screen and (max-width: 600px) {
+                .route-title {
+                    display: none;
+                }
+
+                app-header .history-icon {
+                    display: block;
+                }
+            }
         </style>
 
         <app-location route="{{route}}"
@@ -184,31 +154,33 @@
                             attr-for-selected="name"
                             fallback-selection="view404"
                             role="main">
+
                     <app-toolbar name="menu">
-                        <div class="order-date">
-                            <div class="order">Заказ</div>
+                        <div class="app-toolbar-header">
+                            <div class="app-toolbar-content">Заказ</div>
+                            <div>
+                                <div id="day">Пн</div>
+                                <div id="day-of-the-week">21</div>
+                            </div>
                         </div>
                     </app-toolbar>
 
                     <app-toolbar name="history">
-                        <div class="order-date">
-                            <div class="order">История заказов</div>
+                        <div class="app-toolbar-header">
+                            <div class="app-toolbar-content">История заказов</div>
                         </div>
                     </app-toolbar>
                 </iron-pages>
-                <meal-order-drawer order="[[order]]" currentDate="[[currentDate]]"></meal-order-drawer>
+
+                <meal-order-drawer order="[[order]]"
+                                   on-changed-history-date="_changeHistoryDate"></meal-order-drawer>
             </app-drawer>
 
             <app-header-layout>
                 <app-header slot="header" reveals effects="waterfall">
                     <app-toolbar>
-                        <div class="container">
-                            <div class="order-container">
-                                <div class="main-title">Заказ обедов</div>
-                                <div class="date-container">
-                                    <div class="calendar">Март&nbsp;2018</div>
-                                </div>
-                            </div>
+                        <div class="route-title">
+                            <div id="main-title">Заказ обедов</div>
                             <iron-pages
                                     selected="[[routeData.page]]"
                                     attr-for-selected="name"
@@ -216,27 +188,31 @@
                                     role="main">
 
                                 <div name="menu">
-                                    <div class="history-of-orders"><a href="/#/history/">История заказов</a></div>
+                                    <div class="route-title"><a href="/#/history/">История
+                                        заказов</a></div>
                                     <div class="icon-container">
                                         <a href="/#/history/">
-                                            <iron-icon class="history-icon" icon="maps:icons:history"></iron-icon>
+                                            <iron-icon class="history-icon"
+                                                       icon="maps:icons:history"></iron-icon>
                                         </a>
                                         <div>
-                                            <iron-icon class="order" icon="icons:shopping-cart"
+                                            <iron-icon class="app-toolbar-content" icon="icons:shopping-cart"
                                                        drawer-toggle></iron-icon>
                                         </div>
                                     </div>
                                 </div>
 
                                 <div name="history">
-                                    <div class="history-of-orders menu-history"><a href="/#/menu/">Сделать заказ</a>
+                                    <div id="menu-history" class="route-title"><a href="/#/menu/">Сделать
+                                        заказ</a>
                                     </div>
                                     <div class="icon-container">
                                         <a href="/#/menu/">
-                                            <iron-icon class="history-icon" icon="maps:icons:create"></iron-icon>
+                                            <iron-icon class="history-icon"
+                                                       icon="maps:icons:add"></iron-icon>
                                         </a>
                                         <div>
-                                            <iron-icon class="order" icon="icons:date-range"
+                                            <iron-icon class="app-toolbar-content" icon="icons:date-range"
                                                        drawer-toggle></iron-icon>
                                         </div>
                                     </div>
@@ -245,13 +221,13 @@
                         </div>
                     </app-toolbar>
                 </app-header>
-
                 <iron-pages
                         selected="[[routeData.page]]"
                         attr-for-selected="name"
                         fallback-selection="view404"
                         role="main">
-                    <meal-order-menu-container name="menu" on-dish-added="_addDishToOrder"></meal-order-menu-container>
+                    <meal-order-menu-container name="menu"
+                                           on-dish-added="_addDishToOrder"></meal-order-menu-container>
                 </iron-pages>
 
             </app-header-layout>

From 4d9544be83a5646fcf748a4e109ddd59fddaf372 Mon Sep 17 00:00:00 2001
From: Paul <paulageyev@gmail.com>
Date: Fri, 6 Apr 2018 16:45:30 +0300
Subject: [PATCH 120/253] Move font-family to index.html

---
 client/user/index.html                        |  1 +
 .../src/mealorder/meal-order-client-app.html  | 31 +++++++------------
 .../menu/meal-order-menu-container.html       |  6 ++--
 3 files changed, 15 insertions(+), 23 deletions(-)

diff --git a/client/user/index.html b/client/user/index.html
index 7c346a2a..484f5553 100644
--- a/client/user/index.html
+++ b/client/user/index.html
@@ -30,6 +30,7 @@
     <title>MealOrder</title>
     <style>
         body {
+            font-family: 'Roboto', 'Noto', sans-serif;
             background-color: #F2F2F2;
         }
     </style>
diff --git a/client/user/src/mealorder/meal-order-client-app.html b/client/user/src/mealorder/meal-order-client-app.html
index ece61c26..c0a35e3b 100644
--- a/client/user/src/mealorder/meal-order-client-app.html
+++ b/client/user/src/mealorder/meal-order-client-app.html
@@ -40,7 +40,6 @@
     <template>
         <style>
             :host {
-                font-family: 'Roboto', 'Noto', sans-serif;
                 --app-primary-color: #4285f4;
                 --app-secondary-color: black;
                 display: block;
@@ -107,16 +106,6 @@
                 font-size: 24px;
             }
 
-            #day {
-                font-size: 0.7em;
-                font-weight: lighter;
-                text-align: center;
-            }
-
-            #day-of-the-week {
-                font-size: 22px;
-            }
-
             #menu-history {
                 margin-right: 44px;
             }
@@ -128,6 +117,16 @@
                 align-items: center;
             }
 
+            #day {
+                font-size: 0.7em;
+                font-weight: lighter;
+                text-align: center;
+            }
+
+            #day-of-the-week {
+                font-size: 22px;
+            }
+
             @media only screen and (max-width: 600px) {
                 .route-title {
                     display: none;
@@ -172,8 +171,6 @@
                     </app-toolbar>
                 </iron-pages>
 
-                <meal-order-drawer order="[[order]]"
-                                   on-changed-history-date="_changeHistoryDate"></meal-order-drawer>
             </app-drawer>
 
             <app-header-layout>
@@ -243,15 +240,9 @@
          * 1. A page with vendor menus, and user's shopping cart.
          * 2. A page with user's history.
          *
-         * The redux mixin provides its own data system and data flow.
-         * Fires following redux events:
-         * <li>addDish</li>
-         * <li>removeDish</li>
-         * <li>changeHistoryDate</li>
-         *
          * @customElement
          * @polymer
-         * @ReduxMixin
+         * @appliesMixin ExlibrisApplication.ReduxMixin
          */
         class MealOrderClientApp extends MealOrderApp.ReduxMixin(Polymer.Element) {
             static get is() {
diff --git a/client/user/src/mealorder/menu/meal-order-menu-container.html b/client/user/src/mealorder/menu/meal-order-menu-container.html
index 8f4a3ef3..0e50261c 100644
--- a/client/user/src/mealorder/menu/meal-order-menu-container.html
+++ b/client/user/src/mealorder/menu/meal-order-menu-container.html
@@ -102,13 +102,13 @@
         /**
          * menu-order is container for vendors' menus and navigation.
          *
-         * <p>Is adopted for both desktop and mobile.
          * Contains a menu for the current date and tabs for quick date navigation.
          *
-         * Fires redux `menuForDay` event
+         * Fires `menuForDay` event
+         *
          * @customElement
          * @polymer
-         * @ReduxMixin
+         * @appliesMixin ExlibrisApplication.ReduxMixin
          */
         class MealOrderMenuContainer extends MealOrderApp.ReduxMixin(Polymer.Element) {
             static get is() {

From 8187c51aafec689a5f220bb81c515441a9771d0c Mon Sep 17 00:00:00 2001
From: Paul <paulageyev@gmail.com>
Date: Fri, 6 Apr 2018 17:13:12 +0300
Subject: [PATCH 121/253] Add day of the week to paper-tabs with disabled days

---
 .../menu/meal-order-menu-container.html       | 47 +++++++++++++------
 .../mealorder/shell/reducers/reducers.html    |  8 ++++
 2 files changed, 41 insertions(+), 14 deletions(-)

diff --git a/client/user/src/mealorder/menu/meal-order-menu-container.html b/client/user/src/mealorder/menu/meal-order-menu-container.html
index 0e50261c..c3b383e9 100644
--- a/client/user/src/mealorder/menu/meal-order-menu-container.html
+++ b/client/user/src/mealorder/menu/meal-order-menu-container.html
@@ -49,7 +49,7 @@
                 color: #179EFF;
             }
 
-            paper-tab .link {
+            paper-tab .paper-tab-container {
                 @apply --layout-horizontal;
                 @apply --layout-center-center;
                 text-decoration: none;
@@ -57,6 +57,10 @@
                 font-size: 1.5em;
             }
 
+            .link-disabled {
+                color: #8c8c8c;
+            }
+
             .day-of-the-week {
                 font-size: 0.7em;
                 font-weight: lighter;
@@ -81,19 +85,34 @@
 
         <paper-tabs class="tabs" selected="[[routeData.date]]" attr-for-selected='key'>
             <template is="dom-repeat" items="{{menuForDates}}" as="calendar">
-                <paper-tab
-                        key="[[calendar.date.year]]-[[calendar.date.month]]-[[calendar.date.day]]"
-                        link>
-                    <a class="link"
-                       name="[[calendar.date.year]]-[[calendar.date.month]]-[[calendar.date.day]]"
-                       href="/#/menu/[[calendar.date.year]]-[[calendar.date.month]]-[[calendar.date.day]]"
-                       on-click="_handleClick">
-                        <div>
-                            <div class="day-of-the-week">Пн</div>
-                            <div class="day">{{calendar.date.day}}</div>
-                        </div>
-                    </a>
-                </paper-tab>
+                <dom-if if="[[calendar.hasMenu]]">
+                    <template>
+                        <paper-tab link>
+                            <a class="paper-tab-container"
+                               href="/#/menu/[[calendar.date.year]]-[[calendar.date.month]]-[[calendar.date.day]]"
+                               on-click="_handleClick">
+                                <div>
+                                    <div class="day-of-the-week">{{calendar.date.dayOfTheWeek}}
+                                    </div>
+                                    <div class="day">{{calendar.date.day}}</div>
+                                </div>
+                            </a>
+                        </paper-tab>
+                    </template>
+                </dom-if>
+                <dom-if if="[[!calendar.hasMenu]]">
+                    <template>
+                        <paper-tab link disabled>
+                            <div class="paper-tab-container link-disabled">
+                                <div>
+                                    <div class="day-of-the-week">{{calendar.date.dayOfTheWeek}}
+                                    </div>
+                                    <div class="day">{{calendar.date.day}}</div>
+                                </div>
+                            </div>
+                        </paper-tab>
+                    </template>
+                </dom-if>
             </template>
         </paper-tabs>
 
diff --git a/client/user/src/mealorder/shell/reducers/reducers.html b/client/user/src/mealorder/shell/reducers/reducers.html
index cc75b68f..4f512a16 100644
--- a/client/user/src/mealorder/shell/reducers/reducers.html
+++ b/client/user/src/mealorder/shell/reducers/reducers.html
@@ -27,6 +27,7 @@
                 year: '2018',
                 month: '03',
                 day: '21',
+                dayOfTheWeek: 'Ср',
             },
             hasMenu: true
         },
@@ -35,6 +36,7 @@
                     year: '2018',
                     month: '03',
                     day: '22',
+                    dayOfTheWeek: 'Чт',
                 },
                 hasMenu: true
             },
@@ -43,6 +45,7 @@
                     year: '2018',
                     month: '03',
                     day: '23',
+                    dayOfTheWeek: 'Пт',
                 },
                 hasMenu: true
             },
@@ -51,6 +54,7 @@
                     year: '2018',
                     month: '03',
                     day: '24',
+                    dayOfTheWeek: 'Сб',
                 },
                 hasMenu: false
             },
@@ -59,6 +63,7 @@
                     year: '2018',
                     month: '03',
                     day: '25',
+                    dayOfTheWeek: 'Вс',
                 },
                 hasMenu: false
             }
@@ -67,6 +72,7 @@
                     year: '2018',
                     month: '03',
                     day: '26',
+                    dayOfTheWeek: 'Пн',
                 },
                 hasMenu: true
             }
@@ -75,6 +81,7 @@
                     year: '2018',
                     month: '03',
                     day: '27',
+                    dayOfTheWeek: 'Вт',
                 },
                 hasMenu: true
             }
@@ -83,6 +90,7 @@
                     year: '2018',
                     month: '03',
                     day: '28',
+                    dayOfTheWeek: 'Ср',
                 },
                 hasMenu: true
             }];

From 2e0c45bccaafd13a6fb5d41f3d72e27f69d4dd8e Mon Sep 17 00:00:00 2001
From: Paul <paulageyev@gmail.com>
Date: Fri, 6 Apr 2018 18:02:11 +0300
Subject: [PATCH 122/253] Refactor docs

---
 client/user/src/mealorder/meal-order-client-app.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/user/src/mealorder/meal-order-client-app.html b/client/user/src/mealorder/meal-order-client-app.html
index c0a35e3b..8eeef488 100644
--- a/client/user/src/mealorder/meal-order-client-app.html
+++ b/client/user/src/mealorder/meal-order-client-app.html
@@ -170,6 +170,7 @@
                         </div>
                     </app-toolbar>
                 </iron-pages>
+                <meal-order-drawer order="[[order]]" on-changed-history-date="_changeHistoryDate"></meal-order-drawer>
 
             </app-drawer>
 
@@ -235,7 +236,6 @@
         /**
          * Main user meal order component.
          *
-         * <p>Is adopted for both desktop and mobile.
          * Consists of 2 page:
          * 1. A page with vendor menus, and user's shopping cart.
          * 2. A page with user's history.

From 9c3020151269a0ec43ae45ea58c78032ca648527 Mon Sep 17 00:00:00 2001
From: Paul <paulageyev@gmail.com>
Date: Fri, 6 Apr 2018 18:05:34 +0300
Subject: [PATCH 123/253] Add `meal-order-drawer` component

---
 .../src/mealorder/meal-order-client-app.html  |   1 +
 .../src/mealorder/menu/meal-order-drawer.html | 108 ++++++++++++++++++
 2 files changed, 109 insertions(+)
 create mode 100644 client/user/src/mealorder/menu/meal-order-drawer.html

diff --git a/client/user/src/mealorder/meal-order-client-app.html b/client/user/src/mealorder/meal-order-client-app.html
index 8eeef488..ea3ba37b 100644
--- a/client/user/src/mealorder/meal-order-client-app.html
+++ b/client/user/src/mealorder/meal-order-client-app.html
@@ -36,6 +36,7 @@
 <link rel="import" href="../../bower_components/iron-icons/maps-icons.html">
 <link rel="import" href="shell/redux-store.html">
 <link rel="import" href="menu/meal-order-menu-container.html">
+<link rel="import" href="menu/meal-order-drawer.html">
 <dom-module id="meal-order-client-app">
     <template>
         <style>
diff --git a/client/user/src/mealorder/menu/meal-order-drawer.html b/client/user/src/mealorder/menu/meal-order-drawer.html
new file mode 100644
index 00000000..33a3e2c9
--- /dev/null
+++ b/client/user/src/mealorder/menu/meal-order-drawer.html
@@ -0,0 +1,108 @@
+<!--
+  ~ Copyright 2018, TeamDev Ltd. All rights reserved.
+  ~
+  ~ Redistribution and use in source and/or binary forms, with or without
+  ~ modification, must retain the above copyright notice and the following
+  ~ disclaimer.
+  ~
+  ~ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+  ~ "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+  ~ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+  ~ A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+  ~ OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+  ~ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+  ~ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+  ~ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+  ~ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  ~ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+  ~ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+  -->
+<link rel="import" href="../../../bower_components/app-route/app-location.html">
+<link rel="import" href="../../../bower_components/app-route/app-route.html">
+<link rel="import" href="../../../bower_components/iron-pages/iron-pages.html">
+<link rel="import" href="../../../bower_components/app-datepicker/app-datepicker.html">
+
+<dom-module id="meal-order-drawer">
+    <template>
+        <style>
+            #date-picker {
+                --app-datepicker-selection-bg: #fafafa;
+                --app-datepicker-selection-color: #616161;
+                --app-datepicker-iron-selected: #616161;
+                --app-datepicker-selected-day-bg: #179EFF;
+                --app-datepicker-today-color: #179EFF;
+                --app-datepicker-date-hover-background-color: #179EFF;
+            }
+        </style>
+
+        <app-location route="{{route}}"
+                      use-hash-as-path></app-location>
+
+        <app-route
+                route="{{route}}"
+                pattern="/:page"
+                data="{{routeData}}"></app-route>
+
+        <iron-pages
+                selected="[[routeData.page]]"
+                attr-for-selected="name"
+                fallback-selection="view404"
+                role="main">
+            <meal-order-user-cart name="menu" order="[[order]]"
+                                  on-dish-removed="_removeDishFromOrder"></meal-order-user-cart>
+            <app-datepicker name="history" id="date-picker" view="vertical"
+                            date="{{currentDate}}" auto-update-date="true" locale="ru-RU"></app-datepicker>
+        </iron-pages>
+    </template>
+
+    <script>
+        class MealOrderDrawer extends Polymer.Element {
+            static get is() {
+                return 'meal-order-drawer';
+            }
+
+            static get properties() {
+                return {
+                    /**
+                     * Current user's meal order.
+                     */
+                    order: {
+                        type: Array,
+                        statePath: 'currentOrder'
+                    },
+
+                    /**
+                     * Chosen date.
+                     */
+                    currentDate: {},
+                }
+            };
+
+            static get observers() {
+                return [
+                    '_updateDate(currentDate)',
+                    '_changehistoryUrl(currentDate)'
+                ];
+            }
+
+            _changehistoryUrl() {
+                if (this.routeData.page) {
+                    const newRouteData = {};
+                    newRouteData.page = 'history/' + '#/' + this.currentDate;
+                    this.set('routeData', newRouteData);
+                }
+            }
+
+            _updateDate() {
+                const arr = this.currentDate.split('/');
+                const date = {};
+                date.year = arr[0];
+                date.month = arr[1];
+                date.day = arr[2];
+                this.dispatchEvent(new CustomEvent('changed-history-date', {detail: date}));
+            }
+        }
+
+        window.customElements.define(MealOrderDrawer.is, MealOrderDrawer);
+    </script>
+</dom-module>

From 627dc5abe3677548a695a227af314e3c64d16f67 Mon Sep 17 00:00:00 2001
From: Paul <paulageyev@gmail.com>
Date: Fri, 6 Apr 2018 19:40:47 +0300
Subject: [PATCH 124/253] Create an observation of the date and route for the
 history page

---
 .../src/mealorder/menu/meal-order-drawer.html | 37 ++++++++++++-------
 1 file changed, 23 insertions(+), 14 deletions(-)

diff --git a/client/user/src/mealorder/menu/meal-order-drawer.html b/client/user/src/mealorder/menu/meal-order-drawer.html
index 33a3e2c9..8cff43f3 100644
--- a/client/user/src/mealorder/menu/meal-order-drawer.html
+++ b/client/user/src/mealorder/menu/meal-order-drawer.html
@@ -40,7 +40,7 @@
 
         <app-route
                 route="{{route}}"
-                pattern="/:page"
+                pattern="/:page/:date"
                 data="{{routeData}}"></app-route>
 
         <iron-pages
@@ -48,15 +48,14 @@
                 attr-for-selected="name"
                 fallback-selection="view404"
                 role="main">
-            <meal-order-user-cart name="menu" order="[[order]]"
-                                  on-dish-removed="_removeDishFromOrder"></meal-order-user-cart>
             <app-datepicker name="history" id="date-picker" view="vertical"
-                            date="{{currentDate}}" auto-update-date="true" locale="ru-RU"></app-datepicker>
+                            input-date="[[inputDate]]" date="{{outputDate}}" auto-update-date="true"
+                            locale="ru-RU"></app-datepicker>
         </iron-pages>
     </template>
 
     <script>
-        class MealOrderDrawer extends Polymer.Element {
+        class MealOrderDrawer extends ReduxMixin(Polymer.Element) {
             static get is() {
                 return 'meal-order-drawer';
             }
@@ -74,31 +73,41 @@
                     /**
                      * Chosen date.
                      */
-                    currentDate: {},
+                    inputDate: {},
+                    outputDate: {},
+                    routeData: {},
                 }
             };
 
             static get observers() {
                 return [
-                    '_updateDate(currentDate)',
-                    '_changehistoryUrl(currentDate)'
+                    '_updateDate(outputDate)',
+                    '_changeHistoryUrl(routeData)'
                 ];
             }
 
-            _changehistoryUrl() {
-                if (this.routeData.page) {
-                    const newRouteData = {};
-                    newRouteData.page = 'history/' + '#/' + this.currentDate;
-                    this.set('routeData', newRouteData);
+            _changeHistoryUrl() {
+                if (this.routeData.date) {
+                    const routeDate = this.routeData.date.split('-');
+                    this.set('inputDate', routeDate[0] + "/" + routeDate[1] + "/" + routeDate[2]);
+                    const arr = this.routeData.date.split('-');
+                    const date = {};
+                    date.year = arr[0];
+                    date.month = arr[1];
+                    date.day = arr[2];
+                    this.dispatchEvent(new CustomEvent('changed-history-date', {detail: date}));
                 }
             }
 
             _updateDate() {
-                const arr = this.currentDate.split('/');
+                const arr = this.outputDate.split('/');
                 const date = {};
                 date.year = arr[0];
                 date.month = arr[1];
                 date.day = arr[2];
+                const newRouteData = {};
+                newRouteData.page = 'history/' + date.year + "-" + date.month + "-" + date.day;
+                this.set('routeData', newRouteData);
                 this.dispatchEvent(new CustomEvent('changed-history-date', {detail: date}));
             }
         }

From 44d91fae0d8d4ec11c8be6f413bff7b222ee84bf Mon Sep 17 00:00:00 2001
From: Paul Ageyev <paulageyev@gmail.com>
Date: Sat, 7 Apr 2018 00:54:20 +0300
Subject: [PATCH 125/253] Add docs

---
 .eslintrc.json                                |  3 +-
 .../src/mealorder/meal-order-client-app.html  | 35 ++--------
 .../src/mealorder/menu/meal-order-drawer.html |  6 +-
 .../menu/meal-order-menu-container.html       | 67 +++++++++----------
 .../mealorder/shell/actions/user-actions.html |  1 -
 .../mealorder/shell/reducers/reducers.html    |  7 +-
 6 files changed, 44 insertions(+), 75 deletions(-)

diff --git a/.eslintrc.json b/.eslintrc.json
index b34d5e48..e99d0e05 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -28,7 +28,8 @@
       {
         "ignore": [
           0,
-          1
+          1,
+          2
         ]
       }
     ],
diff --git a/client/user/src/mealorder/meal-order-client-app.html b/client/user/src/mealorder/meal-order-client-app.html
index ea3ba37b..8fd89147 100644
--- a/client/user/src/mealorder/meal-order-client-app.html
+++ b/client/user/src/mealorder/meal-order-client-app.html
@@ -64,7 +64,7 @@
                 display: none;
             }
 
-            app-header app-toolbar .route-title {
+            app-header app-toolbar .app-toolbar-container {
                 display: flex;
                 width: 100%;
                 align-items: center;
@@ -138,7 +138,6 @@
                 }
             }
         </style>
-
         <app-location route="{{route}}"
                       use-hash-as-path></app-location>
 
@@ -178,7 +177,7 @@
             <app-header-layout>
                 <app-header slot="header" reveals effects="waterfall">
                     <app-toolbar>
-                        <div class="route-title">
+                        <div class="app-toolbar-container">
                             <div id="main-title">Заказ обедов</div>
                             <iron-pages
                                     selected="[[routeData.page]]"
@@ -243,7 +242,7 @@
          *
          * @customElement
          * @polymer
-         * @appliesMixin ExlibrisApplication.ReduxMixin
+         * @appliesMixin MealOrderApp.ReduxMixin
          */
         class MealOrderClientApp extends MealOrderApp.ReduxMixin(Polymer.Element) {
             static get is() {
@@ -252,11 +251,6 @@
 
             static get properties() {
                 return {
-                    /**
-                     * Used for routing.
-                     */
-                    routeData: {},
-
                     /**
                      * Chosen date.
                      */
@@ -269,39 +263,24 @@
                         type: Array,
                         statePath: 'currentOrder'
                     },
-
                     /**
                      * User's history for the chosen day.
                      */
                     history: {
                         type: Array,
                         statePath: 'currentHistory'
-                    }
-                }
-            }
-
-            static get actions() {
-                return {
-                    addDish(dish) {
-                        return {
-                            type: MealOrderClientApp.UserAction.ADD_DISH_TO_CART,
-                            dish: dish
-                        }
                     },
-                    removeDish(dish) {
-                    }
+                    /**
+                     * Used for routing.
+                     */
+                    routeData: {},
                 }
             }
 
-            _addDishToOrder(e) {
-                this.dispatch('addDish', e.detail);
-            }
-
             _getClassForDrawer(page) {
                 return page;
             }
         }
-
         window.customElements.define(MealOrderClientApp.is, MealOrderClientApp);
     </script>
 </dom-module>
diff --git a/client/user/src/mealorder/menu/meal-order-drawer.html b/client/user/src/mealorder/menu/meal-order-drawer.html
index 8cff43f3..3b26cd18 100644
--- a/client/user/src/mealorder/menu/meal-order-drawer.html
+++ b/client/user/src/mealorder/menu/meal-order-drawer.html
@@ -53,9 +53,8 @@
                             locale="ru-RU"></app-datepicker>
         </iron-pages>
     </template>
-
     <script>
-        class MealOrderDrawer extends ReduxMixin(Polymer.Element) {
+        class MealOrderDrawer extends Polymer.Element {
             static get is() {
                 return 'meal-order-drawer';
             }
@@ -77,7 +76,7 @@
                     outputDate: {},
                     routeData: {},
                 }
-            };
+            }
 
             static get observers() {
                 return [
@@ -111,7 +110,6 @@
                 this.dispatchEvent(new CustomEvent('changed-history-date', {detail: date}));
             }
         }
-
         window.customElements.define(MealOrderDrawer.is, MealOrderDrawer);
     </script>
 </dom-module>
diff --git a/client/user/src/mealorder/menu/meal-order-menu-container.html b/client/user/src/mealorder/menu/meal-order-menu-container.html
index c3b383e9..566e6216 100644
--- a/client/user/src/mealorder/menu/meal-order-menu-container.html
+++ b/client/user/src/mealorder/menu/meal-order-menu-container.html
@@ -24,7 +24,6 @@
 <link rel="import" href="../../../bower_components/app-route/app-route.html">
 <link rel="import" href="../../../bower_components/iron-pages/iron-pages.html">
 <link rel="import" href="../shell/redux-store.html">
-<link rel="import" href="../../../bower_components/polymer/lib/elements/dom-repeat.html">
 <dom-module id="meal-order-menu-container">
     <template>
         <style>
@@ -84,7 +83,8 @@
         </app-route>
 
         <paper-tabs class="tabs" selected="[[routeData.date]]" attr-for-selected='key'>
-            <template is="dom-repeat" items="{{menuForDates}}" as="calendar">
+            <dom-repeat items="{{calendar}}" as="calendar">
+                <template>
                 <dom-if if="[[calendar.hasMenu]]">
                     <template>
                         <paper-tab link>
@@ -113,9 +113,9 @@
                         </paper-tab>
                     </template>
                 </dom-if>
-            </template>
+                </template>
+            </dom-repeat>
         </paper-tabs>
-
     </template>
     <script>
         /**
@@ -123,11 +123,9 @@
          *
          * Contains a menu for the current date and tabs for quick date navigation.
          *
-         * Fires `menuForDay` event
-         *
          * @customElement
          * @polymer
-         * @appliesMixin ExlibrisApplication.ReduxMixin
+         * @appliesMixin MealOrderApp.ReduxMixin
          */
         class MealOrderMenuContainer extends MealOrderApp.ReduxMixin(Polymer.Element) {
             static get is() {
@@ -136,19 +134,12 @@
 
             static get properties() {
                 return {
-                    /**
-                     * Fired when a dish add button is tapped.
-                     *
-                     * @event `dish-added`
-                     * @param {dish} contains vendor, category, title.
-                     */
-
                     /**
                      * Array of dates with menu which may not exist.
                      */
-                    menuForDates: {
+                    calendar: {
                         type: Array,
-                        statePath: 'menuForDates'
+                        statePath: 'calendar'
                     },
 
                     /**
@@ -158,6 +149,9 @@
                         type: Array,
                         statePath: 'menuForDay'
                     },
+                    /**
+                     * Used for routing.
+                     */
                     routeData: {
                         type: Object,
                     }
@@ -165,6 +159,19 @@
             }
 
             static get actions() {
+                /**
+                 * Fired when a paper tab is selected.
+                 *
+                 * @action `changeCurrentMenu`
+                 * @param {date} contains selected date by tab
+                 */
+
+                /**
+                 * Fired when a paper tab is selected.
+                 *
+                 * @action `changeCurrentCart`
+                 * @param {date} contains selected date by tab
+                 */
                 return {
                     changeCurrentMenu(date) {
                         return {
@@ -178,20 +185,14 @@
                             date: date
                         }
                     },
-                    addDish(dish) {
-                        return {
-                            type: MealOrderApp.UserAction.ADD_DISH_TO_CART,
-                            dish: dish
-                        }
-                    },
                 }
             }
 
             connectedCallback() {
                 super.connectedCallback();
-                if (this.menuForDates[0].hasMenu) {
-                    this.dispatch('menuForDay', this.menuForDates[0].date);
-                    this.dispatch('cartForDay', this.menuForDates[0].date);
+                if (this.calendar[0].hasMenu) {
+                    this.dispatch('changeCurrentMenu', this.calendar[0].date);
+                    this.dispatch('changeCurrentCart', this.calendar[0].date);
                 }
             }
 
@@ -203,8 +204,8 @@
 
             _pageChanged() {
                 if (!this.route.path) {
-                    this.set('route.path', '/menu/' + this.menuForDates[0].date.year + "-" +
-                        this.menuForDates[0].date.month + "-" + this.menuForDates[0].date.day);
+                    this.set('route.path', '/menu/' + this.calendar[0].date.year + "-" +
+                        this.calendar[0].date.month + "-" + this.calendar[0].date.day);
                 }
                 else {
                     const arr = this.routeData.date.split('-');
@@ -212,18 +213,14 @@
                     date.year = arr[0];
                     date.month = arr[1];
                     date.day = arr[2];
-                    this.dispatch('menuForDay', date);
-                    this.dispatch('cartForDay', date);
+                    this.dispatch('changeCurrentMenu', date);
+                    this.dispatch('changeCurrentCart', date);
                 }
             }
 
             _handleClick(e) {
-                this.dispatch('changeCurrentMenu', this.menuForDates[e.model.index].date);
-                this.dispatch('changeCurrentCart', this.menuForDates[e.model.index].date);
-            }
-
-            _addDishToOrder(e) {
-                this.dispatch('addDish', e.detail);
+                this.dispatch('changeCurrentMenu', this.calendar[e.model.index].date);
+                this.dispatch('changeCurrentCart', this.calendar[e.model.index].date);
             }
         }
         window.customElements.define(MealOrderMenuContainer.is, MealOrderMenuContainer);
diff --git a/client/user/src/mealorder/shell/actions/user-actions.html b/client/user/src/mealorder/shell/actions/user-actions.html
index 8e729795..14172041 100644
--- a/client/user/src/mealorder/shell/actions/user-actions.html
+++ b/client/user/src/mealorder/shell/actions/user-actions.html
@@ -22,6 +22,5 @@
     MealOrderApp.UserAction = {
         CHANGE_CURRENT_MENU: "CHANGE_CURRENT_MENU",
         CHANGE_CURRENT_CART: 'CHANGE_CURRENT_CART',
-        ADD_DISH_TO_CART: "ADD_DISH",
     }
 </script>
diff --git a/client/user/src/mealorder/shell/reducers/reducers.html b/client/user/src/mealorder/shell/reducers/reducers.html
index 4f512a16..343e5c04 100644
--- a/client/user/src/mealorder/shell/reducers/reducers.html
+++ b/client/user/src/mealorder/shell/reducers/reducers.html
@@ -96,7 +96,7 @@
             }];
 
         MealOrderApp.initialState = {
-            menuForDates: arrayOfDates,
+            calendar: arrayOfDates,
             menuForDay: [],
 
             menu: [
@@ -239,11 +239,6 @@
                 return MealOrderApp.initialState;
             }
             switch (action.type) {
-
-                case MealOrderApp.UserAction.ADD_DISH_TO_CART: {
-                    return state;
-                }
-
                 case MealOrderApp.UserAction.CHANGE_CURRENT_MENU: {
                     let arr = [];
                     let j = 0;

From 9e6e5e0dfbe1e8c8a89842a0ebba46e479431fe5 Mon Sep 17 00:00:00 2001
From: Paul Ageyev <paulageyev@gmail.com>
Date: Sat, 7 Apr 2018 01:17:24 +0300
Subject: [PATCH 126/253] Add `MealOrderApp` namespace

---
 client/user/src/mealorder/shell/redux-store.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/user/src/mealorder/shell/redux-store.html b/client/user/src/mealorder/shell/redux-store.html
index 1f87a73a..35d13e74 100644
--- a/client/user/src/mealorder/shell/redux-store.html
+++ b/client/user/src/mealorder/shell/redux-store.html
@@ -24,7 +24,7 @@
     {
         /* global Redux, PolymerRedux */
         const store = Redux.createStore(MealOrderApp.reducer);
-        window.MealOrderApp = {};
+        window.MealOrderApp = window.MealOrderApp || {};
         MealOrderApp.store = store;
         MealOrderApp.ReduxMixin = PolymerRedux(MealOrderApp.store);
     }

From 952d90e169c7a6aba608e9a295e77d9e9f3f7bdd Mon Sep 17 00:00:00 2001
From: "alexander.karpetc" <alexander.karpetc@gmail.com>
Date: Tue, 10 Apr 2018 13:00:05 +0300
Subject: [PATCH 127/253] Refactor namespace and imports

---
 client/user/src/mealorder/meal-order-client-app.html          | 2 +-
 client/user/src/mealorder/menu/meal-order-menu-container.html | 1 +
 client/user/src/mealorder/shell/reducers/reducers.html        | 1 +
 client/user/src/mealorder/shell/redux-store.html              | 2 +-
 4 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/client/user/src/mealorder/meal-order-client-app.html b/client/user/src/mealorder/meal-order-client-app.html
index 8fd89147..e377122c 100644
--- a/client/user/src/mealorder/meal-order-client-app.html
+++ b/client/user/src/mealorder/meal-order-client-app.html
@@ -170,7 +170,7 @@
                         </div>
                     </app-toolbar>
                 </iron-pages>
-                <meal-order-drawer order="[[order]]" on-changed-history-date="_changeHistoryDate"></meal-order-drawer>
+                <meal-order-drawer order="[[order]]"></meal-order-drawer>
 
             </app-drawer>
 
diff --git a/client/user/src/mealorder/menu/meal-order-menu-container.html b/client/user/src/mealorder/menu/meal-order-menu-container.html
index 566e6216..b01bb8a5 100644
--- a/client/user/src/mealorder/menu/meal-order-menu-container.html
+++ b/client/user/src/mealorder/menu/meal-order-menu-container.html
@@ -24,6 +24,7 @@
 <link rel="import" href="../../../bower_components/app-route/app-route.html">
 <link rel="import" href="../../../bower_components/iron-pages/iron-pages.html">
 <link rel="import" href="../shell/redux-store.html">
+<link rel="import" href="../shell/actions/user-actions.html">
 <dom-module id="meal-order-menu-container">
     <template>
         <style>
diff --git a/client/user/src/mealorder/shell/reducers/reducers.html b/client/user/src/mealorder/shell/reducers/reducers.html
index 343e5c04..4fb97d7e 100644
--- a/client/user/src/mealorder/shell/reducers/reducers.html
+++ b/client/user/src/mealorder/shell/reducers/reducers.html
@@ -21,6 +21,7 @@
 <script src="../utils/Utils.js"></script>
 <script>
     {
+        window.MealOrderApp = window.MealOrderApp || {};
         /*global Utils */
         const arrayOfDates = [{
             date: {
diff --git a/client/user/src/mealorder/shell/redux-store.html b/client/user/src/mealorder/shell/redux-store.html
index 35d13e74..304dd0ad 100644
--- a/client/user/src/mealorder/shell/redux-store.html
+++ b/client/user/src/mealorder/shell/redux-store.html
@@ -24,7 +24,7 @@
     {
         /* global Redux, PolymerRedux */
         const store = Redux.createStore(MealOrderApp.reducer);
-        window.MealOrderApp = window.MealOrderApp || {};
+
         MealOrderApp.store = store;
         MealOrderApp.ReduxMixin = PolymerRedux(MealOrderApp.store);
     }

From 88e6b1f60b71e29f92a710f3d18c60ad07f9f991 Mon Sep 17 00:00:00 2001
From: "alexander.karpetc" <alexander.karpetc@gmail.com>
Date: Tue, 10 Apr 2018 13:12:13 +0300
Subject: [PATCH 128/253] Edit docs for inner structure of a menu

---
 client/user/src/mealorder/menu/meal-order-vendor-menu.html  | 3 ++-
 client/user/src/mealorder/menu/meal-order-vendor-menus.html | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/client/user/src/mealorder/menu/meal-order-vendor-menu.html b/client/user/src/mealorder/menu/meal-order-vendor-menu.html
index 26166765..696673e2 100644
--- a/client/user/src/mealorder/menu/meal-order-vendor-menu.html
+++ b/client/user/src/mealorder/menu/meal-order-vendor-menu.html
@@ -176,7 +176,8 @@
                     /**
                      * Menu of a vendor.
                      *
-                     * Initial state represents its structure.
+                     * @property name is name of a vendor.
+                     * @property {array} categories list of categories with dishes.
                      */
                     menu: {
                         type: Array
diff --git a/client/user/src/mealorder/menu/meal-order-vendor-menus.html b/client/user/src/mealorder/menu/meal-order-vendor-menus.html
index 6a352f32..5ebdd00a 100644
--- a/client/user/src/mealorder/menu/meal-order-vendor-menus.html
+++ b/client/user/src/mealorder/menu/meal-order-vendor-menus.html
@@ -154,7 +154,8 @@
 
                     /**
                      * Full menu for day.
-                     * For structure details see {@code redux-store.html} or inner template.
+                     *
+                     * @property {array} each item is a menu of a vendor for a day.
                      */
                     items: {
                         type: Array,

From 35ff375cbe8cddb0ec526c45e368dfed408fac55 Mon Sep 17 00:00:00 2001
From: "alexander.karpetc" <alexander.karpetc@gmail.com>
Date: Tue, 10 Apr 2018 13:16:44 +0300
Subject: [PATCH 129/253] Add `vendor-menus` to the menu container

---
 .../mealorder/menu/meal-order-menu-container.html   | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/client/user/src/mealorder/menu/meal-order-menu-container.html b/client/user/src/mealorder/menu/meal-order-menu-container.html
index b01bb8a5..a5e740a9 100644
--- a/client/user/src/mealorder/menu/meal-order-menu-container.html
+++ b/client/user/src/mealorder/menu/meal-order-menu-container.html
@@ -25,6 +25,9 @@
 <link rel="import" href="../../../bower_components/iron-pages/iron-pages.html">
 <link rel="import" href="../shell/redux-store.html">
 <link rel="import" href="../shell/actions/user-actions.html">
+
+<link rel="import" href="meal-order-vendor-menus.html">
+
 <dom-module id="meal-order-menu-container">
     <template>
         <style>
@@ -117,6 +120,16 @@
                 </template>
             </dom-repeat>
         </paper-tabs>
+        <iron-pages
+                selected="[[routeData.menu]]"
+                attr-for-selected="name"
+                fallback-selection="view404"
+                role="main">
+
+            <meal-order-vendor-menus name="[[routeData.menu]]"
+                                     items="[[menu]]" route="[[subroute]]"
+                                     on-dish-added="addDishToOrder"></meal-order-vendor-menus>
+        </iron-pages>
     </template>
     <script>
         /**

From 605ca364be0973911c88403c38019c6177ac9bfd Mon Sep 17 00:00:00 2001
From: "alexander.karpetc" <alexander.karpetc@gmail.com>
Date: Tue, 10 Apr 2018 13:20:07 +0300
Subject: [PATCH 130/253] Set menu to be open by default

---
 client/user/src/mealorder/menu/meal-order-vendor-menu.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/user/src/mealorder/menu/meal-order-vendor-menu.html b/client/user/src/mealorder/menu/meal-order-vendor-menu.html
index 696673e2..f8d46d4f 100644
--- a/client/user/src/mealorder/menu/meal-order-vendor-menu.html
+++ b/client/user/src/mealorder/menu/meal-order-vendor-menu.html
@@ -115,11 +115,11 @@
             <paper-item on-click="_toggle" class="menu-caption">
                 <div class="menu-caption">
                     [[menu.name]]
-                    <paper-icon-button id="expand" icon="expand-more"></paper-icon-button>
+                    <paper-icon-button id="expand" icon="expand-less"></paper-icon-button>
                 </div>
             </paper-item>
         </div>
-        <div id="menu" class="collapsed">
+        <div id="menu" class="expanded">
             <dom-repeat items="[[menu.categories]]" as="item">
                 <template>
                     <dom-if if="[[item.dishes.length]]">

From b2a46ec4a8ea26f8e52d145b590f480941aa0347 Mon Sep 17 00:00:00 2001
From: "alexander.karpetc" <alexander.karpetc@gmail.com>
Date: Tue, 10 Apr 2018 13:24:20 +0300
Subject: [PATCH 131/253] Optimize imports

---
 client/user/src/mealorder/menu/meal-order-vendor-menu.html  | 3 ---
 client/user/src/mealorder/menu/meal-order-vendor-menus.html | 3 ---
 2 files changed, 6 deletions(-)

diff --git a/client/user/src/mealorder/menu/meal-order-vendor-menu.html b/client/user/src/mealorder/menu/meal-order-vendor-menu.html
index f8d46d4f..713796ab 100644
--- a/client/user/src/mealorder/menu/meal-order-vendor-menu.html
+++ b/client/user/src/mealorder/menu/meal-order-vendor-menu.html
@@ -20,13 +20,10 @@
 
 <script src="../../../bower_components/webcomponentsjs/webcomponents-lite.js"></script>
 <link rel="import" href="../../../bower_components/polymer/polymer-element.html">
-<link rel="import" href="../../../bower_components/iron-list/iron-list.html">
 <link rel="import" href="../../../bower_components/paper-item/paper-item.html">
 <link rel="import" href="../../../bower_components/paper-icon-button/paper-icon-button.html">
-<link rel="import" href="../../../bower_components/paper-button/paper-button.html">
 <link rel="import" href="../../../bower_components/iron-icons/iron-icons.html">
 <link rel="import" href="../../../bower_components/paper-input/paper-input.html">
-<link rel="import" href="../../../bower_components/paper-search/paper-search-bar.html">
 <link rel="import" href="../../../bower_components/paper-item/paper-item.html">
 
 <dom-module id="meal-order-vendor-menu">
diff --git a/client/user/src/mealorder/menu/meal-order-vendor-menus.html b/client/user/src/mealorder/menu/meal-order-vendor-menus.html
index 5ebdd00a..7c57b61d 100644
--- a/client/user/src/mealorder/menu/meal-order-vendor-menus.html
+++ b/client/user/src/mealorder/menu/meal-order-vendor-menus.html
@@ -21,11 +21,8 @@
 <script src="../../../bower_components/webcomponentsjs/webcomponents-lite.js"></script>
 <link rel="import" href="../../../bower_components/polymer/polymer-element.html">
 <link rel="import" href="../../../bower_components/iron-list/iron-list.html">
-<link rel="import" href="../../../bower_components/paper-item/paper-item.html">
 <link rel="import" href="../../../bower_components/paper-icon-button/paper-icon-button.html">
-<link rel="import" href="../../../bower_components/paper-button/paper-button.html">
 <link rel="import" href="../../../bower_components/iron-icons/iron-icons.html">
-<link rel="import" href="../../../bower_components/paper-input/paper-input.html">
 <link rel="import" href="../../../bower_components/paper-search/paper-search-bar.html">
 
 <link rel="import" href="meal-order-vendor-menu.html">

From 1e22e84172fa422321383a09a4cdfe41f46c08dc Mon Sep 17 00:00:00 2001
From: Paul <paulageyev@gmail.com>
Date: Tue, 10 Apr 2018 13:30:53 +0300
Subject: [PATCH 132/253] Add CSS and refactor routing for `menu-order-drawer`

---
 client/user/src/mealorder/meal-order-client-app.html   |  4 ++++
 client/user/src/mealorder/menu/meal-order-drawer.html  |  2 +-
 .../src/mealorder/menu/meal-order-menu-container.html  | 10 +++++++---
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/client/user/src/mealorder/meal-order-client-app.html b/client/user/src/mealorder/meal-order-client-app.html
index e377122c..97e0b5b9 100644
--- a/client/user/src/mealorder/meal-order-client-app.html
+++ b/client/user/src/mealorder/meal-order-client-app.html
@@ -90,6 +90,10 @@
                 font-size: 0.75em;
             }
 
+            app-drawer.history {
+                --app-drawer-width: 300px;
+            }
+
             app-drawer {
                 --app-drawer-content-container: {
                     background-color: #fafafa;
diff --git a/client/user/src/mealorder/menu/meal-order-drawer.html b/client/user/src/mealorder/menu/meal-order-drawer.html
index 3b26cd18..0cb00acd 100644
--- a/client/user/src/mealorder/menu/meal-order-drawer.html
+++ b/client/user/src/mealorder/menu/meal-order-drawer.html
@@ -86,7 +86,7 @@
             }
 
             _changeHistoryUrl() {
-                if (this.routeData.date) {
+                if (this.routeData.date && this.routeData.page.startsWith("history")) {
                     const routeDate = this.routeData.date.split('-');
                     this.set('inputDate', routeDate[0] + "/" + routeDate[1] + "/" + routeDate[2]);
                     const arr = this.routeData.date.split('-');
diff --git a/client/user/src/mealorder/menu/meal-order-menu-container.html b/client/user/src/mealorder/menu/meal-order-menu-container.html
index b01bb8a5..33e7b555 100644
--- a/client/user/src/mealorder/menu/meal-order-menu-container.html
+++ b/client/user/src/mealorder/menu/meal-order-menu-container.html
@@ -53,11 +53,15 @@
                 @apply --layout-horizontal;
                 @apply --layout-center-center;
                 text-decoration: none;
-                color: #4f4f4f;
+                color: #323232;
                 font-size: 1.5em;
             }
 
-            .link-disabled {
+            .disabled .day{
+                color: #8c8c8c;
+            }
+
+            .disabled .day-of-the-week{
                 color: #8c8c8c;
             }
 
@@ -104,7 +108,7 @@
                 <dom-if if="[[!calendar.hasMenu]]">
                     <template>
                         <paper-tab link disabled>
-                            <div class="paper-tab-container link-disabled">
+                            <div class="paper-tab-container disabled">
                                 <div>
                                     <div class="day-of-the-week">{{calendar.date.dayOfTheWeek}}
                                     </div>

From f721485e8b966ca48a1643eeb23a3392959c4221 Mon Sep 17 00:00:00 2001
From: "alexander.karpetc" <alexander.karpetc@gmail.com>
Date: Tue, 10 Apr 2018 15:20:47 +0300
Subject: [PATCH 133/253] Add dom-if for total amount in `user-cart`

---
 .../user/src/mealorder/menu/meal-order-drawer.html |  8 ++++++++
 .../src/mealorder/menu/meal-order-user-cart.html   | 14 ++++++++------
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/client/user/src/mealorder/menu/meal-order-drawer.html b/client/user/src/mealorder/menu/meal-order-drawer.html
index 0cb00acd..10acf224 100644
--- a/client/user/src/mealorder/menu/meal-order-drawer.html
+++ b/client/user/src/mealorder/menu/meal-order-drawer.html
@@ -21,6 +21,8 @@
 <link rel="import" href="../../../bower_components/app-route/app-route.html">
 <link rel="import" href="../../../bower_components/iron-pages/iron-pages.html">
 <link rel="import" href="../../../bower_components/app-datepicker/app-datepicker.html">
+<link rel="import" href="meal-order-user-cart.html">
+
 
 <dom-module id="meal-order-drawer">
     <template>
@@ -48,6 +50,8 @@
                 attr-for-selected="name"
                 fallback-selection="view404"
                 role="main">
+            <meal-order-user-cart name="menu" order="[[order]]"
+                                  on-dish-removed="_removeDishFromOrder"></meal-order-user-cart>
             <app-datepicker name="history" id="date-picker" view="vertical"
                             input-date="[[inputDate]]" date="{{outputDate}}" auto-update-date="true"
                             locale="ru-RU"></app-datepicker>
@@ -98,6 +102,10 @@
                 }
             }
 
+            _removeDishFromOrder() {
+                console.log('removing');
+            }
+
             _updateDate() {
                 const arr = this.outputDate.split('/');
                 const date = {};
diff --git a/client/user/src/mealorder/menu/meal-order-user-cart.html b/client/user/src/mealorder/menu/meal-order-user-cart.html
index 44c544a2..bb83a563 100644
--- a/client/user/src/mealorder/menu/meal-order-user-cart.html
+++ b/client/user/src/mealorder/menu/meal-order-user-cart.html
@@ -114,12 +114,14 @@
                     </dom-repeat>
                 </template>
             </dom-repeat>
-
-            <div class="total">
-                <div class="amount">Общая сумма:</div>
-                <div class="price">[[total]]</div>
-            </div>
-
+            <dom-if if="[[order.length]]">
+                <template>
+                    <div class="total">
+                        <div class="amount">Общая сумма:</div>
+                        <div class="price">[[total]]</div>
+                    </div>
+                </template>
+            </dom-if>
         </div>
     </template>
     <script>

From f32e91d666ddde76ae094aafd0669776a1dc80cc Mon Sep 17 00:00:00 2001
From: "alexander.karpetc" <alexander.karpetc@gmail.com>
Date: Tue, 10 Apr 2018 15:45:00 +0300
Subject: [PATCH 134/253] Add action handler for removing the dish

---
 .../src/mealorder/menu/meal-order-drawer.html    | 16 ++++++++++++++--
 .../mealorder/shell/actions/user-actions.html    |  1 +
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/client/user/src/mealorder/menu/meal-order-drawer.html b/client/user/src/mealorder/menu/meal-order-drawer.html
index 10acf224..4230e357 100644
--- a/client/user/src/mealorder/menu/meal-order-drawer.html
+++ b/client/user/src/mealorder/menu/meal-order-drawer.html
@@ -82,6 +82,17 @@
                 }
             }
 
+            static get actions() {
+                return {
+                    removeDish(dish) {
+                        return {
+                            type: MealOrderApp.UserAction.REMOVE_DISH,
+                            dish: dish
+                        }
+                    }
+                }
+            }
+
             static get observers() {
                 return [
                     '_updateDate(outputDate)',
@@ -102,8 +113,8 @@
                 }
             }
 
-            _removeDishFromOrder() {
-                console.log('removing');
+            _removeDishFromOrder(e) {
+                this.dispatch('removeDish', e.detail);
             }
 
             _updateDate() {
@@ -118,6 +129,7 @@
                 this.dispatchEvent(new CustomEvent('changed-history-date', {detail: date}));
             }
         }
+
         window.customElements.define(MealOrderDrawer.is, MealOrderDrawer);
     </script>
 </dom-module>
diff --git a/client/user/src/mealorder/shell/actions/user-actions.html b/client/user/src/mealorder/shell/actions/user-actions.html
index 14172041..68a52389 100644
--- a/client/user/src/mealorder/shell/actions/user-actions.html
+++ b/client/user/src/mealorder/shell/actions/user-actions.html
@@ -22,5 +22,6 @@
     MealOrderApp.UserAction = {
         CHANGE_CURRENT_MENU: "CHANGE_CURRENT_MENU",
         CHANGE_CURRENT_CART: 'CHANGE_CURRENT_CART',
+        REMOVE_DISH: 'REMOVE_DISH',
     }
 </script>

From 83e57b101a9acd5d3f3db6f4f7b74e45770756c4 Mon Sep 17 00:00:00 2001
From: "alexander.karpetc" <alexander.karpetc@gmail.com>
Date: Tue, 10 Apr 2018 15:52:39 +0300
Subject: [PATCH 135/253] `menu-container` throws redux event

---
 .../menu/meal-order-menu-container.html       | 70 +++++++++++--------
 .../mealorder/shell/actions/user-actions.html |  1 +
 2 files changed, 43 insertions(+), 28 deletions(-)

diff --git a/client/user/src/mealorder/menu/meal-order-menu-container.html b/client/user/src/mealorder/menu/meal-order-menu-container.html
index 93bce71f..1ccdf6c7 100644
--- a/client/user/src/mealorder/menu/meal-order-menu-container.html
+++ b/client/user/src/mealorder/menu/meal-order-menu-container.html
@@ -60,11 +60,11 @@
                 font-size: 1.5em;
             }
 
-            .disabled .day{
+            .disabled .day {
                 color: #8c8c8c;
             }
 
-            .disabled .day-of-the-week{
+            .disabled .day-of-the-week {
                 color: #8c8c8c;
             }
 
@@ -93,34 +93,34 @@
         <paper-tabs class="tabs" selected="[[routeData.date]]" attr-for-selected='key'>
             <dom-repeat items="{{calendar}}" as="calendar">
                 <template>
-                <dom-if if="[[calendar.hasMenu]]">
-                    <template>
-                        <paper-tab link>
-                            <a class="paper-tab-container"
-                               href="/#/menu/[[calendar.date.year]]-[[calendar.date.month]]-[[calendar.date.day]]"
-                               on-click="_handleClick">
-                                <div>
-                                    <div class="day-of-the-week">{{calendar.date.dayOfTheWeek}}
+                    <dom-if if="[[calendar.hasMenu]]">
+                        <template>
+                            <paper-tab link>
+                                <a class="paper-tab-container"
+                                   href="/#/menu/[[calendar.date.year]]-[[calendar.date.month]]-[[calendar.date.day]]"
+                                   on-click="_handleClick">
+                                    <div>
+                                        <div class="day-of-the-week">{{calendar.date.dayOfTheWeek}}
+                                        </div>
+                                        <div class="day">{{calendar.date.day}}</div>
                                     </div>
-                                    <div class="day">{{calendar.date.day}}</div>
-                                </div>
-                            </a>
-                        </paper-tab>
-                    </template>
-                </dom-if>
-                <dom-if if="[[!calendar.hasMenu]]">
-                    <template>
-                        <paper-tab link disabled>
-                            <div class="paper-tab-container disabled">
-                                <div>
-                                    <div class="day-of-the-week">{{calendar.date.dayOfTheWeek}}
+                                </a>
+                            </paper-tab>
+                        </template>
+                    </dom-if>
+                    <dom-if if="[[!calendar.hasMenu]]">
+                        <template>
+                            <paper-tab link disabled>
+                                <div class="paper-tab-container disabled">
+                                    <div>
+                                        <div class="day-of-the-week">{{calendar.date.dayOfTheWeek}}
+                                        </div>
+                                        <div class="day">{{calendar.date.day}}</div>
                                     </div>
-                                    <div class="day">{{calendar.date.day}}</div>
                                 </div>
-                            </div>
-                        </paper-tab>
-                    </template>
-                </dom-if>
+                            </paper-tab>
+                        </template>
+                    </dom-if>
                 </template>
             </dom-repeat>
         </paper-tabs>
@@ -132,7 +132,7 @@
 
             <meal-order-vendor-menus name="[[routeData.menu]]"
                                      items="[[menu]]" route="[[subroute]]"
-                                     on-dish-added="addDishToOrder"></meal-order-vendor-menus>
+                                     on-dish-added="_addDishToOrder"></meal-order-vendor-menus>
         </iron-pages>
     </template>
     <script>
@@ -191,6 +191,12 @@
                  * @param {date} contains selected date by tab
                  */
                 return {
+                    addDish(dish) {
+                        return {
+                            type: MealOrderApp.UserAction.ADD_DISH,
+                            dish: dish
+                        }
+                    },
                     changeCurrentMenu(date) {
                         return {
                             type: MealOrderApp.UserAction.CHANGE_CURRENT_MENU,
@@ -236,11 +242,19 @@
                 }
             }
 
+            _addDishToOrder(e) {
+                const order = {};
+                order.dish = e.detail;
+                order.date = this.routeData.date;
+                this.dispatch('addDish', order);
+            }
+
             _handleClick(e) {
                 this.dispatch('changeCurrentMenu', this.calendar[e.model.index].date);
                 this.dispatch('changeCurrentCart', this.calendar[e.model.index].date);
             }
         }
+
         window.customElements.define(MealOrderMenuContainer.is, MealOrderMenuContainer);
     </script>
 </dom-module>
diff --git a/client/user/src/mealorder/shell/actions/user-actions.html b/client/user/src/mealorder/shell/actions/user-actions.html
index 14172041..9f64ed30 100644
--- a/client/user/src/mealorder/shell/actions/user-actions.html
+++ b/client/user/src/mealorder/shell/actions/user-actions.html
@@ -22,5 +22,6 @@
     MealOrderApp.UserAction = {
         CHANGE_CURRENT_MENU: "CHANGE_CURRENT_MENU",
         CHANGE_CURRENT_CART: 'CHANGE_CURRENT_CART',
+        ADD_DISH: 'ADD_DISH',
     }
 </script>

From 9c649b96fac1f58f9c78bffaef0ec2505b303a02 Mon Sep 17 00:00:00 2001
From: "alexander.karpetc" <alexander.karpetc@gmail.com>
Date: Tue, 10 Apr 2018 16:04:37 +0300
Subject: [PATCH 136/253] Add `user-order` to `user-cart`

---
 .../src/mealorder/meal-order-client-app.html  | 19 ++++++++++++++++++-
 .../src/mealorder/menu/meal-order-drawer.html | 18 +-----------------
 .../mealorder/menu/meal-order-user-cart.html  | 18 ++++--------------
 3 files changed, 23 insertions(+), 32 deletions(-)

diff --git a/client/user/src/mealorder/meal-order-client-app.html b/client/user/src/mealorder/meal-order-client-app.html
index 97e0b5b9..b4635873 100644
--- a/client/user/src/mealorder/meal-order-client-app.html
+++ b/client/user/src/mealorder/meal-order-client-app.html
@@ -174,7 +174,8 @@
                         </div>
                     </app-toolbar>
                 </iron-pages>
-                <meal-order-drawer order="[[order]]"></meal-order-drawer>
+                <meal-order-drawer order="[[order]]"
+                                   on-dish-removed="_removeDishFromOrder"></meal-order-drawer>
 
             </app-drawer>
 
@@ -281,6 +282,22 @@
                 }
             }
 
+            static get actions() {
+                return {
+                    removeDish(dish) {
+                        return {
+                            type: MealOrderApp.UserAction.REMOVE_DISH,
+                            dish: dish
+                        }
+                    }
+                }
+            }
+
+            _removeDishFromOrder(e) {
+                console.log(e.detail);
+                this.dispatch('removeDish', e.detail);
+            }
+
             _getClassForDrawer(page) {
                 return page;
             }
diff --git a/client/user/src/mealorder/menu/meal-order-drawer.html b/client/user/src/mealorder/menu/meal-order-drawer.html
index 4230e357..4ed3060f 100644
--- a/client/user/src/mealorder/menu/meal-order-drawer.html
+++ b/client/user/src/mealorder/menu/meal-order-drawer.html
@@ -50,8 +50,7 @@
                 attr-for-selected="name"
                 fallback-selection="view404"
                 role="main">
-            <meal-order-user-cart name="menu" order="[[order]]"
-                                  on-dish-removed="_removeDishFromOrder"></meal-order-user-cart>
+            <meal-order-user-cart name="menu" order="[[order]]"></meal-order-user-cart>
             <app-datepicker name="history" id="date-picker" view="vertical"
                             input-date="[[inputDate]]" date="{{outputDate}}" auto-update-date="true"
                             locale="ru-RU"></app-datepicker>
@@ -82,17 +81,6 @@
                 }
             }
 
-            static get actions() {
-                return {
-                    removeDish(dish) {
-                        return {
-                            type: MealOrderApp.UserAction.REMOVE_DISH,
-                            dish: dish
-                        }
-                    }
-                }
-            }
-
             static get observers() {
                 return [
                     '_updateDate(outputDate)',
@@ -113,10 +101,6 @@
                 }
             }
 
-            _removeDishFromOrder(e) {
-                this.dispatch('removeDish', e.detail);
-            }
-
             _updateDate() {
                 const arr = this.outputDate.split('/');
                 const date = {};
diff --git a/client/user/src/mealorder/menu/meal-order-user-cart.html b/client/user/src/mealorder/menu/meal-order-user-cart.html
index bb83a563..e2825e89 100644
--- a/client/user/src/mealorder/menu/meal-order-user-cart.html
+++ b/client/user/src/mealorder/menu/meal-order-user-cart.html
@@ -31,6 +31,9 @@
 <link rel="import" href="../../../bower_components/app-layout/app-scroll-effects/app-scroll-effects.html">
 <link rel="import" href="../../../bower_components/app-layout/app-toolbar/app-toolbar.html">
 <link rel="import" href="../../../bower_components/iron-flex-layout/iron-flex-layout.html">
+
+<link rel="import" href="meal-order-user-order.html">
+
 <dom-module id="meal-order-user-cart">
     <template>
         <style>
@@ -98,20 +101,7 @@
 
             <dom-repeat items="[[order]]" as="dish">
                 <template>
-                    <div class="vendor">
-                        <div>[[dish.vendor]]</div>
-                        <paper-icon-button icon="delete" class="icon-delete"></paper-icon-button>
-                    </div>
-                    <dom-repeat items="[[dish.dishes]]" as="d">
-                        <template>
-                            <div class="order-details">
-                                <div class="order-title">[[d.title]]</div>
-                                <div class="order-price">[[d.price]] ₴</div>
-                                <div class="order-quantity">[[d.quantity]]</div>
-                                <paper-icon-button icon="remove" on-click="_removeDish"></paper-icon-button>
-                            </div>
-                        </template>
-                    </dom-repeat>
+                    <meal-order-user-order order="[[dish]]"></meal-order-user-order>
                 </template>
             </dom-repeat>
             <dom-if if="[[order.length]]">

From 4ac832c1bfd8e1ae1820f08176f8f39fe1af1c1d Mon Sep 17 00:00:00 2001
From: "alexander.karpetc" <alexander.karpetc@gmail.com>
Date: Tue, 10 Apr 2018 16:20:54 +0300
Subject: [PATCH 137/253] Add redux action for removing dish

---
 client/user/src/mealorder/meal-order-client-app.html      | 6 ++++--
 client/user/src/mealorder/menu/meal-order-user-cart.html  | 6 ------
 client/user/src/mealorder/menu/meal-order-user-order.html | 2 +-
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/client/user/src/mealorder/meal-order-client-app.html b/client/user/src/mealorder/meal-order-client-app.html
index b4635873..9de3c082 100644
--- a/client/user/src/mealorder/meal-order-client-app.html
+++ b/client/user/src/mealorder/meal-order-client-app.html
@@ -294,8 +294,10 @@
             }
 
             _removeDishFromOrder(e) {
-                console.log(e.detail);
-                this.dispatch('removeDish', e.detail);
+                const dish = {};
+                dish.date = this.currentDate;
+                dish.details = e.detail;
+                this.dispatch('removeDish', dish);
             }
 
             _getClassForDrawer(page) {
diff --git a/client/user/src/mealorder/menu/meal-order-user-cart.html b/client/user/src/mealorder/menu/meal-order-user-cart.html
index e2825e89..dc64b2f0 100644
--- a/client/user/src/mealorder/menu/meal-order-user-cart.html
+++ b/client/user/src/mealorder/menu/meal-order-user-cart.html
@@ -159,12 +159,6 @@
                     }
                 }
             };
-            _removeDish(e) {
-                const dish = {};
-                dish.vendor = e.model.parentModel.__data.dish.vendor;
-                dish.name = e.model.__data.d.title;
-                this.dispatchEvent(new CustomEvent('dish-removed', {detail: dish}));
-            }
 
             _getTotalAmount() {
                 let sum = 0;
diff --git a/client/user/src/mealorder/menu/meal-order-user-order.html b/client/user/src/mealorder/menu/meal-order-user-order.html
index 97f0dd75..02798354 100644
--- a/client/user/src/mealorder/menu/meal-order-user-order.html
+++ b/client/user/src/mealorder/menu/meal-order-user-order.html
@@ -105,7 +105,7 @@
                 const dish = {};
                 dish.vendor = this.order.vendor;
                 dish.name = this.order.dishes[e.model.index].title;
-                this.dispatchEvent(new CustomEvent('dish-removed', {detail: dish}));
+                this.dispatchEvent(new CustomEvent('dish-removed', {composed: true, detail: dish}));
             }
         }
 

From d38993bb4a6d6f2dba9c6de00acfc8bbb1a2b163 Mon Sep 17 00:00:00 2001
From: "alexander.karpetc" <alexander.karpetc@gmail.com>
Date: Tue, 10 Apr 2018 16:22:49 +0300
Subject: [PATCH 138/253] Set custom event to composed

---
 client/user/src/mealorder/menu/meal-order-vendor-menu.html  | 2 +-
 client/user/src/mealorder/menu/meal-order-vendor-menus.html | 5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/client/user/src/mealorder/menu/meal-order-vendor-menu.html b/client/user/src/mealorder/menu/meal-order-vendor-menu.html
index 713796ab..273f56e6 100644
--- a/client/user/src/mealorder/menu/meal-order-vendor-menu.html
+++ b/client/user/src/mealorder/menu/meal-order-vendor-menu.html
@@ -208,7 +208,7 @@
                 dish.vendor = this.menu.name;
                 dish.price = this.menu.categories[e.model.parentModel.index].dishes[e.model.index].price;
                 dish.title = this.menu.categories[e.model.parentModel.index].dishes[e.model.index].title;
-                this.dispatchEvent(new CustomEvent('dish-added', {detail: dish}));
+                this.dispatchEvent(new CustomEvent('dish-added', {composed: true, detail: dish}));
             }
         }
 
diff --git a/client/user/src/mealorder/menu/meal-order-vendor-menus.html b/client/user/src/mealorder/menu/meal-order-vendor-menus.html
index 7c57b61d..5401b6b4 100644
--- a/client/user/src/mealorder/menu/meal-order-vendor-menus.html
+++ b/client/user/src/mealorder/menu/meal-order-vendor-menus.html
@@ -117,7 +117,7 @@
                 <div class="non-select">
                     <div class="item">
                         <div class="pad">
-                            <meal-order-vendor-menu menu="[[item]]" on-dish-added="addDish"
+                            <meal-order-vendor-menu menu="[[item]]"
                                                     on-vendor-menu-resize="_resize"></meal-order-vendor-menu>
                         </div>
                     </div>
@@ -182,9 +182,6 @@
             _resize() {
                 this.shadowRoot.querySelector("#list").notifyResize();
             }
-            addDish(e) {
-                this.dispatchEvent(new CustomEvent('dish-added', {detail: e.detail}));
-            }
 
             filteredItems() {
                 const predicate = this.filter;

From 3e5af2325842d8e231a987fa0f993ebcb43d07da Mon Sep 17 00:00:00 2001
From: "alexander.karpetc" <alexander.karpetc@gmail.com>
Date: Tue, 10 Apr 2018 16:32:12 +0300
Subject: [PATCH 139/253] Remove redundant imports

---
 .../mealorder/menu/meal-order-user-cart.html  | 55 -------------------
 1 file changed, 55 deletions(-)

diff --git a/client/user/src/mealorder/menu/meal-order-user-cart.html b/client/user/src/mealorder/menu/meal-order-user-cart.html
index dc64b2f0..1371d369 100644
--- a/client/user/src/mealorder/menu/meal-order-user-cart.html
+++ b/client/user/src/mealorder/menu/meal-order-user-cart.html
@@ -19,18 +19,6 @@
   -->
 <script src="../../../bower_components/webcomponentsjs/webcomponents-lite.js"></script>
 <link rel="import" href="../../../bower_components/polymer/polymer-element.html">
-<link rel="import" href="../../../bower_components/iron-list/iron-list.html">
-<link rel="import" href="../../../bower_components/paper-item/paper-item.html">
-<link rel="import" href="../../../bower_components/paper-icon-button/paper-icon-button.html">
-<link rel="import" href="../../../bower_components/paper-button/paper-button.html">
-<link rel="import" href="../../../bower_components/iron-icons/iron-icons.html">
-<link rel="import" href="../../../bower_components/app-layout/app-drawer-layout/app-drawer-layout.html">
-<link rel="import" href="../../../bower_components/app-layout/app-drawer/app-drawer.html">
-<link rel="import" href="../../../bower_components/app-layout/app-header/app-header.html">
-<link rel="import" href="../../../bower_components/app-layout/app-header-layout/app-header-layout.html">
-<link rel="import" href="../../../bower_components/app-layout/app-scroll-effects/app-scroll-effects.html">
-<link rel="import" href="../../../bower_components/app-layout/app-toolbar/app-toolbar.html">
-<link rel="import" href="../../../bower_components/iron-flex-layout/iron-flex-layout.html">
 
 <link rel="import" href="meal-order-user-order.html">
 
@@ -41,55 +29,12 @@
                 color: #4f4f4f;
             }
 
-            .order-details {
-                display: flex;
-                font-size: 15px;
-                align-items: center;
-                border-bottom: 2px solid #fcfcfc;
-            }
-
-            .vendor {
-                display: flex;
-                justify-content: space-between;
-                align-items: center;
-                padding-left: 4%;
-                background-color: #fcfcfc;
-            }
-
             .cart {
                 overflow-x: hidden;
                 overflow-y: auto;
                 max-height: 93vh;
             }
 
-            .order-title {
-                width: 50%;
-                text-align: left;
-                padding-left: 4%;
-            }
-
-            .order-price {
-                width: 20%;
-                text-align: right;
-            }
-
-            .order-quantity {
-                width: 15%;
-            }
-
-            .amount-title {
-                width: 50%;
-                text-align: left;
-                padding-left: 4%;
-                font-weight: bolder;
-            }
-
-            .amount-order-price {
-                width: 20%;
-                text-align: right;
-
-            }
-
             .total {
                 display: flex;
                 justify-content: space-between;

From 54921ec083ed8b8b7c07a5e5bca2cdbef123a4c3 Mon Sep 17 00:00:00 2001
From: Paul <paulageyev@gmail.com>
Date: Tue, 10 Apr 2018 17:38:55 +0300
Subject: [PATCH 140/253] Add `selectedDay` property for routing

---
 .../src/mealorder/meal-order-client-app.html  |  51 ++++++---
 .../src/mealorder/menu/meal-order-drawer.html |  25 +++--
 .../menu/meal-order-menu-container.html       | 106 ++++++++++--------
 .../mealorder/shell/reducers/reducers.html    |   1 +
 4 files changed, 114 insertions(+), 69 deletions(-)

diff --git a/client/user/src/mealorder/meal-order-client-app.html b/client/user/src/mealorder/meal-order-client-app.html
index 97e0b5b9..f9d9a7b3 100644
--- a/client/user/src/mealorder/meal-order-client-app.html
+++ b/client/user/src/mealorder/meal-order-client-app.html
@@ -21,10 +21,13 @@
 
 <link rel="import" href="../../bower_components/polymer/polymer-element.html">
 <link rel="import" href="../../bower_components/app-layout/app-drawer/app-drawer.html">
-<link rel="import" href="../../bower_components/app-layout/app-drawer-layout/app-drawer-layout.html">
+<link rel="import"
+      href="../../bower_components/app-layout/app-drawer-layout/app-drawer-layout.html">
 <link rel="import" href="../../bower_components/app-layout/app-header/app-header.html">
-<link rel="import" href="../../bower_components/app-layout/app-header-layout/app-header-layout.html">
-<link rel="import" href="../../bower_components/app-layout/app-scroll-effects/app-scroll-effects.html">
+<link rel="import"
+      href="../../bower_components/app-layout/app-header-layout/app-header-layout.html">
+<link rel="import"
+      href="../../bower_components/app-layout/app-scroll-effects/app-scroll-effects.html">
 <link rel="import" href="../../bower_components/app-layout/app-toolbar/app-toolbar.html">
 <link rel="import" href="../../bower_components/app-route/app-location.html">
 <link rel="import" href="../../bower_components/app-route/app-route.html">
@@ -162,8 +165,8 @@
                         <div class="app-toolbar-header">
                             <div class="app-toolbar-content">Заказ</div>
                             <div>
-                                <div id="day">Пн</div>
-                                <div id="day-of-the-week">21</div>
+                                <div id="day">[[selectedDay.stringDay]]</div>
+                                <div id="day-of-the-week">[[selectedDay.day]]</div>
                             </div>
                         </div>
                     </app-toolbar>
@@ -198,7 +201,8 @@
                                                        icon="maps:icons:history"></iron-icon>
                                         </a>
                                         <div>
-                                            <iron-icon class="app-toolbar-content" icon="icons:shopping-cart"
+                                            <iron-icon class="app-toolbar-content"
+                                                       icon="icons:shopping-cart"
                                                        drawer-toggle></iron-icon>
                                         </div>
                                     </div>
@@ -214,7 +218,8 @@
                                                        icon="maps:icons:add"></iron-icon>
                                         </a>
                                         <div>
-                                            <iron-icon class="app-toolbar-content" icon="icons:date-range"
+                                            <iron-icon class="app-toolbar-content"
+                                                       icon="icons:date-range"
                                                        drawer-toggle></iron-icon>
                                         </div>
                                     </div>
@@ -228,8 +233,8 @@
                         attr-for-selected="name"
                         fallback-selection="view404"
                         role="main">
-                    <meal-order-menu-container name="menu"
-                                           on-dish-added="_addDishToOrder"></meal-order-menu-container>
+                    <meal-order-menu-container on-date-updated="_updateDay"
+                                               name="menu"></meal-order-menu-container>
                 </iron-pages>
 
             </app-header-layout>
@@ -249,17 +254,13 @@
          * @appliesMixin MealOrderApp.ReduxMixin
          */
         class MealOrderClientApp extends MealOrderApp.ReduxMixin(Polymer.Element) {
+
             static get is() {
                 return 'meal-order-client-app';
             }
 
             static get properties() {
                 return {
-                    /**
-                     * Chosen date.
-                     */
-                    currentDate: {},
-
                     /**
                      * Current user's meal order.
                      */
@@ -274,6 +275,14 @@
                         type: Array,
                         statePath: 'currentHistory'
                     },
+
+                    /**
+                     * Current selected day by user.
+                     */
+                    selectedDay: {
+                        type: Object,
+                    },
+
                     /**
                      * Used for routing.
                      */
@@ -284,7 +293,21 @@
             _getClassForDrawer(page) {
                 return page;
             }
+
+            _updateDay(e) {
+                const date = new Date(e.detail.year, e.detail.month - 1, e.detail.day);
+
+                let stringDay = date.toLocaleDateString("ru-RU", {weekday: 'long'});
+                stringDay = stringDay.charAt(0).toUpperCase() + stringDay.slice(1);
+
+                const selectedDay = {
+                    day: e.detail.day,
+                    stringDay: stringDay,
+                };
+                this.set('selectedDay', selectedDay);
+            }
         }
+
         window.customElements.define(MealOrderClientApp.is, MealOrderClientApp);
     </script>
 </dom-module>
diff --git a/client/user/src/mealorder/menu/meal-order-drawer.html b/client/user/src/mealorder/menu/meal-order-drawer.html
index 0cb00acd..515648cb 100644
--- a/client/user/src/mealorder/menu/meal-order-drawer.html
+++ b/client/user/src/mealorder/menu/meal-order-drawer.html
@@ -41,7 +41,8 @@
         <app-route
                 route="{{route}}"
                 pattern="/:page/:date"
-                data="{{routeData}}"></app-route>
+                data="{{routeData}}">
+        </app-route>
 
         <iron-pages
                 selected="[[routeData.page]]"
@@ -99,17 +100,21 @@
             }
 
             _updateDate() {
-                const arr = this.outputDate.split('/');
-                const date = {};
-                date.year = arr[0];
-                date.month = arr[1];
-                date.day = arr[2];
-                const newRouteData = {};
-                newRouteData.page = 'history/' + date.year + "-" + date.month + "-" + date.day;
-                this.set('routeData', newRouteData);
-                this.dispatchEvent(new CustomEvent('changed-history-date', {detail: date}));
+                if (this.routeData.page && this.routeData.page.startsWith("history")) {
+                    const arr = this.outputDate.split('/');
+                    const date = {};
+                    date.year = arr[0];
+                    date.month = arr[1];
+                    date.day = arr[2];
+                    const newRouteData = {};
+                    newRouteData.page = 'history';
+                    newRouteData.date = date.year + "-" + date.month + "-" + date.day;
+                    this.set('routeData', newRouteData);
+                    this.dispatchEvent(new CustomEvent('changed-history-date', {detail: date}));
+                }
             }
         }
+
         window.customElements.define(MealOrderDrawer.is, MealOrderDrawer);
     </script>
 </dom-module>
diff --git a/client/user/src/mealorder/menu/meal-order-menu-container.html b/client/user/src/mealorder/menu/meal-order-menu-container.html
index 33e7b555..227f5e17 100644
--- a/client/user/src/mealorder/menu/meal-order-menu-container.html
+++ b/client/user/src/mealorder/menu/meal-order-menu-container.html
@@ -57,11 +57,11 @@
                 font-size: 1.5em;
             }
 
-            .disabled .day{
+            .disabled .day {
                 color: #8c8c8c;
             }
 
-            .disabled .day-of-the-week{
+            .disabled .day-of-the-week {
                 color: #8c8c8c;
             }
 
@@ -82,42 +82,45 @@
 
         <app-route
                 route="{{route}}"
-                pattern="/:menu/:date"
-                data="{{routeData}}"
-                tail="{{subroute}}">
+                pattern="/:page/:date"
+                data="{{routeData}}">
         </app-route>
 
         <paper-tabs class="tabs" selected="[[routeData.date]]" attr-for-selected='key'>
             <dom-repeat items="{{calendar}}" as="calendar">
                 <template>
-                <dom-if if="[[calendar.hasMenu]]">
-                    <template>
-                        <paper-tab link>
-                            <a class="paper-tab-container"
-                               href="/#/menu/[[calendar.date.year]]-[[calendar.date.month]]-[[calendar.date.day]]"
-                               on-click="_handleClick">
-                                <div>
-                                    <div class="day-of-the-week">{{calendar.date.dayOfTheWeek}}
+                    <dom-if if="[[calendar.hasMenu]]">
+                        <template>
+                            <paper-tab
+                                    key="[[calendar.date.year]]-[[calendar.date.month]]-[[calendar.date.day]]"
+                                    link>
+                                <a class="paper-tab-container"
+                                   href="/#/menu/[[calendar.date.year]]-[[calendar.date.month]]-[[calendar.date.day]]"
+                                   on-click="_handleClick">
+                                    <div>
+                                        <div class="day-of-the-week">{{calendar.date.dayOfTheWeek}}
+                                        </div>
+                                        <div class="day">{{calendar.date.day}}</div>
                                     </div>
-                                    <div class="day">{{calendar.date.day}}</div>
-                                </div>
-                            </a>
-                        </paper-tab>
-                    </template>
-                </dom-if>
-                <dom-if if="[[!calendar.hasMenu]]">
-                    <template>
-                        <paper-tab link disabled>
-                            <div class="paper-tab-container disabled">
-                                <div>
-                                    <div class="day-of-the-week">{{calendar.date.dayOfTheWeek}}
+                                </a>
+                            </paper-tab>
+                        </template>
+                    </dom-if>
+                    <dom-if if="[[!calendar.hasMenu]]">
+                        <template>
+                            <paper-tab
+                                    key="[[calendar.date.year]]-[[calendar.date.month]]-[[calendar.date.day]]"
+                                    link disabled>
+                                <div class="paper-tab-container disabled">
+                                    <div>
+                                        <div class="day-of-the-week">{{calendar.date.dayOfTheWeek}}
+                                        </div>
+                                        <div class="day">{{calendar.date.day}}</div>
                                     </div>
-                                    <div class="day">{{calendar.date.day}}</div>
                                 </div>
-                            </div>
-                        </paper-tab>
-                    </template>
-                </dom-if>
+                            </paper-tab>
+                        </template>
+                    </dom-if>
                 </template>
             </dom-repeat>
         </paper-tabs>
@@ -159,6 +162,13 @@
                      */
                     routeData: {
                         type: Object,
+                    },
+
+                    /**
+                     * Current selected day by user.
+                     */
+                    selectedDay: {
+                        type: Object,
                     }
                 };
             }
@@ -193,13 +203,6 @@
                 }
             }
 
-            connectedCallback() {
-                super.connectedCallback();
-                if (this.calendar[0].hasMenu) {
-                    this.dispatch('changeCurrentMenu', this.calendar[0].date);
-                    this.dispatch('changeCurrentCart', this.calendar[0].date);
-                }
-            }
 
             static get observers() {
                 return [
@@ -208,18 +211,30 @@
             }
 
             _pageChanged() {
-                if (!this.route.path) {
+                if (!this.routeData.page) {
                     this.set('route.path', '/menu/' + this.calendar[0].date.year + "-" +
                         this.calendar[0].date.month + "-" + this.calendar[0].date.day);
                 }
                 else {
-                    const arr = this.routeData.date.split('-');
-                    const date = {};
-                    date.year = arr[0];
-                    date.month = arr[1];
-                    date.day = arr[2];
-                    this.dispatch('changeCurrentMenu', date);
-                    this.dispatch('changeCurrentCart', date);
+                    let date = {};
+                    if (this.routeData.page.startsWith("menu")) {
+                        if (!this.routeData.date) {
+                            date = this.selectedDay;
+                            console.log(date);
+                            this.set('route.path', '/menu/' + date.year + "-" +
+                                date.month + "-" + date.day);
+                        }
+                        else {
+                            const arr = this.routeData.date.split('-');
+                            date.year = arr[0];
+                            date.month = arr[1];
+                            date.day = arr[2];
+                            this.set('selectedDay', date);
+                        }
+                        this.dispatch('changeCurrentMenu', date);
+                        this.dispatch('changeCurrentCart', date);
+                        this.dispatchEvent(new CustomEvent('date-updated', {detail: date}));
+                    }
                 }
             }
 
@@ -228,6 +243,7 @@
                 this.dispatch('changeCurrentCart', this.calendar[e.model.index].date);
             }
         }
+
         window.customElements.define(MealOrderMenuContainer.is, MealOrderMenuContainer);
     </script>
 </dom-module>
diff --git a/client/user/src/mealorder/shell/reducers/reducers.html b/client/user/src/mealorder/shell/reducers/reducers.html
index 4fb97d7e..ca23b8a0 100644
--- a/client/user/src/mealorder/shell/reducers/reducers.html
+++ b/client/user/src/mealorder/shell/reducers/reducers.html
@@ -97,6 +97,7 @@
             }];
 
         MealOrderApp.initialState = {
+
             calendar: arrayOfDates,
             menuForDay: [],
 

From 027c58634f65943b452f4d84eb6d5362d8a4885e Mon Sep 17 00:00:00 2001
From: "alexander.karpetc" <alexander.karpetc@gmail.com>
Date: Tue, 10 Apr 2018 17:44:31 +0300
Subject: [PATCH 141/253] Set name in iron pages static

---
 .../user/src/mealorder/menu/meal-order-menu-container.html  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/client/user/src/mealorder/menu/meal-order-menu-container.html b/client/user/src/mealorder/menu/meal-order-menu-container.html
index b0ae1950..f8cb721b 100644
--- a/client/user/src/mealorder/menu/meal-order-menu-container.html
+++ b/client/user/src/mealorder/menu/meal-order-menu-container.html
@@ -128,13 +128,13 @@
             </dom-repeat>
         </paper-tabs>
         <iron-pages
-                selected="[[routeData.menu]]"
+                selected="[[routeData.page]]"
                 attr-for-selected="name"
                 fallback-selection="view404"
                 role="main">
 
-            <meal-order-vendor-menus name="[[routeData.menu]]"
-                                     items="[[menu]]" route="[[subroute]]"
+            <meal-order-vendor-menus name="menu"
+                                     items="[[menu]]"
                                      on-dish-added="_addDishToOrder"></meal-order-vendor-menus>
         </iron-pages>
     </template>

From c360641a54366a0a909b043f9abadfdb3bf70ab6 Mon Sep 17 00:00:00 2001
From: Paul <paulageyev@gmail.com>
Date: Tue, 10 Apr 2018 17:58:55 +0300
Subject: [PATCH 142/253] Add docs for the calendar

---
 client/user/src/mealorder/meal-order-client-app.html |  8 ++++----
 .../user/src/mealorder/menu/meal-order-drawer.html   | 12 ++++++++++--
 .../mealorder/menu/meal-order-menu-container.html    |  3 +--
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/client/user/src/mealorder/meal-order-client-app.html b/client/user/src/mealorder/meal-order-client-app.html
index f9d9a7b3..b0fbcadf 100644
--- a/client/user/src/mealorder/meal-order-client-app.html
+++ b/client/user/src/mealorder/meal-order-client-app.html
@@ -165,7 +165,7 @@
                         <div class="app-toolbar-header">
                             <div class="app-toolbar-content">Заказ</div>
                             <div>
-                                <div id="day">[[selectedDay.stringDay]]</div>
+                                <div id="day">[[selectedDay.dayOfTheWeek]]</div>
                                 <div id="day-of-the-week">[[selectedDay.day]]</div>
                             </div>
                         </div>
@@ -297,12 +297,12 @@
             _updateDay(e) {
                 const date = new Date(e.detail.year, e.detail.month - 1, e.detail.day);
 
-                let stringDay = date.toLocaleDateString("ru-RU", {weekday: 'long'});
-                stringDay = stringDay.charAt(0).toUpperCase() + stringDay.slice(1);
+                let dayOfTheWeek = date.toLocaleDateString("ru-RU", {weekday: 'long'});
+                dayOfTheWeek = dayOfTheWeek.charAt(0).toUpperCase() + dayOfTheWeek.slice(1);
 
                 const selectedDay = {
                     day: e.detail.day,
-                    stringDay: stringDay,
+                    dayOfTheWeek: dayOfTheWeek,
                 };
                 this.set('selectedDay', selectedDay);
             }
diff --git a/client/user/src/mealorder/menu/meal-order-drawer.html b/client/user/src/mealorder/menu/meal-order-drawer.html
index 515648cb..1df09959 100644
--- a/client/user/src/mealorder/menu/meal-order-drawer.html
+++ b/client/user/src/mealorder/menu/meal-order-drawer.html
@@ -71,10 +71,18 @@
                     },
 
                     /**
-                     * Chosen date.
+                     * Date that the user can select on the calendar.
                      */
                     inputDate: {},
+
+                    /**
+                     * Chosen day.
+                     */
                     outputDate: {},
+
+                    /**
+                     * Used for routing.
+                     */
                     routeData: {},
                 }
             }
@@ -87,7 +95,7 @@
             }
 
             _changeHistoryUrl() {
-                if (this.routeData.date && this.routeData.page.startsWith("history")) {
+                if (this.routeData.page && this.routeData.page.startsWith("history")) {
                     const routeDate = this.routeData.date.split('-');
                     this.set('inputDate', routeDate[0] + "/" + routeDate[1] + "/" + routeDate[2]);
                     const arr = this.routeData.date.split('-');
diff --git a/client/user/src/mealorder/menu/meal-order-menu-container.html b/client/user/src/mealorder/menu/meal-order-menu-container.html
index 227f5e17..8f847c18 100644
--- a/client/user/src/mealorder/menu/meal-order-menu-container.html
+++ b/client/user/src/mealorder/menu/meal-order-menu-container.html
@@ -219,8 +219,7 @@
                     let date = {};
                     if (this.routeData.page.startsWith("menu")) {
                         if (!this.routeData.date) {
-                            date = this.selectedDay;
-                            console.log(date);
+                            date = this.selectedDay || this.calendar[0].date;
                             this.set('route.path', '/menu/' + date.year + "-" +
                                 date.month + "-" + date.day);
                         }

From c5843dacf589a6de34de51e70fda726fd52daf50 Mon Sep 17 00:00:00 2001
From: "alexander.karpetc" <alexander.karpetc@gmail.com>
Date: Tue, 10 Apr 2018 18:11:25 +0300
Subject: [PATCH 143/253] Change padding of a record from 2px -> 0

---
 client/user/src/mealorder/menu/meal-order-vendor-menu.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/user/src/mealorder/menu/meal-order-vendor-menu.html b/client/user/src/mealorder/menu/meal-order-vendor-menu.html
index 273f56e6..b45747be 100644
--- a/client/user/src/mealorder/menu/meal-order-vendor-menu.html
+++ b/client/user/src/mealorder/menu/meal-order-vendor-menu.html
@@ -36,7 +36,7 @@
 
             paper-item {
                 font-size: 15px;
-                padding: 2px 2%;
+                padding: 0 2%;
                 width: 96%;
                 border-bottom: 1px solid #ddd;
             }
@@ -104,7 +104,7 @@
 
             @media only screen and (max-width: 600px) {
                 paper-item {
-                    padding: 2px 2%;
+                    padding: 0 2%;
                 }
             }
         </style>

From a1609bcf5d65da334ec454b1689d3d53a01ac6e5 Mon Sep 17 00:00:00 2001
From: Paul <paulageyev@gmail.com>
Date: Tue, 10 Apr 2018 18:33:05 +0300
Subject: [PATCH 144/253] Refactor `dayOfTheWeek` in the initialState

---
 .../menu/meal-order-menu-container.html          |  4 ++--
 .../src/mealorder/shell/reducers/reducers.html   | 16 ++++++++--------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/client/user/src/mealorder/menu/meal-order-menu-container.html b/client/user/src/mealorder/menu/meal-order-menu-container.html
index 8f847c18..79561ec0 100644
--- a/client/user/src/mealorder/menu/meal-order-menu-container.html
+++ b/client/user/src/mealorder/menu/meal-order-menu-container.html
@@ -98,7 +98,7 @@
                                    href="/#/menu/[[calendar.date.year]]-[[calendar.date.month]]-[[calendar.date.day]]"
                                    on-click="_handleClick">
                                     <div>
-                                        <div class="day-of-the-week">{{calendar.date.dayOfTheWeek}}
+                                        <div class="day-of-the-week">{{calendar.dayOfTheWeek}}
                                         </div>
                                         <div class="day">{{calendar.date.day}}</div>
                                     </div>
@@ -113,7 +113,7 @@
                                     link disabled>
                                 <div class="paper-tab-container disabled">
                                     <div>
-                                        <div class="day-of-the-week">{{calendar.date.dayOfTheWeek}}
+                                        <div class="day-of-the-week">{{calendar.dayOfTheWeek}}
                                         </div>
                                         <div class="day">{{calendar.date.day}}</div>
                                     </div>
diff --git a/client/user/src/mealorder/shell/reducers/reducers.html b/client/user/src/mealorder/shell/reducers/reducers.html
index ca23b8a0..53fc0f23 100644
--- a/client/user/src/mealorder/shell/reducers/reducers.html
+++ b/client/user/src/mealorder/shell/reducers/reducers.html
@@ -28,8 +28,8 @@
                 year: '2018',
                 month: '03',
                 day: '21',
-                dayOfTheWeek: 'Ср',
             },
+            dayOfTheWeek: 'Ср',
             hasMenu: true
         },
             {
@@ -37,8 +37,8 @@
                     year: '2018',
                     month: '03',
                     day: '22',
-                    dayOfTheWeek: 'Чт',
                 },
+                dayOfTheWeek: 'Чт',
                 hasMenu: true
             },
             {
@@ -46,8 +46,8 @@
                     year: '2018',
                     month: '03',
                     day: '23',
-                    dayOfTheWeek: 'Пт',
                 },
+                dayOfTheWeek: 'Пт',
                 hasMenu: true
             },
             {
@@ -55,8 +55,8 @@
                     year: '2018',
                     month: '03',
                     day: '24',
-                    dayOfTheWeek: 'Сб',
                 },
+                dayOfTheWeek: 'Сб',
                 hasMenu: false
             },
             {
@@ -64,8 +64,8 @@
                     year: '2018',
                     month: '03',
                     day: '25',
-                    dayOfTheWeek: 'Вс',
                 },
+                dayOfTheWeek: 'Вс',
                 hasMenu: false
             }
             , {
@@ -73,8 +73,8 @@
                     year: '2018',
                     month: '03',
                     day: '26',
-                    dayOfTheWeek: 'Пн',
                 },
+                dayOfTheWeek: 'Пн',
                 hasMenu: true
             }
             , {
@@ -82,8 +82,8 @@
                     year: '2018',
                     month: '03',
                     day: '27',
-                    dayOfTheWeek: 'Вт',
                 },
+                dayOfTheWeek: 'Вт',
                 hasMenu: true
             }
             , {
@@ -91,8 +91,8 @@
                     year: '2018',
                     month: '03',
                     day: '28',
-                    dayOfTheWeek: 'Ср',
                 },
+                dayOfTheWeek: 'Ср',
                 hasMenu: true
             }];
 

From 0c92ec388c4aa26145074eecd4a9dc0c2dd26a16 Mon Sep 17 00:00:00 2001
From: Paul <paulageyev@gmail.com>
Date: Tue, 10 Apr 2018 18:36:13 +0300
Subject: [PATCH 145/253] Add text color for index.html body

---
 client/user/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/user/index.html b/client/user/index.html
index 2d2c08ff..62687d3c 100644
--- a/client/user/index.html
+++ b/client/user/index.html
@@ -32,7 +32,7 @@
         body {
             font-family: 'Roboto', 'Noto', sans-serif;
             background-color: #F2F2F2;
-            flex-direction: column;
+            color: #616161;
         }
     </style>
 </head>

From 66e1e94841e4c596bdb5f647c8525221d11c8b9c Mon Sep 17 00:00:00 2001
From: Paul <paulageyev@gmail.com>
Date: Tue, 10 Apr 2018 18:59:19 +0300
Subject: [PATCH 146/253] Add font-weight for the `app-datepicker` component

---
 client/user/src/mealorder/menu/meal-order-drawer.html | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/client/user/src/mealorder/menu/meal-order-drawer.html b/client/user/src/mealorder/menu/meal-order-drawer.html
index 1df09959..19e6a5a2 100644
--- a/client/user/src/mealorder/menu/meal-order-drawer.html
+++ b/client/user/src/mealorder/menu/meal-order-drawer.html
@@ -32,9 +32,17 @@
                 --app-datepicker-selected-day-bg: #179EFF;
                 --app-datepicker-today-color: #179EFF;
                 --app-datepicker-date-hover-background-color: #179EFF;
+
+                --app-datepicker-selected-date: {
+                    font-weight: normal;
+                    font-size: 22px;
+                };
+
+                --app-datepicker-selected-year: {
+                    font-weight: normal;
+                }
             }
         </style>
-
         <app-location route="{{route}}"
                       use-hash-as-path></app-location>
 

From efcbc986fed1cefb3a7be8af9159681ccf511b48 Mon Sep 17 00:00:00 2001
From: Paul <paulageyev@gmail.com>
Date: Tue, 10 Apr 2018 19:20:56 +0300
Subject: [PATCH 147/253] Add currency icon

---
 client/user/src/mealorder/menu/meal-order-user-cart.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/user/src/mealorder/menu/meal-order-user-cart.html b/client/user/src/mealorder/menu/meal-order-user-cart.html
index 1371d369..ab25396c 100644
--- a/client/user/src/mealorder/menu/meal-order-user-cart.html
+++ b/client/user/src/mealorder/menu/meal-order-user-cart.html
@@ -53,7 +53,7 @@
                 <template>
                     <div class="total">
                         <div class="amount">Общая сумма:</div>
-                        <div class="price">[[total]]</div>
+                        <div class="price">[[total]] ₴</div>
                     </div>
                 </template>
             </dom-if>

From 08b6700118c4352d72d287466ee48e4e782de44e Mon Sep 17 00:00:00 2001
From: Paul Ageyev <paulageyev@gmail.com>
Date: Wed, 11 Apr 2018 01:12:17 +0300
Subject: [PATCH 148/253] Refactor routing for the selected day

---
 .eslintrc.json                                |  3 +-
 .../src/mealorder/meal-order-client-app.html  | 63 +++++++++++--------
 .../src/mealorder/menu/meal-order-drawer.html | 28 +++++----
 .../menu/meal-order-menu-container.html       | 10 +--
 4 files changed, 61 insertions(+), 43 deletions(-)

diff --git a/.eslintrc.json b/.eslintrc.json
index e99d0e05..b34d5e48 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -28,8 +28,7 @@
       {
         "ignore": [
           0,
-          1,
-          2
+          1
         ]
       }
     ],
diff --git a/client/user/src/mealorder/meal-order-client-app.html b/client/user/src/mealorder/meal-order-client-app.html
index b0fbcadf..d4636882 100644
--- a/client/user/src/mealorder/meal-order-client-app.html
+++ b/client/user/src/mealorder/meal-order-client-app.html
@@ -43,12 +43,6 @@
 <dom-module id="meal-order-client-app">
     <template>
         <style>
-            :host {
-                --app-primary-color: #4285f4;
-                --app-secondary-color: black;
-                display: block;
-            }
-
             app-header {
                 background-color: #616161;
                 color: #fff;
@@ -93,16 +87,16 @@
                 font-size: 0.75em;
             }
 
-            app-drawer.history {
-                --app-drawer-width: 300px;
-            }
-
             app-drawer {
                 --app-drawer-content-container: {
                     background-color: #fafafa;
                 }
             }
 
+            .wide {
+                --app-drawer-width: 300px;
+            }
+
             .app-toolbar-header {
                 display: flex;
                 justify-content: space-between;
@@ -150,18 +144,18 @@
 
         <app-route
                 route="{{route}}"
-                pattern="/:page"
+                pattern="/:page/:date"
                 data="{{routeData}}"></app-route>
 
         <app-drawer-layout fullbleed narrow="{{narrow}}">
             <app-drawer slot="drawer" align="right" class$="[[_getClassForDrawer(routeData.page)]]">
 
                 <iron-pages selected="[[routeData.page]]"
-                            attr-for-selected="name"
+                            attr-for-selected="data-page"
                             fallback-selection="view404"
                             role="main">
 
-                    <app-toolbar name="menu">
+                    <app-toolbar data-page="menu">
                         <div class="app-toolbar-header">
                             <div class="app-toolbar-content">Заказ</div>
                             <div>
@@ -171,7 +165,7 @@
                         </div>
                     </app-toolbar>
 
-                    <app-toolbar name="history">
+                    <app-toolbar data-page="history">
                         <div class="app-toolbar-header">
                             <div class="app-toolbar-content">История заказов</div>
                         </div>
@@ -188,11 +182,11 @@
                             <div id="main-title">Заказ обедов</div>
                             <iron-pages
                                     selected="[[routeData.page]]"
-                                    attr-for-selected="name"
+                                    attr-for-selected="data-page"
                                     fallback-selection="view404"
                                     role="main">
 
-                                <div name="menu">
+                                <div data-page="menu">
                                     <div class="route-title"><a href="/#/history/">История
                                         заказов</a></div>
                                     <div class="icon-container">
@@ -208,7 +202,7 @@
                                     </div>
                                 </div>
 
-                                <div name="history">
+                                <div data-page="history">
                                     <div id="menu-history" class="route-title"><a href="/#/menu/">Сделать
                                         заказ</a>
                                     </div>
@@ -230,11 +224,10 @@
                 </app-header>
                 <iron-pages
                         selected="[[routeData.page]]"
-                        attr-for-selected="name"
+                        attr-for-selected="data-page"
                         fallback-selection="view404"
                         role="main">
-                    <meal-order-menu-container on-date-updated="_updateDay"
-                                               name="menu"></meal-order-menu-container>
+                    <meal-order-menu-container data-page="menu"></meal-order-menu-container>
                 </iron-pages>
 
             </app-header-layout>
@@ -245,7 +238,7 @@
         /**
          * Main user meal order component.
          *
-         * Consists of 2 page:
+         * Consists of 2 pages:
          * 1. A page with vendor menus, and user's shopping cart.
          * 2. A page with user's history.
          *
@@ -290,24 +283,42 @@
                 }
             }
 
+            static get observers() {
+                return [
+                    '_pageChanged(routeData.date)'
+                ];
+            }
+
             _getClassForDrawer(page) {
-                return page;
+                if (page === "history") {
+                    return "wide";
+                }
             }
 
-            _updateDay(e) {
-                const date = new Date(e.detail.year, e.detail.month - 1, e.detail.day);
+            _pageChanged() {
+                const YEAR = 0;
+                const MONTH = 1;
+                const DAY = 2;
+
+                const arr = this.routeData.date.split('-');
+
+                let urlDate = {};
+                urlDate.year = arr[YEAR];
+                urlDate.month = arr[MONTH];
+                urlDate.day = arr[DAY];
+
+                const date = new Date(urlDate.year, urlDate.month-1, urlDate.day);
 
                 let dayOfTheWeek = date.toLocaleDateString("ru-RU", {weekday: 'long'});
                 dayOfTheWeek = dayOfTheWeek.charAt(0).toUpperCase() + dayOfTheWeek.slice(1);
 
                 const selectedDay = {
-                    day: e.detail.day,
+                    day: urlDate.day,
                     dayOfTheWeek: dayOfTheWeek,
                 };
                 this.set('selectedDay', selectedDay);
             }
         }
-
         window.customElements.define(MealOrderClientApp.is, MealOrderClientApp);
     </script>
 </dom-module>
diff --git a/client/user/src/mealorder/menu/meal-order-drawer.html b/client/user/src/mealorder/menu/meal-order-drawer.html
index 19e6a5a2..008a7c46 100644
--- a/client/user/src/mealorder/menu/meal-order-drawer.html
+++ b/client/user/src/mealorder/menu/meal-order-drawer.html
@@ -54,10 +54,10 @@
 
         <iron-pages
                 selected="[[routeData.page]]"
-                attr-for-selected="name"
+                attr-for-selected="data-page"
                 fallback-selection="view404"
                 role="main">
-            <app-datepicker name="history" id="date-picker" view="vertical"
+            <app-datepicker data-page="history" id="date-picker" view="vertical"
                             input-date="[[inputDate]]" date="{{outputDate}}" auto-update-date="true"
                             locale="ru-RU"></app-datepicker>
         </iron-pages>
@@ -104,33 +104,39 @@
 
             _changeHistoryUrl() {
                 if (this.routeData.page && this.routeData.page.startsWith("history")) {
+                    const YEAR = 0;
+                    const MONTH = 1;
+                    const DAY = 2;
+
                     const routeDate = this.routeData.date.split('-');
-                    this.set('inputDate', routeDate[0] + "/" + routeDate[1] + "/" + routeDate[2]);
+                    this.set('inputDate', routeDate[YEAR] + "/" + routeDate[MONTH] + "/" + routeDate[DAY]);
                     const arr = this.routeData.date.split('-');
                     const date = {};
-                    date.year = arr[0];
-                    date.month = arr[1];
-                    date.day = arr[2];
+                    date.year = arr[YEAR];
+                    date.month = arr[MONTH];
+                    date.day = arr[DAY];
                     this.dispatchEvent(new CustomEvent('changed-history-date', {detail: date}));
                 }
             }
 
             _updateDate() {
                 if (this.routeData.page && this.routeData.page.startsWith("history")) {
+                    const YEAR = 0;
+                    const MONTH = 1;
+                    const DAY = 2;
+
                     const arr = this.outputDate.split('/');
                     const date = {};
-                    date.year = arr[0];
-                    date.month = arr[1];
-                    date.day = arr[2];
+                    date.year = arr[YEAR];
+                    date.month = arr[MONTH];
+                    date.day = arr[DAY];
                     const newRouteData = {};
                     newRouteData.page = 'history';
                     newRouteData.date = date.year + "-" + date.month + "-" + date.day;
                     this.set('routeData', newRouteData);
-                    this.dispatchEvent(new CustomEvent('changed-history-date', {detail: date}));
                 }
             }
         }
-
         window.customElements.define(MealOrderDrawer.is, MealOrderDrawer);
     </script>
 </dom-module>
diff --git a/client/user/src/mealorder/menu/meal-order-menu-container.html b/client/user/src/mealorder/menu/meal-order-menu-container.html
index 79561ec0..f3d9e015 100644
--- a/client/user/src/mealorder/menu/meal-order-menu-container.html
+++ b/client/user/src/mealorder/menu/meal-order-menu-container.html
@@ -224,15 +224,17 @@
                                 date.month + "-" + date.day);
                         }
                         else {
+                            const YEAR = 0;
+                            const MONTH = 1;
+                            const DAY = 2;
                             const arr = this.routeData.date.split('-');
-                            date.year = arr[0];
-                            date.month = arr[1];
-                            date.day = arr[2];
+                            date.year = arr[YEAR];
+                            date.month = arr[MONTH];
+                            date.day = arr[DAY];
                             this.set('selectedDay', date);
                         }
                         this.dispatch('changeCurrentMenu', date);
                         this.dispatch('changeCurrentCart', date);
-                        this.dispatchEvent(new CustomEvent('date-updated', {detail: date}));
                     }
                 }
             }

From 9cde4d8a068e05c2cb64845ae454f46b86b225dc Mon Sep 17 00:00:00 2001
From: Paul Ageyev <paulageyev@gmail.com>
Date: Wed, 11 Apr 2018 11:54:11 +0300
Subject: [PATCH 149/253] Remove unnecessary `narrow` property from
 `app-drawer`

---
 client/user/src/mealorder/meal-order-client-app.html  | 11 +++++++++--
 .../src/mealorder/menu/meal-order-menu-container.html |  7 ++++---
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/client/user/src/mealorder/meal-order-client-app.html b/client/user/src/mealorder/meal-order-client-app.html
index d4636882..37e02bb7 100644
--- a/client/user/src/mealorder/meal-order-client-app.html
+++ b/client/user/src/mealorder/meal-order-client-app.html
@@ -147,7 +147,7 @@
                 pattern="/:page/:date"
                 data="{{routeData}}"></app-route>
 
-        <app-drawer-layout fullbleed narrow="{{narrow}}">
+        <app-drawer-layout fullbleed>
             <app-drawer slot="drawer" align="right" class$="[[_getClassForDrawer(routeData.page)]]">
 
                 <iron-pages selected="[[routeData.page]]"
@@ -246,6 +246,7 @@
          * @polymer
          * @appliesMixin MealOrderApp.ReduxMixin
          */
+        /* @polymerMixin */
         class MealOrderClientApp extends MealOrderApp.ReduxMixin(Polymer.Element) {
 
             static get is() {
@@ -307,13 +308,19 @@
                 urlDate.month = arr[MONTH];
                 urlDate.day = arr[DAY];
 
+                console.log(urlDate);
+
                 const date = new Date(urlDate.year, urlDate.month-1, urlDate.day);
 
+                console.log(date);
+
                 let dayOfTheWeek = date.toLocaleDateString("ru-RU", {weekday: 'long'});
                 dayOfTheWeek = dayOfTheWeek.charAt(0).toUpperCase() + dayOfTheWeek.slice(1);
 
+                console.log(date);
+
                 const selectedDay = {
-                    day: urlDate.day,
+                    day: date.getDate(),
                     dayOfTheWeek: dayOfTheWeek,
                 };
                 this.set('selectedDay', selectedDay);
diff --git a/client/user/src/mealorder/menu/meal-order-menu-container.html b/client/user/src/mealorder/menu/meal-order-menu-container.html
index f3d9e015..c3991355 100644
--- a/client/user/src/mealorder/menu/meal-order-menu-container.html
+++ b/client/user/src/mealorder/menu/meal-order-menu-container.html
@@ -86,13 +86,13 @@
                 data="{{routeData}}">
         </app-route>
 
-        <paper-tabs class="tabs" selected="[[routeData.date]]" attr-for-selected='key'>
+        <paper-tabs class="tabs" selected="[[routeData.date]]" attr-for-selected='data-key'>
             <dom-repeat items="{{calendar}}" as="calendar">
                 <template>
                     <dom-if if="[[calendar.hasMenu]]">
                         <template>
                             <paper-tab
-                                    key="[[calendar.date.year]]-[[calendar.date.month]]-[[calendar.date.day]]"
+                                    data-key$="[[calendar.date.year]]-[[calendar.date.month]]-[[calendar.date.day]]"
                                     link>
                                 <a class="paper-tab-container"
                                    href="/#/menu/[[calendar.date.year]]-[[calendar.date.month]]-[[calendar.date.day]]"
@@ -109,7 +109,7 @@
                     <dom-if if="[[!calendar.hasMenu]]">
                         <template>
                             <paper-tab
-                                    key="[[calendar.date.year]]-[[calendar.date.month]]-[[calendar.date.day]]"
+                                    data-key$="[[calendar.date.year]]-[[calendar.date.month]]-[[calendar.date.day]]"
                                     link disabled>
                                 <div class="paper-tab-container disabled">
                                     <div>
@@ -135,6 +135,7 @@
          * @polymer
          * @appliesMixin MealOrderApp.ReduxMixin
          */
+        /* @polymerMixin */
         class MealOrderMenuContainer extends MealOrderApp.ReduxMixin(Polymer.Element) {
             static get is() {
                 return 'meal-order-menu-container';

From b6544284c8adf4e3e6b17284d85504deb1600e81 Mon Sep 17 00:00:00 2001
From: Paul <paulageyev@gmail.com>
Date: Wed, 11 Apr 2018 12:57:45 +0300
Subject: [PATCH 150/253] Create `CHANGE_HISTORY_DAY` action

---
 .../src/mealorder/meal-order-client-app.html  | 15 ++++-
 .../menu/meal-order-user-history.html         |  4 +-
 .../mealorder/shell/actions/user-actions.html |  4 +-
 .../mealorder/shell/reducers/reducers.html    | 59 +++++++++++++++++--
 4 files changed, 71 insertions(+), 11 deletions(-)

diff --git a/client/user/src/mealorder/meal-order-client-app.html b/client/user/src/mealorder/meal-order-client-app.html
index 9937d34c..db07e9c4 100644
--- a/client/user/src/mealorder/meal-order-client-app.html
+++ b/client/user/src/mealorder/meal-order-client-app.html
@@ -39,6 +39,7 @@
 <link rel="import" href="../../bower_components/iron-icons/maps-icons.html">
 <link rel="import" href="shell/redux-store.html">
 <link rel="import" href="menu/meal-order-menu-container.html">
+<link rel="import" href="menu/meal-order-user-history.html">
 <link rel="import" href="menu/meal-order-drawer.html">
 <dom-module id="meal-order-client-app">
     <template>
@@ -178,7 +179,7 @@
                     </app-toolbar>
                 </iron-pages>
                 <meal-order-drawer order="[[order]]"
-                                   on-dish-removed="_removeDishFromOrder"></meal-order-drawer>
+                                   on-dish-removed="_removeDishFromOrder" on-changed-history-date="_updateHistoryDay"></meal-order-drawer>
 
             </app-drawer>
 
@@ -236,6 +237,8 @@
                         role="main">
                     <meal-order-menu-container on-date-updated="_updateDay"
                                                name="menu"></meal-order-menu-container>
+                    <meal-order-user-history name="history" cart="[[history]]"
+                                             narrow="[[narrow]]"></meal-order-user-history>
                 </iron-pages>
 
             </app-header-layout>
@@ -298,6 +301,12 @@
                             type: MealOrderApp.UserAction.REMOVE_DISH,
                             dish: dish
                         }
+                    },
+                    changeHistoryDate(date) {
+                        return {
+                            type: MealOrderApp.UserAction.CHANGE_HISTORY_DAY,
+                            date: date
+                        }
                     }
                 }
             }
@@ -325,6 +334,10 @@
                 };
                 this.set('selectedDay', selectedDay);
             }
+
+            _updateHistoryDay(e) {
+                this.dispatch('changeHistoryDate', e.detail);
+            }
         }
 
         window.customElements.define(MealOrderClientApp.is, MealOrderClientApp);
diff --git a/client/user/src/mealorder/menu/meal-order-user-history.html b/client/user/src/mealorder/menu/meal-order-user-history.html
index ef77d437..f92ed969 100644
--- a/client/user/src/mealorder/menu/meal-order-user-history.html
+++ b/client/user/src/mealorder/menu/meal-order-user-history.html
@@ -21,7 +21,6 @@
 <link rel="import" href="../../../bower_components/polymer/polymer-element.html">
 <link rel="import" href="../../../bower_components/iron-list/iron-list.html">
 <link rel="import" href="../../../bower_components/paper-card/paper-card.html">
-<link rel="import" href="../../../bower_components/vaadin-grid/vaadin-grid.html">
 <dom-module id="meal-order-user-history">
     <template>
         <style>
@@ -108,7 +107,6 @@
 
             }
 
-
             .vendor-title {
                 font-size: 22px;
                 font-weight: bolder;
@@ -146,7 +144,7 @@
             </iron-list>
             <dom-if if="[[totalSum]]">
                 <template>
-                    <div class="total-sum">Общая сумма: [[totalSum]]</div>
+                    <div class="total-sum">Общая сумма: [[totalSum]] ₴</div>
                 </template>
             </dom-if>
         </div>
diff --git a/client/user/src/mealorder/shell/actions/user-actions.html b/client/user/src/mealorder/shell/actions/user-actions.html
index 105e468b..d9eac0fe 100644
--- a/client/user/src/mealorder/shell/actions/user-actions.html
+++ b/client/user/src/mealorder/shell/actions/user-actions.html
@@ -19,11 +19,11 @@
   -->
 
 <script>
-    const UserAction = {
+    MealOrderApp.UserAction = {
         CHANGE_HISTORY_DAY: "CHANGE_HISTORY_DAY",
         MENU_FOR_DAY: "MENU_FOR_DAY",
         CART_FOR_DAY: 'CART_FOR_DAY',
-        REMOVE_DISH : "REMOVE_DISH"
+        REMOVE_DISH : "REMOVE_DISH",
         CHANGE_CURRENT_MENU: "CHANGE_CURRENT_MENU",
         CHANGE_CURRENT_CART: 'CHANGE_CURRENT_CART',
         ADD_DISH: 'ADD_DISH',
diff --git a/client/user/src/mealorder/shell/reducers/reducers.html b/client/user/src/mealorder/shell/reducers/reducers.html
index 5db811ef..f61a26cd 100644
--- a/client/user/src/mealorder/shell/reducers/reducers.html
+++ b/client/user/src/mealorder/shell/reducers/reducers.html
@@ -233,9 +233,58 @@
                         quantity: 1
                     }]
                 }]
-            }]
+            }],
+
+            history: [{
+                date: {
+                    year: '2018',
+                    month: '03',
+                    day: '29',
+                }, order: [{
+                    vendor: "Пюре",
+                    dishes: [
+                        {title: 'Борщ украинский', price: 35, quantity: 1},
+                        {title: 'Солянка', price: 40, quantity: 1},
+                        {title: 'Суп гороховый', price: 40, quantity: 1},
+                        {title: 'Уха', price: 35, quantity: 1},
+                        {title: 'Суп-пюре грибной', price: 40, quantity: 1},
+                        {title: 'Суп куриный', price: 40, quantity: 1},]
+                }, {
+                    vendor: 'Позитив',
+                    dishes: [{title: 'Суп куриный', price: 35, quantity: 1}, {
+                        title: 'Стейк из лосося',
+                        price: 35,
+                        quantity: 1
+                    }]
+                }]
+            }, {
+                date: {
+                    year: '2018',
+                    month: '03',
+                    day: '28',
+                }, order: [{
+                    vendor: "Пюре",
+                    dishes: [
+                        {title: 'Грибное пюре', price: 45, quantity: 1},
+                        {title: 'Солянка', price: 40, quantity: 1},
+                        {title: 'Суп гороховый', price: 40, quantity: 1},
+                        {title: 'Уха', price: 35, quantity: 1},
+                        {title: 'Суп-пюре грибной', price: 40, quantity: 1},
+                        {title: 'Суп куриный', price: 40, quantity: 1},]
+                }, {
+                    vendor: 'Позитив',
+                    dishes: [{title: 'Каша манная', price: 15, quantity: 5}, {
+                        title: 'Стейк из лосося',
+                        price: 35,
+                        quantity: 1
+                    }]
+                }]
+            }],
+
+            currentHistory: [],
         };
 
+
         MealOrderApp.reducer = (state, action) => {
             if (!state) {
                 return MealOrderApp.initialState;
@@ -270,11 +319,11 @@
                         }
                     );
                 }
-                case UserAction.CHANGE_HISTORY_DAY: {
+                case MealOrderApp.UserAction.CHANGE_HISTORY_DAY: {
                     let newHistory = [];
-                    for (let i = 0; i < initialState.history.length; i++) {
-                        if (Utils.compareObjects(action.date, initialState.history[i].date)) {
-                            newHistory = initialState.history[i].order;
+                    for (let i = 0; i < state.history.length; i++) {
+                        if (Utils.compareObjects(action.date, state.history[i].date)) {
+                            newHistory = state.history[i].order;
                             break;
                         }
                     }

From b0c99770e37342bb08dd2456d85a2585242ed857 Mon Sep 17 00:00:00 2001
From: Paul <paulageyev@gmail.com>
Date: Wed, 11 Apr 2018 13:24:46 +0300
Subject: [PATCH 151/253] Apply paper-styles colors

---
 client/user/index.html                        |  3 ++-
 .../src/mealorder/meal-order-client-app.html  | 15 +++++++-------
 .../src/mealorder/menu/meal-order-drawer.html | 20 +++++++++++++------
 .../menu/meal-order-menu-container.html       | 14 ++++++-------
 .../shell/meal-order-app-namespace.html       |  2 --
 .../user/src/mealorder/shell/redux-store.html |  1 -
 6 files changed, 31 insertions(+), 24 deletions(-)

diff --git a/client/user/index.html b/client/user/index.html
index 484f5553..0766872f 100644
--- a/client/user/index.html
+++ b/client/user/index.html
@@ -25,13 +25,14 @@
           content="width=device-width, minimum-scale=1, initial-scale=1, user-scalable=yes">
     <script src="bower_components/webcomponentsjs/webcomponents-loader.js"></script>
     <script src="node_modules/redux/dist/redux.js"></script>
+    <link rel="import" href="bower_components/paper-styles/color.html">
     <link rel="icon" href="images/favicon-16x16.png" type="image/png">
     <link rel=import href="src/mealorder/meal-order-client-app.html">
     <title>MealOrder</title>
     <style>
         body {
             font-family: 'Roboto', 'Noto', sans-serif;
-            background-color: #F2F2F2;
+            background-color: var(--paper-grey-100);
         }
     </style>
 </head>
diff --git a/client/user/src/mealorder/meal-order-client-app.html b/client/user/src/mealorder/meal-order-client-app.html
index 15b42441..3fd2adfd 100644
--- a/client/user/src/mealorder/meal-order-client-app.html
+++ b/client/user/src/mealorder/meal-order-client-app.html
@@ -38,6 +38,7 @@
 <link rel="import" href="../../bower_components/paper-tabs/paper-tabs.html">
 <link rel="import" href="../../bower_components/iron-icons/iron-icons.html">
 <link rel="import" href="../../bower_components/iron-icons/maps-icons.html">
+<link rel="import" href="../../bower_components/paper-styles/color.html">
 <link rel="import" href="shell/redux-store.html">
 <link rel="import" href="menu/meal-order-menu-container.html">
 <link rel="import" href="menu/meal-order-drawer.html">
@@ -45,8 +46,8 @@
     <template>
         <style>
             app-header {
-                background-color: #616161;
-                color: #fff;
+                background-color: var(--google-grey-700);
+                color: var(--paper-grey-50);
                 right: 300px;
             }
 
@@ -55,7 +56,7 @@
             }
 
             app-drawer-layout {
-                background-color: #F2F2F2;
+                background-color: var(--paper-grey-100);
             }
 
             app-drawer-layout:not([narrow]) [drawer-toggle] {
@@ -72,16 +73,16 @@
             app-header .route-title a {
                 font-size: 0.8em;
                 text-decoration: none;
-                color: white;
+                color: var(--paper-grey-50);
             }
 
             app-header .route-title a:hover {
-                color: #179EFF;
+                color: var(--paper-light-blue-500);
             }
 
             app-header .history-icon {
                 display: none;
-                color: white;
+                color: var(--paper-grey-50);
             }
 
             app-header .app-toolbar-content {
@@ -90,7 +91,7 @@
 
             app-drawer {
                 --app-drawer-content-container: {
-                    background-color: #fafafa;
+                    background-color:  var(--paper-grey-50);
                 }
             }
 
diff --git a/client/user/src/mealorder/menu/meal-order-drawer.html b/client/user/src/mealorder/menu/meal-order-drawer.html
index 008a7c46..eef5811e 100644
--- a/client/user/src/mealorder/menu/meal-order-drawer.html
+++ b/client/user/src/mealorder/menu/meal-order-drawer.html
@@ -26,12 +26,12 @@
     <template>
         <style>
             #date-picker {
-                --app-datepicker-selection-bg: #fafafa;
-                --app-datepicker-selection-color: #616161;
-                --app-datepicker-iron-selected: #616161;
-                --app-datepicker-selected-day-bg: #179EFF;
-                --app-datepicker-today-color: #179EFF;
-                --app-datepicker-date-hover-background-color: #179EFF;
+                --app-datepicker-selection-bg: var(--paper-grey-50);
+                --app-datepicker-selection-color: var(--google-grey-700);
+                --app-datepicker-iron-selected: var(--google-grey-700);
+                --app-datepicker-selected-day-bg: var(--paper-light-blue-500);
+                --app-datepicker-today-color: var(--paper-light-blue-500);
+                --app-datepicker-date-hover-background-color: var(--paper-light-blue-500);
 
                 --app-datepicker-selected-date: {
                     font-weight: normal;
@@ -63,6 +63,14 @@
         </iron-pages>
     </template>
     <script>
+        /**
+         * meal-order-drawer is container for user's order and user's order history calendar.
+         *
+         * Contains a order for selected day and calendar.
+         *
+         * @customElement
+         * @polymer
+         */
         class MealOrderDrawer extends Polymer.Element {
             static get is() {
                 return 'meal-order-drawer';
diff --git a/client/user/src/mealorder/menu/meal-order-menu-container.html b/client/user/src/mealorder/menu/meal-order-menu-container.html
index c3991355..388308ac 100644
--- a/client/user/src/mealorder/menu/meal-order-menu-container.html
+++ b/client/user/src/mealorder/menu/meal-order-menu-container.html
@@ -23,6 +23,7 @@
 <link rel="import" href="../../../bower_components/app-route/app-location.html">
 <link rel="import" href="../../../bower_components/app-route/app-route.html">
 <link rel="import" href="../../../bower_components/iron-pages/iron-pages.html">
+<link rel="import" href="../../../bower_components/paper-styles/color.html">
 <link rel="import" href="../shell/redux-store.html">
 <link rel="import" href="../shell/actions/user-actions.html">
 <dom-module id="meal-order-menu-container">
@@ -32,8 +33,8 @@
                 -webkit-font-smoothing: antialiased;
                 width: 100%;
                 margin-bottom: 1px;
-                --paper-tabs-selection-bar-color: #179EFF;
-                --paper-tab-ink: #179EFF;
+                --paper-tabs-selection-bar-color: var(--paper-light-blue-500);
+                --paper-tab-ink: var(--paper-light-blue-500);
             }
 
             paper-tabs {
@@ -42,11 +43,11 @@
             }
 
             paper-tab.iron-selected .day-of-the-week {
-                color: #179EFF;
+                color: var(--paper-light-blue-500);
             }
 
             paper-tab.iron-selected .day {
-                color: #179EFF;
+                color: var(--paper-light-blue-500);
             }
 
             paper-tab .paper-tab-container {
@@ -58,11 +59,11 @@
             }
 
             .disabled .day {
-                color: #8c8c8c;
+                color: var(--paper-grey-500);
             }
 
             .disabled .day-of-the-week {
-                color: #8c8c8c;
+                color: var(--paper-grey-500);
             }
 
             .day-of-the-week {
@@ -135,7 +136,6 @@
          * @polymer
          * @appliesMixin MealOrderApp.ReduxMixin
          */
-        /* @polymerMixin */
         class MealOrderMenuContainer extends MealOrderApp.ReduxMixin(Polymer.Element) {
             static get is() {
                 return 'meal-order-menu-container';
diff --git a/client/user/src/mealorder/shell/meal-order-app-namespace.html b/client/user/src/mealorder/shell/meal-order-app-namespace.html
index b36b4c24..8a4e9e2e 100644
--- a/client/user/src/mealorder/shell/meal-order-app-namespace.html
+++ b/client/user/src/mealorder/shell/meal-order-app-namespace.html
@@ -18,8 +18,6 @@
   ~ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   -->
 <script>
-    // A bunch of elements, for zombies, by zombies.
-    //
     /**
      * A bunch of elements for meal order application.
      *
diff --git a/client/user/src/mealorder/shell/redux-store.html b/client/user/src/mealorder/shell/redux-store.html
index 4be295df..ef87ca10 100644
--- a/client/user/src/mealorder/shell/redux-store.html
+++ b/client/user/src/mealorder/shell/redux-store.html
@@ -22,7 +22,6 @@
 <link rel="import" href="reducers/reducers.html">
 <script>
     {
-
         /* global Redux, PolymerRedux */
         const store = Redux.createStore(MealOrderApp.reducer);
         MealOrderApp.store = store;

From 64b1309dc2b148489a91c1e1d7a9f25ef3cdb5fa Mon Sep 17 00:00:00 2001
From: "alexander.karpetc" <alexander.karpetc@gmail.com>
Date: Wed, 11 Apr 2018 13:44:35 +0300
Subject: [PATCH 152/253] Change colors to `paper-style` colors

---
 .../menu/meal-order-vendor-menu.html          |  6 ++---
 .../menu/meal-order-vendor-menus.html         | 24 +++----------------
 2 files changed, 6 insertions(+), 24 deletions(-)

diff --git a/client/user/src/mealorder/menu/meal-order-vendor-menu.html b/client/user/src/mealorder/menu/meal-order-vendor-menu.html
index b45747be..b035e54b 100644
--- a/client/user/src/mealorder/menu/meal-order-vendor-menu.html
+++ b/client/user/src/mealorder/menu/meal-order-vendor-menu.html
@@ -38,15 +38,15 @@
                 font-size: 15px;
                 padding: 0 2%;
                 width: 96%;
-                border-bottom: 1px solid #ddd;
+                border-bottom: 1px solid var(--paper-grey-200);
             }
 
             .menu-dishes {
                 display: flex;
                 justify-content: space-between;
                 align-items: center;
-                border-top: 1px solid #fcfcfc;
-                border-bottom: 1px solid #fcfcfc;
+                border-top: 1px solid var(--paper-grey-50);
+                border-bottom: 1px solid var(--paper-grey-50);
             }
 
             .wrapper {
diff --git a/client/user/src/mealorder/menu/meal-order-vendor-menus.html b/client/user/src/mealorder/menu/meal-order-vendor-menus.html
index 5401b6b4..1839330a 100644
--- a/client/user/src/mealorder/menu/meal-order-vendor-menus.html
+++ b/client/user/src/mealorder/menu/meal-order-vendor-menus.html
@@ -33,29 +33,11 @@
                 display: block;
                 padding: 0;
             }
-
-            app-toolbar {
-                background-color: var(--google-green-700);
-                box-shadow: 0 2px 5px 0 rgba(0, 0, 0, 0.3);
-                font-weight: bold;
-                color: white;
-                font-size: 18px;
-                z-index: 1;
-                position: fixed;
-                top: 0;
-                left: 0;
-                right: 0;
-            }
-
-            app-toolbar paper-icon-button {
-                --paper-icon-button-ink-color: white;
-            }
-
             iron-list {
                 --iron-list-items-container: {
                     width: 70%;
                     margin: 2% auto;
-                    border-bottom: 1px solid #ddd;
+                    border-bottom: 1px solid var(--paper-grey-300);
                 };
             }
 
@@ -63,13 +45,13 @@
                 margin: 0 auto;
                 width: 70%;
                 border-radius: 5px;
-                background-color: #ffffff;
+                background-color: white;
             }
 
             .item {
                 @apply --layout-horizontal;
                 background-color: white;
-                border: 1px solid #ddd;
+                border: 1px solid var(--paper-grey-100);
                 cursor: pointer;
                 margin-bottom: 5px;
             }

From fd5481ca534b7e984931c4435b6cba94a848681a Mon Sep 17 00:00:00 2001
From: Paul <paulageyev@gmail.com>
Date: Wed, 11 Apr 2018 14:29:28 +0300
Subject: [PATCH 153/253] Add routing and property for the
 `meal-order-user-cart`

---
 client/user/index.html                                | 1 +
 client/user/src/mealorder/menu/meal-order-drawer.html | 4 +---
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/client/user/index.html b/client/user/index.html
index 0766872f..d5df144d 100644
--- a/client/user/index.html
+++ b/client/user/index.html
@@ -33,6 +33,7 @@
         body {
             font-family: 'Roboto', 'Noto', sans-serif;
             background-color: var(--paper-grey-100);
+            color: var(--google-grey-700);
         }
     </style>
 </head>
diff --git a/client/user/src/mealorder/menu/meal-order-drawer.html b/client/user/src/mealorder/menu/meal-order-drawer.html
index 8fa7cd12..5214211b 100644
--- a/client/user/src/mealorder/menu/meal-order-drawer.html
+++ b/client/user/src/mealorder/menu/meal-order-drawer.html
@@ -22,8 +22,6 @@
 <link rel="import" href="../../../bower_components/iron-pages/iron-pages.html">
 <link rel="import" href="../../../bower_components/app-datepicker/app-datepicker.html">
 <link rel="import" href="meal-order-user-cart.html">
-
-
 <dom-module id="meal-order-drawer">
     <template>
         <style>
@@ -62,6 +60,7 @@
             <app-datepicker data-page="history" id="date-picker" view="vertical"
                             input-date="[[inputDate]]" date="{{outputDate}}" auto-update-date="true"
                             locale="ru-RU"></app-datepicker>
+            <meal-order-user-cart data-page="menu" order="[[order]]"></meal-order-user-cart>
         </iron-pages>
     </template>
     <script>
@@ -85,7 +84,6 @@
                      */
                     order: {
                         type: Array,
-                        statePath: 'currentOrder'
                     },
 
                     /**

From 3b6fdc0ee28fe50715a97976e4c3f78abf5c4d11 Mon Sep 17 00:00:00 2001
From: Paul <paulageyev@gmail.com>
Date: Wed, 11 Apr 2018 14:30:17 +0300
Subject: [PATCH 154/253] Add `google-grey-700` text color for the index.html
 body

---
 client/user/index.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/client/user/index.html b/client/user/index.html
index 0766872f..d5df144d 100644
--- a/client/user/index.html
+++ b/client/user/index.html
@@ -33,6 +33,7 @@
         body {
             font-family: 'Roboto', 'Noto', sans-serif;
             background-color: var(--paper-grey-100);
+            color: var(--google-grey-700);
         }
     </style>
 </head>

From b8749ff6a1f69a2dec33f489c71815cfa7130d95 Mon Sep 17 00:00:00 2001
From: "alexander.karpetc" <alexander.karpetc@gmail.com>
Date: Wed, 11 Apr 2018 14:38:36 +0300
Subject: [PATCH 155/253] Set material design fonts

---
 .../src/mealorder/menu/meal-order-vendor-menu.html     | 10 +++-------
 .../src/mealorder/menu/meal-order-vendor-menus.html    |  4 ----
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/client/user/src/mealorder/menu/meal-order-vendor-menu.html b/client/user/src/mealorder/menu/meal-order-vendor-menu.html
index b035e54b..47e6c1ce 100644
--- a/client/user/src/mealorder/menu/meal-order-vendor-menu.html
+++ b/client/user/src/mealorder/menu/meal-order-vendor-menu.html
@@ -29,13 +29,8 @@
 <dom-module id="meal-order-vendor-menu">
     <template>
         <style>
-            :host {
-                display: block;
-                padding: 0;
-            }
-
             paper-item {
-                font-size: 15px;
+                @apply --paper-font-body1;
                 padding: 0 2%;
                 width: 96%;
                 border-bottom: 1px solid var(--paper-grey-200);
@@ -64,6 +59,7 @@
             .header paper-item {
                 padding: 2px 1% 2px 2%;
             }
+
             .bold {
                 font-weight: bold;
             }
@@ -98,7 +94,7 @@
                 display: flex;
                 justify-content: space-between;
                 align-items: center;
-                font-size: 16px;
+                @apply --paper-font-subhead;
                 width: 100%;
             }
 
diff --git a/client/user/src/mealorder/menu/meal-order-vendor-menus.html b/client/user/src/mealorder/menu/meal-order-vendor-menus.html
index 1839330a..0777fe25 100644
--- a/client/user/src/mealorder/menu/meal-order-vendor-menus.html
+++ b/client/user/src/mealorder/menu/meal-order-vendor-menus.html
@@ -29,10 +29,6 @@
 <dom-module id="meal-order-vendor-menus">
     <template>
         <style>
-            :host {
-                display: block;
-                padding: 0;
-            }
             iron-list {
                 --iron-list-items-container: {
                     width: 70%;

From 3718010a45ab16b625bd9939d2d6ccf18b1a1cdf Mon Sep 17 00:00:00 2001
From: Paul <paulageyev@gmail.com>
Date: Wed, 11 Apr 2018 15:29:00 +0300
Subject: [PATCH 156/253] Create the action `REMOVE_DISHES_BY_VENDOR`

---
 .../src/mealorder/meal-order-client-app.html  | 58 ++++++++++++-------
 .../mealorder/menu/meal-order-user-cart.html  | 19 ++----
 .../mealorder/menu/meal-order-user-order.html | 16 +++--
 .../mealorder/shell/actions/user-actions.html |  3 +-
 .../mealorder/shell/reducers/reducers.html    |  6 ++
 5 files changed, 58 insertions(+), 44 deletions(-)

diff --git a/client/user/src/mealorder/meal-order-client-app.html b/client/user/src/mealorder/meal-order-client-app.html
index 3ecd4352..e33a2186 100644
--- a/client/user/src/mealorder/meal-order-client-app.html
+++ b/client/user/src/mealorder/meal-order-client-app.html
@@ -91,7 +91,7 @@
 
             app-drawer {
                 --app-drawer-content-container: {
-                    background-color:  var(--paper-grey-50);
+                    background-color: var(--paper-grey-50);
                 }
             }
 
@@ -173,9 +173,9 @@
                         </div>
                     </app-toolbar>
                 </iron-pages>
-                <meal-order-drawer order="[[order]]"
-                                   on-dish-removed="_removeDishFromOrder"></meal-order-drawer>
-
+                <meal-order-drawer on-user-order-dish-removed="_removeDishFromOrder"
+                                   on-user-order-vendor-removed="_removeDishesByVendor"
+                                   order="[[order]]"></meal-order-drawer>
             </app-drawer>
 
             <app-header-layout>
@@ -289,10 +289,16 @@
 
             static get actions() {
                 return {
-                    removeDish(dish) {
+                    removeDish(order) {
                         return {
                             type: MealOrderApp.UserAction.REMOVE_DISH,
-                            dish: dish
+                            order: order
+                        }
+                    },
+                    removeDishesByVendor(order) {
+                        return {
+                            type: MealOrderApp.UserAction.REMOVE_DISHES_BY_VENDOR,
+                            order: order
                         }
                     }
                 }
@@ -311,13 +317,33 @@
             }
 
             _removeDishFromOrder(e) {
-                const dish = {};
-                dish.date = this.currentDate;
-                dish.details = e.detail;
-                this.dispatch('removeDish', dish);
+                const order = {};
+                order.date = this._routeDateToObject().toLocaleDateString("en-US");
+                order.dish = e.detail;
+                this.dispatch('removeDish', order);
+            }
+
+            _removeDishesByVendor(e) {
+                const order = {};
+                order.date = this._routeDateToObject().toLocaleDateString("en-US");
+                order.vendor = e.detail;
+                this.dispatch('removeDishesByVendor', order);
             }
 
             _pageChanged() {
+                const date = this._routeDateToObject();
+
+                let dayOfTheWeek = date.toLocaleDateString("ru-RU", {weekday: 'long'});
+                dayOfTheWeek = dayOfTheWeek.charAt(0).toUpperCase() + dayOfTheWeek.slice(1);
+
+                const selectedDay = {
+                    day: date.getDate(),
+                    dayOfTheWeek: dayOfTheWeek,
+                };
+                this.set('selectedDay', selectedDay);
+            }
+
+            _routeDateToObject() {
                 const YEAR = 0;
                 const MONTH = 1;
                 const DAY = 2;
@@ -329,18 +355,10 @@
                 urlDate.month = arr[MONTH];
                 urlDate.day = arr[DAY];
 
-                const date = new Date(urlDate.year, urlDate.month-1, urlDate.day);
-
-                let dayOfTheWeek = date.toLocaleDateString("ru-RU", {weekday: 'long'});
-                dayOfTheWeek = dayOfTheWeek.charAt(0).toUpperCase() + dayOfTheWeek.slice(1);
-
-                const selectedDay = {
-                    day: date.getDate(),
-                    dayOfTheWeek: dayOfTheWeek,
-                };
-                this.set('selectedDay', selectedDay);
+                return new Date(urlDate.year, urlDate.month - 1, urlDate.day);
             }
         }
+
         window.customElements.define(MealOrderClientApp.is, MealOrderClientApp);
     </script>
 </dom-module>
diff --git a/client/user/src/mealorder/menu/meal-order-user-cart.html b/client/user/src/mealorder/menu/meal-order-user-cart.html
index ab25396c..85e602b1 100644
--- a/client/user/src/mealorder/menu/meal-order-user-cart.html
+++ b/client/user/src/mealorder/menu/meal-order-user-cart.html
@@ -19,31 +19,24 @@
   -->
 <script src="../../../bower_components/webcomponentsjs/webcomponents-lite.js"></script>
 <link rel="import" href="../../../bower_components/polymer/polymer-element.html">
-
 <link rel="import" href="meal-order-user-order.html">
 
 <dom-module id="meal-order-user-cart">
     <template>
         <style>
-            :host {
-                color: #4f4f4f;
-            }
-
-            .cart {
+            #cart {
                 overflow-x: hidden;
                 overflow-y: auto;
                 max-height: 93vh;
             }
-
-            .total {
+            #total {
                 display: flex;
                 justify-content: space-between;
                 margin: 6% 4% 10% 4%;
                 font-weight: bolder;
             }
         </style>
-        <div class="cart">
-
+        <div id="cart">
             <dom-repeat items="[[order]]" as="dish">
                 <template>
                     <meal-order-user-order order="[[dish]]"></meal-order-user-order>
@@ -51,7 +44,7 @@
             </dom-repeat>
             <dom-if if="[[order.length]]">
                 <template>
-                    <div class="total">
+                    <div id="total">
                         <div class="amount">Общая сумма:</div>
                         <div class="price">[[total]] ₴</div>
                     </div>
@@ -63,8 +56,6 @@
         /**
          * user-cart is user's order for current date.
          *
-         * <p>Is adopted for both desktop and mobile.
-         *
          * @customElement
          * @polymer
          */
@@ -103,7 +94,7 @@
                         computed: '_getTotalAmount(order)'
                     }
                 }
-            };
+            }
 
             _getTotalAmount() {
                 let sum = 0;
diff --git a/client/user/src/mealorder/menu/meal-order-user-order.html b/client/user/src/mealorder/menu/meal-order-user-order.html
index 02798354..348a7178 100644
--- a/client/user/src/mealorder/menu/meal-order-user-order.html
+++ b/client/user/src/mealorder/menu/meal-order-user-order.html
@@ -26,10 +26,6 @@
 <dom-module id="meal-order-user-order">
     <template>
         <style>
-            :host {
-                color: #4f4f4f;
-            }
-
             .order-details {
                 display: flex;
                 font-size: 15px;
@@ -63,7 +59,7 @@
         </style>
         <div class="vendor">
             <div>[[order.vendor]]</div>
-            <paper-icon-button icon="delete" class="icon-delete"></paper-icon-button>
+            <paper-icon-button icon="delete" class="icon-delete" on-click="_removeDishesByVendor"></paper-icon-button>
         </div>
         <dom-repeat items="[[order.dishes]]" as="dish">
             <template>
@@ -78,9 +74,7 @@
     </template>
     <script>
         /**
-         * user-cart is user's order for current date, for current vendor.
-         *
-         * <p>Is adopted for both desktop and mobile.
+         * user-order is user's order for current date, for current vendor.
          *
          * @customElement
          * @polymer
@@ -101,11 +95,15 @@
                 }
             }
 
+            _removeDishesByVendor() {
+                this.dispatchEvent(new CustomEvent('user-order-vendor-removed', {composed: true, detail: this.order.vendor}));
+            }
+
             _removeDish(e) {
                 const dish = {};
                 dish.vendor = this.order.vendor;
                 dish.name = this.order.dishes[e.model.index].title;
-                this.dispatchEvent(new CustomEvent('dish-removed', {composed: true, detail: dish}));
+                this.dispatchEvent(new CustomEvent('user-order-dish-removed', {composed: true, detail: dish}));
             }
         }
 
diff --git a/client/user/src/mealorder/shell/actions/user-actions.html b/client/user/src/mealorder/shell/actions/user-actions.html
index 48d028c6..566e1500 100644
--- a/client/user/src/mealorder/shell/actions/user-actions.html
+++ b/client/user/src/mealorder/shell/actions/user-actions.html
@@ -22,7 +22,8 @@
     MealOrderApp.UserAction = {
         CHANGE_CURRENT_MENU: "CHANGE_CURRENT_MENU",
         CHANGE_CURRENT_CART: 'CHANGE_CURRENT_CART',
-        REMOVE_DISH: 'REMOVE_DISH',
         ADD_DISH: 'ADD_DISH',
+        REMOVE_DISH: 'REMOVE_DISH',
+        REMOVE_DISHES_BY_VENDOR: 'REMOVE_DISHES_BY_VENDOR',
     }
 </script>
diff --git a/client/user/src/mealorder/shell/reducers/reducers.html b/client/user/src/mealorder/shell/reducers/reducers.html
index 6f98671b..8124bcd8 100644
--- a/client/user/src/mealorder/shell/reducers/reducers.html
+++ b/client/user/src/mealorder/shell/reducers/reducers.html
@@ -271,6 +271,12 @@
                         }
                     );
                 }
+                case MealOrderApp.UserAction.REMOVE_DISH: {
+                    return state;
+                }
+                case MealOrderApp.UserAction.REMOVE_DISHES_BY_VENDOR: {
+                    return state;
+                }
                 default : {
                     return state;
                 }

From 5f84941c4b3739ef8d979c1b87755f9ca0d85899 Mon Sep 17 00:00:00 2001
From: Paul <paulageyev@gmail.com>
Date: Wed, 11 Apr 2018 15:41:31 +0300
Subject: [PATCH 157/253] Apply paper style colors for the user's order

---
 .../src/mealorder/menu/meal-order-menu-container.html     | 1 -
 client/user/src/mealorder/menu/meal-order-user-cart.html  | 4 ++--
 client/user/src/mealorder/menu/meal-order-user-order.html | 8 +++-----
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/client/user/src/mealorder/menu/meal-order-menu-container.html b/client/user/src/mealorder/menu/meal-order-menu-container.html
index 3c22f191..e856ad75 100644
--- a/client/user/src/mealorder/menu/meal-order-menu-container.html
+++ b/client/user/src/mealorder/menu/meal-order-menu-container.html
@@ -26,7 +26,6 @@
 <link rel="import" href="../../../bower_components/paper-styles/color.html">
 <link rel="import" href="../shell/redux-store.html">
 <link rel="import" href="../shell/actions/user-actions.html">
-
 <link rel="import" href="meal-order-vendor-menus.html">
 
 <dom-module id="meal-order-menu-container">
diff --git a/client/user/src/mealorder/menu/meal-order-user-cart.html b/client/user/src/mealorder/menu/meal-order-user-cart.html
index 85e602b1..e98ddebd 100644
--- a/client/user/src/mealorder/menu/meal-order-user-cart.html
+++ b/client/user/src/mealorder/menu/meal-order-user-cart.html
@@ -37,9 +37,9 @@
             }
         </style>
         <div id="cart">
-            <dom-repeat items="[[order]]" as="dish">
+            <dom-repeat items="[[order]]" as="orderByVendor">
                 <template>
-                    <meal-order-user-order order="[[dish]]"></meal-order-user-order>
+                    <meal-order-user-order order="[[orderByVendor]]"></meal-order-user-order>
                 </template>
             </dom-repeat>
             <dom-if if="[[order.length]]">
diff --git a/client/user/src/mealorder/menu/meal-order-user-order.html b/client/user/src/mealorder/menu/meal-order-user-order.html
index 348a7178..cb197ff9 100644
--- a/client/user/src/mealorder/menu/meal-order-user-order.html
+++ b/client/user/src/mealorder/menu/meal-order-user-order.html
@@ -21,7 +21,7 @@
 <link rel="import" href="../../../bower_components/polymer/polymer-element.html">
 <link rel="import" href="../../../bower_components/paper-icon-button/paper-icon-button.html">
 <link rel="import" href="../../../bower_components/iron-icons/iron-icons.html">
-
+<link rel="import" href="../../../bower_components/paper-styles/color.html">
 
 <dom-module id="meal-order-user-order">
     <template>
@@ -30,7 +30,7 @@
                 display: flex;
                 font-size: 15px;
                 align-items: center;
-                border-bottom: 2px solid #fcfcfc;
+                border-bottom: 2px solid var(--google-grey-100);
             }
 
             .vendor {
@@ -38,7 +38,7 @@
                 justify-content: space-between;
                 align-items: center;
                 padding-left: 4%;
-                background-color: #fcfcfc;
+                background-color: var(--google-grey-100);
             }
 
             .order-title {
@@ -55,7 +55,6 @@
             .order-quantity {
                 width: 15%;
             }
-
         </style>
         <div class="vendor">
             <div>[[order.vendor]]</div>
@@ -106,7 +105,6 @@
                 this.dispatchEvent(new CustomEvent('user-order-dish-removed', {composed: true, detail: dish}));
             }
         }
-
         window.customElements.define(MealOrderUserOrder.is, MealOrderUserOrder);
     </script>
 </dom-module>

From 156aa7c9c8f88ca2d8b86b541bebbdb29befbaf1 Mon Sep 17 00:00:00 2001
From: "alexander.karpetc" <alexander.karpetc@gmail.com>
Date: Wed, 11 Apr 2018 17:30:23 +0300
Subject: [PATCH 158/253] Refactor naming and docs

---
 .../user/src/mealorder/menu/meal-order-vendor-menu.html  | 9 ++++++++-
 .../user/src/mealorder/menu/meal-order-vendor-menus.html | 6 ++----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/client/user/src/mealorder/menu/meal-order-vendor-menu.html b/client/user/src/mealorder/menu/meal-order-vendor-menu.html
index 47e6c1ce..fa77d47f 100644
--- a/client/user/src/mealorder/menu/meal-order-vendor-menu.html
+++ b/client/user/src/mealorder/menu/meal-order-vendor-menu.html
@@ -158,7 +158,14 @@
         </div>
     </template>
     <script>
-
+        /**
+         * meal-order-vendor-menu represents a menu of a vendor for a single day.
+         *
+         * Contains a list of categories with dish titles and prices.
+         *
+         * @customElement
+         * @polymer
+         */
         class MealOrderVendorMenu extends Polymer.Element {
             static get is() {
                 return 'meal-order-vendor-menu';
diff --git a/client/user/src/mealorder/menu/meal-order-vendor-menus.html b/client/user/src/mealorder/menu/meal-order-vendor-menus.html
index 0777fe25..60153caa 100644
--- a/client/user/src/mealorder/menu/meal-order-vendor-menus.html
+++ b/client/user/src/mealorder/menu/meal-order-vendor-menus.html
@@ -70,7 +70,6 @@
             }
 
             @media only screen and (max-width: 600px) {
-
                 paper-search-bar {
                     margin: 0 auto;
                     width: 100%;
@@ -107,7 +106,6 @@
         /**
          * vendor-menus represents an expanding list of menus for current date and filter.
          *
-         * <p>Is adopted for both desktop and mobile.
          * Contains search by dish keywords.
          *
          * @customElement
@@ -141,7 +139,7 @@
                      */
                     filtered: {
                         type: Array,
-                        computed: 'filteredItems(items,filter)',
+                        computed: '_filteredItems(items,filter)',
                         reflectToAttribute: true
                     },
 
@@ -161,7 +159,7 @@
                 this.shadowRoot.querySelector("#list").notifyResize();
             }
 
-            filteredItems() {
+            _filteredItems() {
                 const predicate = this.filter;
                 const filtered = [];
                 for (let i = 0; i < this.items.length; i++) {

From fa494b5f46ac9094f32adb05520f8649fb7575e3 Mon Sep 17 00:00:00 2001
From: Paul <paulageyev@gmail.com>
Date: Wed, 11 Apr 2018 17:43:23 +0300
Subject: [PATCH 159/253] Add a default date for the calendar

---
 .../src/mealorder/meal-order-client-app.html  |  4 +-
 .../src/mealorder/menu/meal-order-drawer.html | 23 ++++-
 .../menu/meal-order-user-history.html         | 84 +++++++++----------
 .../mealorder/shell/reducers/reducers.html    |  9 +-
 4 files changed, 65 insertions(+), 55 deletions(-)

diff --git a/client/user/src/mealorder/meal-order-client-app.html b/client/user/src/mealorder/meal-order-client-app.html
index 387a206f..96df4ee1 100644
--- a/client/user/src/mealorder/meal-order-client-app.html
+++ b/client/user/src/mealorder/meal-order-client-app.html
@@ -176,6 +176,7 @@
                 </iron-pages>
                 <meal-order-drawer on-user-order-dish-removed="_removeDishFromOrder"
                                    on-user-order-vendor-removed="_removeDishesByVendor"
+                                   on-menu-order-drawer-changed-history-date="_updateHistoryDay"
                                    order="[[order]]"></meal-order-drawer>
             </app-drawer>
 
@@ -232,8 +233,7 @@
                         fallback-selection="view404"
                         role="main">
                     <meal-order-menu-container data-page="menu"></meal-order-menu-container>
-                    <meal-order-user-history name="history" cart="[[history]]"
-                                             narrow="[[narrow]]"></meal-order-user-history>
+                    <meal-order-user-history data-page="history" cart="[[history]]"></meal-order-user-history>
                 </iron-pages>
 
             </app-header-layout>
diff --git a/client/user/src/mealorder/menu/meal-order-drawer.html b/client/user/src/mealorder/menu/meal-order-drawer.html
index 5214211b..e7237e00 100644
--- a/client/user/src/mealorder/menu/meal-order-drawer.html
+++ b/client/user/src/mealorder/menu/meal-order-drawer.html
@@ -110,8 +110,26 @@
                 ];
             }
 
+            connectedCallback() {
+                super.connectedCallback();
+                if (!this.routeData.date) {
+                    let date = new Date();
+                    date.setDate(date.getDate());
+                    date.setMonth(date.getMonth());
+
+                    const yesterdayDate = {};
+                    yesterdayDate.year = "" + date.getFullYear();
+                    yesterdayDate.month = ("0" + (date.getMonth() + 1)).slice(-2);
+                    yesterdayDate.day = "" + (date.getDate() - 1);
+                    this.set('inputDate', yesterdayDate.year + "/" + yesterdayDate.month + "/" +
+                        yesterdayDate.day);
+                    this.dispatchEvent(new CustomEvent('menu-order-drawer-changed-history-date', {detail: yesterdayDate}));
+                }
+            }
+
             _changeHistoryUrl() {
-                if (this.routeData.page && this.routeData.page.startsWith("history")) {
+                if (this.routeData.page && this.routeData.page.startsWith("history") &&
+                    this.routeData.date) {
                     const YEAR = 0;
                     const MONTH = 1;
                     const DAY = 2;
@@ -123,7 +141,7 @@
                     date.year = arr[YEAR];
                     date.month = arr[MONTH];
                     date.day = arr[DAY];
-                    this.dispatchEvent(new CustomEvent('changed-history-date', {detail: date}));
+                    this.dispatchEvent(new CustomEvent('menu-order-drawer-changed-history-date', {detail: date}));
                 }
             }
 
@@ -145,6 +163,7 @@
                 }
             }
         }
+
         window.customElements.define(MealOrderDrawer.is, MealOrderDrawer);
     </script>
 </dom-module>
diff --git a/client/user/src/mealorder/menu/meal-order-user-history.html b/client/user/src/mealorder/menu/meal-order-user-history.html
index f92ed969..42a2bec0 100644
--- a/client/user/src/mealorder/menu/meal-order-user-history.html
+++ b/client/user/src/mealorder/menu/meal-order-user-history.html
@@ -24,16 +24,30 @@
 <dom-module id="meal-order-user-history">
     <template>
         <style>
-            :host {
-                font-family: 'Roboto', 'Noto', sans-serif;
-                color: #4f4f4f;
-            }
-
-            .history {
+            #history {
                 width: 70%;
                 margin: 3% auto;
             }
 
+            #title-for-mobile {
+                display: none;
+            }
+
+            .header {
+                display: flex;
+                justify-content: space-between;
+                background-color: var(--paper-grey-300);
+                height: 40px;
+                align-items: center;
+            }
+
+            .vendor-title {
+                font-size: 22px;
+                font-weight: bolder;
+                margin-top: 2%;
+                margin-bottom: 2px;
+            }
+
             .history-title {
                 width: 35%;
                 text-align: left;
@@ -51,18 +65,10 @@
                 margin-right: 2%;
             }
 
-            .header {
-                display: flex;
-                justify-content: space-between;
-                background-color: #e2e2e2;
-                height: 40px;
-                align-items: center;
-            }
-
             .dishes {
                 display: flex;
                 justify-content: space-between;
-                background-color: white;
+                background-color: #FFFFFF;
                 height: 40px;
                 margin-bottom: 2px;
                 align-items: center;
@@ -72,18 +78,13 @@
                 display: flex;
                 justify-content: flex-end;
                 align-items: center;
-                background-color: white;
+                background-color: #FFFFFF;
                 font-weight: bolder;
                 height: 40px;
                 padding-right: 2%;
             }
 
-            .title-for-mobile {
-                display: none;
-            }
-
             @media only screen and (max-width: 600px) {
-
                 .history-title {
                     width: 40%;
                 }
@@ -93,31 +94,20 @@
 
                 }
 
-                .history {
+                #history {
                     width: 100%;
                 }
 
-                .title-for-mobile {
-                    color: #969696;
-
+                #title-for-mobile {
+                    color: var(--paper-grey-600);
                     display: flex;
                     justify-content: flex-end;
                     margin-right: 2%;
                 }
-
-            }
-
-            .vendor-title {
-                font-size: 22px;
-                font-weight: bolder;
-                margin-top: 2%;
-                margin-bottom: 2px;
             }
-
         </style>
-        <div class="history">
-
-            <div class="title-for-mobile">История заказов</div>
+        <div id="history">
+            <div id="title-for-mobile">История заказов</div>
 
             <iron-list items="[[cart]]" as="item">
                 <template>
@@ -153,8 +143,6 @@
         /**
          * User's history for individual day.
          *
-         * <p>Is adopted for both desktop and mobile.
-         *
          * @customElement
          * @polymer
          */
@@ -168,28 +156,32 @@
                     /**
                      * An array containing items to be displayed.
                      */
-                    cart: {type: Array},
+                    cart: {
+                        type: Array
+                    },
+                    /**
+                     * Total amount of the order.
+                     */
                     totalSum: {
                         type: Number,
-                        computed: 'getTotalSum(cart)',
+                        computed: '_getTotalSum(cart)',
                     }
                 }
             };
 
-            getTotalSum(cart) {
-                let total_sum = 0;
+            _getTotalSum(cart) {
+                let totalSum = 0;
                 for (let i = 0; i < cart.length; i++) {
                     const dishes = cart[i].dishes;
                     let sum = 0;
                     for (let i = 0; i < dishes.length; i++) {
                         sum += (dishes[i].price) * dishes[i].quantity;
                     }
-                    total_sum += sum;
+                    totalSum += sum;
                 }
-                return total_sum;
+                return totalSum;
             }
         }
-
         window.customElements.define(MealOrderUserHistory.is, MealOrderUserHistory);
     </script>
 </dom-module>
diff --git a/client/user/src/mealorder/shell/reducers/reducers.html b/client/user/src/mealorder/shell/reducers/reducers.html
index 15929c02..c17c8da1 100644
--- a/client/user/src/mealorder/shell/reducers/reducers.html
+++ b/client/user/src/mealorder/shell/reducers/reducers.html
@@ -239,8 +239,8 @@
             history: [{
                 date: {
                     year: '2018',
-                    month: '03',
-                    day: '29',
+                    month: '04',
+                    day: '10',
                 }, order: [{
                     vendor: "Пюре",
                     dishes: [
@@ -261,8 +261,8 @@
             }, {
                 date: {
                     year: '2018',
-                    month: '03',
-                    day: '28',
+                    month: '04',
+                    day: '09',
                 }, order: [{
                     vendor: "Пюре",
                     dishes: [
@@ -281,7 +281,6 @@
                     }]
                 }]
             }],
-
             currentHistory: [],
         };
 

From f909608f294647ee5db0425396c050ba3b36cfdf Mon Sep 17 00:00:00 2001
From: Paul <paulageyev@gmail.com>
Date: Wed, 11 Apr 2018 18:06:27 +0300
Subject: [PATCH 160/253] Add actions to the `MealOrderApp` namespace

---
 .../user/src/mealorder/menu/meal-order-drawer.html   |  4 ++--
 .../src/mealorder/menu/meal-order-menu-order.html    | 12 +++++++++---
 .../src/mealorder/menu/meal-order-user-history.html  |  2 +-
 .../src/mealorder/shell/actions/user-actions.html    |  1 -
 4 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/client/user/src/mealorder/menu/meal-order-drawer.html b/client/user/src/mealorder/menu/meal-order-drawer.html
index e7237e00..979db895 100644
--- a/client/user/src/mealorder/menu/meal-order-drawer.html
+++ b/client/user/src/mealorder/menu/meal-order-drawer.html
@@ -117,9 +117,10 @@
                     date.setDate(date.getDate());
                     date.setMonth(date.getMonth());
 
+                    const YESTERDAY= -1;
                     const yesterdayDate = {};
                     yesterdayDate.year = "" + date.getFullYear();
-                    yesterdayDate.month = ("0" + (date.getMonth() + 1)).slice(-2);
+                    yesterdayDate.month = ("0" + (date.getMonth() + 1)).slice(YESTERDAY-1);
                     yesterdayDate.day = "" + (date.getDate() - 1);
                     this.set('inputDate', yesterdayDate.year + "/" + yesterdayDate.month + "/" +
                         yesterdayDate.day);
@@ -163,7 +164,6 @@
                 }
             }
         }
-
         window.customElements.define(MealOrderDrawer.is, MealOrderDrawer);
     </script>
 </dom-module>
diff --git a/client/user/src/mealorder/menu/meal-order-menu-order.html b/client/user/src/mealorder/menu/meal-order-menu-order.html
index f5caabf7..104e8028 100644
--- a/client/user/src/mealorder/menu/meal-order-menu-order.html
+++ b/client/user/src/mealorder/menu/meal-order-menu-order.html
@@ -123,7 +123,7 @@
          * @polymer
          * @ReduxMixin
          */
-        class MealOrderMenuOrder extends ReduxMixin(Polymer.Element) {
+        class MealOrderMenuOrder extends Polymer.Element {
             static get is() {
                 return 'meal-order-menu-order';
             }
@@ -152,6 +152,12 @@
                         type: Array,
                         statePath: 'menuForDay'
                     },
+                    /**
+                     * Used for routing.
+                     */
+                    routeData: {
+                        type: Object,
+                    },
                 };
             }
 
@@ -159,13 +165,13 @@
                 return {
                     menuForDay(date) {
                         return {
-                            type: UserAction.MENU_FOR_DAY,
+                            type: MealOrderApp.UserAction.MENU_FOR_DAY,
                             date: date
                         }
                     },
                     cartForDay(date) {
                         return {
-                            type: UserAction.CART_FOR_DAY,
+                            type: MealOrderApp.UserAction.CART_FOR_DAY,
                             date: date
                         }
                     },
diff --git a/client/user/src/mealorder/menu/meal-order-user-history.html b/client/user/src/mealorder/menu/meal-order-user-history.html
index 42a2bec0..748e571a 100644
--- a/client/user/src/mealorder/menu/meal-order-user-history.html
+++ b/client/user/src/mealorder/menu/meal-order-user-history.html
@@ -167,7 +167,7 @@
                         computed: '_getTotalSum(cart)',
                     }
                 }
-            };
+            }
 
             _getTotalSum(cart) {
                 let totalSum = 0;
diff --git a/client/user/src/mealorder/shell/actions/user-actions.html b/client/user/src/mealorder/shell/actions/user-actions.html
index 16dda230..e1e15978 100644
--- a/client/user/src/mealorder/shell/actions/user-actions.html
+++ b/client/user/src/mealorder/shell/actions/user-actions.html
@@ -23,7 +23,6 @@
         CHANGE_HISTORY_DAY: "CHANGE_HISTORY_DAY",
         MENU_FOR_DAY: "MENU_FOR_DAY",
         CART_FOR_DAY: 'CART_FOR_DAY',
-        REMOVE_DISH : "REMOVE_DISH",
         CHANGE_CURRENT_MENU: "CHANGE_CURRENT_MENU",
         CHANGE_CURRENT_CART: 'CHANGE_CURRENT_CART',
         ADD_DISH: 'ADD_DISH',

From 6fb8c12a66483d1cc70d9114919bf478867b344f Mon Sep 17 00:00:00 2001
From: Paul <paulageyev@gmail.com>
Date: Wed, 11 Apr 2018 19:31:11 +0300
Subject: [PATCH 161/253] Refactor a default date for the calendar

---
 client/user/src/mealorder/menu/meal-order-drawer.html | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/client/user/src/mealorder/menu/meal-order-drawer.html b/client/user/src/mealorder/menu/meal-order-drawer.html
index 979db895..5050b460 100644
--- a/client/user/src/mealorder/menu/meal-order-drawer.html
+++ b/client/user/src/mealorder/menu/meal-order-drawer.html
@@ -117,10 +117,11 @@
                     date.setDate(date.getDate());
                     date.setMonth(date.getMonth());
 
-                    const YESTERDAY= -1;
                     const yesterdayDate = {};
                     yesterdayDate.year = "" + date.getFullYear();
-                    yesterdayDate.month = ("0" + (date.getMonth() + 1)).slice(YESTERDAY-1);
+
+                    let month = date.getMonth() + 1;
+                    yesterdayDate.month = month < 10 ? '0' + month : '' + month;
                     yesterdayDate.day = "" + (date.getDate() - 1);
                     this.set('inputDate', yesterdayDate.year + "/" + yesterdayDate.month + "/" +
                         yesterdayDate.day);

From f130127a8fe1f32aeda6e94fd97cc3692114fb10 Mon Sep 17 00:00:00 2001
From: Paul <paulageyev@gmail.com>
Date: Wed, 11 Apr 2018 19:38:52 +0300
Subject: [PATCH 162/253] Fix no-magic-numbers error

---
 client/user/src/mealorder/menu/meal-order-drawer.html | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/client/user/src/mealorder/menu/meal-order-drawer.html b/client/user/src/mealorder/menu/meal-order-drawer.html
index 5050b460..cd19b490 100644
--- a/client/user/src/mealorder/menu/meal-order-drawer.html
+++ b/client/user/src/mealorder/menu/meal-order-drawer.html
@@ -110,6 +110,7 @@
                 ];
             }
 
+
             connectedCallback() {
                 super.connectedCallback();
                 if (!this.routeData.date) {
@@ -119,8 +120,8 @@
 
                     const yesterdayDate = {};
                     yesterdayDate.year = "" + date.getFullYear();
-
                     let month = date.getMonth() + 1;
+                    /*eslint no-magic-numbers: ["error", { "ignore": [10] }]*/
                     yesterdayDate.month = month < 10 ? '0' + month : '' + month;
                     yesterdayDate.day = "" + (date.getDate() - 1);
                     this.set('inputDate', yesterdayDate.year + "/" + yesterdayDate.month + "/" +

From e6effce2c1d70e2200f79321bd8ecc5fe87dc65b Mon Sep 17 00:00:00 2001
From: Paul <paulageyev@gmail.com>
Date: Wed, 11 Apr 2018 19:46:43 +0300
Subject: [PATCH 163/253] Add ignore for the no-magic-numbers

---
 client/user/src/mealorder/menu/meal-order-drawer.html | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/client/user/src/mealorder/menu/meal-order-drawer.html b/client/user/src/mealorder/menu/meal-order-drawer.html
index cd19b490..b734a341 100644
--- a/client/user/src/mealorder/menu/meal-order-drawer.html
+++ b/client/user/src/mealorder/menu/meal-order-drawer.html
@@ -110,7 +110,7 @@
                 ];
             }
 
-
+            /*eslint no-magic-numbers: ["error", { "ignore": [1,10] }]*/
             connectedCallback() {
                 super.connectedCallback();
                 if (!this.routeData.date) {
@@ -121,7 +121,6 @@
                     const yesterdayDate = {};
                     yesterdayDate.year = "" + date.getFullYear();
                     let month = date.getMonth() + 1;
-                    /*eslint no-magic-numbers: ["error", { "ignore": [10] }]*/
                     yesterdayDate.month = month < 10 ? '0' + month : '' + month;
                     yesterdayDate.day = "" + (date.getDate() - 1);
                     this.set('inputDate', yesterdayDate.year + "/" + yesterdayDate.month + "/" +

From 4642308d549e4e9625da36862be642e1503cf373 Mon Sep 17 00:00:00 2001
From: "alexander.karpetc" <alexander.karpetc@gmail.com>
Date: Mon, 16 Apr 2018 17:00:25 +0300
Subject: [PATCH 164/253] Set `add-method` private

---
 client/user/src/mealorder/menu/meal-order-vendor-menu.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/user/src/mealorder/menu/meal-order-vendor-menu.html b/client/user/src/mealorder/menu/meal-order-vendor-menu.html
index fa77d47f..1071446a 100644
--- a/client/user/src/mealorder/menu/meal-order-vendor-menu.html
+++ b/client/user/src/mealorder/menu/meal-order-vendor-menu.html
@@ -144,7 +144,7 @@
                                                 </div>
                                                 <div class="add-dish-icon">
                                                     <paper-icon-button icon="add"
-                                                                       on-click="addDish"></paper-icon-button>
+                                                                       on-click="_addDish"></paper-icon-button>
                                                 </div>
                                             </paper-item>
                                         </div>
@@ -206,7 +206,7 @@
                 this.dispatchEvent(new CustomEvent('vendor-menu-resize'));
             }
 
-            addDish(e) {
+            _addDish(e) {
                 const dish = {};
                 dish.vendor = this.menu.name;
                 dish.price = this.menu.categories[e.model.parentModel.index].dishes[e.model.index].price;

From 3887c0de997004e62b3282da734da62a23687af4 Mon Sep 17 00:00:00 2001
From: "alexander.karpetc" <alexander.karpetc@gmail.com>
Date: Tue, 17 Apr 2018 14:07:38 +0300
Subject: [PATCH 165/253] Add tests for `vendor-menu`

---
 .eslintrc.json                                |  1 +
 .../menu/meal-order-vendor-menu.html          |  2 +-
 .../menu/meal-order-vendor-menu_test.html     | 73 +++++++++++++++++++
 client/user/test/mealorder/test_variables.js  | 40 ++++++++++
 4 files changed, 115 insertions(+), 1 deletion(-)
 create mode 100644 client/user/test/mealorder/menu/meal-order-vendor-menu_test.html
 create mode 100644 client/user/test/mealorder/test_variables.js

diff --git a/.eslintrc.json b/.eslintrc.json
index d34030c0..891d8628 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -44,6 +44,7 @@
   "globals": {
     "Polymer": false,
     "MealOrderApp": true,
+    "MealOrderAppTest": true,
     "assert": false,
     "test": false,
     "suite": false,
diff --git a/client/user/src/mealorder/menu/meal-order-vendor-menu.html b/client/user/src/mealorder/menu/meal-order-vendor-menu.html
index 1071446a..826a72ab 100644
--- a/client/user/src/mealorder/menu/meal-order-vendor-menu.html
+++ b/client/user/src/mealorder/menu/meal-order-vendor-menu.html
@@ -180,7 +180,7 @@
                      * @property {array} categories list of categories with dishes.
                      */
                     menu: {
-                        type: Array
+                        type: Object
                     }
                 }
             }
diff --git a/client/user/test/mealorder/menu/meal-order-vendor-menu_test.html b/client/user/test/mealorder/menu/meal-order-vendor-menu_test.html
new file mode 100644
index 00000000..3f2479bf
--- /dev/null
+++ b/client/user/test/mealorder/menu/meal-order-vendor-menu_test.html
@@ -0,0 +1,73 @@
+<!doctype html>
+<!--
+  ~ Copyright 2018, TeamDev Ltd. All rights reserved.
+  ~
+  ~ Redistribution and use in source and/or binary forms, with or without
+  ~ modification, must retain the above copyright notice and the following
+  ~ disclaimer.
+  ~
+  ~ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+  ~ "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+  ~ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+  ~ A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+  ~ OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+  ~ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+  ~ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+  ~ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+  ~ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  ~ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+  ~ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+  -->
+
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <meta name="viewport"
+          content="width=device-width, minimum-scale=1, initial-scale=1, user-scalable=yes">
+
+    <title>meal-order-vendor-menu test</title>
+    <link rel="import" href="../../../src/mealorder/shell/meal-order-app-namespace.html">
+    <script src="../../../bower_components/webcomponentsjs/webcomponents-loader.js"></script>
+    <script src="../../../bower_components/web-component-tester/browser.js"></script>
+    <script src="../../../node_modules/redux/dist/redux.js"></script>
+    <link rel="import" href="../../../src/mealorder/menu/meal-order-vendor-menu.html">
+    <script src="../test_variables.js"></script>
+
+</head>
+<body>
+
+<test-fixture id="SimpleMenu">
+    <template>
+        <meal-order-vendor-menu></meal-order-vendor-menu>
+    </template>
+</test-fixture>
+
+<script>
+    suite('meal-order-vendor-menu', function () {
+        let component;
+
+        setup(() => {
+            component = fixture('SimpleMenu');
+            component.menu = MealOrderAppTest.initialMenu;
+        });
+        test('should store menu correctly', function () {
+            assert.equal('Пюре', component.menu.name);
+            assert.equal(2, component.menu.categories.length);
+            assert.equal('Первое блюдо', component.menu.categories[0].categoryName);
+            assert.equal(5, component.menu.categories[0].dishes.length);
+            assert.equal('Суп гречневый', component.menu.categories[0].dishes[0].title);
+            assert.equal(35, component.menu.categories[0].dishes[0].price);
+        });
+        test('should expand and collapse on click', function () {
+            const header = component.shadowRoot.querySelector('.menu-caption');
+            const menu = component.shadowRoot.querySelector('#menu');
+            header.click();
+            assert.equal('collapsed', menu.className);
+            header.click();
+            assert.equal('expanded', menu.className);
+        });
+    });
+</script>
+
+</body>
+</html>
diff --git a/client/user/test/mealorder/test_variables.js b/client/user/test/mealorder/test_variables.js
new file mode 100644
index 00000000..d3736593
--- /dev/null
+++ b/client/user/test/mealorder/test_variables.js
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2018, TeamDev Ltd. All rights reserved.
+ *
+ * Redistribution and use in source and/or binary forms, with or without
+ * modification, must retain the above copyright notice and the following
+ * disclaimer.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+{
+    window.MealOrderAppTest = {};
+
+    MealOrderAppTest.initialMenu = {
+        name: 'Пюре',
+        categories: [{
+            categoryName: 'Первое блюдо', dishes: [
+                {title: 'Суп гречневый', price: 35},
+                {title: 'Солянка', price: 40},
+                {title: 'Суп гороховый', price: 140},
+                {title: 'Уха', price: 35},
+                {title: 'Суп-пюре грибной', price: 40}]
+        }
+            , {
+                categoryName: 'Второе блюдо', dishes: [
+                    {title: 'Утиные крылышки', price: 40},
+                    {title: 'Куриные крылышки', price: 45}]
+            }
+        ]
+    };
+}

From 7928a7a9c9b9827ec9102a39b4baa299a13ecbbb Mon Sep 17 00:00:00 2001
From: "alexander.karpetc" <alexander.karpetc@gmail.com>
Date: Tue, 17 Apr 2018 14:57:53 +0300
Subject: [PATCH 166/253] Edit docs for `vendor-menus`

---
 client/user/src/mealorder/menu/meal-order-vendor-menus.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/user/src/mealorder/menu/meal-order-vendor-menus.html b/client/user/src/mealorder/menu/meal-order-vendor-menus.html
index 60153caa..99a556fe 100644
--- a/client/user/src/mealorder/menu/meal-order-vendor-menus.html
+++ b/client/user/src/mealorder/menu/meal-order-vendor-menus.html
@@ -128,7 +128,7 @@
                     /**
                      * Full menu for day.
                      *
-                     * @property {array} each item is a menu of a vendor for a day.
+                     * @property {{name:String vendor name, categories:array a menu of a vendor for a day}}.
                      */
                     items: {
                         type: Array,

From 4d8057170d34a1f05a7b27e44651ea9121367aaf Mon Sep 17 00:00:00 2001
From: "alexander.karpetc" <alexander.karpetc@gmail.com>
Date: Tue, 17 Apr 2018 15:23:22 +0300
Subject: [PATCH 167/253] Describe add-dish event

---
 .../user/src/mealorder/menu/meal-order-vendor-menu.html   | 7 +++++++
 .../test/mealorder/menu/meal-order-vendor-menu_test.html  | 8 ++++++++
 2 files changed, 15 insertions(+)

diff --git a/client/user/src/mealorder/menu/meal-order-vendor-menu.html b/client/user/src/mealorder/menu/meal-order-vendor-menu.html
index 826a72ab..d304fa39 100644
--- a/client/user/src/mealorder/menu/meal-order-vendor-menu.html
+++ b/client/user/src/mealorder/menu/meal-order-vendor-menu.html
@@ -173,6 +173,13 @@
 
             static get properties() {
                 return {
+                    /**
+                     * Fired on `add-button` click.
+                     *
+                     * @action `dish-added`
+                     * @param {dish} contains vendor, category and dish title
+                     */
+
                     /**
                      * Menu of a vendor.
                      *
diff --git a/client/user/test/mealorder/menu/meal-order-vendor-menu_test.html b/client/user/test/mealorder/menu/meal-order-vendor-menu_test.html
index 3f2479bf..70ebcaac 100644
--- a/client/user/test/mealorder/menu/meal-order-vendor-menu_test.html
+++ b/client/user/test/mealorder/menu/meal-order-vendor-menu_test.html
@@ -66,6 +66,14 @@
             header.click();
             assert.equal('expanded', menu.className);
         });
+        test('should send `add-dish` event', function () {
+            const header = component.shadowRoot.querySelector('.menu-caption');
+            const menu = component.shadowRoot.querySelector('#menu');
+            header.click();
+            assert.equal('collapsed', menu.className);
+            header.click();
+            assert.equal('expanded', menu.className);
+        });
     });
 </script>
 

From 27a2e02ad79f25d339f250f017bf34706f08e432 Mon Sep 17 00:00:00 2001
From: Paul <paulageyev@gmail.com>
Date: Tue, 17 Apr 2018 16:23:40 +0300
Subject: [PATCH 168/253] Refactor event click on the `paper tabs`

---
 .eslintrc.json                                |  1 +
 .../menu/meal-order-menu-container.html       | 25 +++--
 .../meal-order-menu-container_test.html       | 95 ++++++++++++++++++
 client/user/test/mealorder/test_variables.js  | 99 +++++++++++++++++++
 4 files changed, 213 insertions(+), 7 deletions(-)
 create mode 100644 client/user/test/mealorder/meal-order-menu-container_test.html
 create mode 100644 client/user/test/mealorder/test_variables.js

diff --git a/.eslintrc.json b/.eslintrc.json
index d34030c0..891d8628 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -44,6 +44,7 @@
   "globals": {
     "Polymer": false,
     "MealOrderApp": true,
+    "MealOrderAppTest": true,
     "assert": false,
     "test": false,
     "suite": false,
diff --git a/client/user/src/mealorder/menu/meal-order-menu-container.html b/client/user/src/mealorder/menu/meal-order-menu-container.html
index 388308ac..3671e813 100644
--- a/client/user/src/mealorder/menu/meal-order-menu-container.html
+++ b/client/user/src/mealorder/menu/meal-order-menu-container.html
@@ -87,17 +87,16 @@
                 data="{{routeData}}">
         </app-route>
 
-        <paper-tabs class="tabs" selected="[[routeData.date]]" attr-for-selected='data-key'>
+        <paper-tabs id="paper-tabs" selected="[[routeData.date]]" attr-for-selected='data-key' on-iron-select="selectDate">
             <dom-repeat items="{{calendar}}" as="calendar">
                 <template>
                     <dom-if if="[[calendar.hasMenu]]">
                         <template>
-                            <paper-tab
+                            <paper-tab class="paper-tab"
                                     data-key$="[[calendar.date.year]]-[[calendar.date.month]]-[[calendar.date.day]]"
                                     link>
                                 <a class="paper-tab-container"
-                                   href="/#/menu/[[calendar.date.year]]-[[calendar.date.month]]-[[calendar.date.day]]"
-                                   on-click="_handleClick">
+                                   href="/#/menu/[[calendar.date.year]]-[[calendar.date.month]]-[[calendar.date.day]]">
                                     <div>
                                         <div class="day-of-the-week">{{calendar.dayOfTheWeek}}
                                         </div>
@@ -240,10 +239,22 @@
                 }
             }
 
-            _handleClick(e) {
-                this.dispatch('changeCurrentMenu', this.calendar[e.model.index].date);
-                this.dispatch('changeCurrentCart', this.calendar[e.model.index].date);
+            selectDate(e) {
+                const YEAR = 0;
+                const MONTH = 1;
+                const DAY = 2;
+
+                const paperDate = e.target.selected.split('-');
+
+                const date = {};
+                date.year = paperDate[YEAR];
+                date.month = paperDate[MONTH];
+                date.day = paperDate[DAY];
+
+                this.dispatch('changeCurrentMenu', date);
+                this.dispatch('changeCurrentCart', date);
             }
+
         }
 
         window.customElements.define(MealOrderMenuContainer.is, MealOrderMenuContainer);
diff --git a/client/user/test/mealorder/meal-order-menu-container_test.html b/client/user/test/mealorder/meal-order-menu-container_test.html
new file mode 100644
index 00000000..e820c94b
--- /dev/null
+++ b/client/user/test/mealorder/meal-order-menu-container_test.html
@@ -0,0 +1,95 @@
+<!DOCTYPE html>
+<!--
+  ~ Copyright 2018, TeamDev Ltd. All rights reserved.
+  ~
+  ~ Redistribution and use in source and/or binary forms, with or without
+  ~ modification, must retain the above copyright notice and the following
+  ~ disclaimer.
+  ~
+  ~ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+  ~ "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+  ~ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+  ~ A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+  ~ OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+  ~ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+  ~ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+  ~ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+  ~ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  ~ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+  ~ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+  -->
+
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <meta name="viewport"
+          content="width=device-width, minimum-scale=1, initial-scale=1, user-scalable=yes">
+
+    <title>meal-order-client test</title>
+
+    <script src="../../bower_components/webcomponentsjs/webcomponents-loader.js"></script>
+    <script src="../../bower_components/web-component-tester/browser.js"></script>
+    <script src="../../node_modules/redux/dist/redux.js"></script>
+    <script src="test_variables.js"></script>
+    <link rel="import" href="../../src/mealorder/menu/meal-order-menu-container.html">
+
+</head>
+<body>
+
+<test-fixture id="MealOrderMenuContainer">
+    <template>
+        <meal-order-menu-container></meal-order-menu-container>
+    </template>
+</test-fixture>
+
+<script>
+    function setLocation(url) {
+        window.history.pushState({}, '', url);
+        Polymer.Base.fire('location-changed', {}, {node: window});
+    }
+
+    suite('meal-order-menu-container', function () {
+        let component;
+
+
+        setup(() => {
+            component = fixture('MealOrderMenuContainer');
+
+            component.calendar = MealOrderAppTest.initialMenu.calendar;
+        });
+
+        test('should parse `routeData.page` correctly', function () {
+            setLocation('/#/history/');
+            assert.equal('history', component.routeData.page);
+            setLocation('/#/menu/');
+            assert.equal('menu', component.routeData.page);
+        });
+
+        test('should parse `routeData.date` correctly', function () {
+            setLocation('/#/history/2018-03-21');
+            assert.equal('2018-03-21', component.routeData.date);
+            setLocation('/#/menu/2018-03-21');
+            assert.equal('2018-03-21', component.routeData.date);
+        });
+
+        test('should parse `routeData.date` by selected paper-tab', function () {
+            const componentShadowRoot = component.shadowRoot;
+            const paperTabs = componentShadowRoot.querySelector("#paper-tabs");
+            assert.equal(component.routeData.date, paperTabs.selected);
+        });
+
+        test('should parse changed `routeData.date` by selected paper-tab', function () {
+
+            const componentShadowRoot = component.shadowRoot;
+            const paperTabs = componentShadowRoot.querySelector("#paper-tabs");
+            paperTabs.select('2018-03-22');
+
+
+
+        });
+
+    });
+</script>
+
+</body>
+</html>
diff --git a/client/user/test/mealorder/test_variables.js b/client/user/test/mealorder/test_variables.js
new file mode 100644
index 00000000..626788ac
--- /dev/null
+++ b/client/user/test/mealorder/test_variables.js
@@ -0,0 +1,99 @@
+/*
+ * Copyright 2018, TeamDev Ltd. All rights reserved.
+ *
+ * Redistribution and use in source and/or binary forms, with or without
+ * modification, must retain the above copyright notice and the following
+ * disclaimer.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+{
+    window.MealOrderAppTest = {};
+
+    const arrayOfDates = [{
+        date: {
+            year: '2018',
+            month: '03',
+            day: '21',
+        },
+        dayOfTheWeek: 'Ср',
+        hasMenu: true
+    },
+        {
+            date: {
+                year: '2018',
+                month: '03',
+                day: '22',
+            },
+            dayOfTheWeek: 'Чт',
+            hasMenu: true
+        },
+        {
+            date: {
+                year: '2018',
+                month: '03',
+                day: '23',
+            },
+            dayOfTheWeek: 'Пт',
+            hasMenu: true
+        },
+        {
+            date: {
+                year: '2018',
+                month: '03',
+                day: '24',
+            },
+            dayOfTheWeek: 'Сб',
+            hasMenu: false
+        },
+        {
+            date: {
+                year: '2018',
+                month: '03',
+                day: '25',
+            },
+            dayOfTheWeek: 'Вс',
+            hasMenu: false
+        }
+        , {
+            date: {
+                year: '2018',
+                month: '03',
+                day: '26',
+            },
+            dayOfTheWeek: 'Пн',
+            hasMenu: true
+        }
+        , {
+            date: {
+                year: '2018',
+                month: '03',
+                day: '27',
+            },
+            dayOfTheWeek: 'Вт',
+            hasMenu: true
+        }
+        , {
+            date: {
+                year: '2018',
+                month: '03',
+                day: '28',
+            },
+            dayOfTheWeek: 'Ср',
+            hasMenu: true
+        }];
+
+    MealOrderAppTest.initialMenu = {
+        calendar: arrayOfDates,
+    };
+}

From 2d418593811c9d0070ddcb75829e2af00d0a3578 Mon Sep 17 00:00:00 2001
From: "alexander.karpetc" <alexander.karpetc@gmail.com>
Date: Tue, 17 Apr 2018 16:34:51 +0300
Subject: [PATCH 169/253] Extract variables for tests

---
 .../menu/meal-order-vendor-menu_test.html      | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/client/user/test/mealorder/menu/meal-order-vendor-menu_test.html b/client/user/test/mealorder/menu/meal-order-vendor-menu_test.html
index 70ebcaac..d1c36226 100644
--- a/client/user/test/mealorder/menu/meal-order-vendor-menu_test.html
+++ b/client/user/test/mealorder/menu/meal-order-vendor-menu_test.html
@@ -51,12 +51,16 @@
             component.menu = MealOrderAppTest.initialMenu;
         });
         test('should store menu correctly', function () {
+            const CATEGORIES = 2;
+            const DISHES_LENGTH = 5;
+            const DISH_COST = 35;
+
             assert.equal('Пюре', component.menu.name);
-            assert.equal(2, component.menu.categories.length);
+            assert.equal(CATEGORIES, component.menu.categories.length);
             assert.equal('Первое блюдо', component.menu.categories[0].categoryName);
-            assert.equal(5, component.menu.categories[0].dishes.length);
+            assert.equal(DISHES_LENGTH, component.menu.categories[0].dishes.length);
             assert.equal('Суп гречневый', component.menu.categories[0].dishes[0].title);
-            assert.equal(35, component.menu.categories[0].dishes[0].price);
+            assert.equal(DISH_COST, component.menu.categories[0].dishes[0].price);
         });
         test('should expand and collapse on click', function () {
             const header = component.shadowRoot.querySelector('.menu-caption');
@@ -67,12 +71,8 @@
             assert.equal('expanded', menu.className);
         });
         test('should send `add-dish` event', function () {
-            const header = component.shadowRoot.querySelector('.menu-caption');
-            const menu = component.shadowRoot.querySelector('#menu');
-            header.click();
-            assert.equal('collapsed', menu.className);
-            header.click();
-            assert.equal('expanded', menu.className);
+            const domRepeat = component.shadowRoot.querySelectorAll('dom-repeat');
+            console.log(domRepeat.length);
         });
     });
 </script>

From e9c7ddc1eef455c4689ff26e7cda4b7c2c60e3a2 Mon Sep 17 00:00:00 2001
From: "alexander.karpetc" <alexander.karpetc@gmail.com>
Date: Tue, 17 Apr 2018 17:34:37 +0300
Subject: [PATCH 170/253] Add tests for `add-dish` event

---
 .../menu/meal-order-vendor-menu_test.html         | 15 +++++++++------
 client/user/test/mealorder/test_variables.js      |  3 +++
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/client/user/test/mealorder/menu/meal-order-vendor-menu_test.html b/client/user/test/mealorder/menu/meal-order-vendor-menu_test.html
index d1c36226..9f3c9a28 100644
--- a/client/user/test/mealorder/menu/meal-order-vendor-menu_test.html
+++ b/client/user/test/mealorder/menu/meal-order-vendor-menu_test.html
@@ -51,9 +51,6 @@
             component.menu = MealOrderAppTest.initialMenu;
         });
         test('should store menu correctly', function () {
-            const CATEGORIES = 2;
-            const DISHES_LENGTH = 5;
-            const DISH_COST = 35;
 
             assert.equal('Пюре', component.menu.name);
             assert.equal(CATEGORIES, component.menu.categories.length);
@@ -70,9 +67,15 @@
             header.click();
             assert.equal('expanded', menu.className);
         });
-        test('should send `add-dish` event', function () {
-            const domRepeat = component.shadowRoot.querySelectorAll('dom-repeat');
-            console.log(domRepeat.length);
+        test('should send `add-dish` event', function (done) {
+            flush(function () {
+                const addButton = component.shadowRoot.querySelector('#menu > div:nth-child(1) > div:nth-child(3) > paper-item > .add-dish-icon > paper-icon-button');
+                console.log(addButton);
+                component.addEventListener('dish-added', function () {
+                    done();
+                });
+                addButton.click();
+            });
         });
     });
 </script>
diff --git a/client/user/test/mealorder/test_variables.js b/client/user/test/mealorder/test_variables.js
index d3736593..92db90fe 100644
--- a/client/user/test/mealorder/test_variables.js
+++ b/client/user/test/mealorder/test_variables.js
@@ -38,3 +38,6 @@
         ]
     };
 }
+const CATEGORIES = 2;
+const DISHES_LENGTH = 5;
+const DISH_COST = 35;

From a2a486d8866c8180a8788f34efb599585092ca30 Mon Sep 17 00:00:00 2001
From: Paul <paulageyev@gmail.com>
Date: Wed, 18 Apr 2018 16:15:00 +0300
Subject: [PATCH 171/253] Refactor CSS, rename redux actions

---
 client/user/index.html                        |  7 --
 .../src/mealorder/meal-order-client-app.html  | 39 +++++----
 .../menu/meal-order-menu-container.html       | 85 +++++++------------
 .../mealorder/shell/actions/user-actions.html |  4 +-
 .../mealorder/shell/reducers/reducers.html    | 25 ++----
 .../user/src/mealorder/shell/utils/Utils.js   | 12 +--
 .../mealorder/meal-order-client-app_test.html | 85 ++++++++++++++++++-
 .../meal-order-menu-container_test.html       | 53 +++++++++---
 client/user/test/mealorder/test_variables.js  |  2 +-
 9 files changed, 190 insertions(+), 122 deletions(-)

diff --git a/client/user/index.html b/client/user/index.html
index d5df144d..f746c02e 100644
--- a/client/user/index.html
+++ b/client/user/index.html
@@ -29,13 +29,6 @@
     <link rel="icon" href="images/favicon-16x16.png" type="image/png">
     <link rel=import href="src/mealorder/meal-order-client-app.html">
     <title>MealOrder</title>
-    <style>
-        body {
-            font-family: 'Roboto', 'Noto', sans-serif;
-            background-color: var(--paper-grey-100);
-            color: var(--google-grey-700);
-        }
-    </style>
 </head>
 <body>
 <meal-order-client-app></meal-order-client-app>
diff --git a/client/user/src/mealorder/meal-order-client-app.html b/client/user/src/mealorder/meal-order-client-app.html
index 67d99a1d..977c8655 100644
--- a/client/user/src/mealorder/meal-order-client-app.html
+++ b/client/user/src/mealorder/meal-order-client-app.html
@@ -39,9 +39,9 @@
 <link rel="import" href="../../bower_components/iron-icons/iron-icons.html">
 <link rel="import" href="../../bower_components/iron-icons/maps-icons.html">
 <link rel="import" href="../../bower_components/paper-styles/color.html">
-<link rel="import" href="shell/redux-store.html">
-<link rel="import" href="menu/meal-order-menu-container.html">
-<link rel="import" href="menu/meal-order-drawer.html">
+<link rel="import" href="./shell/redux-store.html">
+<link rel="import" href="./menu/meal-order-menu-container.html">
+<link rel="import" href="./menu/meal-order-drawer.html">
 <dom-module id="meal-order-client-app">
     <template>
         <style>
@@ -56,7 +56,9 @@
             }
 
             app-drawer-layout {
+                font-family: 'Roboto', 'Noto', sans-serif;
                 background-color: var(--paper-grey-100);
+                color: var(--google-grey-700);
             }
 
             app-drawer-layout:not([narrow]) [drawer-toggle] {
@@ -70,13 +72,13 @@
                 justify-content: space-between;
             }
 
-            app-header .route-title a {
+            app-header .title-link {
                 font-size: 0.8em;
                 text-decoration: none;
                 color: var(--paper-grey-50);
             }
 
-            app-header .route-title a:hover {
+            app-header .title-link:hover .route-title{
                 color: var(--paper-light-blue-500);
             }
 
@@ -91,11 +93,11 @@
 
             app-drawer {
                 --app-drawer-content-container: {
-                    background-color:  var(--paper-grey-50);
+                    background-color: var(--paper-grey-50);
                 }
             }
 
-            .wide {
+            app-drawer.wide {
                 --app-drawer-width: 300px;
             }
 
@@ -180,43 +182,45 @@
                     <app-toolbar>
                         <div class="app-toolbar-container">
                             <div id="main-title">Заказ обедов</div>
-                            <iron-pages
+                            <iron-pages id="app-header-iron"
                                     selected="[[routeData.page]]"
                                     attr-for-selected="data-page"
                                     fallback-selection="view404"
                                     role="main">
 
                                 <div data-page="menu">
-                                    <div class="route-title"><a href="/#/history/">История
-                                        заказов</a></div>
+                                    <a class="title-link"
+                                       href="/#/history/">
+                                    <div class="route-title">История заказов</div>
                                     <div class="icon-container">
-                                        <a href="/#/history/">
+
                                             <iron-icon class="history-icon"
                                                        icon="maps:icons:history"></iron-icon>
-                                        </a>
+
                                         <div>
                                             <iron-icon class="app-toolbar-content"
                                                        icon="icons:shopping-cart"
                                                        drawer-toggle></iron-icon>
                                         </div>
                                     </div>
+                                    </a>
                                 </div>
 
                                 <div data-page="history">
-                                    <div id="menu-history" class="route-title"><a href="/#/menu/">Сделать
-                                        заказ</a>
+                                    <a class="title-link"
+                                       href="/#/menu/">
+                                    <div id="menu-history" class="route-title">Сделать заказ
                                     </div>
                                     <div class="icon-container">
-                                        <a href="/#/menu/">
                                             <iron-icon class="history-icon"
                                                        icon="maps:icons:add"></iron-icon>
-                                        </a>
                                         <div>
                                             <iron-icon class="app-toolbar-content"
                                                        icon="icons:date-range"
                                                        drawer-toggle></iron-icon>
                                         </div>
                                     </div>
+                                    </a>
                                 </div>
                             </iron-pages>
                         </div>
@@ -309,7 +313,7 @@
                 urlDate.month = arr[MONTH];
                 urlDate.day = arr[DAY];
 
-                const date = new Date(urlDate.year, urlDate.month-1, urlDate.day);
+                const date = new Date(urlDate.year, urlDate.month - 1, urlDate.day);
 
                 let dayOfTheWeek = date.toLocaleDateString("ru-RU", {weekday: 'long'});
                 dayOfTheWeek = dayOfTheWeek.charAt(0).toUpperCase() + dayOfTheWeek.slice(1);
@@ -321,6 +325,7 @@
                 this.set('selectedDay', selectedDay);
             }
         }
+
         window.customElements.define(MealOrderClientApp.is, MealOrderClientApp);
     </script>
 </dom-module>
diff --git a/client/user/src/mealorder/menu/meal-order-menu-container.html b/client/user/src/mealorder/menu/meal-order-menu-container.html
index 3671e813..f9a8d9e7 100644
--- a/client/user/src/mealorder/menu/meal-order-menu-container.html
+++ b/client/user/src/mealorder/menu/meal-order-menu-container.html
@@ -58,11 +58,7 @@
                 font-size: 1.5em;
             }
 
-            .disabled .day {
-                color: var(--paper-grey-500);
-            }
-
-            .disabled .day-of-the-week {
+            paper-tab[disabled] .paper-tab-container {
                 color: var(--paper-grey-500);
             }
 
@@ -87,42 +83,21 @@
                 data="{{routeData}}">
         </app-route>
 
-        <paper-tabs id="paper-tabs" selected="[[routeData.date]]" attr-for-selected='data-key' on-iron-select="selectDate">
-            <dom-repeat items="{{calendar}}" as="calendar">
-                <template>
-                    <dom-if if="[[calendar.hasMenu]]">
-                        <template>
-                            <paper-tab class="paper-tab"
-                                    data-key$="[[calendar.date.year]]-[[calendar.date.month]]-[[calendar.date.day]]"
-                                    link>
-                                <a class="paper-tab-container"
-                                   href="/#/menu/[[calendar.date.year]]-[[calendar.date.month]]-[[calendar.date.day]]">
-                                    <div>
-                                        <div class="day-of-the-week">{{calendar.dayOfTheWeek}}
-                                        </div>
-                                        <div class="day">{{calendar.date.day}}</div>
-                                    </div>
-                                </a>
-                            </paper-tab>
-                        </template>
-                    </dom-if>
-                    <dom-if if="[[!calendar.hasMenu]]">
-                        <template>
-                            <paper-tab
-                                    data-key$="[[calendar.date.year]]-[[calendar.date.month]]-[[calendar.date.day]]"
-                                    link disabled>
-                                <div class="paper-tab-container disabled">
-                                    <div>
-                                        <div class="day-of-the-week">{{calendar.dayOfTheWeek}}
-                                        </div>
-                                        <div class="day">{{calendar.date.day}}</div>
-                                    </div>
-                                </div>
-                            </paper-tab>
-                        </template>
-                    </dom-if>
-                </template>
-            </dom-repeat>
+        <paper-tabs id="paper-tabs" selected="[[routeData.date]]" attr-for-selected='data-key'
+                    on-iron-select="_selectDate">
+            <template is="dom-repeat" items="{{calendar}}" as="calendar">
+                <paper-tab class="paper-tab"
+                           data-key$="[[calendar.date.year]]-[[calendar.date.month]]-[[calendar.date.day]]"
+                           link disabled="[[!calendar.hasMenu]]">
+                    <div class="paper-tab-container">
+                        <div>
+                            <div class="day-of-the-week">{{calendar.dayOfTheWeek}}
+                            </div>
+                            <div class="day">{{calendar.date.day}}</div>
+                        </div>
+                    </div>
+                </paper-tab>
+            </template>
         </paper-tabs>
     </template>
     <script>
@@ -178,35 +153,35 @@
                  * Fired when a paper tab is selected.
                  *
                  * @action `changeCurrentMenu`
-                 * @param {date} contains selected date by tab
+                 * @param {date} selected date by tab
                  */
 
                 /**
                  * Fired when a paper tab is selected.
                  *
                  * @action `changeCurrentCart`
-                 * @param {date} contains selected date by tab
+                 * @param {date} selected date by tab
                  */
                 return {
-                    changeCurrentMenu(date) {
+                    changeCurrentMenu: date => {
                         return {
-                            type: MealOrderApp.UserAction.CHANGE_CURRENT_MENU,
-                            date: date
+                            type: MealOrderApp.UserAction.SET_CURRENT_MENU,
+                            date
                         }
                     },
-                    changeCurrentCart(date) {
+                    changeCurrentCart: date => {
                         return {
-                            type: MealOrderApp.UserAction.CHANGE_CURRENT_CART,
-                            date: date
+                            type: MealOrderApp.UserAction.SET_CURRENT_CART,
+                            date
                         }
-                    },
+                    }
                 }
             }
 
 
             static get observers() {
                 return [
-                    '_pageChanged(routeData.menu)'
+                    '_pageChanged(routeData.page)'
                 ];
             }
 
@@ -239,7 +214,7 @@
                 }
             }
 
-            selectDate(e) {
+            _selectDate(e) {
                 const YEAR = 0;
                 const MONTH = 1;
                 const DAY = 2;
@@ -251,10 +226,14 @@
                 date.month = paperDate[MONTH];
                 date.day = paperDate[DAY];
 
+                const newRouteData = {};
+                newRouteData.page = 'menu';
+                newRouteData.date = date.year + "-" + date.month + "-" + date.day;
+                this.set('routeData', newRouteData);
+
                 this.dispatch('changeCurrentMenu', date);
                 this.dispatch('changeCurrentCart', date);
             }
-
         }
 
         window.customElements.define(MealOrderMenuContainer.is, MealOrderMenuContainer);
diff --git a/client/user/src/mealorder/shell/actions/user-actions.html b/client/user/src/mealorder/shell/actions/user-actions.html
index 14172041..9e84345a 100644
--- a/client/user/src/mealorder/shell/actions/user-actions.html
+++ b/client/user/src/mealorder/shell/actions/user-actions.html
@@ -20,7 +20,7 @@
 
 <script>
     MealOrderApp.UserAction = {
-        CHANGE_CURRENT_MENU: "CHANGE_CURRENT_MENU",
-        CHANGE_CURRENT_CART: 'CHANGE_CURRENT_CART',
+        SET_CURRENT_MENU: "SET_CURRENT_MENU",
+        SET_CURRENT_CART: 'SET_CURRENT_CART',
     }
 </script>
diff --git a/client/user/src/mealorder/shell/reducers/reducers.html b/client/user/src/mealorder/shell/reducers/reducers.html
index 6f98671b..15eda5c4 100644
--- a/client/user/src/mealorder/shell/reducers/reducers.html
+++ b/client/user/src/mealorder/shell/reducers/reducers.html
@@ -242,30 +242,17 @@
                 return MealOrderApp.initialState;
             }
             switch (action.type) {
-                case MealOrderApp.UserAction.CHANGE_CURRENT_MENU: {
-                    let arr = [];
-                    let j = 0;
+                case MealOrderApp.UserAction.SET_CURRENT_MENU: {
+
+                    const menu = state.menu.date.filter(menu => (Utils.shallowEqual(action.date, state.menu.date)));
 
-                    for (let i = 0; i < state.menu.length; i++) {
-                        if (Utils.compareObjects(action.date, state.menu[i].date)) {
-                            arr[j] = state.menu[i];
-                            j++;
-                        }
-                    }
                     return Object.assign({}, state, {
-                            dateForMenu: state.dateForMenu,
-                            menuForDay: arr
+                            menuForDay: menu
                         }
                     );
                 }
-                case MealOrderApp.UserAction.CHANGE_CURRENT_CART: {
-                    let newOrder = [];
-                    for (let i = 0; i < state.orders.length; i++) {
-                        if (Utils.compareObjects(action.date, state.orders[i].date)) {
-                            newOrder = state.orders[i].cart;
-                            break;
-                        }
-                    }
+                case MealOrderApp.UserAction.SET_CURRENT_CART: {
+                    const newOrder = state.orders.find(order => Utils.shallowEqual(action.date, order.date));
                     return Object.assign({}, state, {
                             currentOrder: newOrder
                         }
diff --git a/client/user/src/mealorder/shell/utils/Utils.js b/client/user/src/mealorder/shell/utils/Utils.js
index 5aa9f53d..3c670443 100644
--- a/client/user/src/mealorder/shell/utils/Utils.js
+++ b/client/user/src/mealorder/shell/utils/Utils.js
@@ -20,14 +20,8 @@
 
 /*exported Utils */
 class Utils {
-    static compareObjects(o1, o2) {
-        for (let p in o1) {
-            if (o1.hasOwnProperty(p)) {
-                if (o1[p] !== o2[p]) {
-                    return false;
-                }
-            }
-        }
-        return true;
+    static shallowEqual(o1, o2) {
+        return Object.keys(o1)
+            .every(key => o1[key] === o2[key]);
     }
 }
diff --git a/client/user/test/mealorder/meal-order-client-app_test.html b/client/user/test/mealorder/meal-order-client-app_test.html
index 6de3294a..02d05d7a 100644
--- a/client/user/test/mealorder/meal-order-client-app_test.html
+++ b/client/user/test/mealorder/meal-order-client-app_test.html
@@ -53,12 +53,95 @@
         setup(() => {
             component = fixture('BasicClientApp');
         });
-        test('should parse url correctly', function () {
+
+        test('should parse `routeData.page` correctly', function () {
             setLocation('/#/history/');
             assert.equal('history', component.routeData.page);
             setLocation('/#/menu/');
             assert.equal('menu', component.routeData.page);
         });
+
+        test('should parse `routeData.date` correctly', function () {
+            setLocation('/#/history/2018-03-21');
+            assert.equal('2018-03-21', component.routeData.date);
+            setLocation('/#/menu/2018-03-21');
+            assert.equal('2018-03-21', component.routeData.date);
+        });
+
+
+        test('should instantiate the `app-toolbar` with data-page `menu`' +
+            ' and the component `app-toolbar-content` with routing title', function () {
+            setLocation('/#/menu/2018-03-23');
+            const elementShadowRoot = component.shadowRoot;
+            const toolBar = elementShadowRoot.querySelector(".app-toolbar-content");
+            assert.equal(toolBar.innerHTML, 'Заказ');
+
+        });
+
+        test('should instantiate the `app-toolbar` with data-page `menu`' +
+            ' and day, and day of the week', function () {
+            setLocation('/#/menu/2018-03-23');
+            const elementShadowRoot = component.shadowRoot;
+            const day = elementShadowRoot.querySelector("#day");
+            const dayOfTheWeek = elementShadowRoot.querySelector("#day-of-the-week");
+            assert.equal(day.innerHTML, 'Пятница');
+            assert.equal(dayOfTheWeek.innerHTML, '23');
+        });
+
+        test('should instantiate the `app-header` with main-title', function () {
+            const elementShadowRoot = component.shadowRoot;
+            const mainTitle = elementShadowRoot.querySelector("#main-title");
+            assert.equal(mainTitle.innerHTML, 'Заказ обедов');
+        });
+
+        test('should instantiate the `app-toolbar` with data-page `menu` with routing title', function (done) {
+            setLocation('/#/menu/2018-03-23');
+
+            const pages = component.shadowRoot.querySelector('#app-header-iron');
+            pages.forceSynchronousItemUpdate();
+
+            const routeLinkTitle = pages.selectedItem.getElementsByClassName("title-link").item(0).innerHTML;
+            flush(function () {
+                assert.equal(routeLinkTitle, 'История заказов');
+                done();
+            });
+        });
+
+        test('should instantiate the `app-toolbar` with data-page `history` with routing title', function (done) {
+            setLocation('/#/history/2018-03-23');
+
+            const pages = component.shadowRoot.querySelector('#app-header-iron');
+            pages.forceSynchronousItemUpdate();
+
+            const routeLinkTitle = pages.selectedItem.getElementsByClassName("title-link").item(0).innerHTML;
+            flush(function () {
+                assert.equal(routeLinkTitle, 'Сделать заказ');
+                done();
+            });
+        });
+
+        test('should instantiate the `meal-order-menu-container` component ' +
+            'with data-page `menu`', function (done) {
+            setLocation('/#/menu/2018-03-23');
+            const elementShadowRoot = component.shadowRoot;
+            const menuContainer = elementShadowRoot.querySelector("meal-order-menu-container");
+            flush(function () {
+                assert.isNotNull(menuContainer);
+                done();
+            });
+        });
+
+        test('should instantiate the `meal-order-drawer` component ' +
+            'with data-page `history`', function (done) {
+            setLocation('/#/history/2018-03-23');
+            const elementShadowRoot = component.shadowRoot;
+            const drawer = elementShadowRoot.querySelector("meal-order-drawer");
+            flush(function () {
+                assert.isNotNull(drawer);
+                done();
+            });
+        });
+
     });
 </script>
 
diff --git a/client/user/test/mealorder/meal-order-menu-container_test.html b/client/user/test/mealorder/meal-order-menu-container_test.html
index e820c94b..992ae9be 100644
--- a/client/user/test/mealorder/meal-order-menu-container_test.html
+++ b/client/user/test/mealorder/meal-order-menu-container_test.html
@@ -25,7 +25,7 @@
     <meta name="viewport"
           content="width=device-width, minimum-scale=1, initial-scale=1, user-scalable=yes">
 
-    <title>meal-order-client test</title>
+    <title>meal-order-menu-container test</title>
 
     <script src="../../bower_components/webcomponentsjs/webcomponents-loader.js"></script>
     <script src="../../bower_components/web-component-tester/browser.js"></script>
@@ -50,12 +50,12 @@
 
     suite('meal-order-menu-container', function () {
         let component;
-
+        let mock;
 
         setup(() => {
             component = fixture('MealOrderMenuContainer');
-
-            component.calendar = MealOrderAppTest.initialMenu.calendar;
+            component.calendar = MealOrderAppTest.initialState.calendar;
+            mock = sinon.mock(MealOrderApp.store);
         });
 
         test('should parse `routeData.page` correctly', function () {
@@ -72,22 +72,49 @@
             assert.equal('2018-03-21', component.routeData.date);
         });
 
-        test('should parse `routeData.date` by selected paper-tab', function () {
-            const componentShadowRoot = component.shadowRoot;
-            const paperTabs = componentShadowRoot.querySelector("#paper-tabs");
-            assert.equal(component.routeData.date, paperTabs.selected);
+        test('should instantiate the component `paper-tabs`', function (done) {
+            flush(function () {
+                const elementShadowRoot = component.shadowRoot;
+                const paperTabs = elementShadowRoot.querySelector("#paper-tabs");
+                assert.equal(paperTabs.id, 'paper-tabs');
+                done();
+            });
         });
 
-        test('should parse changed `routeData.date` by selected paper-tab', function () {
-
-            const componentShadowRoot = component.shadowRoot;
-            const paperTabs = componentShadowRoot.querySelector("#paper-tabs");
-            paperTabs.select('2018-03-22');
+        test('should parse `routeData.date` by the default selected paper-tab', function () {
+            const elementShadowRoot = component.shadowRoot;
+            const paperTabs = elementShadowRoot.querySelector("#paper-tabs");
+            assert.equal(component.routeData.date, paperTabs.selected);
+        });
 
+        test('should parse changed `routeData.date` by the selected paper-tab', function (done) {
+            const elementShadowRoot = component.shadowRoot;
 
+            flush(function () {
+                const paperTabs = elementShadowRoot.querySelector("#paper-tabs");
+                paperTabs.select('2018-03-22');
+                assert.equal(component.routeData.date, '2018-03-22');
+                done();
+            });
+        });
 
+        test('should responds on `on-iron-select` event and ' +
+            'fire `CHANGE_CURRENT_MENU`, `CHANGE_CURRENT_CART` actions.', function (done) {
+            const expectedAction1 = {type: MealOrderApp.UserAction.CHANGE_CURRENT_MENU, date: {}};
+            const expectedAction = {type: MealOrderApp.UserAction.CHANGE_CURRENT_CART, date: {}};
+
+            flush(function () {
+                mock.expects('dispatch').withArgs(expectedAction1);
+                flush(function () {
+                    mock.expects('dispatch').withArgs(expectedAction);
+                    done();
+                });
+            });
+            mock.verify();
+            mock.restore();
         });
 
+
     });
 </script>
 
diff --git a/client/user/test/mealorder/test_variables.js b/client/user/test/mealorder/test_variables.js
index 626788ac..387b6296 100644
--- a/client/user/test/mealorder/test_variables.js
+++ b/client/user/test/mealorder/test_variables.js
@@ -93,7 +93,7 @@
             hasMenu: true
         }];
 
-    MealOrderAppTest.initialMenu = {
+    MealOrderAppTest.initialState = {
         calendar: arrayOfDates,
     };
 }

From 3c780665c31aee1c8c3605fe66535548bb44d06e Mon Sep 17 00:00:00 2001
From: Paul <paulageyev@gmail.com>
Date: Wed, 18 Apr 2018 16:21:39 +0300
Subject: [PATCH 172/253] Add action

---
 client/user/src/mealorder/shell/actions/user-actions.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/client/user/src/mealorder/shell/actions/user-actions.html b/client/user/src/mealorder/shell/actions/user-actions.html
index 9e84345a..cec93c1d 100644
--- a/client/user/src/mealorder/shell/actions/user-actions.html
+++ b/client/user/src/mealorder/shell/actions/user-actions.html
@@ -22,5 +22,6 @@
     MealOrderApp.UserAction = {
         SET_CURRENT_MENU: "SET_CURRENT_MENU",
         SET_CURRENT_CART: 'SET_CURRENT_CART',
+        ADD_DISH: 'ADD_DISH'
     }
 </script>

From d3f88ab2ec6c6fd31f92c4d680dd9f605c2d6462 Mon Sep 17 00:00:00 2001
From: Paul <paulageyev@gmail.com>
Date: Wed, 18 Apr 2018 16:29:09 +0300
Subject: [PATCH 173/253] Refactor reducer, simplify object comparison

---
 client/user/src/mealorder/shell/reducers/reducers.html | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/client/user/src/mealorder/shell/reducers/reducers.html b/client/user/src/mealorder/shell/reducers/reducers.html
index 15eda5c4..106f1bab 100644
--- a/client/user/src/mealorder/shell/reducers/reducers.html
+++ b/client/user/src/mealorder/shell/reducers/reducers.html
@@ -243,9 +243,7 @@
             }
             switch (action.type) {
                 case MealOrderApp.UserAction.SET_CURRENT_MENU: {
-
-                    const menu = state.menu.date.filter(menu => (Utils.shallowEqual(action.date, state.menu.date)));
-
+                    const menu = state.menu.filter(menu => (Utils.shallowEqual(action.date, menu.date)));
                     return Object.assign({}, state, {
                             menuForDay: menu
                         }

From 267535157d2ff6d56de807b4e6178a005eb45117 Mon Sep 17 00:00:00 2001
From: Paul <paulageyev@gmail.com>
Date: Wed, 18 Apr 2018 16:33:04 +0300
Subject: [PATCH 174/253] Resolve conflict for the `app-toolbar`

---
 .../src/mealorder/meal-order-client-app.html  | 54 ++++++++++---------
 1 file changed, 28 insertions(+), 26 deletions(-)

diff --git a/client/user/src/mealorder/meal-order-client-app.html b/client/user/src/mealorder/meal-order-client-app.html
index 0ee76396..ef964b30 100644
--- a/client/user/src/mealorder/meal-order-client-app.html
+++ b/client/user/src/mealorder/meal-order-client-app.html
@@ -182,43 +182,45 @@
                     <app-toolbar>
                         <div class="app-toolbar-container">
                             <div id="main-title">Заказ обедов</div>
-                            <iron-pages
-                                    selected="[[routeData.page]]"
-                                    attr-for-selected="data-page"
-                                    fallback-selection="view404"
-                                    role="main">
+                            <iron-pages id="app-header-iron"
+                                        selected="[[routeData.page]]"
+                                        attr-for-selected="data-page"
+                                        fallback-selection="view404"
+                                        role="main">
 
                                 <div data-page="menu">
-                                    <div class="route-title"><a href="/#/history/">История
-                                        заказов</a></div>
-                                    <div class="icon-container">
-                                        <a href="/#/history/">
+                                    <a class="title-link"
+                                       href="/#/history/">
+                                        <div class="route-title">История заказов</div>
+                                        <div class="icon-container">
+
                                             <iron-icon class="history-icon"
                                                        icon="maps:icons:history"></iron-icon>
-                                        </a>
-                                        <div>
-                                            <iron-icon class="app-toolbar-content"
-                                                       icon="icons:shopping-cart"
-                                                       drawer-toggle></iron-icon>
+
+                                            <div>
+                                                <iron-icon class="app-toolbar-content"
+                                                           icon="icons:shopping-cart"
+                                                           drawer-toggle></iron-icon>
+                                            </div>
                                         </div>
-                                    </div>
+                                    </a>
                                 </div>
 
                                 <div data-page="history">
-                                    <div id="menu-history" class="route-title"><a href="/#/menu/">Сделать
-                                        заказ</a>
-                                    </div>
-                                    <div class="icon-container">
-                                        <a href="/#/menu/">
+                                    <a class="title-link"
+                                       href="/#/menu/">
+                                        <div id="menu-history" class="route-title">Сделать заказ
+                                        </div>
+                                        <div class="icon-container">
                                             <iron-icon class="history-icon"
                                                        icon="maps:icons:add"></iron-icon>
-                                        </a>
-                                        <div>
-                                            <iron-icon class="app-toolbar-content"
-                                                       icon="icons:date-range"
-                                                       drawer-toggle></iron-icon>
+                                            <div>
+                                                <iron-icon class="app-toolbar-content"
+                                                           icon="icons:date-range"
+                                                           drawer-toggle></iron-icon>
+                                            </div>
                                         </div>
-                                    </div>
+                                    </a>
                                 </div>
                             </iron-pages>
                         </div>

From 4f35977876f99cdb0912a8dfe007858c6a747970 Mon Sep 17 00:00:00 2001
From: Paul <paulageyev@gmail.com>
Date: Wed, 18 Apr 2018 18:16:50 +0300
Subject: [PATCH 175/253] Add tests for `meal-order-app` and`
 meal-order-menu-container`

---
 .../src/mealorder/meal-order-client-app.html  | 52 ++++++------
 .../mealorder/meal-order-client-app_test.html | 80 ++++++++++---------
 .../meal-order-menu-container_test.html       |  9 +--
 3 files changed, 74 insertions(+), 67 deletions(-)

diff --git a/client/user/src/mealorder/meal-order-client-app.html b/client/user/src/mealorder/meal-order-client-app.html
index 977c8655..58b8b5d2 100644
--- a/client/user/src/mealorder/meal-order-client-app.html
+++ b/client/user/src/mealorder/meal-order-client-app.html
@@ -78,7 +78,7 @@
                 color: var(--paper-grey-50);
             }
 
-            app-header .title-link:hover .route-title{
+            app-header .title-link:hover .route-title {
                 color: var(--paper-light-blue-500);
             }
 
@@ -153,7 +153,8 @@
 
         <app-drawer-layout fullbleed>
             <app-drawer slot="drawer" align="right" class$="[[_getClassForDrawer(routeData.page)]]">
-                <iron-pages selected="[[routeData.page]]"
+                <iron-pages id="app-drawer-iron"
+                            selected="[[routeData.page]]"
                             attr-for-selected="data-page"
                             fallback-selection="view404"
                             role="main">
@@ -183,54 +184,53 @@
                         <div class="app-toolbar-container">
                             <div id="main-title">Заказ обедов</div>
                             <iron-pages id="app-header-iron"
-                                    selected="[[routeData.page]]"
-                                    attr-for-selected="data-page"
-                                    fallback-selection="view404"
-                                    role="main">
+                                        selected="[[routeData.page]]"
+                                        attr-for-selected="data-page"
+                                        fallback-selection="view404"
+                                        role="main">
 
                                 <div data-page="menu">
                                     <a class="title-link"
                                        href="/#/history/">
-                                    <div class="route-title">История заказов</div>
-                                    <div class="icon-container">
+                                        <div class="route-title">История заказов</div>
+                                        <div class="icon-container">
 
                                             <iron-icon class="history-icon"
                                                        icon="maps:icons:history"></iron-icon>
 
-                                        <div>
-                                            <iron-icon class="app-toolbar-content"
-                                                       icon="icons:shopping-cart"
-                                                       drawer-toggle></iron-icon>
+                                            <div>
+                                                <iron-icon class="app-toolbar-content"
+                                                           icon="icons:shopping-cart"
+                                                           drawer-toggle></iron-icon>
+                                            </div>
                                         </div>
-                                    </div>
                                     </a>
                                 </div>
 
                                 <div data-page="history">
                                     <a class="title-link"
                                        href="/#/menu/">
-                                    <div id="menu-history" class="route-title">Сделать заказ
-                                    </div>
-                                    <div class="icon-container">
+                                        <div id="menu-history" class="route-title">Сделать заказ</div>
+                                        <div class="icon-container">
                                             <iron-icon class="history-icon"
                                                        icon="maps:icons:add"></iron-icon>
-                                        <div>
-                                            <iron-icon class="app-toolbar-content"
-                                                       icon="icons:date-range"
-                                                       drawer-toggle></iron-icon>
+                                            <div>
+                                                <iron-icon class="app-toolbar-content"
+                                                           icon="icons:date-range"
+                                                           drawer-toggle></iron-icon>
+                                            </div>
                                         </div>
-                                    </div>
                                     </a>
                                 </div>
                             </iron-pages>
                         </div>
                     </app-toolbar>
                 </app-header>
-                <iron-pages
-                        selected="[[routeData.page]]"
-                        attr-for-selected="data-page"
-                        fallback-selection="view404"
-                        role="main">
+                <iron-pages id="app-header-layout-iron"
+                            selected="[[routeData.page]]"
+                            attr-for-selected="data-page"
+                            fallback-selection="view404"
+                            role="main">
                     <meal-order-menu-container data-page="menu"></meal-order-menu-container>
                 </iron-pages>
 
diff --git a/client/user/test/mealorder/meal-order-client-app_test.html b/client/user/test/mealorder/meal-order-client-app_test.html
index 02d05d7a..9afaa7eb 100644
--- a/client/user/test/mealorder/meal-order-client-app_test.html
+++ b/client/user/test/mealorder/meal-order-client-app_test.html
@@ -69,25 +69,6 @@
         });
 
 
-        test('should instantiate the `app-toolbar` with data-page `menu`' +
-            ' and the component `app-toolbar-content` with routing title', function () {
-            setLocation('/#/menu/2018-03-23');
-            const elementShadowRoot = component.shadowRoot;
-            const toolBar = elementShadowRoot.querySelector(".app-toolbar-content");
-            assert.equal(toolBar.innerHTML, 'Заказ');
-
-        });
-
-        test('should instantiate the `app-toolbar` with data-page `menu`' +
-            ' and day, and day of the week', function () {
-            setLocation('/#/menu/2018-03-23');
-            const elementShadowRoot = component.shadowRoot;
-            const day = elementShadowRoot.querySelector("#day");
-            const dayOfTheWeek = elementShadowRoot.querySelector("#day-of-the-week");
-            assert.equal(day.innerHTML, 'Пятница');
-            assert.equal(dayOfTheWeek.innerHTML, '23');
-        });
-
         test('should instantiate the `app-header` with main-title', function () {
             const elementShadowRoot = component.shadowRoot;
             const mainTitle = elementShadowRoot.querySelector("#main-title");
@@ -96,11 +77,9 @@
 
         test('should instantiate the `app-toolbar` with data-page `menu` with routing title', function (done) {
             setLocation('/#/menu/2018-03-23');
-
             const pages = component.shadowRoot.querySelector('#app-header-iron');
             pages.forceSynchronousItemUpdate();
-
-            const routeLinkTitle = pages.selectedItem.getElementsByClassName("title-link").item(0).innerHTML;
+            const routeLinkTitle = pages.selectedItem.getElementsByClassName("route-title").item(0).innerHTML;
             flush(function () {
                 assert.equal(routeLinkTitle, 'История заказов');
                 done();
@@ -109,41 +88,70 @@
 
         test('should instantiate the `app-toolbar` with data-page `history` with routing title', function (done) {
             setLocation('/#/history/2018-03-23');
-
             const pages = component.shadowRoot.querySelector('#app-header-iron');
             pages.forceSynchronousItemUpdate();
-
-            const routeLinkTitle = pages.selectedItem.getElementsByClassName("title-link").item(0).innerHTML;
+            const routeLinkTitle = pages.selectedItem.getElementsByClassName("route-title").item(0).innerHTML;
             flush(function () {
                 assert.equal(routeLinkTitle, 'Сделать заказ');
                 done();
             });
         });
 
-        test('should instantiate the `meal-order-menu-container` component ' +
-            'with data-page `menu`', function (done) {
+        test('should instantiate the `app-toolbar` with data-page `menu`' +
+            ' and the component `app-toolbar-content` with routing title', function (done) {
             setLocation('/#/menu/2018-03-23');
-            const elementShadowRoot = component.shadowRoot;
-            const menuContainer = elementShadowRoot.querySelector("meal-order-menu-container");
+            const pages = component.shadowRoot.querySelector('#app-drawer-iron');
+            pages.forceSynchronousItemUpdate();
+            const routeLinkTitle = pages.selectedItem.getElementsByClassName("app-toolbar-content").item(0).innerHTML;
+            flush(function () {
+                assert.equal(routeLinkTitle, 'Заказ');
+                done();
+            });
+        });
+
+        test('should instantiate the `app-toolbar` with data-page `menu`' +
+            ' and day, and day of the week', function (done) {
+            setLocation('/#/menu/2018-03-23');
+            const pages = component.shadowRoot.querySelector('#app-drawer-iron');
+            pages.forceSynchronousItemUpdate();
+            const day = pages.querySelector("#day").innerHTML;
+            const dayOfTheWeek = pages.querySelector("#day-of-the-week").innerHTML;
             flush(function () {
-                assert.isNotNull(menuContainer);
+                assert.equal(day, 'Пятница');
+                assert.equal(dayOfTheWeek, '23');
                 done();
             });
         });
 
-        test('should instantiate the `meal-order-drawer` component ' +
-            'with data-page `history`', function (done) {
+        test('should instantiate the `app-toolbar` with data-page `history`' +
+            ' and the component `app-toolbar-content` with routing title', function (done) {
             setLocation('/#/history/2018-03-23');
-            const elementShadowRoot = component.shadowRoot;
-            const drawer = elementShadowRoot.querySelector("meal-order-drawer");
+            const pages = component.shadowRoot.querySelector('#app-drawer-iron');
+            pages.forceSynchronousItemUpdate();
+            const routeLinkTitle = pages.selectedItem.getElementsByClassName("app-toolbar-content").item(0).innerHTML;
             flush(function () {
-                assert.isNotNull(drawer);
+                assert.equal(routeLinkTitle, 'История заказов');
                 done();
             });
         });
 
+        test('should instantiate the `meal-order-drawer` component', function (done) {
+            const elementShadowRoot = component.shadowRoot;
+            const drawer = elementShadowRoot.querySelector("meal-order-drawer");
+            assert.equal(drawer.tagName.toLocaleLowerCase(), MealOrderDrawer.is);
+            done();
+        });
+
+        test('should instantiate the `meal-order-menu-container` component ' +
+            'with data-page `menu`', function () {
+            setLocation('/#/menu/2018-03-23');
+            const pages = component.shadowRoot.querySelector('#app-header-layout-iron');
+            pages.forceSynchronousItemUpdate();
+            assert.equal(pages.selectedItem.tagName.toLocaleLowerCase(), MealOrderMenuContainer.is);
+
+        });
+
     });
 </script>
-
 </body>
 </html>
diff --git a/client/user/test/mealorder/meal-order-menu-container_test.html b/client/user/test/mealorder/meal-order-menu-container_test.html
index 992ae9be..6cda84a5 100644
--- a/client/user/test/mealorder/meal-order-menu-container_test.html
+++ b/client/user/test/mealorder/meal-order-menu-container_test.html
@@ -100,13 +100,12 @@
 
         test('should responds on `on-iron-select` event and ' +
             'fire `CHANGE_CURRENT_MENU`, `CHANGE_CURRENT_CART` actions.', function (done) {
-            const expectedAction1 = {type: MealOrderApp.UserAction.CHANGE_CURRENT_MENU, date: {}};
-            const expectedAction = {type: MealOrderApp.UserAction.CHANGE_CURRENT_CART, date: {}};
-
+            const setCurrentMenuAction = {type: MealOrderApp.UserAction.SET_CURRENT_MENU, date: {}};
+            const setCurrentCartAction = {type: MealOrderApp.UserAction.SET_CURRENT_CART, date: {}};
             flush(function () {
-                mock.expects('dispatch').withArgs(expectedAction1);
+                mock.expects('dispatch').withArgs(setCurrentMenuAction);
                 flush(function () {
-                    mock.expects('dispatch').withArgs(expectedAction);
+                    mock.expects('dispatch').withArgs(setCurrentCartAction);
                     done();
                 });
             });

From 57d0edb12e5eb433d735d908fd368f9263661cc2 Mon Sep 17 00:00:00 2001
From: Paul <paulageyev@gmail.com>
Date: Wed, 18 Apr 2018 20:17:00 +0300
Subject: [PATCH 176/253] Add tests for the `meal-order-drawer` component

---
 .../src/mealorder/menu/meal-order-drawer.html |   4 +-
 .../mealorder/meal-order-client-app_test.html |   4 +-
 .../mealorder/meal-order-drawer_test.html     | 101 ++++++++++++++++++
 3 files changed, 105 insertions(+), 4 deletions(-)
 create mode 100644 client/user/test/mealorder/meal-order-drawer_test.html

diff --git a/client/user/src/mealorder/menu/meal-order-drawer.html b/client/user/src/mealorder/menu/meal-order-drawer.html
index eef5811e..4719b0a3 100644
--- a/client/user/src/mealorder/menu/meal-order-drawer.html
+++ b/client/user/src/mealorder/menu/meal-order-drawer.html
@@ -105,8 +105,7 @@
 
             static get observers() {
                 return [
-                    '_updateDate(outputDate)',
-                    '_changeHistoryUrl(routeData)'
+                    '_changeHistoryUrl(routeData.page)'
                 ];
             }
 
@@ -142,6 +141,7 @@
                     newRouteData.page = 'history';
                     newRouteData.date = date.year + "-" + date.month + "-" + date.day;
                     this.set('routeData', newRouteData);
+                    console.log("2");
                 }
             }
         }
diff --git a/client/user/test/mealorder/meal-order-client-app_test.html b/client/user/test/mealorder/meal-order-client-app_test.html
index 9afaa7eb..cb4d5552 100644
--- a/client/user/test/mealorder/meal-order-client-app_test.html
+++ b/client/user/test/mealorder/meal-order-client-app_test.html
@@ -35,7 +35,7 @@
 </head>
 <body>
 
-<test-fixture id="BasicClientApp">
+<test-fixture id="MealOrderClientApp">
     <template>
         <meal-order-client-app></meal-order-client-app>
     </template>
@@ -51,7 +51,7 @@
         let component;
 
         setup(() => {
-            component = fixture('BasicClientApp');
+            component = fixture('MealOrderClientApp');
         });
 
         test('should parse `routeData.page` correctly', function () {
diff --git a/client/user/test/mealorder/meal-order-drawer_test.html b/client/user/test/mealorder/meal-order-drawer_test.html
new file mode 100644
index 00000000..066c2293
--- /dev/null
+++ b/client/user/test/mealorder/meal-order-drawer_test.html
@@ -0,0 +1,101 @@
+<!doctype html>
+<!--
+  ~ Copyright 2018, TeamDev Ltd. All rights reserved.
+  ~
+  ~ Redistribution and use in source and/or binary forms, with or without
+  ~ modification, must retain the above copyright notice and the following
+  ~ disclaimer.
+  ~
+  ~ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+  ~ "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+  ~ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+  ~ A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+  ~ OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+  ~ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+  ~ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+  ~ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+  ~ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  ~ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+  ~ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+  -->
+
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <meta name="viewport"
+          content="width=device-width, minimum-scale=1, initial-scale=1, user-scalable=yes">
+
+    <title>meal-order-client test</title>
+
+    <script src="../../bower_components/webcomponentsjs/webcomponents-loader.js"></script>
+    <script src="../../bower_components/web-component-tester/browser.js"></script>
+    <script src="../../node_modules/redux/dist/redux.js"></script>
+    <link rel="import" href="../../src/mealorder/menu/meal-order-drawer.html">
+
+</head>
+<body>
+
+<test-fixture id="MealOrderDrawer">
+    <template>
+        <meal-order-drawer></meal-order-drawer>
+    </template>
+</test-fixture>
+
+<script>
+    function setLocation(url) {
+        window.history.pushState({}, '', url);
+        Polymer.Base.fire('location-changed', {}, {node: window});
+    }
+
+    suite('meal-order-drawer', function () {
+        let component;
+
+        setup(() => {
+            component = fixture('MealOrderDrawer');
+        });
+
+        test('should parse `routeData.page` correctly', function () {
+            setLocation('/#/history/');
+            assert.equal('history', component.routeData.page);
+            setLocation('/#/menu/');
+            assert.equal('menu', component.routeData.page);
+        });
+
+        test('should instantiate the `meal-order-drawer` component', function (done) {
+            const elementShadowRoot = component.shadowRoot;
+            const datePicker = elementShadowRoot.querySelector("app-datepicker");
+            assert.equal(datePicker.tagName.toLocaleLowerCase(), "app-datepicker");
+            done();
+        });
+
+        test('should fire `changed-history-date` event on the changed URL ' +
+            ' with the `history` routing and the date', function (done) {
+            component.addEventListener('changed-history-date', function (e) {
+                const date = {};
+                date.year = "2018";
+                date.month = "04";
+                date.day = "20";
+                assert.deepEqual(e.detail, date);
+                done();
+            });
+            setLocation('/#/menu/');
+            setLocation('/#/history/2018-04-20');
+        });
+
+        test('should change URL by selecting the date in the calendar with `history` routing', function (done) {
+            const STRING_DATE = "2018/04/20";
+
+            flush(function () {
+                const elementShadowRoot = component.shadowRoot;
+                const datePicker = elementShadowRoot.querySelector("app-datepicker");
+                datePicker.inputDate = STRING_DATE;
+                assert.equal(datePicker.inputDate , STRING_DATE);
+                done();
+            });
+            setLocation('/#/history/');
+        });
+
+    });
+</script>
+</body>
+</html>

From 0e4791800f65138b3fb17cd9504ee8da6bea3c8f Mon Sep 17 00:00:00 2001
From: Paul <paulageyev@gmail.com>
Date: Wed, 18 Apr 2018 22:13:38 +0300
Subject: [PATCH 177/253] Add an action test for the
 `meal-order-menu-container` component

---
 client/user/package-lock.json                 | 97 ++++++++++++++++++-
 client/user/package.json                      |  3 +-
 ...meal-order-menu-container_action-test.html | 80 +++++++++++++++
 .../meal-order-menu-container_test.html       | 19 +---
 4 files changed, 179 insertions(+), 20 deletions(-)
 create mode 100644 client/user/test/mealorder/meal-order-menu-container_action-test.html

diff --git a/client/user/package-lock.json b/client/user/package-lock.json
index 3bcbe46b..99ce4e34 100644
--- a/client/user/package-lock.json
+++ b/client/user/package-lock.json
@@ -1,14 +1,42 @@
 {
-  "name": "polymer",
+  "name": "MealOrder",
   "version": "1.0.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
+    "@sinonjs/formatio": {
+      "version": "2.0.0",
+      "resolved": "http://registry.npmjs.org/@sinonjs/formatio/-/formatio-2.0.0.tgz",
+      "integrity": "sha512-ls6CAMA6/5gG+O/IdsBcblvnd8qcO/l1TYoNeAzp3wcISOxlPXQEus0mLcdwazEkWjaBdaJ3TaxmNgCLWwvWzg==",
+      "requires": {
+        "samsam": "1.3.0"
+      }
+    },
+    "diff": {
+      "version": "3.5.0",
+      "resolved": "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz",
+      "integrity": "sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA=="
+    },
+    "has-flag": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0="
+    },
+    "isarray": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+      "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8="
+    },
     "js-tokens": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz",
       "integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls="
     },
+    "just-extend": {
+      "version": "1.1.27",
+      "resolved": "https://registry.npmjs.org/just-extend/-/just-extend-1.1.27.tgz",
+      "integrity": "sha512-mJVp13Ix6gFo3SBAy9U/kL+oeZqzlYYYLQBwXVBlVzIsZwBqGREnOro24oC/8s8aox+rJhtZ2DiQof++IrkA+g=="
+    },
     "lodash": {
       "version": "4.17.5",
       "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.5.tgz",
@@ -19,6 +47,16 @@
       "resolved": "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.7.tgz",
       "integrity": "sha512-jzqTi3vk4J5Dxq43cNjB0ekfCjPLHixoY2Sc0WHTo+0r928taLqe/VCt02vY5uQBvg0rdXgL3xWkK4X0MCmZcw=="
     },
+    "lodash.get": {
+      "version": "4.4.2",
+      "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz",
+      "integrity": "sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk="
+    },
+    "lolex": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/lolex/-/lolex-2.3.2.tgz",
+      "integrity": "sha512-A5pN2tkFj7H0dGIAM6MFvHKMJcPnjZsOMvR7ujCjfgW5TbV6H9vb1PgxLtHvjqNZTHsUolz+6/WEO0N1xNx2ng=="
+    },
     "loose-envify": {
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.3.1.tgz",
@@ -27,6 +65,26 @@
         "js-tokens": "3.0.2"
       }
     },
+    "nise": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/nise/-/nise-1.3.2.tgz",
+      "integrity": "sha512-KPKb+wvETBiwb4eTwtR/OsA2+iijXP+VnlSFYJo3EHjm2yjek1NWxHOUQat3i7xNLm1Bm18UA5j5Wor0yO2GtA==",
+      "requires": {
+        "@sinonjs/formatio": "2.0.0",
+        "just-extend": "1.1.27",
+        "lolex": "2.3.2",
+        "path-to-regexp": "1.7.0",
+        "text-encoding": "0.6.4"
+      }
+    },
+    "path-to-regexp": {
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.7.0.tgz",
+      "integrity": "sha1-Wf3g9DW62suhA6hOnTvGTpa5k30=",
+      "requires": {
+        "isarray": "0.0.1"
+      }
+    },
     "redux": {
       "version": "3.7.2",
       "resolved": "https://registry.npmjs.org/redux/-/redux-3.7.2.tgz",
@@ -38,10 +96,47 @@
         "symbol-observable": "1.2.0"
       }
     },
+    "samsam": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/samsam/-/samsam-1.3.0.tgz",
+      "integrity": "sha512-1HwIYD/8UlOtFS3QO3w7ey+SdSDFE4HRNLZoZRYVQefrOY3l17epswImeB1ijgJFQJodIaHcwkp3r/myBjFVbg=="
+    },
+    "sinon": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/sinon/-/sinon-4.5.0.tgz",
+      "integrity": "sha512-trdx+mB0VBBgoYucy6a9L7/jfQOmvGeaKZT4OOJ+lPAtI8623xyGr8wLiE4eojzBS8G9yXbhx42GHUOVLr4X2w==",
+      "requires": {
+        "@sinonjs/formatio": "2.0.0",
+        "diff": "3.5.0",
+        "lodash.get": "4.4.2",
+        "lolex": "2.3.2",
+        "nise": "1.3.2",
+        "supports-color": "5.4.0",
+        "type-detect": "4.0.8"
+      }
+    },
+    "supports-color": {
+      "version": "5.4.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz",
+      "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==",
+      "requires": {
+        "has-flag": "3.0.0"
+      }
+    },
     "symbol-observable": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.2.0.tgz",
       "integrity": "sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ=="
+    },
+    "text-encoding": {
+      "version": "0.6.4",
+      "resolved": "https://registry.npmjs.org/text-encoding/-/text-encoding-0.6.4.tgz",
+      "integrity": "sha1-45mpgiV6J22uQou5KEXLcb3CbRk="
+    },
+    "type-detect": {
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz",
+      "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g=="
     }
   }
 }
diff --git a/client/user/package.json b/client/user/package.json
index 6cb4dd65..a68b033e 100644
--- a/client/user/package.json
+++ b/client/user/package.json
@@ -7,6 +7,7 @@
     "postinstall": "bower install"
   },
   "dependencies": {
-    "redux": "^3.6.0"
+    "redux": "^3.6.0",
+    "sinon": "^4.5.0"
   }
 }
diff --git a/client/user/test/mealorder/meal-order-menu-container_action-test.html b/client/user/test/mealorder/meal-order-menu-container_action-test.html
new file mode 100644
index 00000000..197bf25f
--- /dev/null
+++ b/client/user/test/mealorder/meal-order-menu-container_action-test.html
@@ -0,0 +1,80 @@
+<!DOCTYPE html>
+<!--
+  ~ Copyright 2018, TeamDev Ltd. All rights reserved.
+  ~
+  ~ Redistribution and use in source and/or binary forms, with or without
+  ~ modification, must retain the above copyright notice and the following
+  ~ disclaimer.
+  ~
+  ~ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+  ~ "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+  ~ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+  ~ A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+  ~ OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+  ~ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+  ~ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+  ~ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+  ~ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  ~ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+  ~ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+  -->
+
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <meta name="viewport"
+          content="width=device-width, minimum-scale=1, initial-scale=1, user-scalable=yes">
+
+    <title>meal-order-menu-container test</title>
+
+    <script src="../../bower_components/webcomponentsjs/webcomponents-loader.js"></script>
+    <script src="../../bower_components/web-component-tester/browser.js"></script>
+    <script src="../../node_modules/redux/dist/redux.js"></script>
+    <script src="test_variables.js"></script>
+    <link rel="import" href="../../src/mealorder/menu/meal-order-menu-container.html">
+
+</head>
+<body>
+
+<test-fixture id="MealOrderMenuContainer">
+    <template>
+        <meal-order-menu-container></meal-order-menu-container>
+    </template>
+</test-fixture>
+
+<script>
+
+    suite('meal-order-menu-container', function () {
+
+        let mock;
+
+        function setLocation(url) {
+            window.history.pushState({}, '', url);
+            Polymer.Base.fire('location-changed', {}, {node: window});
+        }
+
+        setup(() => {
+            mock = sinon.mock(MealOrderApp.store);
+        });
+
+        test('should fire `CHANGE_CURRENT_MENU`, `CHANGE_CURRENT_CART` actions with default date.', function () {
+            const setCurrentMenuAction = {
+                type: MealOrderApp.UserAction.SET_CURRENT_MENU,
+                date: {day: "21", month: "03", year: "2018"}
+            };
+            const setCurrentCartAction = {
+                type: MealOrderApp.UserAction.SET_CURRENT_CART,
+                date: {day: "21", month: "03", year: "2018"}
+            };
+            mock.expects('dispatch').withArgs(setCurrentMenuAction);
+            mock.expects('dispatch').withArgs(setCurrentCartAction);
+            const component = fixture('MealOrderMenuContainer');
+            mock.verify();
+            mock.restore();
+        });
+
+    });
+</script>
+
+</body>
+</html>
diff --git a/client/user/test/mealorder/meal-order-menu-container_test.html b/client/user/test/mealorder/meal-order-menu-container_test.html
index 6cda84a5..f1b46630 100644
--- a/client/user/test/mealorder/meal-order-menu-container_test.html
+++ b/client/user/test/mealorder/meal-order-menu-container_test.html
@@ -49,13 +49,12 @@
     }
 
     suite('meal-order-menu-container', function () {
+
         let component;
-        let mock;
 
         setup(() => {
             component = fixture('MealOrderMenuContainer');
             component.calendar = MealOrderAppTest.initialState.calendar;
-            mock = sinon.mock(MealOrderApp.store);
         });
 
         test('should parse `routeData.page` correctly', function () {
@@ -98,22 +97,6 @@
             });
         });
 
-        test('should responds on `on-iron-select` event and ' +
-            'fire `CHANGE_CURRENT_MENU`, `CHANGE_CURRENT_CART` actions.', function (done) {
-            const setCurrentMenuAction = {type: MealOrderApp.UserAction.SET_CURRENT_MENU, date: {}};
-            const setCurrentCartAction = {type: MealOrderApp.UserAction.SET_CURRENT_CART, date: {}};
-            flush(function () {
-                mock.expects('dispatch').withArgs(setCurrentMenuAction);
-                flush(function () {
-                    mock.expects('dispatch').withArgs(setCurrentCartAction);
-                    done();
-                });
-            });
-            mock.verify();
-            mock.restore();
-        });
-
-
     });
 </script>
 

From ac7dd611de6dbb38831c219df263a05b15f9dbdb Mon Sep 17 00:00:00 2001
From: Paul <paulageyev@gmail.com>
Date: Wed, 18 Apr 2018 22:47:52 +0300
Subject: [PATCH 178/253] Add conditional if statement for the existing history
 routing

---
 client/user/src/mealorder/menu/meal-order-drawer.html    | 7 +++++--
 .../user/test/mealorder/meal-order-client-app_test.html  | 9 ++++-----
 .../mealorder/meal-order-menu-container_action-test.html | 2 --
 .../test/mealorder/meal-order-menu-container_test.html   | 2 --
 4 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/client/user/src/mealorder/menu/meal-order-drawer.html b/client/user/src/mealorder/menu/meal-order-drawer.html
index 4719b0a3..a066b2de 100644
--- a/client/user/src/mealorder/menu/meal-order-drawer.html
+++ b/client/user/src/mealorder/menu/meal-order-drawer.html
@@ -105,6 +105,7 @@
 
             static get observers() {
                 return [
+                    '_updateDate(outputDate)',
                     '_changeHistoryUrl(routeData.page)'
                 ];
             }
@@ -140,11 +141,13 @@
                     const newRouteData = {};
                     newRouteData.page = 'history';
                     newRouteData.date = date.year + "-" + date.month + "-" + date.day;
-                    this.set('routeData', newRouteData);
-                    console.log("2");
+                    if (newRouteData.date.localeCompare(this.routeData.date) !== 0) {
+                        this.set('routeData', newRouteData);
+                    }
                 }
             }
         }
+
         window.customElements.define(MealOrderDrawer.is, MealOrderDrawer);
     </script>
 </dom-module>
diff --git a/client/user/test/mealorder/meal-order-client-app_test.html b/client/user/test/mealorder/meal-order-client-app_test.html
index cb4d5552..f6f87620 100644
--- a/client/user/test/mealorder/meal-order-client-app_test.html
+++ b/client/user/test/mealorder/meal-order-client-app_test.html
@@ -102,9 +102,9 @@
             setLocation('/#/menu/2018-03-23');
             const pages = component.shadowRoot.querySelector('#app-drawer-iron');
             pages.forceSynchronousItemUpdate();
-            const routeLinkTitle = pages.selectedItem.getElementsByClassName("app-toolbar-content").item(0).innerHTML;
+            const drawerTitle = pages.selectedItem.getElementsByClassName("app-toolbar-content").item(0).innerHTML;
             flush(function () {
-                assert.equal(routeLinkTitle, 'Заказ');
+                assert.equal(drawerTitle, 'Заказ');
                 done();
             });
         });
@@ -128,9 +128,9 @@
             setLocation('/#/history/2018-03-23');
             const pages = component.shadowRoot.querySelector('#app-drawer-iron');
             pages.forceSynchronousItemUpdate();
-            const routeLinkTitle = pages.selectedItem.getElementsByClassName("app-toolbar-content").item(0).innerHTML;
+            const drawerTitle = pages.selectedItem.getElementsByClassName("app-toolbar-content").item(0).innerHTML;
             flush(function () {
-                assert.equal(routeLinkTitle, 'История заказов');
+                assert.equal(drawerTitle, 'История заказов');
                 done();
             });
         });
@@ -148,7 +148,6 @@
             const pages = component.shadowRoot.querySelector('#app-header-layout-iron');
             pages.forceSynchronousItemUpdate();
             assert.equal(pages.selectedItem.tagName.toLocaleLowerCase(), MealOrderMenuContainer.is);
-
         });
 
     });
diff --git a/client/user/test/mealorder/meal-order-menu-container_action-test.html b/client/user/test/mealorder/meal-order-menu-container_action-test.html
index 197bf25f..f0e989d7 100644
--- a/client/user/test/mealorder/meal-order-menu-container_action-test.html
+++ b/client/user/test/mealorder/meal-order-menu-container_action-test.html
@@ -43,7 +43,6 @@
 </test-fixture>
 
 <script>
-
     suite('meal-order-menu-container', function () {
 
         let mock;
@@ -72,7 +71,6 @@
             mock.verify();
             mock.restore();
         });
-
     });
 </script>
 
diff --git a/client/user/test/mealorder/meal-order-menu-container_test.html b/client/user/test/mealorder/meal-order-menu-container_test.html
index f1b46630..d33f8886 100644
--- a/client/user/test/mealorder/meal-order-menu-container_test.html
+++ b/client/user/test/mealorder/meal-order-menu-container_test.html
@@ -96,9 +96,7 @@
                 done();
             });
         });
-
     });
 </script>
-
 </body>
 </html>

From 94e572f9a148d818f029d68d4bc5800e6fbc2d02 Mon Sep 17 00:00:00 2001
From: Paul Ageyev <paulageyev@gmail.com>
Date: Thu, 19 Apr 2018 11:28:24 +0300
Subject: [PATCH 179/253] Add flush function as global

---
 .../user/test/mealorder/meal-order-client-app_test.html   | 4 +++-
 client/user/test/mealorder/meal-order-drawer_test.html    | 1 +
 .../mealorder/meal-order-menu-container_action-test.html  | 8 ++------
 .../test/mealorder/meal-order-menu-container_test.html    | 1 +
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/client/user/test/mealorder/meal-order-client-app_test.html b/client/user/test/mealorder/meal-order-client-app_test.html
index f6f87620..ba561c63 100644
--- a/client/user/test/mealorder/meal-order-client-app_test.html
+++ b/client/user/test/mealorder/meal-order-client-app_test.html
@@ -31,7 +31,8 @@
     <script src="../../bower_components/web-component-tester/browser.js"></script>
     <script src="../../node_modules/redux/dist/redux.js"></script>
     <link rel="import" href="../../src/mealorder/meal-order-client-app.html">
-
+    <link rel="import" href="../../src/mealorder/menu/meal-order-drawer.html">
+    <link rel="import" href="../../src/mealorder/menu/meal-order-menu-container.html">
 </head>
 <body>
 
@@ -41,6 +42,7 @@
     </template>
 </test-fixture>
 
+/*global flush */
 <script>
     function setLocation(url) {
         window.history.pushState({}, '', url);
diff --git a/client/user/test/mealorder/meal-order-drawer_test.html b/client/user/test/mealorder/meal-order-drawer_test.html
index 066c2293..04459a2a 100644
--- a/client/user/test/mealorder/meal-order-drawer_test.html
+++ b/client/user/test/mealorder/meal-order-drawer_test.html
@@ -41,6 +41,7 @@
     </template>
 </test-fixture>
 
+/*global flush */
 <script>
     function setLocation(url) {
         window.history.pushState({}, '', url);
diff --git a/client/user/test/mealorder/meal-order-menu-container_action-test.html b/client/user/test/mealorder/meal-order-menu-container_action-test.html
index f0e989d7..7e78605a 100644
--- a/client/user/test/mealorder/meal-order-menu-container_action-test.html
+++ b/client/user/test/mealorder/meal-order-menu-container_action-test.html
@@ -42,16 +42,12 @@
     </template>
 </test-fixture>
 
+/*global sinon */
 <script>
     suite('meal-order-menu-container', function () {
 
         let mock;
 
-        function setLocation(url) {
-            window.history.pushState({}, '', url);
-            Polymer.Base.fire('location-changed', {}, {node: window});
-        }
-
         setup(() => {
             mock = sinon.mock(MealOrderApp.store);
         });
@@ -67,7 +63,7 @@
             };
             mock.expects('dispatch').withArgs(setCurrentMenuAction);
             mock.expects('dispatch').withArgs(setCurrentCartAction);
-            const component = fixture('MealOrderMenuContainer');
+            fixture('MealOrderMenuContainer');
             mock.verify();
             mock.restore();
         });
diff --git a/client/user/test/mealorder/meal-order-menu-container_test.html b/client/user/test/mealorder/meal-order-menu-container_test.html
index d33f8886..b8092fe5 100644
--- a/client/user/test/mealorder/meal-order-menu-container_test.html
+++ b/client/user/test/mealorder/meal-order-menu-container_test.html
@@ -42,6 +42,7 @@
     </template>
 </test-fixture>
 
+/*global flush */
 <script>
     function setLocation(url) {
         window.history.pushState({}, '', url);

From 45f87a8107a7801ea0e4e491c1ad31bf2aa93d77 Mon Sep 17 00:00:00 2001
From: Paul Ageyev <paulageyev@gmail.com>
Date: Thu, 19 Apr 2018 11:39:27 +0300
Subject: [PATCH 180/253] Add sinon as global

---
 .eslintrc.json                                                | 4 +++-
 client/user/test/mealorder/meal-order-client-app_test.html    | 1 -
 client/user/test/mealorder/meal-order-drawer_test.html        | 1 -
 .../test/mealorder/meal-order-menu-container_action-test.html | 1 -
 .../user/test/mealorder/meal-order-menu-container_test.html   | 1 -
 5 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/.eslintrc.json b/.eslintrc.json
index 891d8628..23562c0c 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -49,6 +49,8 @@
     "test": false,
     "suite": false,
     "fixture": false,
-    "setup": false
+    "setup": false,
+    "flush": false,
+    "sinon": false
   }
 }
diff --git a/client/user/test/mealorder/meal-order-client-app_test.html b/client/user/test/mealorder/meal-order-client-app_test.html
index ba561c63..34adec27 100644
--- a/client/user/test/mealorder/meal-order-client-app_test.html
+++ b/client/user/test/mealorder/meal-order-client-app_test.html
@@ -42,7 +42,6 @@
     </template>
 </test-fixture>
 
-/*global flush */
 <script>
     function setLocation(url) {
         window.history.pushState({}, '', url);
diff --git a/client/user/test/mealorder/meal-order-drawer_test.html b/client/user/test/mealorder/meal-order-drawer_test.html
index 04459a2a..066c2293 100644
--- a/client/user/test/mealorder/meal-order-drawer_test.html
+++ b/client/user/test/mealorder/meal-order-drawer_test.html
@@ -41,7 +41,6 @@
     </template>
 </test-fixture>
 
-/*global flush */
 <script>
     function setLocation(url) {
         window.history.pushState({}, '', url);
diff --git a/client/user/test/mealorder/meal-order-menu-container_action-test.html b/client/user/test/mealorder/meal-order-menu-container_action-test.html
index 7e78605a..b47ae273 100644
--- a/client/user/test/mealorder/meal-order-menu-container_action-test.html
+++ b/client/user/test/mealorder/meal-order-menu-container_action-test.html
@@ -42,7 +42,6 @@
     </template>
 </test-fixture>
 
-/*global sinon */
 <script>
     suite('meal-order-menu-container', function () {
 
diff --git a/client/user/test/mealorder/meal-order-menu-container_test.html b/client/user/test/mealorder/meal-order-menu-container_test.html
index b8092fe5..d33f8886 100644
--- a/client/user/test/mealorder/meal-order-menu-container_test.html
+++ b/client/user/test/mealorder/meal-order-menu-container_test.html
@@ -42,7 +42,6 @@
     </template>
 </test-fixture>
 
-/*global flush */
 <script>
     function setLocation(url) {
         window.history.pushState({}, '', url);

From f853065aafede65b2a7a79dce4803673814d01b8 Mon Sep 17 00:00:00 2001
From: Paul Ageyev <paulageyev@gmail.com>
Date: Thu, 19 Apr 2018 11:47:47 +0300
Subject: [PATCH 181/253] Add components for tests as global

---
 client/user/test/mealorder/meal-order-client-app_test.html | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/client/user/test/mealorder/meal-order-client-app_test.html b/client/user/test/mealorder/meal-order-client-app_test.html
index 34adec27..c30d9705 100644
--- a/client/user/test/mealorder/meal-order-client-app_test.html
+++ b/client/user/test/mealorder/meal-order-client-app_test.html
@@ -31,8 +31,8 @@
     <script src="../../bower_components/web-component-tester/browser.js"></script>
     <script src="../../node_modules/redux/dist/redux.js"></script>
     <link rel="import" href="../../src/mealorder/meal-order-client-app.html">
-    <link rel="import" href="../../src/mealorder/menu/meal-order-drawer.html">
     <link rel="import" href="../../src/mealorder/menu/meal-order-menu-container.html">
+    <link rel="import" href="../../src/mealorder/menu/meal-order-drawer.html">
 </head>
 <body>
 
@@ -43,6 +43,9 @@
 </test-fixture>
 
 <script>
+    /*global MealOrderDrawer, MealOrderDrawer*/
+    /*eslint no-undef: "error"*/
+
     function setLocation(url) {
         window.history.pushState({}, '', url);
         Polymer.Base.fire('location-changed', {}, {node: window});
@@ -148,7 +151,7 @@
             setLocation('/#/menu/2018-03-23');
             const pages = component.shadowRoot.querySelector('#app-header-layout-iron');
             pages.forceSynchronousItemUpdate();
-            assert.equal(pages.selectedItem.tagName.toLocaleLowerCase(), MealOrderMenuContainer.is);
+            assert.equal(pages.selectedItem.tagName.toLocaleLowerCase(), c.is);
         });
 
     });

From 29fa4704e6f52085e2c14b7a2fde94de9a4616ee Mon Sep 17 00:00:00 2001
From: Paul <paulageyev@gmail.com>
Date: Thu, 19 Apr 2018 14:11:39 +0300
Subject: [PATCH 182/253] Add `MealOrderMenuContainer` component for tests as
 global

---
 client/user/test/mealorder/meal-order-client-app_test.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/user/test/mealorder/meal-order-client-app_test.html b/client/user/test/mealorder/meal-order-client-app_test.html
index c30d9705..f7c97c83 100644
--- a/client/user/test/mealorder/meal-order-client-app_test.html
+++ b/client/user/test/mealorder/meal-order-client-app_test.html
@@ -151,7 +151,7 @@
             setLocation('/#/menu/2018-03-23');
             const pages = component.shadowRoot.querySelector('#app-header-layout-iron');
             pages.forceSynchronousItemUpdate();
-            assert.equal(pages.selectedItem.tagName.toLocaleLowerCase(), c.is);
+            assert.equal(pages.selectedItem.tagName.toLocaleLowerCase(), MealOrderMenuContainer.is);
         });
 
     });

From 6e3ef33e6dfea2c32cbe208ca1b0ce325f053fd0 Mon Sep 17 00:00:00 2001
From: Paul <paulageyev@gmail.com>
Date: Thu, 19 Apr 2018 14:14:13 +0300
Subject: [PATCH 183/253] Add `MealOrderDrawer` component for tests as global

---
 client/user/test/mealorder/meal-order-client-app_test.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/user/test/mealorder/meal-order-client-app_test.html b/client/user/test/mealorder/meal-order-client-app_test.html
index f7c97c83..bf5998d8 100644
--- a/client/user/test/mealorder/meal-order-client-app_test.html
+++ b/client/user/test/mealorder/meal-order-client-app_test.html
@@ -43,7 +43,7 @@
 </test-fixture>
 
 <script>
-    /*global MealOrderDrawer, MealOrderDrawer*/
+    /*global MealOrderDrawer, MealOrderMenuContainer*/
     /*eslint no-undef: "error"*/
 
     function setLocation(url) {

From 28f5227a6072b5d22ea21df4a6064af9406bae1a Mon Sep 17 00:00:00 2001
From: Paul <paulageyev@gmail.com>
Date: Mon, 23 Apr 2018 21:10:46 +0300
Subject: [PATCH 184/253] Refactor actions, add docs

---
 client/user/index.html                        |  1 -
 client/user/package.json                      |  3 +--
 .../src/mealorder/meal-order-client-app.html  | 11 ++++++----
 .../src/mealorder/menu/meal-order-drawer.html | 17 +++++++++-----
 .../menu/meal-order-menu-container.html       | 22 ++++++++-----------
 .../mealorder/shell/reducers/reducers.html    |  2 +-
 .../mealorder/meal-order-client-app_test.html |  3 ---
 7 files changed, 30 insertions(+), 29 deletions(-)

diff --git a/client/user/index.html b/client/user/index.html
index f746c02e..90c6486d 100644
--- a/client/user/index.html
+++ b/client/user/index.html
@@ -25,7 +25,6 @@
           content="width=device-width, minimum-scale=1, initial-scale=1, user-scalable=yes">
     <script src="bower_components/webcomponentsjs/webcomponents-loader.js"></script>
     <script src="node_modules/redux/dist/redux.js"></script>
-    <link rel="import" href="bower_components/paper-styles/color.html">
     <link rel="icon" href="images/favicon-16x16.png" type="image/png">
     <link rel=import href="src/mealorder/meal-order-client-app.html">
     <title>MealOrder</title>
diff --git a/client/user/package.json b/client/user/package.json
index a68b033e..6cb4dd65 100644
--- a/client/user/package.json
+++ b/client/user/package.json
@@ -7,7 +7,6 @@
     "postinstall": "bower install"
   },
   "dependencies": {
-    "redux": "^3.6.0",
-    "sinon": "^4.5.0"
+    "redux": "^3.6.0"
   }
 }
diff --git a/client/user/src/mealorder/meal-order-client-app.html b/client/user/src/mealorder/meal-order-client-app.html
index 58b8b5d2..9d75e327 100644
--- a/client/user/src/mealorder/meal-order-client-app.html
+++ b/client/user/src/mealorder/meal-order-client-app.html
@@ -42,6 +42,7 @@
 <link rel="import" href="./shell/redux-store.html">
 <link rel="import" href="./menu/meal-order-menu-container.html">
 <link rel="import" href="./menu/meal-order-drawer.html">
+
 <dom-module id="meal-order-client-app">
     <template>
         <style>
@@ -194,7 +195,6 @@
                                        href="/#/history/">
                                         <div class="route-title">История заказов</div>
                                         <div class="icon-container">
-
                                             <iron-icon class="history-icon"
                                                        icon="maps:icons:history"></iron-icon>
 
@@ -243,8 +243,8 @@
          * Main client meal order component.
          *
          * Consists of 2 pages:
-         * 1. A page with vendor menus, and user's shopping cart.
-         * 2. A page with user's history.
+         * 1. A page with the vendor menus and the user's shopping cart.
+         * 2. A page with the user's history.
          *
          * @customElement
          * @polymer
@@ -265,6 +265,7 @@
                         type: Array,
                         statePath: 'currentOrder'
                     },
+
                     /**
                      * User's history for the chosen day.
                      */
@@ -285,7 +286,9 @@
                      *
                      * Used for routing.
                      */
-                    routeData: {},
+                    routeData: {
+                        type: Object,
+                    },
                 }
             }
 
diff --git a/client/user/src/mealorder/menu/meal-order-drawer.html b/client/user/src/mealorder/menu/meal-order-drawer.html
index a066b2de..c18fb7cc 100644
--- a/client/user/src/mealorder/menu/meal-order-drawer.html
+++ b/client/user/src/mealorder/menu/meal-order-drawer.html
@@ -64,9 +64,10 @@
     </template>
     <script>
         /**
-         * meal-order-drawer is container for user's order and user's order history calendar.
+         * meal-order-drawer is the container for the user's order and
+         * the calendar of the history of the user's orders.
          *
-         * Contains a order for selected day and calendar.
+         * Contains an order for the selected day and calendar.
          *
          * @customElement
          * @polymer
@@ -89,17 +90,23 @@
                     /**
                      * Date that the user can select on the calendar.
                      */
-                    inputDate: {},
+                    inputDate: {
+                        type: Date,
+                    },
 
                     /**
                      * Chosen day.
                      */
-                    outputDate: {},
+                    outputDate: {
+                        type: Date,
+                    },
 
                     /**
                      * Used for routing.
                      */
-                    routeData: {},
+                    routeData: {
+                        type: Object,
+                    },
                 }
             }
 
diff --git a/client/user/src/mealorder/menu/meal-order-menu-container.html b/client/user/src/mealorder/menu/meal-order-menu-container.html
index f9a8d9e7..03f17f1a 100644
--- a/client/user/src/mealorder/menu/meal-order-menu-container.html
+++ b/client/user/src/mealorder/menu/meal-order-menu-container.html
@@ -102,7 +102,7 @@
     </template>
     <script>
         /**
-         * menu-order is container for vendors' menus and navigation.
+         * menu-order is container for the vendors' menus and navigation.
          *
          * Contains a menu for the current date and tabs for quick date navigation.
          *
@@ -163,18 +163,14 @@
                  * @param {date} selected date by tab
                  */
                 return {
-                    changeCurrentMenu: date => {
-                        return {
-                            type: MealOrderApp.UserAction.SET_CURRENT_MENU,
-                            date
-                        }
-                    },
-                    changeCurrentCart: date => {
-                        return {
-                            type: MealOrderApp.UserAction.SET_CURRENT_CART,
-                            date
-                        }
-                    }
+                    changeCurrentMenu: date => ({
+                        type: MealOrderApp.UserAction.SET_CURRENT_MENU,
+                        date
+                    }),
+                    changeCurrentCart: date => ({
+                        type: MealOrderApp.UserAction.SET_CURRENT_CART,
+                        date
+                    })
                 }
             }
 
diff --git a/client/user/src/mealorder/shell/reducers/reducers.html b/client/user/src/mealorder/shell/reducers/reducers.html
index 106f1bab..2eacbda0 100644
--- a/client/user/src/mealorder/shell/reducers/reducers.html
+++ b/client/user/src/mealorder/shell/reducers/reducers.html
@@ -18,9 +18,9 @@
   ~ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   -->
 <link rel="import" href="../meal-order-app-namespace.html">
-
 <link rel="import" href="../redux-store.html">
 <script src="../utils/Utils.js"></script>
+
 <script>
     {
         /*global Utils */
diff --git a/client/user/test/mealorder/meal-order-client-app_test.html b/client/user/test/mealorder/meal-order-client-app_test.html
index bf5998d8..770c086c 100644
--- a/client/user/test/mealorder/meal-order-client-app_test.html
+++ b/client/user/test/mealorder/meal-order-client-app_test.html
@@ -43,9 +43,6 @@
 </test-fixture>
 
 <script>
-    /*global MealOrderDrawer, MealOrderMenuContainer*/
-    /*eslint no-undef: "error"*/
-
     function setLocation(url) {
         window.history.pushState({}, '', url);
         Polymer.Base.fire('location-changed', {}, {node: window});

From 205a98f3df49f0689ef60bc470fed4a246262967 Mon Sep 17 00:00:00 2001
From: Paul <paulageyev@gmail.com>
Date: Mon, 23 Apr 2018 21:42:20 +0300
Subject: [PATCH 185/253] Use application namespace to use component classes
 outside of component file

---
 client/user/test/mealorder/meal-order-client-app_test.html | 7 +++++--
 .../test/mealorder/meal-order-menu-container_test.html     | 1 -
 client/user/test/mealorder/test_variables.js               | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/client/user/test/mealorder/meal-order-client-app_test.html b/client/user/test/mealorder/meal-order-client-app_test.html
index 770c086c..74d9f9f4 100644
--- a/client/user/test/mealorder/meal-order-client-app_test.html
+++ b/client/user/test/mealorder/meal-order-client-app_test.html
@@ -30,6 +30,7 @@
     <script src="../../bower_components/webcomponentsjs/webcomponents-loader.js"></script>
     <script src="../../bower_components/web-component-tester/browser.js"></script>
     <script src="../../node_modules/redux/dist/redux.js"></script>
+    <script src="test_variables.js"></script>
     <link rel="import" href="../../src/mealorder/meal-order-client-app.html">
     <link rel="import" href="../../src/mealorder/menu/meal-order-menu-container.html">
     <link rel="import" href="../../src/mealorder/menu/meal-order-drawer.html">
@@ -53,6 +54,8 @@
 
         setup(() => {
             component = fixture('MealOrderClientApp');
+            MealOrderAppTest.MealOrderDrawer = MealOrderDrawer;
+            MealOrderAppTest.MealOrderMenuContainer = MealOrderMenuContainer;
         });
 
         test('should parse `routeData.page` correctly', function () {
@@ -139,7 +142,7 @@
         test('should instantiate the `meal-order-drawer` component', function (done) {
             const elementShadowRoot = component.shadowRoot;
             const drawer = elementShadowRoot.querySelector("meal-order-drawer");
-            assert.equal(drawer.tagName.toLocaleLowerCase(), MealOrderDrawer.is);
+            assert.equal(drawer.tagName.toLocaleLowerCase(), MealOrderAppTest.MealOrderDrawer.is);
             done();
         });
 
@@ -148,7 +151,7 @@
             setLocation('/#/menu/2018-03-23');
             const pages = component.shadowRoot.querySelector('#app-header-layout-iron');
             pages.forceSynchronousItemUpdate();
-            assert.equal(pages.selectedItem.tagName.toLocaleLowerCase(), MealOrderMenuContainer.is);
+            assert.equal(pages.selectedItem.tagName.toLocaleLowerCase(), MealOrderAppTest.MealOrderMenuContainer.is);
         });
 
     });
diff --git a/client/user/test/mealorder/meal-order-menu-container_test.html b/client/user/test/mealorder/meal-order-menu-container_test.html
index d33f8886..b75fb147 100644
--- a/client/user/test/mealorder/meal-order-menu-container_test.html
+++ b/client/user/test/mealorder/meal-order-menu-container_test.html
@@ -32,7 +32,6 @@
     <script src="../../node_modules/redux/dist/redux.js"></script>
     <script src="test_variables.js"></script>
     <link rel="import" href="../../src/mealorder/menu/meal-order-menu-container.html">
-
 </head>
 <body>
 
diff --git a/client/user/test/mealorder/test_variables.js b/client/user/test/mealorder/test_variables.js
index 387b6296..d414e1ad 100644
--- a/client/user/test/mealorder/test_variables.js
+++ b/client/user/test/mealorder/test_variables.js
@@ -18,7 +18,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 {
-    window.MealOrderAppTest = {};
+    window.MealOrderAppTest = window.MealOrderAppTest || {};
 
     const arrayOfDates = [{
         date: {

From 263181accc8f123efe6678a67416c35917ce0585 Mon Sep 17 00:00:00 2001
From: Paul <paulageyev@gmail.com>
Date: Mon, 23 Apr 2018 22:22:10 +0300
Subject: [PATCH 186/253] Create `app-header-iron-container`

---
 .../src/mealorder/meal-order-client-app.html  | 52 ++++++++-----------
 1 file changed, 21 insertions(+), 31 deletions(-)

diff --git a/client/user/src/mealorder/meal-order-client-app.html b/client/user/src/mealorder/meal-order-client-app.html
index 9d75e327..af872542 100644
--- a/client/user/src/mealorder/meal-order-client-app.html
+++ b/client/user/src/mealorder/meal-order-client-app.html
@@ -83,7 +83,7 @@
                 color: var(--paper-light-blue-500);
             }
 
-            app-header .history-icon {
+            app-header .link-icon {
                 display: none;
                 color: var(--paper-grey-50);
             }
@@ -117,8 +117,7 @@
                 margin-right: 44px;
             }
 
-            .icon-container {
-                width: 100px;
+            .app-header-iron-container {
                 display: flex;
                 justify-content: space-around;
                 align-items: center;
@@ -135,13 +134,18 @@
             }
 
             @media only screen and (max-width: 600px) {
+                .app-header-iron-container {
+                    width: 100px;
+                }
+
                 .route-title {
                     display: none;
                 }
 
-                app-header .history-icon {
+                app-header .link-icon {
                     display: block;
                 }
+
             }
         </style>
         <app-location route="{{route}}"
@@ -189,38 +193,24 @@
                                         attr-for-selected="data-page"
                                         fallback-selection="view404"
                                         role="main">
-
-                                <div data-page="menu">
-                                    <a class="title-link"
-                                       href="/#/history/">
+                                <div data-page="menu" class="app-header-iron-container">
+                                    <a class="title-link" href="/#/history/">
                                         <div class="route-title">История заказов</div>
-                                        <div class="icon-container">
-                                            <iron-icon class="history-icon"
-                                                       icon="maps:icons:history"></iron-icon>
-
-                                            <div>
-                                                <iron-icon class="app-toolbar-content"
-                                                           icon="icons:shopping-cart"
-                                                           drawer-toggle></iron-icon>
-                                            </div>
-                                        </div>
+                                        <iron-icon class="link-icon"
+                                                   icon="maps:icons:history"></iron-icon>
                                     </a>
+                                    <iron-icon data-page="menu" class="drawer-icon"
+                                               icon="icons:shopping-cart" drawer-toggle></iron-icon>
                                 </div>
-
-                                <div data-page="history">
-                                    <a class="title-link"
-                                       href="/#/menu/">
+                                <div data-page="history" class="app-header-iron-container">
+                                    <a class="title-link" href="/#/menu/">
                                         <div id="menu-history" class="route-title">Сделать заказ</div>
-                                        <div class="icon-container">
-                                            <iron-icon class="history-icon"
-                                                       icon="maps:icons:add"></iron-icon>
-                                            <div>
-                                                <iron-icon class="app-toolbar-content"
-                                                           icon="icons:date-range"
-                                                           drawer-toggle></iron-icon>
-                                            </div>
-                                        </div>
+                                        <iron-icon class="link-icon"
+                                                   icon="maps:icons:add"></iron-icon>
                                     </a>
+                                    <iron-icon data-page="history" class="drawer-icon"
+                                               icon="icons:date-range"
+                                               drawer-toggle></iron-icon>
                                 </div>
                             </iron-pages>
                         </div>

From a28568dc4f8c60821f86bce1b11a82e74d074b52 Mon Sep 17 00:00:00 2001
From: Paul <paulageyev@gmail.com>
Date: Tue, 24 Apr 2018 10:49:15 +0300
Subject: [PATCH 187/253] Rename the action `SET_CURRENT_CART` to
 `SET_CURRENT_ORDER`

---
 .../src/mealorder/menu/meal-order-menu-container.html  | 10 +++++-----
 .../user/src/mealorder/shell/actions/user-actions.html |  2 +-
 client/user/src/mealorder/shell/reducers/reducers.html |  7 +++++--
 .../meal-order-menu-container_action-test.html         |  6 +++---
 4 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/client/user/src/mealorder/menu/meal-order-menu-container.html b/client/user/src/mealorder/menu/meal-order-menu-container.html
index 03f17f1a..f3df195c 100644
--- a/client/user/src/mealorder/menu/meal-order-menu-container.html
+++ b/client/user/src/mealorder/menu/meal-order-menu-container.html
@@ -159,7 +159,7 @@
                 /**
                  * Fired when a paper tab is selected.
                  *
-                 * @action `changeCurrentCart`
+                 * @action `changeCurrentOrder`
                  * @param {date} selected date by tab
                  */
                 return {
@@ -167,8 +167,8 @@
                         type: MealOrderApp.UserAction.SET_CURRENT_MENU,
                         date
                     }),
-                    changeCurrentCart: date => ({
-                        type: MealOrderApp.UserAction.SET_CURRENT_CART,
+                    changeCurrentOrder: date => ({
+                        type: MealOrderApp.UserAction.SET_CURRENT_ORDER,
                         date
                     })
                 }
@@ -205,7 +205,7 @@
                             this.set('selectedDay', date);
                         }
                         this.dispatch('changeCurrentMenu', date);
-                        this.dispatch('changeCurrentCart', date);
+                        this.dispatch('changeCurrentOrder', date);
                     }
                 }
             }
@@ -228,7 +228,7 @@
                 this.set('routeData', newRouteData);
 
                 this.dispatch('changeCurrentMenu', date);
-                this.dispatch('changeCurrentCart', date);
+                this.dispatch('changeCurrentOrder', date);
             }
         }
 
diff --git a/client/user/src/mealorder/shell/actions/user-actions.html b/client/user/src/mealorder/shell/actions/user-actions.html
index 9e84345a..e118a92e 100644
--- a/client/user/src/mealorder/shell/actions/user-actions.html
+++ b/client/user/src/mealorder/shell/actions/user-actions.html
@@ -21,6 +21,6 @@
 <script>
     MealOrderApp.UserAction = {
         SET_CURRENT_MENU: "SET_CURRENT_MENU",
-        SET_CURRENT_CART: 'SET_CURRENT_CART',
+        SET_CURRENT_ORDER: 'SET_CURRENT_ORDER',
     }
 </script>
diff --git a/client/user/src/mealorder/shell/reducers/reducers.html b/client/user/src/mealorder/shell/reducers/reducers.html
index 2eacbda0..ffd08332 100644
--- a/client/user/src/mealorder/shell/reducers/reducers.html
+++ b/client/user/src/mealorder/shell/reducers/reducers.html
@@ -199,7 +199,8 @@
                 }],
             currentOrder: [],
             orders: [{
-                date: {day: '21', month: '03', year: '2018'}, cart: [{
+                date: {day: '21', month: '03', year: '2018'},
+                cart: [{
                     vendor: "Пюре",
                     dishes: [
                         {title: 'Борщ украинский', price: 35, quantity: 1},
@@ -217,7 +218,9 @@
                     }]
                 }]
             }, {
-                date: {day: '22', month: '03', year: '2018'}, cart: [{
+                date:
+                    {day: '22', month: '03', year: '2018'},
+                cart: [{
                     vendor: "Пюре",
                     dishes: [
                         {title: 'Щи русские', price: 48, quantity: 1},
diff --git a/client/user/test/mealorder/meal-order-menu-container_action-test.html b/client/user/test/mealorder/meal-order-menu-container_action-test.html
index b47ae273..ff077759 100644
--- a/client/user/test/mealorder/meal-order-menu-container_action-test.html
+++ b/client/user/test/mealorder/meal-order-menu-container_action-test.html
@@ -56,12 +56,12 @@
                 type: MealOrderApp.UserAction.SET_CURRENT_MENU,
                 date: {day: "21", month: "03", year: "2018"}
             };
-            const setCurrentCartAction = {
-                type: MealOrderApp.UserAction.SET_CURRENT_CART,
+            const setCurrentOrderAction = {
+                type: MealOrderApp.UserAction.SET_CURRENT_ORDER,
                 date: {day: "21", month: "03", year: "2018"}
             };
             mock.expects('dispatch').withArgs(setCurrentMenuAction);
-            mock.expects('dispatch').withArgs(setCurrentCartAction);
+            mock.expects('dispatch').withArgs(setCurrentOrderAction);
             fixture('MealOrderMenuContainer');
             mock.verify();
             mock.restore();

From 0f2c18b5908c5ac6a0ecac577671846e74977ba3 Mon Sep 17 00:00:00 2001
From: Paul <paulageyev@gmail.com>
Date: Tue, 24 Apr 2018 13:05:03 +0300
Subject: [PATCH 188/253] Apply ISO 8601 Date format

---
 .../src/mealorder/meal-order-client-app.html  | 13 +------
 .../src/mealorder/menu/meal-order-drawer.html | 35 +++++++------------
 .../menu/meal-order-menu-container.html       | 27 ++++----------
 3 files changed, 21 insertions(+), 54 deletions(-)

diff --git a/client/user/src/mealorder/meal-order-client-app.html b/client/user/src/mealorder/meal-order-client-app.html
index af872542..62022e40 100644
--- a/client/user/src/mealorder/meal-order-client-app.html
+++ b/client/user/src/mealorder/meal-order-client-app.html
@@ -295,18 +295,7 @@
             }
 
             _pageChanged() {
-                const YEAR = 0;
-                const MONTH = 1;
-                const DAY = 2;
-
-                const arr = this.routeData.date.split('-');
-
-                let urlDate = {};
-                urlDate.year = arr[YEAR];
-                urlDate.month = arr[MONTH];
-                urlDate.day = arr[DAY];
-
-                const date = new Date(urlDate.year, urlDate.month - 1, urlDate.day);
+                const date = new Date(this.routeData.date);
 
                 let dayOfTheWeek = date.toLocaleDateString("ru-RU", {weekday: 'long'});
                 dayOfTheWeek = dayOfTheWeek.charAt(0).toUpperCase() + dayOfTheWeek.slice(1);
diff --git a/client/user/src/mealorder/menu/meal-order-drawer.html b/client/user/src/mealorder/menu/meal-order-drawer.html
index c18fb7cc..7b98f1a0 100644
--- a/client/user/src/mealorder/menu/meal-order-drawer.html
+++ b/client/user/src/mealorder/menu/meal-order-drawer.html
@@ -119,35 +119,26 @@
 
             _changeHistoryUrl() {
                 if (this.routeData.page && this.routeData.page.startsWith("history")) {
-                    const YEAR = 0;
-                    const MONTH = 1;
-                    const DAY = 2;
-
-                    const routeDate = this.routeData.date.split('-');
-                    this.set('inputDate', routeDate[YEAR] + "/" + routeDate[MONTH] + "/" + routeDate[DAY]);
-                    const arr = this.routeData.date.split('-');
-                    const date = {};
-                    date.year = arr[YEAR];
-                    date.month = arr[MONTH];
-                    date.day = arr[DAY];
-                    this.dispatchEvent(new CustomEvent('changed-history-date', {detail: date}));
+                    if (this.routeData.date) {
+                        const routeDate = new Date(this.routeData.date);
+                        this.set('inputDate', routeDate.getFullYear() +
+                            "/" + ("0" + (routeDate.getMonth() + 1)).slice(-2) + "/" + routeDate.getDate());
+                        const date = {};
+                        date.year = routeDate.getFullYear();
+                        date.month = routeDate.getMonth();
+                        date.day = routeDate.getDate();
+                        this.dispatchEvent(new CustomEvent('changed-history-date', {detail: date}));
+                    }
                 }
             }
 
             _updateDate() {
                 if (this.routeData.page && this.routeData.page.startsWith("history")) {
-                    const YEAR = 0;
-                    const MONTH = 1;
-                    const DAY = 2;
-
-                    const arr = this.outputDate.split('/');
-                    const date = {};
-                    date.year = arr[YEAR];
-                    date.month = arr[MONTH];
-                    date.day = arr[DAY];
+                    const date = new Date(this.outputDate.toString());
                     const newRouteData = {};
                     newRouteData.page = 'history';
-                    newRouteData.date = date.year + "-" + date.month + "-" + date.day;
+                    newRouteData.date = date.getFullYear() +
+                        "-" + ("0" + (date.getMonth() + 1)).slice(-2) + "-" + date.getDate();
                     if (newRouteData.date.localeCompare(this.routeData.date) !== 0) {
                         this.set('routeData', newRouteData);
                     }
diff --git a/client/user/src/mealorder/menu/meal-order-menu-container.html b/client/user/src/mealorder/menu/meal-order-menu-container.html
index f3df195c..13d1b7fc 100644
--- a/client/user/src/mealorder/menu/meal-order-menu-container.html
+++ b/client/user/src/mealorder/menu/meal-order-menu-container.html
@@ -195,13 +195,10 @@
                                 date.month + "-" + date.day);
                         }
                         else {
-                            const YEAR = 0;
-                            const MONTH = 1;
-                            const DAY = 2;
-                            const arr = this.routeData.date.split('-');
-                            date.year = arr[YEAR];
-                            date.month = arr[MONTH];
-                            date.day = arr[DAY];
+                            const routeDate = new Date(this.routeData.date);
+                            date.year = routeDate.getFullYear();
+                            date.month = ("0" + (routeDate.getMonth() + 1)).slice(-2);
+                            date.day = routeDate.getDate();
                             this.set('selectedDay', date);
                         }
                         this.dispatch('changeCurrentMenu', date);
@@ -211,22 +208,12 @@
             }
 
             _selectDate(e) {
-                const YEAR = 0;
-                const MONTH = 1;
-                const DAY = 2;
-
-                const paperDate = e.target.selected.split('-');
-
-                const date = {};
-                date.year = paperDate[YEAR];
-                date.month = paperDate[MONTH];
-                date.day = paperDate[DAY];
-
+                const date = new Date(e.target.selected);
                 const newRouteData = {};
                 newRouteData.page = 'menu';
-                newRouteData.date = date.year + "-" + date.month + "-" + date.day;
+                newRouteData.date = date.getFullYear() +
+                    "-" + ("0" + (date.getMonth() + 1)).slice(-2) + "-" + date.getDate();
                 this.set('routeData', newRouteData);
-
                 this.dispatch('changeCurrentMenu', date);
                 this.dispatch('changeCurrentOrder', date);
             }

From 95ce25bcd2ae87623df2bc5352df9919cbb37ac8 Mon Sep 17 00:00:00 2001
From: Paul <paulageyev@gmail.com>
Date: Tue, 24 Apr 2018 13:48:15 +0300
Subject: [PATCH 189/253] Add docs for component properties

---
 .../src/mealorder/meal-order-client-app.html  | 23 +++++++++++--------
 .../src/mealorder/menu/meal-order-drawer.html | 14 +++++++++++
 .../menu/meal-order-menu-container.html       | 23 +++++++++++++++++++
 .../mealorder/shell/reducers/reducers.html    | 12 ++++++----
 4 files changed, 58 insertions(+), 14 deletions(-)

diff --git a/client/user/src/mealorder/meal-order-client-app.html b/client/user/src/mealorder/meal-order-client-app.html
index 62022e40..4319328a 100644
--- a/client/user/src/mealorder/meal-order-client-app.html
+++ b/client/user/src/mealorder/meal-order-client-app.html
@@ -247,23 +247,28 @@
 
             static get properties() {
                 return {
-
                     /**
                      * Current user's meal order.
+                     *
+                     * @typedef {Object} Order the current order
+                     *
+                     * @typedef {Object} Date contains day, month, year
+                     * @property {String} day
+                     * @property {String} month
+                     * @property {String} year
+                     *
+                     * @typedef {Array} Cart array that contains the vendor and dishes
+                     * @property {String} Vendor a vendor name
+                     * @typedef {Array} Dishes array contains the dish title, price, quantity
+                     * @property {String} title
+                     * @property {String} price
+                     * @property {String} quantity
                      */
                     order: {
                         type: Array,
                         statePath: 'currentOrder'
                     },
 
-                    /**
-                     * User's history for the chosen day.
-                     */
-                    history: {
-                        type: Array,
-                        statePath: 'currentHistory'
-                    },
-
                     /**
                      * Current selected day by user.
                      */
diff --git a/client/user/src/mealorder/menu/meal-order-drawer.html b/client/user/src/mealorder/menu/meal-order-drawer.html
index 7b98f1a0..3613dc2f 100644
--- a/client/user/src/mealorder/menu/meal-order-drawer.html
+++ b/client/user/src/mealorder/menu/meal-order-drawer.html
@@ -81,6 +81,20 @@
                 return {
                     /**
                      * Current user's meal order.
+                     *
+                     * @typedef {Object} Order the current order
+                     *
+                     * @typedef {Object} Date contains day, month, year
+                     * @property {String} day
+                     * @property {String} month
+                     * @property {String} year
+                     *
+                     * @typedef {Array} Cart array that contains the vendor and dishes
+                     * @property {String} Vendor a vendor name
+                     * @typedef {Array} Dishes array contains the dish title, price, quantity
+                     * @property {String} title
+                     * @property {String} price
+                     * @property {String} quantity
                      */
                     order: {
                         type: Array,
diff --git a/client/user/src/mealorder/menu/meal-order-menu-container.html b/client/user/src/mealorder/menu/meal-order-menu-container.html
index 13d1b7fc..e63845db 100644
--- a/client/user/src/mealorder/menu/meal-order-menu-container.html
+++ b/client/user/src/mealorder/menu/meal-order-menu-container.html
@@ -119,6 +119,14 @@
                 return {
                     /**
                      * Array of dates with menu which may not exist.
+                     *
+                     * @typedef {Object} Date contains day, month, year
+                     * @property {String} day
+                     * @property {String} month
+                     * @property {String} year
+                     *
+                     * @typedef {String} dayOfTheWeek
+                     * @typedef {Boolean} hasMenu If menu for this date exists
                      */
                     calendar: {
                         type: Array,
@@ -127,6 +135,21 @@
 
                     /**
                      * Menu for a current day.
+                     *
+                     * @typedef {Object} Menu the menu for the current date
+                     *
+                     * @property {String} Vendor a vendor name
+                     *
+                     * @typedef {Object} Date contains day, month, year
+                     * @property {String} day
+                     * @property {String} month
+                     * @property {String} year
+                     *
+                     * @typedef {Array} Categories array contains the category name and dishes
+                     * @typedef {Array} Dishes array contains the dish title, price, quantity
+                     * @property {String} title
+                     * @property {String} price
+                     * @property {String} quantity
                      */
                     menu: {
                         type: Array,
diff --git a/client/user/src/mealorder/shell/reducers/reducers.html b/client/user/src/mealorder/shell/reducers/reducers.html
index ffd08332..bfb4a718 100644
--- a/client/user/src/mealorder/shell/reducers/reducers.html
+++ b/client/user/src/mealorder/shell/reducers/reducers.html
@@ -104,14 +104,15 @@
 
             menu: [
                 {
-                    name: 'Пюре',
+                    vendor: 'Пюре',
                     date: {
                         year: '2018',
                         month: '03',
                         day: '21',
                     },
                     categories: [{
-                        categoryName: 'Первое блюдо', dishes: [
+                        categoryName: 'Первое блюдо',
+                        dishes: [
                             {title: 'Борщ украинский', price: 35},
                             {title: 'Солянка', price: 40},
                             {title: 'Суп гороховый', price: 140},
@@ -119,14 +120,15 @@
                             {title: 'Суп-пюре грибной', price: 40}]
                     }
                         , {
-                            categoryName: 'Второе блюдо', dishes: [
+                            categoryName: 'Второе блюдо',
+                            dishes: [
                                 {title: 'Утиные крылышки', price: 40},
                                 {title: 'Куриные крылышки', price: 45}]
                         }
                     ]
                 },
                 {
-                    name: 'Позитив',
+                    vendor: 'Позитив',
                     date: {
                         year: '2018',
                         month: '03',
@@ -252,7 +254,7 @@
                         }
                     );
                 }
-                case MealOrderApp.UserAction.SET_CURRENT_CART: {
+                case MealOrderApp.UserAction.SET_CURRENT_ORDER: {
                     const newOrder = state.orders.find(order => Utils.shallowEqual(action.date, order.date));
                     return Object.assign({}, state, {
                             currentOrder: newOrder

From 07ed22b91737e0dfc67f2acdae4a93645de4a1cd Mon Sep 17 00:00:00 2001
From: Paul <paulageyev@gmail.com>
Date: Tue, 24 Apr 2018 14:52:33 +0300
Subject: [PATCH 190/253] Refactor Date properties from String to Number type

---
 .../src/mealorder/meal-order-client-app.html  |  6 +-
 .../src/mealorder/menu/meal-order-drawer.html | 13 ++-
 .../menu/meal-order-menu-container.html       | 17 ++--
 .../mealorder/shell/reducers/reducers.html    | 90 ++++++++++---------
 .../mealorder/meal-order-client-app_test.html |  8 +-
 .../mealorder/meal-order-drawer_test.html     |  8 +-
 ...meal-order-menu-container_action-test.html | 14 ++-
 .../meal-order-menu-container_test.html       | 12 +--
 8 files changed, 90 insertions(+), 78 deletions(-)

diff --git a/client/user/src/mealorder/meal-order-client-app.html b/client/user/src/mealorder/meal-order-client-app.html
index 4319328a..ab25e1f3 100644
--- a/client/user/src/mealorder/meal-order-client-app.html
+++ b/client/user/src/mealorder/meal-order-client-app.html
@@ -253,9 +253,9 @@
                      * @typedef {Object} Order the current order
                      *
                      * @typedef {Object} Date contains day, month, year
-                     * @property {String} day
-                     * @property {String} month
-                     * @property {String} year
+                     * @property {Number} day
+                     * @property {Number} month
+                     * @property {Number} year
                      *
                      * @typedef {Array} Cart array that contains the vendor and dishes
                      * @property {String} Vendor a vendor name
diff --git a/client/user/src/mealorder/menu/meal-order-drawer.html b/client/user/src/mealorder/menu/meal-order-drawer.html
index 3613dc2f..e050c736 100644
--- a/client/user/src/mealorder/menu/meal-order-drawer.html
+++ b/client/user/src/mealorder/menu/meal-order-drawer.html
@@ -85,9 +85,9 @@
                      * @typedef {Object} Order the current order
                      *
                      * @typedef {Object} Date contains day, month, year
-                     * @property {String} day
-                     * @property {String} month
-                     * @property {String} year
+                     * @property {Number} day
+                     * @property {Number} month
+                     * @property {Number} year
                      *
                      * @typedef {Array} Cart array that contains the vendor and dishes
                      * @property {String} Vendor a vendor name
@@ -136,10 +136,10 @@
                     if (this.routeData.date) {
                         const routeDate = new Date(this.routeData.date);
                         this.set('inputDate', routeDate.getFullYear() +
-                            "/" + ("0" + (routeDate.getMonth() + 1)).slice(-2) + "/" + routeDate.getDate());
+                            "/" + (routeDate.getMonth() + 1) + "/" + routeDate.getDate());
                         const date = {};
                         date.year = routeDate.getFullYear();
-                        date.month = routeDate.getMonth();
+                        date.month = (routeDate.getMonth() + 1);
                         date.day = routeDate.getDate();
                         this.dispatchEvent(new CustomEvent('changed-history-date', {detail: date}));
                     }
@@ -152,14 +152,13 @@
                     const newRouteData = {};
                     newRouteData.page = 'history';
                     newRouteData.date = date.getFullYear() +
-                        "-" + ("0" + (date.getMonth() + 1)).slice(-2) + "-" + date.getDate();
+                        "-" + (date.getMonth() + 1) + "-" + date.getDate();
                     if (newRouteData.date.localeCompare(this.routeData.date) !== 0) {
                         this.set('routeData', newRouteData);
                     }
                 }
             }
         }
-
         window.customElements.define(MealOrderDrawer.is, MealOrderDrawer);
     </script>
 </dom-module>
diff --git a/client/user/src/mealorder/menu/meal-order-menu-container.html b/client/user/src/mealorder/menu/meal-order-menu-container.html
index e63845db..dcd1b6c6 100644
--- a/client/user/src/mealorder/menu/meal-order-menu-container.html
+++ b/client/user/src/mealorder/menu/meal-order-menu-container.html
@@ -121,9 +121,9 @@
                      * Array of dates with menu which may not exist.
                      *
                      * @typedef {Object} Date contains day, month, year
-                     * @property {String} day
-                     * @property {String} month
-                     * @property {String} year
+                     * @property {Number} day
+                     * @property {Number} month
+                     * @property {Number} year
                      *
                      * @typedef {String} dayOfTheWeek
                      * @typedef {Boolean} hasMenu If menu for this date exists
@@ -141,9 +141,9 @@
                      * @property {String} Vendor a vendor name
                      *
                      * @typedef {Object} Date contains day, month, year
-                     * @property {String} day
-                     * @property {String} month
-                     * @property {String} year
+                     * @property {Number} day
+                     * @property {Number} month
+                     * @property {Number} year
                      *
                      * @typedef {Array} Categories array contains the category name and dishes
                      * @typedef {Array} Dishes array contains the dish title, price, quantity
@@ -220,7 +220,7 @@
                         else {
                             const routeDate = new Date(this.routeData.date);
                             date.year = routeDate.getFullYear();
-                            date.month = ("0" + (routeDate.getMonth() + 1)).slice(-2);
+                            date.month = routeDate.getMonth() + 1;
                             date.day = routeDate.getDate();
                             this.set('selectedDay', date);
                         }
@@ -235,13 +235,12 @@
                 const newRouteData = {};
                 newRouteData.page = 'menu';
                 newRouteData.date = date.getFullYear() +
-                    "-" + ("0" + (date.getMonth() + 1)).slice(-2) + "-" + date.getDate();
+                    "-" + (date.getMonth() + 1) + "-" + date.getDate();
                 this.set('routeData', newRouteData);
                 this.dispatch('changeCurrentMenu', date);
                 this.dispatch('changeCurrentOrder', date);
             }
         }
-
         window.customElements.define(MealOrderMenuContainer.is, MealOrderMenuContainer);
     </script>
 </dom-module>
diff --git a/client/user/src/mealorder/shell/reducers/reducers.html b/client/user/src/mealorder/shell/reducers/reducers.html
index bfb4a718..8d4f7518 100644
--- a/client/user/src/mealorder/shell/reducers/reducers.html
+++ b/client/user/src/mealorder/shell/reducers/reducers.html
@@ -26,79 +26,78 @@
         /*global Utils */
         const arrayOfDates = [{
             date: {
-                year: '2018',
-                month: '03',
-                day: '21',
+                year: 2018,
+                month: 3,
+                day: 21,
             },
             dayOfTheWeek: 'Ср',
             hasMenu: true
         },
             {
                 date: {
-                    year: '2018',
-                    month: '03',
-                    day: '22',
+                    year: 2018,
+                    month: 3,
+                    day: 22,
                 },
                 dayOfTheWeek: 'Чт',
                 hasMenu: true
             },
             {
                 date: {
-                    year: '2018',
-                    month: '03',
-                    day: '23',
+                    year: 2018,
+                    month: 3,
+                    day: 23,
                 },
                 dayOfTheWeek: 'Пт',
                 hasMenu: true
             },
             {
                 date: {
-                    year: '2018',
-                    month: '03',
-                    day: '24',
+                    year: 2018,
+                    month: 3,
+                    day: 24,
                 },
                 dayOfTheWeek: 'Сб',
                 hasMenu: false
             },
             {
                 date: {
-                    year: '2018',
-                    month: '03',
-                    day: '25',
+                    year: 2018,
+                    month: 3,
+                    day: 25,
                 },
                 dayOfTheWeek: 'Вс',
                 hasMenu: false
             }
             , {
                 date: {
-                    year: '2018',
-                    month: '03',
-                    day: '26',
+                    year: 2018,
+                    month: 3,
+                    day: 26,
                 },
                 dayOfTheWeek: 'Пн',
                 hasMenu: true
             }
             , {
                 date: {
-                    year: '2018',
-                    month: '03',
-                    day: '27',
+                    year: 2018,
+                    month: 3,
+                    day: 27,
                 },
                 dayOfTheWeek: 'Вт',
                 hasMenu: true
             }
             , {
                 date: {
-                    year: '2018',
-                    month: '03',
-                    day: '28',
+                    year: 2018,
+                    month: 3,
+                    day: 28,
                 },
                 dayOfTheWeek: 'Ср',
                 hasMenu: true
             }];
 
         MealOrderApp.initialState = {
-
             calendar: arrayOfDates,
             menuForDay: [],
 
@@ -106,9 +105,9 @@
                 {
                     vendor: 'Пюре',
                     date: {
-                        year: '2018',
-                        month: '03',
-                        day: '21',
+                        year: 2018,
+                        month: 3,
+                        day: 21,
                     },
                     categories: [{
                         categoryName: 'Первое блюдо',
@@ -130,9 +129,9 @@
                 {
                     vendor: 'Позитив',
                     date: {
-                        year: '2018',
-                        month: '03',
-                        day: '21',
+                        year: 2018,
+                        month: 3,
+                        day: 21,
                     },
                     categories: [{
                         categoryName: 'Первое блюдо', dishes: [
@@ -153,11 +152,11 @@
                     ]
                 },
                 {
-                    name: 'Пюре',
+                    vendor: 'Пюре',
                     date: {
-                        year: '2018',
-                        month: '03',
-                        day: '22',
+                        year: 2018,
+                        month: 3,
+                        day: 22,
                     },
                     categories: [{
                         categoryName: 'Первое блюдо', dishes: [
@@ -175,11 +174,11 @@
                     ]
                 },
                 {
-                    name: 'Позитив',
+                    vendor: 'Позитив',
                     date: {
-                        year: '2018',
-                        month: '03',
-                        day: '22',
+                        year: 2018,
+                        month: 3,
+                        day: 22,
                     },
                     categories: [{
                         categoryName: 'Первое блюдо', dishes: [
@@ -201,7 +200,11 @@
                 }],
             currentOrder: [],
             orders: [{
-                date: {day: '21', month: '03', year: '2018'},
+                date: {
+                    year: 2018,
+                    month: 3,
+                    day: 21,
+                },
                 cart: [{
                     vendor: "Пюре",
                     dishes: [
@@ -220,8 +223,11 @@
                     }]
                 }]
             }, {
-                date:
-                    {day: '22', month: '03', year: '2018'},
+                date: {
+                    year: 2018,
+                    month: 3,
+                    day: 22,
+                    },
                 cart: [{
                     vendor: "Пюре",
                     dishes: [
diff --git a/client/user/test/mealorder/meal-order-client-app_test.html b/client/user/test/mealorder/meal-order-client-app_test.html
index 74d9f9f4..8f5936b3 100644
--- a/client/user/test/mealorder/meal-order-client-app_test.html
+++ b/client/user/test/mealorder/meal-order-client-app_test.html
@@ -66,10 +66,10 @@
         });
 
         test('should parse `routeData.date` correctly', function () {
-            setLocation('/#/history/2018-03-21');
-            assert.equal('2018-03-21', component.routeData.date);
-            setLocation('/#/menu/2018-03-21');
-            assert.equal('2018-03-21', component.routeData.date);
+            setLocation('/#/history/2018-3-21');
+            assert.equal('2018-3-21', component.routeData.date);
+            setLocation('/#/menu/2018-3-21');
+            assert.equal('2018-3-21', component.routeData.date);
         });
 
 
diff --git a/client/user/test/mealorder/meal-order-drawer_test.html b/client/user/test/mealorder/meal-order-drawer_test.html
index 066c2293..babc8cf2 100644
--- a/client/user/test/mealorder/meal-order-drawer_test.html
+++ b/client/user/test/mealorder/meal-order-drawer_test.html
@@ -72,14 +72,14 @@
             ' with the `history` routing and the date', function (done) {
             component.addEventListener('changed-history-date', function (e) {
                 const date = {};
-                date.year = "2018";
-                date.month = "04";
-                date.day = "20";
+                date.year = 2018;
+                date.month = 4;
+                date.day = 20;
                 assert.deepEqual(e.detail, date);
                 done();
             });
             setLocation('/#/menu/');
-            setLocation('/#/history/2018-04-20');
+            setLocation('/#/history/2018-4-20');
         });
 
         test('should change URL by selecting the date in the calendar with `history` routing', function (done) {
diff --git a/client/user/test/mealorder/meal-order-menu-container_action-test.html b/client/user/test/mealorder/meal-order-menu-container_action-test.html
index ff077759..e1411a91 100644
--- a/client/user/test/mealorder/meal-order-menu-container_action-test.html
+++ b/client/user/test/mealorder/meal-order-menu-container_action-test.html
@@ -51,14 +51,22 @@
             mock = sinon.mock(MealOrderApp.store);
         });
 
-        test('should fire `CHANGE_CURRENT_MENU`, `CHANGE_CURRENT_CART` actions with default date.', function () {
+        test('should fire `CHANGE_CURRENT_MENU`, `CHANGE_CURRENT_ORDER` actions with default date.', function () {
             const setCurrentMenuAction = {
                 type: MealOrderApp.UserAction.SET_CURRENT_MENU,
-                date: {day: "21", month: "03", year: "2018"}
+                date: {
+                    day: 21,
+                    month: 3,
+                    year: 2018
+                }
             };
             const setCurrentOrderAction = {
                 type: MealOrderApp.UserAction.SET_CURRENT_ORDER,
-                date: {day: "21", month: "03", year: "2018"}
+                date: {
+                    day: 21,
+                    month: 3,
+                    year: 2018
+                }
             };
             mock.expects('dispatch').withArgs(setCurrentMenuAction);
             mock.expects('dispatch').withArgs(setCurrentOrderAction);
diff --git a/client/user/test/mealorder/meal-order-menu-container_test.html b/client/user/test/mealorder/meal-order-menu-container_test.html
index b75fb147..547d9632 100644
--- a/client/user/test/mealorder/meal-order-menu-container_test.html
+++ b/client/user/test/mealorder/meal-order-menu-container_test.html
@@ -64,10 +64,10 @@
         });
 
         test('should parse `routeData.date` correctly', function () {
-            setLocation('/#/history/2018-03-21');
-            assert.equal('2018-03-21', component.routeData.date);
-            setLocation('/#/menu/2018-03-21');
-            assert.equal('2018-03-21', component.routeData.date);
+            setLocation('/#/history/2018-3-21');
+            assert.equal('2018-3-21', component.routeData.date);
+            setLocation('/#/menu/2018-3-21');
+            assert.equal('2018-3-21', component.routeData.date);
         });
 
         test('should instantiate the component `paper-tabs`', function (done) {
@@ -90,8 +90,8 @@
 
             flush(function () {
                 const paperTabs = elementShadowRoot.querySelector("#paper-tabs");
-                paperTabs.select('2018-03-22');
-                assert.equal(component.routeData.date, '2018-03-22');
+                paperTabs.select('2018-03-23');
+                assert.equal(component.routeData.date, '2018-3-23');
                 done();
             });
         });

From 619658f0c038f8a43ba9df0f210311f3d224bd65 Mon Sep 17 00:00:00 2001
From: Paul <paulageyev@gmail.com>
Date: Tue, 24 Apr 2018 15:06:46 +0300
Subject: [PATCH 191/253] Add components to the MealOrderAppTest namespace

---
 .../meal-order-app-test-namespace.html        | 32 +++++++++++++++++++
 .../mealorder/meal-order-client-app_test.html |  5 +--
 ...meal-order-menu-container_action-test.html |  1 -
 .../meal-order-menu-container_test.html       |  1 -
 4 files changed, 33 insertions(+), 6 deletions(-)
 create mode 100644 client/user/test/mealorder/meal-order-app-test-namespace.html

diff --git a/client/user/test/mealorder/meal-order-app-test-namespace.html b/client/user/test/mealorder/meal-order-app-test-namespace.html
new file mode 100644
index 00000000..94ff9bdb
--- /dev/null
+++ b/client/user/test/mealorder/meal-order-app-test-namespace.html
@@ -0,0 +1,32 @@
+<!--
+  ~ Copyright 2018, TeamDev Ltd. All rights reserved.
+  ~
+  ~ Redistribution and use in source and/or binary forms, with or without
+  ~ modification, must retain the above copyright notice and the following
+  ~ disclaimer.
+  ~
+  ~ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+  ~ "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+  ~ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+  ~ A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+  ~ OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+  ~ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+  ~ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+  ~ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+  ~ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  ~ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+  ~ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+  -->
+<link rel="import" href="../../src/mealorder/menu/meal-order-drawer.html">
+<link rel="import" href="../../src/mealorder/menu/meal-order-menu-container.html">
+
+<script>
+    /**
+     * A bunch of elements for meal order application tests.
+     *
+     * @namespace MealOrderAppTest
+     */
+    window.MealOrderAppTest = window.MealOrderAppTest || {};
+    MealOrderAppTest.MealOrderDrawer = MealOrderDrawer;
+    MealOrderAppTest.MealOrderMenuContainer = MealOrderMenuContainer;
+</script>
diff --git a/client/user/test/mealorder/meal-order-client-app_test.html b/client/user/test/mealorder/meal-order-client-app_test.html
index 8f5936b3..8a98fadc 100644
--- a/client/user/test/mealorder/meal-order-client-app_test.html
+++ b/client/user/test/mealorder/meal-order-client-app_test.html
@@ -32,8 +32,7 @@
     <script src="../../node_modules/redux/dist/redux.js"></script>
     <script src="test_variables.js"></script>
     <link rel="import" href="../../src/mealorder/meal-order-client-app.html">
-    <link rel="import" href="../../src/mealorder/menu/meal-order-menu-container.html">
-    <link rel="import" href="../../src/mealorder/menu/meal-order-drawer.html">
+    <link rel="import" href="./meal-order-app-test-namespace.html">
 </head>
 <body>
 
@@ -54,8 +53,6 @@
 
         setup(() => {
             component = fixture('MealOrderClientApp');
-            MealOrderAppTest.MealOrderDrawer = MealOrderDrawer;
-            MealOrderAppTest.MealOrderMenuContainer = MealOrderMenuContainer;
         });
 
         test('should parse `routeData.page` correctly', function () {
diff --git a/client/user/test/mealorder/meal-order-menu-container_action-test.html b/client/user/test/mealorder/meal-order-menu-container_action-test.html
index e1411a91..d492e7c0 100644
--- a/client/user/test/mealorder/meal-order-menu-container_action-test.html
+++ b/client/user/test/mealorder/meal-order-menu-container_action-test.html
@@ -44,7 +44,6 @@
 
 <script>
     suite('meal-order-menu-container', function () {
-
         let mock;
 
         setup(() => {
diff --git a/client/user/test/mealorder/meal-order-menu-container_test.html b/client/user/test/mealorder/meal-order-menu-container_test.html
index 547d9632..8df42ca5 100644
--- a/client/user/test/mealorder/meal-order-menu-container_test.html
+++ b/client/user/test/mealorder/meal-order-menu-container_test.html
@@ -48,7 +48,6 @@
     }
 
     suite('meal-order-menu-container', function () {
-
         let component;
 
         setup(() => {

From 0be558c57307d0b10cf29165511c19907976211b Mon Sep 17 00:00:00 2001
From: Paul <paulageyev@gmail.com>
Date: Tue, 24 Apr 2018 15:20:47 +0300
Subject: [PATCH 192/253] Add components as global for the MealOrderAppTest
 namespace

---
 .eslintrc.json | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.eslintrc.json b/.eslintrc.json
index 23562c0c..dbb63d50 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -45,6 +45,8 @@
     "Polymer": false,
     "MealOrderApp": true,
     "MealOrderAppTest": true,
+    "MealOrderAppTest.MealOrderDrawer": false,
+    "MealOrderAppTest.MealOrderMenuContainer": false,
     "assert": false,
     "test": false,
     "suite": false,

From 6037c278a6867744d8ac5c3ec9b7c1fb5701ec2a Mon Sep 17 00:00:00 2001
From: Paul <paulageyev@gmail.com>
Date: Tue, 24 Apr 2018 15:37:57 +0300
Subject: [PATCH 193/253] Refactor MealOrderAppTest namespace

---
 .eslintrc.json                                       |  2 --
 .../mealorder/meal-order-app-test-namespace.html     | 12 ++++++++++++
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/.eslintrc.json b/.eslintrc.json
index dbb63d50..23562c0c 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -45,8 +45,6 @@
     "Polymer": false,
     "MealOrderApp": true,
     "MealOrderAppTest": true,
-    "MealOrderAppTest.MealOrderDrawer": false,
-    "MealOrderAppTest.MealOrderMenuContainer": false,
     "assert": false,
     "test": false,
     "suite": false,
diff --git a/client/user/test/mealorder/meal-order-app-test-namespace.html b/client/user/test/mealorder/meal-order-app-test-namespace.html
index 94ff9bdb..5dc7b879 100644
--- a/client/user/test/mealorder/meal-order-app-test-namespace.html
+++ b/client/user/test/mealorder/meal-order-app-test-namespace.html
@@ -20,6 +20,18 @@
 <link rel="import" href="../../src/mealorder/menu/meal-order-drawer.html">
 <link rel="import" href="../../src/mealorder/menu/meal-order-menu-container.html">
 
+<test-fixture id="MealOrderDrawer">
+    <template>
+        <meal-order-drawer></meal-order-drawer>
+    </template>
+</test-fixture>
+
+<test-fixture id="MealOrderMenuContainer">
+    <template>
+        <meal-order-menu-container></meal-order-menu-container>
+    </template>
+</test-fixture>
+
 <script>
     /**
      * A bunch of elements for meal order application tests.

From 2c869b25d8fc1fa75dc320be42dd16502107921a Mon Sep 17 00:00:00 2001
From: Paul <paulageyev@gmail.com>
Date: Tue, 24 Apr 2018 15:53:04 +0300
Subject: [PATCH 194/253] Refactor tests for the `meal-order-client-app`
 component

---
 .../meal-order-app-test-namespace.html        | 44 -------------------
 .../mealorder/meal-order-client-app_test.html |  5 +--
 2 files changed, 2 insertions(+), 47 deletions(-)
 delete mode 100644 client/user/test/mealorder/meal-order-app-test-namespace.html

diff --git a/client/user/test/mealorder/meal-order-app-test-namespace.html b/client/user/test/mealorder/meal-order-app-test-namespace.html
deleted file mode 100644
index 5dc7b879..00000000
--- a/client/user/test/mealorder/meal-order-app-test-namespace.html
+++ /dev/null
@@ -1,44 +0,0 @@
-<!--
-  ~ Copyright 2018, TeamDev Ltd. All rights reserved.
-  ~
-  ~ Redistribution and use in source and/or binary forms, with or without
-  ~ modification, must retain the above copyright notice and the following
-  ~ disclaimer.
-  ~
-  ~ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-  ~ "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-  ~ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-  ~ A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-  ~ OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-  ~ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-  ~ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-  ~ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-  ~ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-  ~ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-  ~ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-  -->
-<link rel="import" href="../../src/mealorder/menu/meal-order-drawer.html">
-<link rel="import" href="../../src/mealorder/menu/meal-order-menu-container.html">
-
-<test-fixture id="MealOrderDrawer">
-    <template>
-        <meal-order-drawer></meal-order-drawer>
-    </template>
-</test-fixture>
-
-<test-fixture id="MealOrderMenuContainer">
-    <template>
-        <meal-order-menu-container></meal-order-menu-container>
-    </template>
-</test-fixture>
-
-<script>
-    /**
-     * A bunch of elements for meal order application tests.
-     *
-     * @namespace MealOrderAppTest
-     */
-    window.MealOrderAppTest = window.MealOrderAppTest || {};
-    MealOrderAppTest.MealOrderDrawer = MealOrderDrawer;
-    MealOrderAppTest.MealOrderMenuContainer = MealOrderMenuContainer;
-</script>
diff --git a/client/user/test/mealorder/meal-order-client-app_test.html b/client/user/test/mealorder/meal-order-client-app_test.html
index 8a98fadc..93ae5c3b 100644
--- a/client/user/test/mealorder/meal-order-client-app_test.html
+++ b/client/user/test/mealorder/meal-order-client-app_test.html
@@ -32,7 +32,6 @@
     <script src="../../node_modules/redux/dist/redux.js"></script>
     <script src="test_variables.js"></script>
     <link rel="import" href="../../src/mealorder/meal-order-client-app.html">
-    <link rel="import" href="./meal-order-app-test-namespace.html">
 </head>
 <body>
 
@@ -139,7 +138,7 @@
         test('should instantiate the `meal-order-drawer` component', function (done) {
             const elementShadowRoot = component.shadowRoot;
             const drawer = elementShadowRoot.querySelector("meal-order-drawer");
-            assert.equal(drawer.tagName.toLocaleLowerCase(), MealOrderAppTest.MealOrderDrawer.is);
+            assert.equal(drawer.tagName.toLocaleLowerCase(), "meal-order-drawer");
             done();
         });
 
@@ -148,7 +147,7 @@
             setLocation('/#/menu/2018-03-23');
             const pages = component.shadowRoot.querySelector('#app-header-layout-iron');
             pages.forceSynchronousItemUpdate();
-            assert.equal(pages.selectedItem.tagName.toLocaleLowerCase(), MealOrderAppTest.MealOrderMenuContainer.is);
+            assert.equal(pages.selectedItem.tagName.toLocaleLowerCase(), "meal-order-menu-container");
         });
 
     });

From cd98553dad62ab0daa952dbed88dc6890b846d84 Mon Sep 17 00:00:00 2001
From: Paul <paulageyev@gmail.com>
Date: Tue, 24 Apr 2018 17:16:08 +0300
Subject: [PATCH 195/253] Rename the vendor object in redux store

---
 .../menu/meal-order-menu-container.html       | 21 +++++++++++--------
 .../menu/meal-order-vendor-menu.html          |  4 ++--
 .../menu/meal-order-vendor-menus.html         |  2 +-
 .../mealorder/shell/actions/user-actions.html |  1 +
 .../user/src/mealorder/shell/utils/Utils.js   |  3 +--
 .../{ => menu}/meal-order-drawer_test.html    |  8 +++----
 .../meal-order-menu-container_test.html       | 10 ++++-----
 .../menu/meal-order-vendor-menu_test.html     |  4 +++-
 client/user/test/mealorder/test_variables.js  |  3 ---
 9 files changed, 29 insertions(+), 27 deletions(-)
 rename client/user/test/mealorder/{ => menu}/meal-order-drawer_test.html (91%)
 rename client/user/test/mealorder/{ => menu}/meal-order-menu-container_test.html (90%)

diff --git a/client/user/src/mealorder/menu/meal-order-menu-container.html b/client/user/src/mealorder/menu/meal-order-menu-container.html
index fed24504..a0e577ef 100644
--- a/client/user/src/mealorder/menu/meal-order-menu-container.html
+++ b/client/user/src/mealorder/menu/meal-order-menu-container.html
@@ -198,12 +198,10 @@
                  * @param {date} selected date by tab
                  */
                 return {
-                    addDish(dish) {
-                        return {
-                            type: MealOrderApp.UserAction.ADD_DISH,
-                            dish: dish
-                        }
-                    },
+                    addDish: dish => ({
+                        type: MealOrderApp.UserAction.ADD_DISH,
+                        dish
+                    }),
                     changeCurrentMenu: date => ({
                         type: MealOrderApp.UserAction.SET_CURRENT_MENU,
                         date
@@ -249,12 +247,16 @@
             }
 
             _selectDate(e) {
-                const date = new Date(e.target.selected);
+                const routeDate = new Date(e.target.selected);
                 const newRouteData = {};
                 newRouteData.page = 'menu';
-                newRouteData.date = date.getFullYear() +
-                    "-" + (date.getMonth() + 1) + "-" + date.getDate();
+                newRouteData.date = routeDate.getFullYear() +
+                    "-" + (routeDate.getMonth() + 1) + "-" + routeDate.getDate();
                 this.set('routeData', newRouteData);
+                let date = {};
+                date.year = routeDate.getFullYear();
+                date.month = routeDate.getMonth() + 1;
+                date.day = routeDate.getDate();
                 this.dispatch('changeCurrentMenu', date);
                 this.dispatch('changeCurrentOrder', date);
             }
@@ -266,6 +268,7 @@
                 this.dispatch('addDish', order);
             }
         }
+
         window.customElements.define(MealOrderMenuContainer.is, MealOrderMenuContainer);
     </script>
 </dom-module>
diff --git a/client/user/src/mealorder/menu/meal-order-vendor-menu.html b/client/user/src/mealorder/menu/meal-order-vendor-menu.html
index d304fa39..c08bdaec 100644
--- a/client/user/src/mealorder/menu/meal-order-vendor-menu.html
+++ b/client/user/src/mealorder/menu/meal-order-vendor-menu.html
@@ -107,7 +107,7 @@
         <div class="header">
             <paper-item on-click="_toggle" class="menu-caption">
                 <div class="menu-caption">
-                    [[menu.name]]
+                    [[menu.vendor]]
                     <paper-icon-button id="expand" icon="expand-less"></paper-icon-button>
                 </div>
             </paper-item>
@@ -215,7 +215,7 @@
 
             _addDish(e) {
                 const dish = {};
-                dish.vendor = this.menu.name;
+                dish.vendor = this.menu.vendor;
                 dish.price = this.menu.categories[e.model.parentModel.index].dishes[e.model.index].price;
                 dish.title = this.menu.categories[e.model.parentModel.index].dishes[e.model.index].title;
                 this.dispatchEvent(new CustomEvent('dish-added', {composed: true, detail: dish}));
diff --git a/client/user/src/mealorder/menu/meal-order-vendor-menus.html b/client/user/src/mealorder/menu/meal-order-vendor-menus.html
index 99a556fe..f0bdf762 100644
--- a/client/user/src/mealorder/menu/meal-order-vendor-menus.html
+++ b/client/user/src/mealorder/menu/meal-order-vendor-menus.html
@@ -173,7 +173,7 @@
                             dishes: newVendorDishes
                         });
                     }
-                    filtered.push({name: this.items[i].name, categories: newVendorCategories});
+                    filtered.push({vendor: this.items[i].vendor, categories: newVendorCategories});
                 }
                 return filtered;
             }
diff --git a/client/user/src/mealorder/shell/actions/user-actions.html b/client/user/src/mealorder/shell/actions/user-actions.html
index e118a92e..73e9afb9 100644
--- a/client/user/src/mealorder/shell/actions/user-actions.html
+++ b/client/user/src/mealorder/shell/actions/user-actions.html
@@ -22,5 +22,6 @@
     MealOrderApp.UserAction = {
         SET_CURRENT_MENU: "SET_CURRENT_MENU",
         SET_CURRENT_ORDER: 'SET_CURRENT_ORDER',
+        ADD_DISH: "ADD_DISH",
     }
 </script>
diff --git a/client/user/src/mealorder/shell/utils/Utils.js b/client/user/src/mealorder/shell/utils/Utils.js
index 3c670443..2a6fcdae 100644
--- a/client/user/src/mealorder/shell/utils/Utils.js
+++ b/client/user/src/mealorder/shell/utils/Utils.js
@@ -21,7 +21,6 @@
 /*exported Utils */
 class Utils {
     static shallowEqual(o1, o2) {
-        return Object.keys(o1)
-            .every(key => o1[key] === o2[key]);
+        return Object.keys(o1).every(key => o1[key] === o2[key]);
     }
 }
diff --git a/client/user/test/mealorder/meal-order-drawer_test.html b/client/user/test/mealorder/menu/meal-order-drawer_test.html
similarity index 91%
rename from client/user/test/mealorder/meal-order-drawer_test.html
rename to client/user/test/mealorder/menu/meal-order-drawer_test.html
index babc8cf2..3c937755 100644
--- a/client/user/test/mealorder/meal-order-drawer_test.html
+++ b/client/user/test/mealorder/menu/meal-order-drawer_test.html
@@ -27,10 +27,10 @@
 
     <title>meal-order-client test</title>
 
-    <script src="../../bower_components/webcomponentsjs/webcomponents-loader.js"></script>
-    <script src="../../bower_components/web-component-tester/browser.js"></script>
-    <script src="../../node_modules/redux/dist/redux.js"></script>
-    <link rel="import" href="../../src/mealorder/menu/meal-order-drawer.html">
+    <script src="../../../bower_components/webcomponentsjs/webcomponents-loader.js"></script>
+    <script src="../../../bower_components/web-component-tester/browser.js"></script>
+    <script src="../../../node_modules/redux/dist/redux.js"></script>
+    <link rel="import" href="../../../src/mealorder/menu/meal-order-drawer.html">
 
 </head>
 <body>
diff --git a/client/user/test/mealorder/meal-order-menu-container_test.html b/client/user/test/mealorder/menu/meal-order-menu-container_test.html
similarity index 90%
rename from client/user/test/mealorder/meal-order-menu-container_test.html
rename to client/user/test/mealorder/menu/meal-order-menu-container_test.html
index 8df42ca5..3c33ab37 100644
--- a/client/user/test/mealorder/meal-order-menu-container_test.html
+++ b/client/user/test/mealorder/menu/meal-order-menu-container_test.html
@@ -27,11 +27,11 @@
 
     <title>meal-order-menu-container test</title>
 
-    <script src="../../bower_components/webcomponentsjs/webcomponents-loader.js"></script>
-    <script src="../../bower_components/web-component-tester/browser.js"></script>
-    <script src="../../node_modules/redux/dist/redux.js"></script>
-    <script src="test_variables.js"></script>
-    <link rel="import" href="../../src/mealorder/menu/meal-order-menu-container.html">
+    <script src="../../../bower_components/webcomponentsjs/webcomponents-loader.js"></script>
+    <script src="../../../bower_components/web-component-tester/browser.js"></script>
+    <script src="../../../node_modules/redux/dist/redux.js"></script>
+    <script src="../test_variables.js"></script>
+    <link rel="import" href="../../../src/mealorder/menu/meal-order-menu-container.html">
 </head>
 <body>
 
diff --git a/client/user/test/mealorder/menu/meal-order-vendor-menu_test.html b/client/user/test/mealorder/menu/meal-order-vendor-menu_test.html
index 9f3c9a28..48b46bc4 100644
--- a/client/user/test/mealorder/menu/meal-order-vendor-menu_test.html
+++ b/client/user/test/mealorder/menu/meal-order-vendor-menu_test.html
@@ -51,6 +51,9 @@
             component.menu = MealOrderAppTest.initialMenu;
         });
         test('should store menu correctly', function () {
+            const CATEGORIES = 2;
+            const DISHES_LENGTH = 5;
+            const DISH_COST = 35;
 
             assert.equal('Пюре', component.menu.name);
             assert.equal(CATEGORIES, component.menu.categories.length);
@@ -70,7 +73,6 @@
         test('should send `add-dish` event', function (done) {
             flush(function () {
                 const addButton = component.shadowRoot.querySelector('#menu > div:nth-child(1) > div:nth-child(3) > paper-item > .add-dish-icon > paper-icon-button');
-                console.log(addButton);
                 component.addEventListener('dish-added', function () {
                     done();
                 });
diff --git a/client/user/test/mealorder/test_variables.js b/client/user/test/mealorder/test_variables.js
index 40df9a7e..3bde86ca 100644
--- a/client/user/test/mealorder/test_variables.js
+++ b/client/user/test/mealorder/test_variables.js
@@ -115,7 +115,4 @@
         ]
     };
 
-    const CATEGORIES = 2;
-    const DISHES_LENGTH = 5;
-    const DISH_COST = 35;
 }

From a23dfce7b69ba2e36e54405c1629183f6c4c42ed Mon Sep 17 00:00:00 2001
From: Paul <paulageyev@gmail.com>
Date: Tue, 24 Apr 2018 19:45:06 +0300
Subject: [PATCH 196/253] Move `app-toolbar` to the `meal-order-drawer`
 component

---
 .../src/mealorder/meal-order-client-app.html  | 41 +------------
 .../src/mealorder/menu/meal-order-drawer.html | 60 ++++++++++++++++++-
 .../menu/meal-order-menu-container.html       |  1 -
 3 files changed, 59 insertions(+), 43 deletions(-)

diff --git a/client/user/src/mealorder/meal-order-client-app.html b/client/user/src/mealorder/meal-order-client-app.html
index ab25e1f3..1173838c 100644
--- a/client/user/src/mealorder/meal-order-client-app.html
+++ b/client/user/src/mealorder/meal-order-client-app.html
@@ -102,17 +102,6 @@
                 --app-drawer-width: 300px;
             }
 
-            .app-toolbar-header {
-                display: flex;
-                justify-content: space-between;
-                align-items: center;
-                width: 100%
-            }
-
-            .app-toolbar-header .app-toolbar-content {
-                font-size: 24px;
-            }
-
             #menu-history {
                 margin-right: 44px;
             }
@@ -123,16 +112,6 @@
                 align-items: center;
             }
 
-            #day {
-                font-size: 0.7em;
-                font-weight: lighter;
-                text-align: center;
-            }
-
-            #day-of-the-week {
-                font-size: 22px;
-            }
-
             @media only screen and (max-width: 600px) {
                 .app-header-iron-container {
                     width: 100px;
@@ -163,22 +142,6 @@
                             attr-for-selected="data-page"
                             fallback-selection="view404"
                             role="main">
-
-                    <app-toolbar data-page="menu">
-                        <div class="app-toolbar-header">
-                            <div class="app-toolbar-content">Заказ</div>
-                            <div>
-                                <div id="day">[[selectedDay.dayOfTheWeek]]</div>
-                                <div id="day-of-the-week">[[selectedDay.day]]</div>
-                            </div>
-                        </div>
-                    </app-toolbar>
-
-                    <app-toolbar data-page="history">
-                        <div class="app-toolbar-header">
-                            <div class="app-toolbar-content">История заказов</div>
-                        </div>
-                    </app-toolbar>
                 </iron-pages>
                 <meal-order-drawer order="[[order]]"></meal-order-drawer>
             </app-drawer>
@@ -199,7 +162,7 @@
                                         <iron-icon class="link-icon"
                                                    icon="maps:icons:history"></iron-icon>
                                     </a>
-                                    <iron-icon data-page="menu" class="drawer-icon"
+                                    <iron-icon class="drawer-icon"
                                                icon="icons:shopping-cart" drawer-toggle></iron-icon>
                                 </div>
                                 <div data-page="history" class="app-header-iron-container">
@@ -208,7 +171,7 @@
                                         <iron-icon class="link-icon"
                                                    icon="maps:icons:add"></iron-icon>
                                     </a>
-                                    <iron-icon data-page="history" class="drawer-icon"
+                                    <iron-icon class="drawer-icon"
                                                icon="icons:date-range"
                                                drawer-toggle></iron-icon>
                                 </div>
diff --git a/client/user/src/mealorder/menu/meal-order-drawer.html b/client/user/src/mealorder/menu/meal-order-drawer.html
index e050c736..349bf033 100644
--- a/client/user/src/mealorder/menu/meal-order-drawer.html
+++ b/client/user/src/mealorder/menu/meal-order-drawer.html
@@ -42,6 +42,28 @@
                     font-weight: normal;
                 }
             }
+
+            .app-toolbar-header {
+                display: flex;
+                justify-content: space-between;
+                align-items: center;
+                width: 100%
+            }
+
+            .app-toolbar-header .app-toolbar-content {
+                font-size: 24px;
+            }
+
+            #day {
+                font-size: 0.7em;
+                font-weight: lighter;
+                text-align: center;
+            }
+
+            #day-of-the-week {
+                font-size: 22px;
+            }
+
         </style>
         <app-location route="{{route}}"
                       use-hash-as-path></app-location>
@@ -57,9 +79,30 @@
                 attr-for-selected="data-page"
                 fallback-selection="view404"
                 role="main">
-            <app-datepicker data-page="history" id="date-picker" view="vertical"
-                            input-date="[[inputDate]]" date="{{outputDate}}" auto-update-date="true"
-                            locale="ru-RU"></app-datepicker>
+
+            <div data-page="menu">
+                <app-toolbar>
+                    <div class="app-toolbar-header">
+                        <div class="app-toolbar-content">Заказ</div>
+                        <div>
+                            <div id="day">[[selectedDay.dayOfTheWeek]]</div>
+                            <div id="day-of-the-week">[[selectedDay.day]]</div>
+                        </div>
+                    </div>
+                </app-toolbar>
+            </div>
+            <div data-page="history">
+                <app-toolbar>
+                    <div class="app-toolbar-header">
+                        <div class="app-toolbar-content">История заказов</div>
+                    </div>
+                </app-toolbar>
+
+                <app-datepicker id="date-picker" view="vertical"
+                                input-date="[[inputDate]]" date="{{outputDate}}"
+                                auto-update-date="true"
+                                locale="ru-RU"></app-datepicker>
+            </div>
         </iron-pages>
     </template>
     <script>
@@ -144,6 +187,16 @@
                         this.dispatchEvent(new CustomEvent('changed-history-date', {detail: date}));
                     }
                 }
+                const date = new Date(this.routeData.date);
+
+                let dayOfTheWeek = date.toLocaleDateString("ru-RU", {weekday: 'long'});
+                dayOfTheWeek = dayOfTheWeek.charAt(0).toUpperCase() + dayOfTheWeek.slice(1);
+
+                const selectedDay = {
+                    day: date.getDate(),
+                    dayOfTheWeek: dayOfTheWeek,
+                };
+                this.set('selectedDay', selectedDay);
             }
 
             _updateDate() {
@@ -159,6 +212,7 @@
                 }
             }
         }
+
         window.customElements.define(MealOrderDrawer.is, MealOrderDrawer);
     </script>
 </dom-module>
diff --git a/client/user/src/mealorder/menu/meal-order-menu-container.html b/client/user/src/mealorder/menu/meal-order-menu-container.html
index dcd1b6c6..9589d930 100644
--- a/client/user/src/mealorder/menu/meal-order-menu-container.html
+++ b/client/user/src/mealorder/menu/meal-order-menu-container.html
@@ -197,7 +197,6 @@
                 }
             }
 
-
             static get observers() {
                 return [
                     '_pageChanged(routeData.page)'

From 1b16a5ae1c99abd79f244c9535fb17aca0aad365 Mon Sep 17 00:00:00 2001
From: Paul <paulageyev@gmail.com>
Date: Tue, 24 Apr 2018 20:09:58 +0300
Subject: [PATCH 197/253] Remove the `selected-date` from `app-datepicker`

---
 .../src/mealorder/menu/meal-order-drawer.html | 45 ++++++++++---------
 1 file changed, 24 insertions(+), 21 deletions(-)

diff --git a/client/user/src/mealorder/menu/meal-order-drawer.html b/client/user/src/mealorder/menu/meal-order-drawer.html
index 349bf033..1d1ce34c 100644
--- a/client/user/src/mealorder/menu/meal-order-drawer.html
+++ b/client/user/src/mealorder/menu/meal-order-drawer.html
@@ -25,29 +25,12 @@
 <dom-module id="meal-order-drawer">
     <template>
         <style>
-            #date-picker {
-                --app-datepicker-selection-bg: var(--paper-grey-50);
-                --app-datepicker-selection-color: var(--google-grey-700);
-                --app-datepicker-iron-selected: var(--google-grey-700);
-                --app-datepicker-selected-day-bg: var(--paper-light-blue-500);
-                --app-datepicker-today-color: var(--paper-light-blue-500);
-                --app-datepicker-date-hover-background-color: var(--paper-light-blue-500);
-
-                --app-datepicker-selected-date: {
-                    font-weight: normal;
-                    font-size: 22px;
-                };
-
-                --app-datepicker-selected-year: {
-                    font-weight: normal;
-                }
-            }
-
             .app-toolbar-header {
                 display: flex;
                 justify-content: space-between;
                 align-items: center;
-                width: 100%
+                width: 100%;
+                z-index: 1;
             }
 
             .app-toolbar-header .app-toolbar-content {
@@ -64,6 +47,27 @@
                 font-size: 22px;
             }
 
+            #date-picker {
+                z-index: 0;
+                position: absolute;
+                top: 84px;
+
+                --app-datepicker-selection-bg: var(--paper-grey-50);
+                --app-datepicker-selection-color: var(--google-grey-700);
+                --app-datepicker-iron-selected: var(--google-grey-700);
+                --app-datepicker-selected-day-bg: var(--paper-light-blue-500);
+                --app-datepicker-today-color: var(--paper-light-blue-500);
+                --app-datepicker-date-hover-background-color: var(--paper-light-blue-500);
+
+                --app-datepicker-selected-date: {
+                   display: none;
+                };
+
+                --app-datepicker-selected-year: {
+                    display: none;
+                };
+            }
+
         </style>
         <app-location route="{{route}}"
                       use-hash-as-path></app-location>
@@ -79,7 +83,6 @@
                 attr-for-selected="data-page"
                 fallback-selection="view404"
                 role="main">
-
             <div data-page="menu">
                 <app-toolbar>
                     <div class="app-toolbar-header">
@@ -107,7 +110,7 @@
     </template>
     <script>
         /**
-         * meal-order-drawer is the container for the user's order and
+         * meal-order-drawer is container for the user's order and
          * the calendar of the history of the user's orders.
          *
          * Contains an order for the selected day and calendar.

From 2738fba9fbaa262e7b890918d097d8e22f523a6a Mon Sep 17 00:00:00 2001
From: Paul <paulageyev@gmail.com>
Date: Tue, 24 Apr 2018 20:14:56 +0300
Subject: [PATCH 198/253] Add background color to the `app-header-layout`

---
 client/user/index.html                               | 5 +++++
 client/user/src/mealorder/meal-order-client-app.html | 5 ++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/client/user/index.html b/client/user/index.html
index 90c6486d..0a6889bb 100644
--- a/client/user/index.html
+++ b/client/user/index.html
@@ -29,6 +29,11 @@
     <link rel=import href="src/mealorder/meal-order-client-app.html">
     <title>MealOrder</title>
 </head>
+<style>
+    body {
+        font-family: 'Roboto', 'Noto', sans-serif;
+    }
+</style>
 <body>
 <meal-order-client-app></meal-order-client-app>
 </body>
diff --git a/client/user/src/mealorder/meal-order-client-app.html b/client/user/src/mealorder/meal-order-client-app.html
index 1173838c..5cb209b5 100644
--- a/client/user/src/mealorder/meal-order-client-app.html
+++ b/client/user/src/mealorder/meal-order-client-app.html
@@ -56,8 +56,11 @@
                 font-size: 1.375em;
             }
 
+            app-header-layout {
+                background-color: var(--paper-grey-100);
+            }
+
             app-drawer-layout {
-                font-family: 'Roboto', 'Noto', sans-serif;
                 background-color: var(--paper-grey-100);
                 color: var(--google-grey-700);
             }

From fe48de0620032460dd041ce191077404973e21ac Mon Sep 17 00:00:00 2001
From: Paul <paulageyev@gmail.com>
Date: Wed, 25 Apr 2018 11:46:06 +0300
Subject: [PATCH 199/253] Remove `app-route` from the
 `meal-order-menu-container`

---
 .../src/mealorder/meal-order-client-app.html  | 94 +++++++++++++++----
 .../src/mealorder/menu/meal-order-drawer.html |  2 +
 .../menu/meal-order-menu-container.html       | 88 ++++++-----------
 3 files changed, 109 insertions(+), 75 deletions(-)

diff --git a/client/user/src/mealorder/meal-order-client-app.html b/client/user/src/mealorder/meal-order-client-app.html
index 5cb209b5..16b64b83 100644
--- a/client/user/src/mealorder/meal-order-client-app.html
+++ b/client/user/src/mealorder/meal-order-client-app.html
@@ -170,7 +170,8 @@
                                 </div>
                                 <div data-page="history" class="app-header-iron-container">
                                     <a class="title-link" href="/#/menu/">
-                                        <div id="menu-history" class="route-title">Сделать заказ</div>
+                                        <div id="menu-history" class="route-title">Сделать заказ
+                                        </div>
                                         <iron-icon class="link-icon"
                                                    icon="maps:icons:add"></iron-icon>
                                     </a>
@@ -187,7 +188,9 @@
                             attr-for-selected="data-page"
                             fallback-selection="view404"
                             role="main">
-                    <meal-order-menu-container data-page="menu"></meal-order-menu-container>
+                    <meal-order-menu-container data-page="menu"
+                                               date="[[routeData.date]]" calendar="[[calendar]]" menu="[[menu]]"></meal-order-menu-container>
+                    <div data-page="history"></div> <!--vendor menus component-->
                 </iron-pages>
 
             </app-header-layout>
@@ -213,6 +216,30 @@
 
             static get properties() {
                 return {
+
+                    /**
+                     * Menu for a current day.
+                     *
+                     * @typedef {Object} Menu the menu for the current date
+                     *
+                     * @property {String} Vendor a vendor name
+                     *
+                     * @typedef {Object} Date contains day, month, year
+                     * @property {Number} day
+                     * @property {Number} month
+                     * @property {Number} year
+                     *
+                     * @typedef {Array} Categories array contains the category name and dishes
+                     * @typedef {Array} Dishes array contains the dish title, price, quantity
+                     * @property {String} title
+                     * @property {String} price
+                     * @property {String} quantity
+                     */
+                    menu: {
+                        type: Array,
+                        statePath: 'menuForDay'
+                    },
+
                     /**
                      * Current user's meal order.
                      *
@@ -235,11 +262,9 @@
                         statePath: 'currentOrder'
                     },
 
-                    /**
-                     * Current selected day by user.
-                     */
-                    selectedDay: {
-                        type: Object,
+                    calendar: {
+                        type: Array,
+                        statePath: 'calendar'
                     },
 
                     /**
@@ -253,9 +278,35 @@
                 }
             }
 
+            static get actions() {
+                /**
+                 * Fired when a paper tab is selected.
+                 *
+                 * @action `changeCurrentMenu`
+                 * @param {date} selected date by tab
+                 */
+
+                /**
+                 * Fired when a paper tab is selected.
+                 *
+                 * @action `changeCurrentOrder`
+                 * @param {date} selected date by tab
+                 */
+                return {
+                    changeCurrentMenu: date => ({
+                        type: MealOrderApp.UserAction.SET_CURRENT_MENU,
+                        date
+                    }),
+                    changeCurrentOrder: date => ({
+                        type: MealOrderApp.UserAction.SET_CURRENT_ORDER,
+                        date
+                    })
+                }
+            }
+
             static get observers() {
                 return [
-                    '_pageChanged(routeData.date)'
+                    '_pageChanged(routeData.page)'
                 ];
             }
 
@@ -266,16 +317,23 @@
             }
 
             _pageChanged() {
-                const date = new Date(this.routeData.date);
-
-                let dayOfTheWeek = date.toLocaleDateString("ru-RU", {weekday: 'long'});
-                dayOfTheWeek = dayOfTheWeek.charAt(0).toUpperCase() + dayOfTheWeek.slice(1);
-
-                const selectedDay = {
-                    day: date.getDate(),
-                    dayOfTheWeek: dayOfTheWeek,
-                };
-                this.set('selectedDay', selectedDay);
+                if (this.routeData.page.startsWith("menu")) {
+                    if (!this.routeData.date) {
+                        this.set('routeData.date', this.calendar[0].date.year + "-" +
+                            this.calendar[0].date.month + "-" + this.calendar[0].date.day);
+                    }
+                    else
+                    {
+                        let date = {};
+                        const routeDate = new Date(this.routeData.date);
+                        date.year = routeDate.getFullYear();
+                        date.month = routeDate.getMonth() + 1;
+                        date.day = routeDate.getDate();
+
+                        this.dispatch('changeCurrentMenu', date);
+                        this.dispatch('changeCurrentOrder', date);
+                    }
+                }
             }
         }
 
diff --git a/client/user/src/mealorder/menu/meal-order-drawer.html b/client/user/src/mealorder/menu/meal-order-drawer.html
index 1d1ce34c..fe4877f3 100644
--- a/client/user/src/mealorder/menu/meal-order-drawer.html
+++ b/client/user/src/mealorder/menu/meal-order-drawer.html
@@ -93,6 +93,8 @@
                         </div>
                     </div>
                 </app-toolbar>
+
+                <div></div> <!--cart component-->
             </div>
             <div data-page="history">
                 <app-toolbar>
diff --git a/client/user/src/mealorder/menu/meal-order-menu-container.html b/client/user/src/mealorder/menu/meal-order-menu-container.html
index 9589d930..bf23f839 100644
--- a/client/user/src/mealorder/menu/meal-order-menu-container.html
+++ b/client/user/src/mealorder/menu/meal-order-menu-container.html
@@ -74,28 +74,19 @@
                 }
             }
         </style>
-        <app-location route="{{route}}"
-                      use-hash-as-path></app-location>
 
-        <app-route
-                route="{{route}}"
-                pattern="/:page/:date"
-                data="{{routeData}}">
-        </app-route>
-
-        <paper-tabs id="paper-tabs" selected="[[routeData.date]]" attr-for-selected='data-key'
-                    on-iron-select="_selectDate">
+        <paper-tabs id="paper-tabs" selected="[[date]]" attr-for-selected='data-key'>
             <template is="dom-repeat" items="{{calendar}}" as="calendar">
                 <paper-tab class="paper-tab"
                            data-key$="[[calendar.date.year]]-[[calendar.date.month]]-[[calendar.date.day]]"
                            link disabled="[[!calendar.hasMenu]]">
-                    <div class="paper-tab-container">
+                    <a href="#/menu/[[calendar.date.year]]-[[calendar.date.month]]-[[calendar.date.day]]" class="paper-tab-container">
                         <div>
                             <div class="day-of-the-week">{{calendar.dayOfTheWeek}}
                             </div>
                             <div class="day">{{calendar.date.day}}</div>
                         </div>
-                    </div>
+                    </a>
                 </paper-tab>
             </template>
         </paper-tabs>
@@ -130,7 +121,6 @@
                      */
                     calendar: {
                         type: Array,
-                        statePath: 'calendar'
                     },
 
                     /**
@@ -153,58 +143,42 @@
                      */
                     menu: {
                         type: Array,
-                        statePath: 'menuForDay'
-                    },
-                    /**
-                     * Used for routing.
-                     */
-                    routeData: {
-                        type: Object,
                     },
 
-                    /**
-                     * Current selected day by user.
-                     */
-                    selectedDay: {
+                    date: {
                         type: Object,
                     }
                 };
             }
 
-            static get actions() {
-                /**
-                 * Fired when a paper tab is selected.
-                 *
-                 * @action `changeCurrentMenu`
-                 * @param {date} selected date by tab
-                 */
-
-                /**
-                 * Fired when a paper tab is selected.
-                 *
-                 * @action `changeCurrentOrder`
-                 * @param {date} selected date by tab
-                 */
-                return {
-                    changeCurrentMenu: date => ({
-                        type: MealOrderApp.UserAction.SET_CURRENT_MENU,
-                        date
-                    }),
-                    changeCurrentOrder: date => ({
-                        type: MealOrderApp.UserAction.SET_CURRENT_ORDER,
-                        date
-                    })
+            /*_pageChanged() {
+                if (!this.date) {
+                    this.set('route.path', '/menu/' + this.calendar[0].date.year + "-" +
+                        this.calendar[0].date.month + "-" + this.calendar[0].date.day);
                 }
-            }
-
-            static get observers() {
-                return [
-                    '_pageChanged(routeData.page)'
-                ];
-            }
+                else {
+                    let date = {};
+                    if (this.routeData.page.startsWith("menu")) {
+                        if (!this.routeData.date) {
+                            date = this.selectedDay || this.calendar[0].date;
+                            this.set('route.path', '/menu/' + date.year + "-" +
+                                date.month + "-" + date.day);
+                        }
+                        else {
+                            const routeDate = new Date(this.routeData.date);
+                            date.year = routeDate.getFullYear();
+                            date.month = routeDate.getMonth() + 1;
+                            date.day = routeDate.getDate();
+                            this.set('selectedDay', date);
+                        }
+                        this.dispatch('changeCurrentMenu', date);
+                        this.dispatch('changeCurrentOrder', date);
+                    }
+                }
+            }*/
 
-            _pageChanged() {
-                if (!this.routeData.page) {
+            /*_pageChanged() {
+                if (!this.date) {
                     this.set('route.path', '/menu/' + this.calendar[0].date.year + "-" +
                         this.calendar[0].date.month + "-" + this.calendar[0].date.day);
                 }
@@ -238,7 +212,7 @@
                 this.set('routeData', newRouteData);
                 this.dispatch('changeCurrentMenu', date);
                 this.dispatch('changeCurrentOrder', date);
-            }
+            }*/
         }
         window.customElements.define(MealOrderMenuContainer.is, MealOrderMenuContainer);
     </script>

From 50cf7516868c0c434d76754abfdd13ac83f3e716 Mon Sep 17 00:00:00 2001
From: Paul <paulageyev@gmail.com>
Date: Wed, 25 Apr 2018 12:01:10 +0300
Subject: [PATCH 200/253] Add handler for the `dish-added` event

---
 .../src/mealorder/meal-order-client-app.html  | 12 ++-
 .../menu/meal-order-menu-container.html       | 88 ++-----------------
 .../menu/meal-order-vendor-menus.html         |  2 +-
 3 files changed, 17 insertions(+), 85 deletions(-)

diff --git a/client/user/src/mealorder/meal-order-client-app.html b/client/user/src/mealorder/meal-order-client-app.html
index 16b64b83..2de78038 100644
--- a/client/user/src/mealorder/meal-order-client-app.html
+++ b/client/user/src/mealorder/meal-order-client-app.html
@@ -189,7 +189,10 @@
                             fallback-selection="view404"
                             role="main">
                     <meal-order-menu-container data-page="menu"
-                                               date="[[routeData.date]]" calendar="[[calendar]]" menu="[[menu]]"></meal-order-menu-container>
+                                               date="[[routeData.date]]"
+                                               calendar="[[calendar]]"
+                                               menu="[[menu]]"
+                                               on-dish-added="_addDishToOrder"></meal-order-menu-container>
                     <div data-page="history"></div> <!--vendor menus component-->
                 </iron-pages>
 
@@ -335,6 +338,13 @@
                     }
                 }
             }
+
+            _addDishToOrder(e) {
+                const order = {};
+                order.dish = e.detail;
+                order.date = this.routeData.date;
+                this.dispatch('addDish', order);
+            }
         }
 
         window.customElements.define(MealOrderClientApp.is, MealOrderClientApp);
diff --git a/client/user/src/mealorder/menu/meal-order-menu-container.html b/client/user/src/mealorder/menu/meal-order-menu-container.html
index 7aee6137..8f30923b 100644
--- a/client/user/src/mealorder/menu/meal-order-menu-container.html
+++ b/client/user/src/mealorder/menu/meal-order-menu-container.html
@@ -92,16 +92,7 @@
                 </paper-tab>
             </template>
         </paper-tabs>
-        <iron-pages
-                selected="[[routeData.page]]"
-                attr-for-selected="name"
-                fallback-selection="view404"
-                role="main">
-
-            <meal-order-vendor-menus name="menu"
-                                     items="[[menu]]"
-                                     on-dish-added="_addDishToOrder"></meal-order-vendor-menus>
-        </iron-pages>
+            <meal-order-vendor-menus items="[[menu]]"></meal-order-vendor-menus>
     </template>
     <script>
         /**
@@ -113,7 +104,7 @@
          * @polymer
          * @appliesMixin MealOrderApp.ReduxMixin
          */
-        class MealOrderMenuContainer extends MealOrderApp.ReduxMixin(Polymer.Element) {
+        class MealOrderMenuContainer extends (Polymer.Element) {
             static get is() {
                 return 'meal-order-menu-container';
             }
@@ -157,84 +148,15 @@
                         type: Array,
                     },
 
+                    /**
+                     * Selected day.
+                     */
                     date: {
                         type: Object,
                     }
                 };
             }
-
-            /*_pageChanged() {
-                if (!this.date) {
-                    this.set('route.path', '/menu/' + this.calendar[0].date.year + "-" +
-                        this.calendar[0].date.month + "-" + this.calendar[0].date.day);
-                }
-                else {
-                    let date = {};
-                    if (this.routeData.page.startsWith("menu")) {
-                        if (!this.routeData.date) {
-                            date = this.selectedDay || this.calendar[0].date;
-                            this.set('route.path', '/menu/' + date.year + "-" +
-                                date.month + "-" + date.day);
-                        }
-                        else {
-                            const routeDate = new Date(this.routeData.date);
-                            date.year = routeDate.getFullYear();
-                            date.month = routeDate.getMonth() + 1;
-                            date.day = routeDate.getDate();
-                            this.set('selectedDay', date);
-                        }
-                        this.dispatch('changeCurrentMenu', date);
-                        this.dispatch('changeCurrentOrder', date);
-                    }
-                }
-            }*/
-
-            /*_pageChanged() {
-                if (!this.date) {
-                    this.set('route.path', '/menu/' + this.calendar[0].date.year + "-" +
-                        this.calendar[0].date.month + "-" + this.calendar[0].date.day);
-                }
-                else {
-                    let date = {};
-                    if (this.routeData.page.startsWith("menu")) {
-                        if (!this.routeData.date) {
-                            date = this.selectedDay || this.calendar[0].date;
-                            this.set('route.path', '/menu/' + date.year + "-" +
-                                date.month + "-" + date.day);
-                        }
-                        else {
-                            const routeDate = new Date(this.routeData.date);
-                            date.year = routeDate.getFullYear();
-                            date.month = routeDate.getMonth() + 1;
-                            date.day = routeDate.getDate();
-                            this.set('selectedDay', date);
-                        }
-                        this.dispatch('changeCurrentMenu', date);
-                        this.dispatch('changeCurrentOrder', date);
-                    }
-                }
-            }
-
-            _selectDate(e) {
-                const date = new Date(e.target.selected);
-                const newRouteData = {};
-                newRouteData.page = 'menu';
-                newRouteData.date = date.getFullYear() +
-                    "-" + (date.getMonth() + 1) + "-" + date.getDate();
-                this.set('routeData', newRouteData);
-                this.dispatch('changeCurrentMenu', date);
-                this.dispatch('changeCurrentOrder', date);
-            }
-
-            _addDishToOrder(e) {
-                const order = {};
-                order.dish = e.detail;
-                order.date = this.routeData.date;
-                this.dispatch('addDish', order);
-            }
-            }*/
         }
-
         window.customElements.define(MealOrderMenuContainer.is, MealOrderMenuContainer);
     </script>
 </dom-module>
diff --git a/client/user/src/mealorder/menu/meal-order-vendor-menus.html b/client/user/src/mealorder/menu/meal-order-vendor-menus.html
index f0bdf762..aa02c1f4 100644
--- a/client/user/src/mealorder/menu/meal-order-vendor-menus.html
+++ b/client/user/src/mealorder/menu/meal-order-vendor-menus.html
@@ -32,7 +32,7 @@
             iron-list {
                 --iron-list-items-container: {
                     width: 70%;
-                    margin: 2% auto;
+                    margin: 2% auto 0 auto;
                     border-bottom: 1px solid var(--paper-grey-300);
                 };
             }

From 98ccdb0781570ed62614a45ca3283edefa66e209 Mon Sep 17 00:00:00 2001
From: Paul <paulageyev@gmail.com>
Date: Wed, 25 Apr 2018 13:25:27 +0300
Subject: [PATCH 201/253] Remove unnecessary observers for the
 `meal-order-drawer`

---
 .../src/mealorder/meal-order-client-app.html  | 25 +++++--
 .../src/mealorder/menu/meal-order-drawer.html | 57 +++++++--------
 .../menu/meal-order-menu-container.html       | 69 ++-----------------
 3 files changed, 52 insertions(+), 99 deletions(-)

diff --git a/client/user/src/mealorder/meal-order-client-app.html b/client/user/src/mealorder/meal-order-client-app.html
index 16b64b83..39eb34b0 100644
--- a/client/user/src/mealorder/meal-order-client-app.html
+++ b/client/user/src/mealorder/meal-order-client-app.html
@@ -189,7 +189,8 @@
                             fallback-selection="view404"
                             role="main">
                     <meal-order-menu-container data-page="menu"
-                                               date="[[routeData.date]]" calendar="[[calendar]]" menu="[[menu]]"></meal-order-menu-container>
+                                               date="[[routeData.date]]" calendar="[[calendar]]"
+                                               menu="[[menu]]"></meal-order-menu-container>
                     <div data-page="history"></div> <!--vendor menus component-->
                 </iron-pages>
 
@@ -216,7 +217,6 @@
 
             static get properties() {
                 return {
-
                     /**
                      * Menu for a current day.
                      *
@@ -262,6 +262,17 @@
                         statePath: 'currentOrder'
                     },
 
+                    /**
+                     * Array of dates with menu which may not exist.
+                     *
+                     * @typedef {Object} Date contains day, month, year
+                     * @property {Number} day
+                     * @property {Number} month
+                     * @property {Number} year
+                     *
+                     * @typedef {String} dayOfTheWeek
+                     * @typedef {Boolean} hasMenu If menu for this date exists
+                     */
                     calendar: {
                         type: Array,
                         statePath: 'calendar'
@@ -322,8 +333,7 @@
                         this.set('routeData.date', this.calendar[0].date.year + "-" +
                             this.calendar[0].date.month + "-" + this.calendar[0].date.day);
                     }
-                    else
-                    {
+                    else {
                         let date = {};
                         const routeDate = new Date(this.routeData.date);
                         date.year = routeDate.getFullYear();
@@ -334,6 +344,13 @@
                         this.dispatch('changeCurrentOrder', date);
                     }
                 }
+                if (this.routeData.page.startsWith("history")) {
+                    if (!this.routeData.date) {
+                        const date = new Date();
+                        this.set('routeData.date', date.getFullYear() + "-"
+                            + (date.getMonth()+1) +"-" + (date.getDate() -1));
+                    }
+                }
             }
         }
 
diff --git a/client/user/src/mealorder/menu/meal-order-drawer.html b/client/user/src/mealorder/menu/meal-order-drawer.html
index fe4877f3..51ec876f 100644
--- a/client/user/src/mealorder/menu/meal-order-drawer.html
+++ b/client/user/src/mealorder/menu/meal-order-drawer.html
@@ -60,7 +60,7 @@
                 --app-datepicker-date-hover-background-color: var(--paper-light-blue-500);
 
                 --app-datepicker-selected-date: {
-                   display: none;
+                    display: none;
                 };
 
                 --app-datepicker-selected-year: {
@@ -146,14 +146,14 @@
                      */
                     order: {
                         type: Array,
-                        statePath: 'currentOrder'
                     },
 
                     /**
                      * Date that the user can select on the calendar.
                      */
                     inputDate: {
-                        type: Date,
+                        type: String,
+                        computed: '_changeCalendarDate(routeData.date)',
                     },
 
                     /**
@@ -169,55 +169,50 @@
                     routeData: {
                         type: Object,
                     },
+
+                    selectedDay: {
+                        type: Object,
+                        computed: '_changeSelectedDay(routeData.date)'
+                    }
                 }
             }
 
             static get observers() {
                 return [
-                    '_updateDate(outputDate)',
-                    '_changeHistoryUrl(routeData.page)'
+                    ' _calendarDateChanged(outputDate)'
                 ];
             }
 
-            _changeHistoryUrl() {
-                if (this.routeData.page && this.routeData.page.startsWith("history")) {
-                    if (this.routeData.date) {
-                        const routeDate = new Date(this.routeData.date);
-                        this.set('inputDate', routeDate.getFullYear() +
-                            "/" + (routeDate.getMonth() + 1) + "/" + routeDate.getDate());
-                        const date = {};
-                        date.year = routeDate.getFullYear();
-                        date.month = (routeDate.getMonth() + 1);
-                        date.day = routeDate.getDate();
-                        this.dispatchEvent(new CustomEvent('changed-history-date', {detail: date}));
-                    }
-                }
+            _changeSelectedDay() {
                 const date = new Date(this.routeData.date);
 
                 let dayOfTheWeek = date.toLocaleDateString("ru-RU", {weekday: 'long'});
                 dayOfTheWeek = dayOfTheWeek.charAt(0).toUpperCase() + dayOfTheWeek.slice(1);
 
-                const selectedDay = {
+                const day = {
                     day: date.getDate(),
                     dayOfTheWeek: dayOfTheWeek,
                 };
-                this.set('selectedDay', selectedDay);
+                return day;
             }
 
-            _updateDate() {
-                if (this.routeData.page && this.routeData.page.startsWith("history")) {
-                    const date = new Date(this.outputDate.toString());
-                    const newRouteData = {};
-                    newRouteData.page = 'history';
-                    newRouteData.date = date.getFullYear() +
-                        "-" + (date.getMonth() + 1) + "-" + date.getDate();
-                    if (newRouteData.date.localeCompare(this.routeData.date) !== 0) {
-                        this.set('routeData', newRouteData);
-                    }
+            _changeCalendarDate() {
+                const routeDate = new Date(this.routeData.date);
+                return (routeDate.getFullYear() +
+                    "/" + (routeDate.getMonth() + 1) + "/" + routeDate.getDate());
+            }
+
+            _calendarDateChanged() {
+                const date = new Date(this.outputDate.toString());
+                const newRouteData = {};
+                newRouteData.page = 'history';
+                newRouteData.date = date.getFullYear() +
+                    "-" + (date.getMonth() + 1) + "-" + date.getDate();
+                if (newRouteData.date.localeCompare(this.routeData.date) !== 0) {
+                    this.set('routeData', newRouteData);
                 }
             }
         }
-
         window.customElements.define(MealOrderDrawer.is, MealOrderDrawer);
     </script>
 </dom-module>
diff --git a/client/user/src/mealorder/menu/meal-order-menu-container.html b/client/user/src/mealorder/menu/meal-order-menu-container.html
index bf23f839..a99e53d3 100644
--- a/client/user/src/mealorder/menu/meal-order-menu-container.html
+++ b/client/user/src/mealorder/menu/meal-order-menu-container.html
@@ -101,7 +101,7 @@
          * @polymer
          * @appliesMixin MealOrderApp.ReduxMixin
          */
-        class MealOrderMenuContainer extends MealOrderApp.ReduxMixin(Polymer.Element) {
+        class MealOrderMenuContainer extends (Polymer.Element) {
             static get is() {
                 return 'meal-order-menu-container';
             }
@@ -145,75 +145,16 @@
                         type: Array,
                     },
 
+                    /**
+                     * Selected day.
+                     */
                     date: {
                         type: Object,
                     }
                 };
             }
-
-            /*_pageChanged() {
-                if (!this.date) {
-                    this.set('route.path', '/menu/' + this.calendar[0].date.year + "-" +
-                        this.calendar[0].date.month + "-" + this.calendar[0].date.day);
-                }
-                else {
-                    let date = {};
-                    if (this.routeData.page.startsWith("menu")) {
-                        if (!this.routeData.date) {
-                            date = this.selectedDay || this.calendar[0].date;
-                            this.set('route.path', '/menu/' + date.year + "-" +
-                                date.month + "-" + date.day);
-                        }
-                        else {
-                            const routeDate = new Date(this.routeData.date);
-                            date.year = routeDate.getFullYear();
-                            date.month = routeDate.getMonth() + 1;
-                            date.day = routeDate.getDate();
-                            this.set('selectedDay', date);
-                        }
-                        this.dispatch('changeCurrentMenu', date);
-                        this.dispatch('changeCurrentOrder', date);
-                    }
-                }
-            }*/
-
-            /*_pageChanged() {
-                if (!this.date) {
-                    this.set('route.path', '/menu/' + this.calendar[0].date.year + "-" +
-                        this.calendar[0].date.month + "-" + this.calendar[0].date.day);
-                }
-                else {
-                    let date = {};
-                    if (this.routeData.page.startsWith("menu")) {
-                        if (!this.routeData.date) {
-                            date = this.selectedDay || this.calendar[0].date;
-                            this.set('route.path', '/menu/' + date.year + "-" +
-                                date.month + "-" + date.day);
-                        }
-                        else {
-                            const routeDate = new Date(this.routeData.date);
-                            date.year = routeDate.getFullYear();
-                            date.month = routeDate.getMonth() + 1;
-                            date.day = routeDate.getDate();
-                            this.set('selectedDay', date);
-                        }
-                        this.dispatch('changeCurrentMenu', date);
-                        this.dispatch('changeCurrentOrder', date);
-                    }
-                }
-            }
-
-            _selectDate(e) {
-                const date = new Date(e.target.selected);
-                const newRouteData = {};
-                newRouteData.page = 'menu';
-                newRouteData.date = date.getFullYear() +
-                    "-" + (date.getMonth() + 1) + "-" + date.getDate();
-                this.set('routeData', newRouteData);
-                this.dispatch('changeCurrentMenu', date);
-                this.dispatch('changeCurrentOrder', date);
-            }*/
         }
+
         window.customElements.define(MealOrderMenuContainer.is, MealOrderMenuContainer);
     </script>
 </dom-module>

From e0a83e1510ad4fadb923f787e0eba987d8a708f4 Mon Sep 17 00:00:00 2001
From: Paul <paulageyev@gmail.com>
Date: Wed, 25 Apr 2018 14:04:18 +0300
Subject: [PATCH 202/253] Refactor `meal-order-client-app` component

---
 .../src/mealorder/meal-order-client-app.html  |  7 +++++--
 .../src/mealorder/menu/meal-order-drawer.html | 21 ++++++++++++-------
 .../menu/meal-order-menu-container.html       |  4 +++-
 3 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/client/user/src/mealorder/meal-order-client-app.html b/client/user/src/mealorder/meal-order-client-app.html
index 39eb34b0..32d17779 100644
--- a/client/user/src/mealorder/meal-order-client-app.html
+++ b/client/user/src/mealorder/meal-order-client-app.html
@@ -189,9 +189,12 @@
                             fallback-selection="view404"
                             role="main">
                     <meal-order-menu-container data-page="menu"
-                                               date="[[routeData.date]]" calendar="[[calendar]]"
+                                               date="[[routeData.date]]"
+                                               calendar="[[calendar]]"
                                                menu="[[menu]]"></meal-order-menu-container>
-                    <div data-page="history"></div> <!--vendor menus component-->
+                    <div data-page="history">
+                        <!--user history component-->
+                    </div>
                 </iron-pages>
 
             </app-header-layout>
diff --git a/client/user/src/mealorder/menu/meal-order-drawer.html b/client/user/src/mealorder/menu/meal-order-drawer.html
index 51ec876f..af08d933 100644
--- a/client/user/src/mealorder/menu/meal-order-drawer.html
+++ b/client/user/src/mealorder/menu/meal-order-drawer.html
@@ -94,7 +94,7 @@
                     </div>
                 </app-toolbar>
 
-                <div></div> <!--cart component-->
+                <!--cart component-->
             </div>
             <div data-page="history">
                 <app-toolbar>
@@ -170,6 +170,9 @@
                         type: Object,
                     },
 
+                    /**
+                     * Selected day.
+                     */
                     selectedDay: {
                         type: Object,
                         computed: '_changeSelectedDay(routeData.date)'
@@ -203,13 +206,15 @@
             }
 
             _calendarDateChanged() {
-                const date = new Date(this.outputDate.toString());
-                const newRouteData = {};
-                newRouteData.page = 'history';
-                newRouteData.date = date.getFullYear() +
-                    "-" + (date.getMonth() + 1) + "-" + date.getDate();
-                if (newRouteData.date.localeCompare(this.routeData.date) !== 0) {
-                    this.set('routeData', newRouteData);
+                if (this.routeData.page.startsWith("history")) {
+                    const date = new Date(this.outputDate.toString());
+                    const newRouteData = {};
+                    newRouteData.page = 'history';
+                    newRouteData.date = date.getFullYear() +
+                        "-" + (date.getMonth() + 1) + "-" + date.getDate();
+                    if (newRouteData.date.localeCompare(this.routeData.date) !== 0) {
+                        this.set('routeData', newRouteData);
+                    }
                 }
             }
         }
diff --git a/client/user/src/mealorder/menu/meal-order-menu-container.html b/client/user/src/mealorder/menu/meal-order-menu-container.html
index a99e53d3..c41864ee 100644
--- a/client/user/src/mealorder/menu/meal-order-menu-container.html
+++ b/client/user/src/mealorder/menu/meal-order-menu-container.html
@@ -75,7 +75,7 @@
             }
         </style>
 
-        <paper-tabs id="paper-tabs" selected="[[date]]" attr-for-selected='data-key'>
+        <paper-tabs on-iron-select='_dateChanged' id="paper-tabs" selected="[[date]]" attr-for-selected='data-key'>
             <template is="dom-repeat" items="{{calendar}}" as="calendar">
                 <paper-tab class="paper-tab"
                            data-key$="[[calendar.date.year]]-[[calendar.date.month]]-[[calendar.date.day]]"
@@ -90,6 +90,7 @@
                 </paper-tab>
             </template>
         </paper-tabs>
+        <!--meal-order-vendor-menus-->
     </template>
     <script>
         /**
@@ -153,6 +154,7 @@
                     }
                 };
             }
+
         }
 
         window.customElements.define(MealOrderMenuContainer.is, MealOrderMenuContainer);

From b59e2e1dd70ed75eeb6e4f4e31ff2509581286aa Mon Sep 17 00:00:00 2001
From: Paul <paulageyev@gmail.com>
Date: Wed, 25 Apr 2018 17:28:58 +0300
Subject: [PATCH 203/253] Add current date to redux store

---
 .../src/mealorder/meal-order-client-app.html  | 37 ++++++++++---------
 .../src/mealorder/menu/meal-order-drawer.html |  2 +-
 .../menu/meal-order-menu-container.html       |  4 ++
 .../mealorder/shell/reducers/reducers.html    |  6 +++
 4 files changed, 31 insertions(+), 18 deletions(-)

diff --git a/client/user/src/mealorder/meal-order-client-app.html b/client/user/src/mealorder/meal-order-client-app.html
index 32d17779..f3d0aecc 100644
--- a/client/user/src/mealorder/meal-order-client-app.html
+++ b/client/user/src/mealorder/meal-order-client-app.html
@@ -289,6 +289,12 @@
                     routeData: {
                         type: Object,
                     },
+
+                    currentDate: {
+                        type: Object,
+                        statePath: 'currentDate'
+                    }
+
                 }
             }
 
@@ -331,27 +337,24 @@
             }
 
             _pageChanged() {
+                if (!this.routeData.page) {
+                    this.set('route.path', '/menu/' + this.currentDate.year + "-" +
+                        this.currentDate.month + "-" + this.currentDate.day);
+                }
                 if (this.routeData.page.startsWith("menu")) {
-                    if (!this.routeData.date) {
-                        this.set('routeData.date', this.calendar[0].date.year + "-" +
-                            this.calendar[0].date.month + "-" + this.calendar[0].date.day);
-                    }
-                    else {
-                        let date = {};
-                        const routeDate = new Date(this.routeData.date);
-                        date.year = routeDate.getFullYear();
-                        date.month = routeDate.getMonth() + 1;
-                        date.day = routeDate.getDate();
-
-                        this.dispatch('changeCurrentMenu', date);
-                        this.dispatch('changeCurrentOrder', date);
-                    }
+                    let date = {};
+                    const routeDate = new Date(this.routeData.date);
+                    date.year = routeDate.getFullYear();
+                    date.month = routeDate.getMonth() + 1;
+                    date.day = routeDate.getDate();
+
+                    this.dispatch('changeCurrentMenu', date);
+                    this.dispatch('changeCurrentOrder', date);
                 }
                 if (this.routeData.page.startsWith("history")) {
                     if (!this.routeData.date) {
-                        const date = new Date();
-                        this.set('routeData.date', date.getFullYear() + "-"
-                            + (date.getMonth()+1) +"-" + (date.getDate() -1));
+                        this.set('routeData.date', this.currentDate.year + "-" +
+                            this.currentDate.month + "-" + (this.currentDate.day - 1));
                     }
                 }
             }
diff --git a/client/user/src/mealorder/menu/meal-order-drawer.html b/client/user/src/mealorder/menu/meal-order-drawer.html
index af08d933..b625b506 100644
--- a/client/user/src/mealorder/menu/meal-order-drawer.html
+++ b/client/user/src/mealorder/menu/meal-order-drawer.html
@@ -206,7 +206,7 @@
             }
 
             _calendarDateChanged() {
-                if (this.routeData.page.startsWith("history")) {
+                if (this.routeData.page && this.routeData.page.startsWith("history")) {
                     const date = new Date(this.outputDate.toString());
                     const newRouteData = {};
                     newRouteData.page = 'history';
diff --git a/client/user/src/mealorder/menu/meal-order-menu-container.html b/client/user/src/mealorder/menu/meal-order-menu-container.html
index c41864ee..6895ebf0 100644
--- a/client/user/src/mealorder/menu/meal-order-menu-container.html
+++ b/client/user/src/mealorder/menu/meal-order-menu-container.html
@@ -155,6 +155,10 @@
                 };
             }
 
+            _dateChanged() {
+                this.dispatch('changeCurrentOrder', this.date);
+            }
+
         }
 
         window.customElements.define(MealOrderMenuContainer.is, MealOrderMenuContainer);
diff --git a/client/user/src/mealorder/shell/reducers/reducers.html b/client/user/src/mealorder/shell/reducers/reducers.html
index 8d4f7518..a448e35a 100644
--- a/client/user/src/mealorder/shell/reducers/reducers.html
+++ b/client/user/src/mealorder/shell/reducers/reducers.html
@@ -101,6 +101,12 @@
             calendar: arrayOfDates,
             menuForDay: [],
 
+            currentDate: {
+                year: 2018,
+                month: 3,
+                day: 21,
+            },
+
             menu: [
                 {
                     vendor: 'Пюре',

From 9ecb73174de142d51154289decb992aecf260b87 Mon Sep 17 00:00:00 2001
From: Paul <paulageyev@gmail.com>
Date: Wed, 25 Apr 2018 19:21:52 +0300
Subject: [PATCH 204/253] Rename properties

---
 .../user/src/mealorder/meal-order-client-app.html  | 14 +++++++-------
 .../mealorder/menu/meal-order-menu-container.html  | 11 +++--------
 .../src/mealorder/shell/reducers/reducers.html     | 12 ++++++------
 3 files changed, 16 insertions(+), 21 deletions(-)

diff --git a/client/user/src/mealorder/meal-order-client-app.html b/client/user/src/mealorder/meal-order-client-app.html
index f3d0aecc..c9b03d87 100644
--- a/client/user/src/mealorder/meal-order-client-app.html
+++ b/client/user/src/mealorder/meal-order-client-app.html
@@ -190,8 +190,8 @@
                             role="main">
                     <meal-order-menu-container data-page="menu"
                                                date="[[routeData.date]]"
-                                               calendar="[[calendar]]"
-                                               menu="[[menu]]"></meal-order-menu-container>
+                                               current-week-menus="[[currentWeekMenus]]"
+                                               menu-for-day="[[menuForDay]]"></meal-order-menu-container>
                     <div data-page="history">
                         <!--user history component-->
                     </div>
@@ -238,7 +238,7 @@
                      * @property {String} price
                      * @property {String} quantity
                      */
-                    menu: {
+                    menuForDay: {
                         type: Array,
                         statePath: 'menuForDay'
                     },
@@ -260,9 +260,9 @@
                      * @property {String} price
                      * @property {String} quantity
                      */
-                    order: {
+                    orderForDay: {
                         type: Array,
-                        statePath: 'currentOrder'
+                        statePath: 'orderForDay'
                     },
 
                     /**
@@ -276,9 +276,9 @@
                      * @typedef {String} dayOfTheWeek
                      * @typedef {Boolean} hasMenu If menu for this date exists
                      */
-                    calendar: {
+                    currentWeekMenus: {
                         type: Array,
-                        statePath: 'calendar'
+                        statePath: 'currentWeekMenus'
                     },
 
                     /**
diff --git a/client/user/src/mealorder/menu/meal-order-menu-container.html b/client/user/src/mealorder/menu/meal-order-menu-container.html
index 6895ebf0..c3dd04c4 100644
--- a/client/user/src/mealorder/menu/meal-order-menu-container.html
+++ b/client/user/src/mealorder/menu/meal-order-menu-container.html
@@ -76,7 +76,7 @@
         </style>
 
         <paper-tabs on-iron-select='_dateChanged' id="paper-tabs" selected="[[date]]" attr-for-selected='data-key'>
-            <template is="dom-repeat" items="{{calendar}}" as="calendar">
+            <template is="dom-repeat" items="{{currentWeekMenus}}" as="calendar">
                 <paper-tab class="paper-tab"
                            data-key$="[[calendar.date.year]]-[[calendar.date.month]]-[[calendar.date.day]]"
                            link disabled="[[!calendar.hasMenu]]">
@@ -120,7 +120,7 @@
                      * @typedef {String} dayOfTheWeek
                      * @typedef {Boolean} hasMenu If menu for this date exists
                      */
-                    calendar: {
+                    currentWeekMenus: {
                         type: Array,
                     },
 
@@ -142,7 +142,7 @@
                      * @property {String} price
                      * @property {String} quantity
                      */
-                    menu: {
+                    menuForDay: {
                         type: Array,
                     },
 
@@ -154,11 +154,6 @@
                     }
                 };
             }
-
-            _dateChanged() {
-                this.dispatch('changeCurrentOrder', this.date);
-            }
-
         }
 
         window.customElements.define(MealOrderMenuContainer.is, MealOrderMenuContainer);
diff --git a/client/user/src/mealorder/shell/reducers/reducers.html b/client/user/src/mealorder/shell/reducers/reducers.html
index a448e35a..6db3ed56 100644
--- a/client/user/src/mealorder/shell/reducers/reducers.html
+++ b/client/user/src/mealorder/shell/reducers/reducers.html
@@ -98,7 +98,7 @@
             }];
 
         MealOrderApp.initialState = {
-            calendar: arrayOfDates,
+            currentWeekMenus: arrayOfDates,
             menuForDay: [],
 
             currentDate: {
@@ -107,7 +107,7 @@
                 day: 21,
             },
 
-            menu: [
+            menus: [
                 {
                     vendor: 'Пюре',
                     date: {
@@ -204,14 +204,14 @@
                         }
                     ]
                 }],
-            currentOrder: [],
+            orderForDay: [],
             orders: [{
                 date: {
                     year: 2018,
                     month: 3,
                     day: 21,
                 },
-                cart: [{
+                order: [{
                     vendor: "Пюре",
                     dishes: [
                         {title: 'Борщ украинский', price: 35, quantity: 1},
@@ -234,7 +234,7 @@
                     month: 3,
                     day: 22,
                     },
-                cart: [{
+                order: [{
                     vendor: "Пюре",
                     dishes: [
                         {title: 'Щи русские', price: 48, quantity: 1},
@@ -260,7 +260,7 @@
             }
             switch (action.type) {
                 case MealOrderApp.UserAction.SET_CURRENT_MENU: {
-                    const menu = state.menu.filter(menu => (Utils.shallowEqual(action.date, menu.date)));
+                    const menu = state.menus.filter(menu => (Utils.shallowEqual(action.date, menu.date)));
                     return Object.assign({}, state, {
                             menuForDay: menu
                         }

From cf8651228949b773cbf11e298c2b5dd80936d5fc Mon Sep 17 00:00:00 2001
From: Paul <paulageyev@gmail.com>
Date: Wed, 25 Apr 2018 19:44:39 +0300
Subject: [PATCH 205/253] Add `SET_CURRENT_DATE` action

---
 .../src/mealorder/meal-order-client-app.html  |  7 +++++--
 .../menu/meal-order-menu-container.html       | 18 ++++++++++++++++--
 .../mealorder/shell/actions/user-actions.html |  1 +
 .../mealorder/shell/reducers/reducers.html    | 19 ++++++++++++++++++-
 4 files changed, 40 insertions(+), 5 deletions(-)

diff --git a/client/user/src/mealorder/meal-order-client-app.html b/client/user/src/mealorder/meal-order-client-app.html
index c9b03d87..a8620ee3 100644
--- a/client/user/src/mealorder/meal-order-client-app.html
+++ b/client/user/src/mealorder/meal-order-client-app.html
@@ -290,6 +290,9 @@
                         type: Object,
                     },
 
+                    /**
+                     * Current date.
+                     */
                     currentDate: {
                         type: Object,
                         statePath: 'currentDate'
@@ -341,7 +344,7 @@
                     this.set('route.path', '/menu/' + this.currentDate.year + "-" +
                         this.currentDate.month + "-" + this.currentDate.day);
                 }
-                if (this.routeData.page.startsWith("menu")) {
+                /*if (this.routeData.page.startsWith("menu")) {
                     let date = {};
                     const routeDate = new Date(this.routeData.date);
                     date.year = routeDate.getFullYear();
@@ -350,7 +353,7 @@
 
                     this.dispatch('changeCurrentMenu', date);
                     this.dispatch('changeCurrentOrder', date);
-                }
+                }*/
                 if (this.routeData.page.startsWith("history")) {
                     if (!this.routeData.date) {
                         this.set('routeData.date', this.currentDate.year + "-" +
diff --git a/client/user/src/mealorder/menu/meal-order-menu-container.html b/client/user/src/mealorder/menu/meal-order-menu-container.html
index c3dd04c4..14abeba2 100644
--- a/client/user/src/mealorder/menu/meal-order-menu-container.html
+++ b/client/user/src/mealorder/menu/meal-order-menu-container.html
@@ -102,11 +102,21 @@
          * @polymer
          * @appliesMixin MealOrderApp.ReduxMixin
          */
-        class MealOrderMenuContainer extends (Polymer.Element) {
+        class MealOrderMenuContainer extends MealOrderApp.ReduxMixin(Polymer.Element) {
             static get is() {
                 return 'meal-order-menu-container';
             }
 
+            static get actions() {
+
+                return {
+                    changeCurrentDate: date => ({
+                        type: MealOrderApp.UserAction.SET_CURRENT_DATE,
+                        date
+                    }),
+                }
+            }
+
             static get properties() {
                 return {
                     /**
@@ -143,7 +153,7 @@
                      * @property {String} quantity
                      */
                     menuForDay: {
-                        type: Array,
+                        type: Object,
                     },
 
                     /**
@@ -154,6 +164,10 @@
                     }
                 };
             }
+
+            _dateChanged(e) {
+                this.dispatch('changeCurrentDate', new Date(e.target.selected));
+            }
         }
 
         window.customElements.define(MealOrderMenuContainer.is, MealOrderMenuContainer);
diff --git a/client/user/src/mealorder/shell/actions/user-actions.html b/client/user/src/mealorder/shell/actions/user-actions.html
index e118a92e..da79f71a 100644
--- a/client/user/src/mealorder/shell/actions/user-actions.html
+++ b/client/user/src/mealorder/shell/actions/user-actions.html
@@ -22,5 +22,6 @@
     MealOrderApp.UserAction = {
         SET_CURRENT_MENU: "SET_CURRENT_MENU",
         SET_CURRENT_ORDER: 'SET_CURRENT_ORDER',
+        SET_CURRENT_DATE: 'SET_CURRENT_DATE'
     }
 </script>
diff --git a/client/user/src/mealorder/shell/reducers/reducers.html b/client/user/src/mealorder/shell/reducers/reducers.html
index 6db3ed56..9110be27 100644
--- a/client/user/src/mealorder/shell/reducers/reducers.html
+++ b/client/user/src/mealorder/shell/reducers/reducers.html
@@ -233,7 +233,7 @@
                     year: 2018,
                     month: 3,
                     day: 22,
-                    },
+                },
                 order: [{
                     vendor: "Пюре",
                     dishes: [
@@ -273,6 +273,23 @@
                         }
                     );
                 }
+                case MealOrderApp.UserAction.SET_CURRENT_DATE: {
+
+                    let date = {};
+                    date.day = action.date.getDate();
+                    date.month = action.date.getMonth() + 1;
+                    date.year = action.date.getFullYear();
+
+                    const menu = state.menus.filter(menu => (Utils.shallowEqual(date, menu.date)));
+
+                    const newOrder = state.orders.find(order => Utils.shallowEqual(date, order.date));
+                    return Object.assign({}, state, {
+                            menuForDay: menu,
+                            currentOrder: newOrder,
+                        }
+                    );
+
+                }
                 default : {
                     return state;
                 }

From 3ce4624a85066f9604c938a89e0c6409d654b5b7 Mon Sep 17 00:00:00 2001
From: Paul <paulageyev@gmail.com>
Date: Wed, 25 Apr 2018 21:28:04 +0300
Subject: [PATCH 206/253] Change date to ISO 8601 format

---
 .../src/mealorder/meal-order-client-app.html  |  42 +++----
 .../src/mealorder/menu/meal-order-drawer.html |  10 +-
 .../menu/meal-order-menu-container.html       |  33 ++---
 .../mealorder/shell/reducers/reducers.html    | 117 +++---------------
 4 files changed, 55 insertions(+), 147 deletions(-)

diff --git a/client/user/src/mealorder/meal-order-client-app.html b/client/user/src/mealorder/meal-order-client-app.html
index a8620ee3..9189372d 100644
--- a/client/user/src/mealorder/meal-order-client-app.html
+++ b/client/user/src/mealorder/meal-order-client-app.html
@@ -188,10 +188,12 @@
                             attr-for-selected="data-page"
                             fallback-selection="view404"
                             role="main">
-                    <meal-order-menu-container data-page="menu"
-                                               date="[[routeData.date]]"
-                                               current-week-menus="[[currentWeekMenus]]"
-                                               menu-for-day="[[menuForDay]]"></meal-order-menu-container>
+                    <meal-order-menu-container
+                            on-current-date-changed="_changeCurrentDate"
+                            data-page="menu"
+                            date="[[routeData.date]]"
+                            current-week-menus="[[currentWeekMenus]]"
+                            menu-for-day="[[menuForDay]]"></meal-order-menu-container>
                     <div data-page="history">
                         <!--user history component-->
                     </div>
@@ -316,14 +318,10 @@
                  * @param {date} selected date by tab
                  */
                 return {
-                    changeCurrentMenu: date => ({
-                        type: MealOrderApp.UserAction.SET_CURRENT_MENU,
+                    setCurrentDate: date => ({
+                        type: MealOrderApp.UserAction.SET_CURRENT_DATE,
                         date
                     }),
-                    changeCurrentOrder: date => ({
-                        type: MealOrderApp.UserAction.SET_CURRENT_ORDER,
-                        date
-                    })
                 }
             }
 
@@ -340,27 +338,21 @@
             }
 
             _pageChanged() {
-                if (!this.routeData.page) {
-                    this.set('route.path', '/menu/' + this.currentDate.year + "-" +
-                        this.currentDate.month + "-" + this.currentDate.day);
+                if (!this.routeData.page || (this.routeData.page.startsWith("menu") && !this.routeData.date)) {
+                    this.set('route.path', '/menu/' + this.currentDate.toISOString().slice(0,10));
                 }
-                /*if (this.routeData.page.startsWith("menu")) {
-                    let date = {};
-                    const routeDate = new Date(this.routeData.date);
-                    date.year = routeDate.getFullYear();
-                    date.month = routeDate.getMonth() + 1;
-                    date.day = routeDate.getDate();
-
-                    this.dispatch('changeCurrentMenu', date);
-                    this.dispatch('changeCurrentOrder', date);
-                }*/
                 if (this.routeData.page.startsWith("history")) {
                     if (!this.routeData.date) {
-                        this.set('routeData.date', this.currentDate.year + "-" +
-                            this.currentDate.month + "-" + (this.currentDate.day - 1));
+                        let yesterday = new Date(this.currentDate);
+                        yesterday.setDate(yesterday.getDate()-1);
+                        this.set('routeData.date', yesterday.toISOString().slice(0,10));
                     }
                 }
             }
+
+            _changeCurrentDate(e) {
+                this.dispatch('setCurrentDate', e.detail.date)
+            }
         }
 
         window.customElements.define(MealOrderClientApp.is, MealOrderClientApp);
diff --git a/client/user/src/mealorder/menu/meal-order-drawer.html b/client/user/src/mealorder/menu/meal-order-drawer.html
index b625b506..a3444aef 100644
--- a/client/user/src/mealorder/menu/meal-order-drawer.html
+++ b/client/user/src/mealorder/menu/meal-order-drawer.html
@@ -207,17 +207,15 @@
 
             _calendarDateChanged() {
                 if (this.routeData.page && this.routeData.page.startsWith("history")) {
-                    const date = new Date(this.outputDate.toString());
+                    const date = this.outputDate.replace(/\//g, '-');
                     const newRouteData = {};
                     newRouteData.page = 'history';
-                    newRouteData.date = date.getFullYear() +
-                        "-" + (date.getMonth() + 1) + "-" + date.getDate();
-                    if (newRouteData.date.localeCompare(this.routeData.date) !== 0) {
-                        this.set('routeData', newRouteData);
-                    }
+                    newRouteData.date = date;
+                    this.set('routeData', newRouteData);
                 }
             }
         }
+
         window.customElements.define(MealOrderDrawer.is, MealOrderDrawer);
     </script>
 </dom-module>
diff --git a/client/user/src/mealorder/menu/meal-order-menu-container.html b/client/user/src/mealorder/menu/meal-order-menu-container.html
index 14abeba2..c25235df 100644
--- a/client/user/src/mealorder/menu/meal-order-menu-container.html
+++ b/client/user/src/mealorder/menu/meal-order-menu-container.html
@@ -75,16 +75,18 @@
             }
         </style>
 
-        <paper-tabs on-iron-select='_dateChanged' id="paper-tabs" selected="[[date]]" attr-for-selected='data-key'>
+        <paper-tabs on-iron-select='_dateChanged' id="paper-tabs" selected="[[date]]"
+                    attr-for-selected='data-key'>
             <template is="dom-repeat" items="{{currentWeekMenus}}" as="calendar">
                 <paper-tab class="paper-tab"
-                           data-key$="[[calendar.date.year]]-[[calendar.date.month]]-[[calendar.date.day]]"
+                           data-key$="[[_getDate(calendar.date)]]"
                            link disabled="[[!calendar.hasMenu]]">
-                    <a href="#/menu/[[calendar.date.year]]-[[calendar.date.month]]-[[calendar.date.day]]" class="paper-tab-container">
+                    <a href="#/menu/[[_getDate(calendar.date)]]"
+                       class="paper-tab-container">
                         <div>
                             <div class="day-of-the-week">{{calendar.dayOfTheWeek}}
                             </div>
-                            <div class="day">{{calendar.date.day}}</div>
+                            <div class="day">[[_getDay(calendar.date)]]</div>
                         </div>
                     </a>
                 </paper-tab>
@@ -102,21 +104,11 @@
          * @polymer
          * @appliesMixin MealOrderApp.ReduxMixin
          */
-        class MealOrderMenuContainer extends MealOrderApp.ReduxMixin(Polymer.Element) {
+        class MealOrderMenuContainer extends (Polymer.Element) {
             static get is() {
                 return 'meal-order-menu-container';
             }
 
-            static get actions() {
-
-                return {
-                    changeCurrentDate: date => ({
-                        type: MealOrderApp.UserAction.SET_CURRENT_DATE,
-                        date
-                    }),
-                }
-            }
-
             static get properties() {
                 return {
                     /**
@@ -165,8 +157,17 @@
                 };
             }
 
+            _getDay(date) {
+                return date.getDate();
+            }
+
+            _getDate(date) {
+                return date.toISOString().slice(0,10);
+            }
+
             _dateChanged(e) {
-                this.dispatch('changeCurrentDate', new Date(e.target.selected));
+                this.dispatchEvent(new CustomEvent('current-date-changed',
+                    {detail: {date: new Date(e.target.selected)}}));
             }
         }
 
diff --git a/client/user/src/mealorder/shell/reducers/reducers.html b/client/user/src/mealorder/shell/reducers/reducers.html
index 9110be27..4081e156 100644
--- a/client/user/src/mealorder/shell/reducers/reducers.html
+++ b/client/user/src/mealorder/shell/reducers/reducers.html
@@ -25,74 +25,42 @@
     {
         /*global Utils */
         const arrayOfDates = [{
-            date: {
-                year: 2018,
-                month: 3,
-                day: 21,
-            },
+            date: new Date('2018-03-21'),
             dayOfTheWeek: 'Ср',
             hasMenu: true
         },
             {
-                date: {
-                    year: 2018,
-                    month: 3,
-                    day: 22,
-                },
+                date: new Date('2018-03-22'),
                 dayOfTheWeek: 'Чт',
                 hasMenu: true
             },
             {
-                date: {
-                    year: 2018,
-                    month: 3,
-                    day: 23,
-                },
+                date: new Date('2018-03-23'),
                 dayOfTheWeek: 'Пт',
                 hasMenu: true
             },
             {
-                date: {
-                    year: 2018,
-                    month: 3,
-                    day: 24,
-                },
+                date: new Date('2018-03-24'),
                 dayOfTheWeek: 'Сб',
                 hasMenu: false
             },
             {
-                date: {
-                    year: 2018,
-                    month: 3,
-                    day: 25,
-                },
+                date: new Date('2018-03-25'),
                 dayOfTheWeek: 'Вс',
                 hasMenu: false
             }
             , {
-                date: {
-                    year: 2018,
-                    month: 3,
-                    day: 26,
-                },
+                date: new Date('2018-03-26'),
                 dayOfTheWeek: 'Пн',
                 hasMenu: true
             }
             , {
-                date: {
-                    year: 2018,
-                    month: 3,
-                    day: 27,
-                },
+                date: new Date('2018-03-27'),
                 dayOfTheWeek: 'Вт',
                 hasMenu: true
             }
             , {
-                date: {
-                    year: 2018,
-                    month: 3,
-                    day: 28,
-                },
+                date: new Date('2018-03-28'),
                 dayOfTheWeek: 'Ср',
                 hasMenu: true
             }];
@@ -101,20 +69,11 @@
             currentWeekMenus: arrayOfDates,
             menuForDay: [],
 
-            currentDate: {
-                year: 2018,
-                month: 3,
-                day: 21,
-            },
-
+            currentDate: new Date('2018-03-21'),
             menus: [
                 {
                     vendor: 'Пюре',
-                    date: {
-                        year: 2018,
-                        month: 3,
-                        day: 21,
-                    },
+                    date: new Date('2018-03-21'),
                     categories: [{
                         categoryName: 'Первое блюдо',
                         dishes: [
@@ -134,11 +93,7 @@
                 },
                 {
                     vendor: 'Позитив',
-                    date: {
-                        year: 2018,
-                        month: 3,
-                        day: 21,
-                    },
+                    date: new Date('2018-03-21'),
                     categories: [{
                         categoryName: 'Первое блюдо', dishes: [
                             {title: 'Борщ украинский', price: 35},
@@ -159,11 +114,7 @@
                 },
                 {
                     vendor: 'Пюре',
-                    date: {
-                        year: 2018,
-                        month: 3,
-                        day: 22,
-                    },
+                    date: new Date('2018-03-22'),
                     categories: [{
                         categoryName: 'Первое блюдо', dishes: [
                             {title: 'Суп гречневый', price: 35},
@@ -181,11 +132,7 @@
                 },
                 {
                     vendor: 'Позитив',
-                    date: {
-                        year: 2018,
-                        month: 3,
-                        day: 22,
-                    },
+                    date: new Date('2018-03-22'),
                     categories: [{
                         categoryName: 'Первое блюдо', dishes: [
                             {title: 'Суп сырный', price: 35},
@@ -206,11 +153,7 @@
                 }],
             orderForDay: [],
             orders: [{
-                date: {
-                    year: 2018,
-                    month: 3,
-                    day: 21,
-                },
+                date: new Date('2018-03-21'),
                 order: [{
                     vendor: "Пюре",
                     dishes: [
@@ -229,11 +172,7 @@
                     }]
                 }]
             }, {
-                date: {
-                    year: 2018,
-                    month: 3,
-                    day: 22,
-                },
+                date: new Date('2018-03-22'),
                 order: [{
                     vendor: "Пюре",
                     dishes: [
@@ -259,36 +198,14 @@
                 return MealOrderApp.initialState;
             }
             switch (action.type) {
-                case MealOrderApp.UserAction.SET_CURRENT_MENU: {
-                    const menu = state.menus.filter(menu => (Utils.shallowEqual(action.date, menu.date)));
-                    return Object.assign({}, state, {
-                            menuForDay: menu
-                        }
-                    );
-                }
-                case MealOrderApp.UserAction.SET_CURRENT_ORDER: {
-                    const newOrder = state.orders.find(order => Utils.shallowEqual(action.date, order.date));
-                    return Object.assign({}, state, {
-                            currentOrder: newOrder
-                        }
-                    );
-                }
                 case MealOrderApp.UserAction.SET_CURRENT_DATE: {
-
-                    let date = {};
-                    date.day = action.date.getDate();
-                    date.month = action.date.getMonth() + 1;
-                    date.year = action.date.getFullYear();
-
-                    const menu = state.menus.filter(menu => (Utils.shallowEqual(date, menu.date)));
-
-                    const newOrder = state.orders.find(order => Utils.shallowEqual(date, order.date));
+                    const menu = state.menus.filter(menu => menu.date.getTime() === action.date.getTime());
+                    const newOrder = state.orders.find(order => order.date.getTime() === action.date.getTime());
                     return Object.assign({}, state, {
                             menuForDay: menu,
                             currentOrder: newOrder,
                         }
                     );
-
                 }
                 default : {
                     return state;

From f9599e69b20edee2b0597780d2d97ec5284c9655 Mon Sep 17 00:00:00 2001
From: Paul <paulageyev@gmail.com>
Date: Wed, 25 Apr 2018 21:30:40 +0300
Subject: [PATCH 207/253] Refactor menu for day

---
 client/user/src/mealorder/menu/meal-order-menu-container.html | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/client/user/src/mealorder/menu/meal-order-menu-container.html b/client/user/src/mealorder/menu/meal-order-menu-container.html
index e13646b8..7e57a1ac 100644
--- a/client/user/src/mealorder/menu/meal-order-menu-container.html
+++ b/client/user/src/mealorder/menu/meal-order-menu-container.html
@@ -26,6 +26,8 @@
 <link rel="import" href="../../../bower_components/paper-styles/color.html">
 <link rel="import" href="../shell/redux-store.html">
 <link rel="import" href="../shell/actions/user-actions.html">
+<link rel="import" href="meal-order-vendor-menus.html">
+
 <dom-module id="meal-order-menu-container">
     <template>
         <style>
@@ -92,7 +94,7 @@
                 </paper-tab>
             </template>
         </paper-tabs>
-            <meal-order-vendor-menus items="[[menu]]"></meal-order-vendor-menus>
+            <meal-order-vendor-menus items="[[menuForDay]]"></meal-order-vendor-menus>
     </template>
     <script>
         /**

From 92b3b65c2c0ff4d055db595dd9b8c607f2e950e6 Mon Sep 17 00:00:00 2001
From: Paul <paulageyev@gmail.com>
Date: Wed, 25 Apr 2018 21:36:37 +0300
Subject: [PATCH 208/253] Remove unnecessary utils

---
 .../src/mealorder/meal-order-client-app.html  |  6 +++--
 .../menu/meal-order-menu-container.html       |  3 ++-
 .../mealorder/shell/reducers/reducers.html    |  1 -
 .../user/src/mealorder/shell/utils/Utils.js   | 27 -------------------
 4 files changed, 6 insertions(+), 31 deletions(-)
 delete mode 100644 client/user/src/mealorder/shell/utils/Utils.js

diff --git a/client/user/src/mealorder/meal-order-client-app.html b/client/user/src/mealorder/meal-order-client-app.html
index 9189372d..3fc75b8c 100644
--- a/client/user/src/mealorder/meal-order-client-app.html
+++ b/client/user/src/mealorder/meal-order-client-app.html
@@ -337,15 +337,17 @@
                 }
             }
 
+
             _pageChanged() {
+                const DATE_LENGTH = 10;
                 if (!this.routeData.page || (this.routeData.page.startsWith("menu") && !this.routeData.date)) {
-                    this.set('route.path', '/menu/' + this.currentDate.toISOString().slice(0,10));
+                    this.set('route.path', '/menu/' + this.currentDate.toISOString().slice(0,DATE_LENGTH));
                 }
                 if (this.routeData.page.startsWith("history")) {
                     if (!this.routeData.date) {
                         let yesterday = new Date(this.currentDate);
                         yesterday.setDate(yesterday.getDate()-1);
-                        this.set('routeData.date', yesterday.toISOString().slice(0,10));
+                        this.set('routeData.date', yesterday.toISOString().slice(0, DATE_LENGTH));
                     }
                 }
             }
diff --git a/client/user/src/mealorder/menu/meal-order-menu-container.html b/client/user/src/mealorder/menu/meal-order-menu-container.html
index c25235df..0d472200 100644
--- a/client/user/src/mealorder/menu/meal-order-menu-container.html
+++ b/client/user/src/mealorder/menu/meal-order-menu-container.html
@@ -162,7 +162,8 @@
             }
 
             _getDate(date) {
-                return date.toISOString().slice(0,10);
+                const DATE_LENGTH = 10;
+                return date.toISOString().slice(0,DATE_LENGTH);
             }
 
             _dateChanged(e) {
diff --git a/client/user/src/mealorder/shell/reducers/reducers.html b/client/user/src/mealorder/shell/reducers/reducers.html
index 4081e156..9a3b57ff 100644
--- a/client/user/src/mealorder/shell/reducers/reducers.html
+++ b/client/user/src/mealorder/shell/reducers/reducers.html
@@ -23,7 +23,6 @@
 
 <script>
     {
-        /*global Utils */
         const arrayOfDates = [{
             date: new Date('2018-03-21'),
             dayOfTheWeek: 'Ср',
diff --git a/client/user/src/mealorder/shell/utils/Utils.js b/client/user/src/mealorder/shell/utils/Utils.js
deleted file mode 100644
index 3c670443..00000000
--- a/client/user/src/mealorder/shell/utils/Utils.js
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright 2018, TeamDev Ltd. All rights reserved.
- *
- * Redistribution and use in source and/or binary forms, with or without
- * modification, must retain the above copyright notice and the following
- * disclaimer.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/*exported Utils */
-class Utils {
-    static shallowEqual(o1, o2) {
-        return Object.keys(o1)
-            .every(key => o1[key] === o2[key]);
-    }
-}

From 5658353a74c93cf42ea5a9db9c39aa88d270ff6c Mon Sep 17 00:00:00 2001
From: Paul <paulageyev@gmail.com>
Date: Wed, 25 Apr 2018 21:48:01 +0300
Subject: [PATCH 209/253] Add computed day of the week for the `paper-tabs`

---
 client/user/src/mealorder/meal-order-client-app.html     | 2 +-
 .../src/mealorder/menu/meal-order-menu-container.html    | 8 +++++++-
 client/user/src/mealorder/shell/reducers/reducers.html   | 9 ---------
 3 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/client/user/src/mealorder/meal-order-client-app.html b/client/user/src/mealorder/meal-order-client-app.html
index 3fc75b8c..1129f178 100644
--- a/client/user/src/mealorder/meal-order-client-app.html
+++ b/client/user/src/mealorder/meal-order-client-app.html
@@ -263,7 +263,7 @@
                      * @property {String} quantity
                      */
                     orderForDay: {
-                        type: Array,
+                        type: Object,
                         statePath: 'orderForDay'
                     },
 
diff --git a/client/user/src/mealorder/menu/meal-order-menu-container.html b/client/user/src/mealorder/menu/meal-order-menu-container.html
index 0d472200..7af19760 100644
--- a/client/user/src/mealorder/menu/meal-order-menu-container.html
+++ b/client/user/src/mealorder/menu/meal-order-menu-container.html
@@ -84,7 +84,7 @@
                     <a href="#/menu/[[_getDate(calendar.date)]]"
                        class="paper-tab-container">
                         <div>
-                            <div class="day-of-the-week">{{calendar.dayOfTheWeek}}
+                            <div class="day-of-the-week">[[_getDayOfTheWeek(calendar.date)]]
                             </div>
                             <div class="day">[[_getDay(calendar.date)]]</div>
                         </div>
@@ -166,6 +166,12 @@
                 return date.toISOString().slice(0,DATE_LENGTH);
             }
 
+            _getDayOfTheWeek(date) {
+                let dayOfTheWeek = date.toLocaleDateString("ru-RU", {weekday: 'short'});
+                dayOfTheWeek = dayOfTheWeek.charAt(0).toUpperCase() + dayOfTheWeek.slice(1);
+                return dayOfTheWeek;
+            }
+
             _dateChanged(e) {
                 this.dispatchEvent(new CustomEvent('current-date-changed',
                     {detail: {date: new Date(e.target.selected)}}));
diff --git a/client/user/src/mealorder/shell/reducers/reducers.html b/client/user/src/mealorder/shell/reducers/reducers.html
index 9a3b57ff..51c09f86 100644
--- a/client/user/src/mealorder/shell/reducers/reducers.html
+++ b/client/user/src/mealorder/shell/reducers/reducers.html
@@ -19,48 +19,39 @@
   -->
 <link rel="import" href="../meal-order-app-namespace.html">
 <link rel="import" href="../redux-store.html">
-<script src="../utils/Utils.js"></script>
 
 <script>
     {
         const arrayOfDates = [{
             date: new Date('2018-03-21'),
-            dayOfTheWeek: 'Ср',
             hasMenu: true
         },
             {
                 date: new Date('2018-03-22'),
-                dayOfTheWeek: 'Чт',
                 hasMenu: true
             },
             {
                 date: new Date('2018-03-23'),
-                dayOfTheWeek: 'Пт',
                 hasMenu: true
             },
             {
                 date: new Date('2018-03-24'),
-                dayOfTheWeek: 'Сб',
                 hasMenu: false
             },
             {
                 date: new Date('2018-03-25'),
-                dayOfTheWeek: 'Вс',
                 hasMenu: false
             }
             , {
                 date: new Date('2018-03-26'),
-                dayOfTheWeek: 'Пн',
                 hasMenu: true
             }
             , {
                 date: new Date('2018-03-27'),
-                dayOfTheWeek: 'Вт',
                 hasMenu: true
             }
             , {
                 date: new Date('2018-03-28'),
-                dayOfTheWeek: 'Ср',
                 hasMenu: true
             }];
 

From e309675276170993c7a81cd6897e784e2aba8e6f Mon Sep 17 00:00:00 2001
From: Paul <paulageyev@gmail.com>
Date: Wed, 25 Apr 2018 21:56:02 +0300
Subject: [PATCH 210/253] Apply the default day for the order

---
 client/user/src/mealorder/meal-order-client-app.html   | 5 ++---
 client/user/src/mealorder/shell/reducers/reducers.html | 3 +--
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/client/user/src/mealorder/meal-order-client-app.html b/client/user/src/mealorder/meal-order-client-app.html
index 1129f178..1c19430c 100644
--- a/client/user/src/mealorder/meal-order-client-app.html
+++ b/client/user/src/mealorder/meal-order-client-app.html
@@ -337,15 +337,14 @@
                 }
             }
 
-
             _pageChanged() {
                 const DATE_LENGTH = 10;
                 if (!this.routeData.page || (this.routeData.page.startsWith("menu") && !this.routeData.date)) {
-                    this.set('route.path', '/menu/' + this.currentDate.toISOString().slice(0,DATE_LENGTH));
+                    this.set('route.path', '/menu/' + this.currentWeekMenus[0].date.toISOString().slice(0,DATE_LENGTH));
                 }
                 if (this.routeData.page.startsWith("history")) {
                     if (!this.routeData.date) {
-                        let yesterday = new Date(this.currentDate);
+                        let yesterday = new Date(this.currentWeekMenus[0].date);
                         yesterday.setDate(yesterday.getDate()-1);
                         this.set('routeData.date', yesterday.toISOString().slice(0, DATE_LENGTH));
                     }
diff --git a/client/user/src/mealorder/shell/reducers/reducers.html b/client/user/src/mealorder/shell/reducers/reducers.html
index 51c09f86..547f197e 100644
--- a/client/user/src/mealorder/shell/reducers/reducers.html
+++ b/client/user/src/mealorder/shell/reducers/reducers.html
@@ -57,9 +57,8 @@
 
         MealOrderApp.initialState = {
             currentWeekMenus: arrayOfDates,
-            menuForDay: [],
 
-            currentDate: new Date('2018-03-21'),
+            menuForDay: [],
             menus: [
                 {
                     vendor: 'Пюре',

From 7c41b1bf0e0a1853b43cd649579f4bed970f26dc Mon Sep 17 00:00:00 2001
From: Paul <paulageyev@gmail.com>
Date: Thu, 26 Apr 2018 18:16:39 +0300
Subject: [PATCH 211/253] Add a days calculation with a possible menu

---
 .../src/mealorder/meal-order-client-app.html  |  87 ++------------
 .../src/mealorder/menu/meal-order-drawer.html |   1 +
 .../menu/meal-order-menu-container.html       |  91 ++++++++++-----
 .../mealorder/shell/reducers/reducers.html    | 106 ++++--------------
 4 files changed, 98 insertions(+), 187 deletions(-)

diff --git a/client/user/src/mealorder/meal-order-client-app.html b/client/user/src/mealorder/meal-order-client-app.html
index 1c19430c..e370241e 100644
--- a/client/user/src/mealorder/meal-order-client-app.html
+++ b/client/user/src/mealorder/meal-order-client-app.html
@@ -146,7 +146,7 @@
                             fallback-selection="view404"
                             role="main">
                 </iron-pages>
-                <meal-order-drawer order="[[order]]"></meal-order-drawer>
+                <meal-order-drawer></meal-order-drawer>
             </app-drawer>
 
             <app-header-layout>
@@ -189,11 +189,10 @@
                             fallback-selection="view404"
                             role="main">
                     <meal-order-menu-container
-                            on-current-date-changed="_changeCurrentDate"
                             data-page="menu"
+                            server-time="[[serverTime]]"
                             date="[[routeData.date]]"
-                            current-week-menus="[[currentWeekMenus]]"
-                            menu-for-day="[[menuForDay]]"></meal-order-menu-container>
+                            menus="[[menus]]"></meal-order-menu-container>
                     <div data-page="history">
                         <!--user history component-->
                     </div>
@@ -222,6 +221,7 @@
 
             static get properties() {
                 return {
+
                     /**
                      * Menu for a current day.
                      *
@@ -240,47 +240,9 @@
                      * @property {String} price
                      * @property {String} quantity
                      */
-                    menuForDay: {
+                    menus: {
                         type: Array,
-                        statePath: 'menuForDay'
-                    },
-
-                    /**
-                     * Current user's meal order.
-                     *
-                     * @typedef {Object} Order the current order
-                     *
-                     * @typedef {Object} Date contains day, month, year
-                     * @property {Number} day
-                     * @property {Number} month
-                     * @property {Number} year
-                     *
-                     * @typedef {Array} Cart array that contains the vendor and dishes
-                     * @property {String} Vendor a vendor name
-                     * @typedef {Array} Dishes array contains the dish title, price, quantity
-                     * @property {String} title
-                     * @property {String} price
-                     * @property {String} quantity
-                     */
-                    orderForDay: {
-                        type: Object,
-                        statePath: 'orderForDay'
-                    },
-
-                    /**
-                     * Array of dates with menu which may not exist.
-                     *
-                     * @typedef {Object} Date contains day, month, year
-                     * @property {Number} day
-                     * @property {Number} month
-                     * @property {Number} year
-                     *
-                     * @typedef {String} dayOfTheWeek
-                     * @typedef {Boolean} hasMenu If menu for this date exists
-                     */
-                    currentWeekMenus: {
-                        type: Array,
-                        statePath: 'currentWeekMenus'
+                        statePath: 'menus'
                     },
 
                     /**
@@ -292,39 +254,14 @@
                         type: Object,
                     },
 
-                    /**
-                     * Current date.
-                     */
-                    currentDate: {
+                    serverTime: {
                         type: Object,
-                        statePath: 'currentDate'
+                        statePath: 'serverTime'
                     }
 
                 }
             }
 
-            static get actions() {
-                /**
-                 * Fired when a paper tab is selected.
-                 *
-                 * @action `changeCurrentMenu`
-                 * @param {date} selected date by tab
-                 */
-
-                /**
-                 * Fired when a paper tab is selected.
-                 *
-                 * @action `changeCurrentOrder`
-                 * @param {date} selected date by tab
-                 */
-                return {
-                    setCurrentDate: date => ({
-                        type: MealOrderApp.UserAction.SET_CURRENT_DATE,
-                        date
-                    }),
-                }
-            }
-
             static get observers() {
                 return [
                     '_pageChanged(routeData.page)'
@@ -340,20 +277,16 @@
             _pageChanged() {
                 const DATE_LENGTH = 10;
                 if (!this.routeData.page || (this.routeData.page.startsWith("menu") && !this.routeData.date)) {
-                    this.set('route.path', '/menu/' + this.currentWeekMenus[0].date.toISOString().slice(0,DATE_LENGTH));
+                    this.set('route.path', '/menu/' + this.serverTime.toISOString().slice(0,DATE_LENGTH));
                 }
                 if (this.routeData.page.startsWith("history")) {
                     if (!this.routeData.date) {
-                        let yesterday = new Date(this.currentWeekMenus[0].date);
+                        let yesterday = new Date(this.serverTime);
                         yesterday.setDate(yesterday.getDate()-1);
                         this.set('routeData.date', yesterday.toISOString().slice(0, DATE_LENGTH));
                     }
                 }
             }
-
-            _changeCurrentDate(e) {
-                this.dispatch('setCurrentDate', e.detail.date)
-            }
         }
 
         window.customElements.define(MealOrderClientApp.is, MealOrderClientApp);
diff --git a/client/user/src/mealorder/menu/meal-order-drawer.html b/client/user/src/mealorder/menu/meal-order-drawer.html
index a3444aef..f6719304 100644
--- a/client/user/src/mealorder/menu/meal-order-drawer.html
+++ b/client/user/src/mealorder/menu/meal-order-drawer.html
@@ -21,6 +21,7 @@
 <link rel="import" href="../../../bower_components/app-route/app-route.html">
 <link rel="import" href="../../../bower_components/iron-pages/iron-pages.html">
 <link rel="import" href="../../../bower_components/app-datepicker/app-datepicker.html">
+<link rel="import" href="../../../bower_components/app-layout/app-toolbar/app-toolbar.html">
 
 <dom-module id="meal-order-drawer">
     <template>
diff --git a/client/user/src/mealorder/menu/meal-order-menu-container.html b/client/user/src/mealorder/menu/meal-order-menu-container.html
index 7af19760..ef4cc021 100644
--- a/client/user/src/mealorder/menu/meal-order-menu-container.html
+++ b/client/user/src/mealorder/menu/meal-order-menu-container.html
@@ -75,18 +75,18 @@
             }
         </style>
 
-        <paper-tabs on-iron-select='_dateChanged' id="paper-tabs" selected="[[date]]"
+        <paper-tabs id="paper-tabs" selected="[[date]]"
                     attr-for-selected='data-key'>
-            <template is="dom-repeat" items="{{currentWeekMenus}}" as="calendar">
+            <template is="dom-repeat" items="{{currentWeek}}" as="calendar">
                 <paper-tab class="paper-tab"
-                           data-key$="[[_getDate(calendar.date)]]"
+                           data-key$="[[_getDate(calendar)]]"
                            link disabled="[[!calendar.hasMenu]]">
-                    <a href="#/menu/[[_getDate(calendar.date)]]"
+                    <a href="#/menu/[[_getDate(calendar)]]"
                        class="paper-tab-container">
                         <div>
-                            <div class="day-of-the-week">[[_getDayOfTheWeek(calendar.date)]]
+                            <div class="day-of-the-week">[[_getDayOfTheWeek(calendar)]]
                             </div>
-                            <div class="day">[[_getDay(calendar.date)]]</div>
+                            <div class="day">[[_getDay(calendar)]]</div>
                         </div>
                     </a>
                 </paper-tab>
@@ -111,21 +111,6 @@
 
             static get properties() {
                 return {
-                    /**
-                     * Array of dates with menu which may not exist.
-                     *
-                     * @typedef {Object} Date contains day, month, year
-                     * @property {Number} day
-                     * @property {Number} month
-                     * @property {Number} year
-                     *
-                     * @typedef {String} dayOfTheWeek
-                     * @typedef {Boolean} hasMenu If menu for this date exists
-                     */
-                    currentWeekMenus: {
-                        type: Array,
-                    },
-
                     /**
                      * Menu for a current day.
                      *
@@ -144,8 +129,13 @@
                      * @property {String} price
                      * @property {String} quantity
                      */
+                    menus: {
+                        type: Array,
+                    },
+
                     menuForDay: {
                         type: Object,
+                        computed: '_getMenuForDay(date)'
                     },
 
                     /**
@@ -153,7 +143,26 @@
                      */
                     date: {
                         type: Object,
-                    }
+                    },
+
+                    /**
+                     * Array of dates with menu which may not exist.
+                     *
+                     * @typedef {Object} Date
+                     * @typedef {Boolean} hasMenu If menu for this date exists
+                     */
+                    currentWeek: {
+                        type: Array,
+                        computed: '_getMenuDatesForWeek(menus)'
+                    },
+
+                    /**
+                     * The current server time for the calendar.
+                     */
+                    serverTime: {
+                        type: Object,
+                    },
+
                 };
             }
 
@@ -163,7 +172,7 @@
 
             _getDate(date) {
                 const DATE_LENGTH = 10;
-                return date.toISOString().slice(0,DATE_LENGTH);
+                return date.toISOString().slice(0, DATE_LENGTH);
             }
 
             _getDayOfTheWeek(date) {
@@ -172,9 +181,39 @@
                 return dayOfTheWeek;
             }
 
-            _dateChanged(e) {
-                this.dispatchEvent(new CustomEvent('current-date-changed',
-                    {detail: {date: new Date(e.target.selected)}}));
+            _getMenuForDay(date) {
+                const routeDate = new Date(date);
+                const menus = this.menus.filter(menu => menu.date);
+                return menus.filter(menu => menu.date.getTime() === routeDate.getTime());
+            }
+
+            _getMenuDatesForWeek(menus) {
+                const weekDates = [];
+                let menuDates = [];
+
+                for (let i = 0; i < 8; i++) {
+                    let tempDate = new Date();
+                    tempDate.setDate(this.serverTime.getDate() + i);
+                    tempDate.setMonth(this.serverTime.getMonth());
+                    weekDates.push(tempDate);
+                }
+
+                const dates = this.menus.filter(menu => menu.date);
+                for (let i = 0; i < dates.length; i++) {
+                    menuDates.push(dates[i].date);
+                }
+
+                menuDates = menuDates.map(s => s.toString())
+                    .filter((s, i, a) => a.indexOf(s) === i)
+                    .map(s => new Date(s));
+
+                for (let i = 0; i < menuDates.length; i++) {
+                    const diff = weekDates[i].getTime() - menuDates[i].getTime();
+                    if (diff >= 0 && diff < 86400000) {
+                        weekDates[i].hasMenu = true;
+                    }
+                }
+                return weekDates;
             }
         }
 
diff --git a/client/user/src/mealorder/shell/reducers/reducers.html b/client/user/src/mealorder/shell/reducers/reducers.html
index 547f197e..7a52a405 100644
--- a/client/user/src/mealorder/shell/reducers/reducers.html
+++ b/client/user/src/mealorder/shell/reducers/reducers.html
@@ -22,43 +22,9 @@
 
 <script>
     {
-        const arrayOfDates = [{
-            date: new Date('2018-03-21'),
-            hasMenu: true
-        },
-            {
-                date: new Date('2018-03-22'),
-                hasMenu: true
-            },
-            {
-                date: new Date('2018-03-23'),
-                hasMenu: true
-            },
-            {
-                date: new Date('2018-03-24'),
-                hasMenu: false
-            },
-            {
-                date: new Date('2018-03-25'),
-                hasMenu: false
-            }
-            , {
-                date: new Date('2018-03-26'),
-                hasMenu: true
-            }
-            , {
-                date: new Date('2018-03-27'),
-                hasMenu: true
-            }
-            , {
-                date: new Date('2018-03-28'),
-                hasMenu: true
-            }];
-
         MealOrderApp.initialState = {
-            currentWeekMenus: arrayOfDates,
 
-            menuForDay: [],
+            serverTime: new Date('2018-03-21'),
             menus: [
                 {
                     vendor: 'Пюре',
@@ -139,47 +105,28 @@
                                 {title: 'Лимонад', price: 40}]
                         }
                     ]
-                }],
-            orderForDay: [],
-            orders: [{
-                date: new Date('2018-03-21'),
-                order: [{
-                    vendor: "Пюре",
-                    dishes: [
-                        {title: 'Борщ украинский', price: 35, quantity: 1},
-                        {title: 'Солянка', price: 40, quantity: 1},
-                        {title: 'Суп гороховый', price: 40, quantity: 1},
-                        {title: 'Уха', price: 35, quantity: 1},
-                        {title: 'Суп-пюре грибной', price: 40, quantity: 1},
-                        {title: 'Суп куриный', price: 40, quantity: 1},]
-                }, {
-                    vendor: 'Позитив',
-                    dishes: [{title: 'Суп куриный', price: 35, quantity: 1}, {
-                        title: 'Стейк из лосося',
-                        price: 35,
-                        quantity: 1
-                    }]
-                }]
-            }, {
-                date: new Date('2018-03-22'),
-                order: [{
-                    vendor: "Пюре",
-                    dishes: [
-                        {title: 'Щи русские', price: 48, quantity: 1},
-                        {title: 'Солянка', price: 40, quantity: 1},
-                        {title: 'Суп гороховый', price: 40, quantity: 1},
-                        {title: 'Уха', price: 35, quantity: 1},
-                        {title: 'Суп-пюре грибной', price: 40, quantity: 1},
-                        {title: 'Суп куриный', price: 40, quantity: 1},]
-                }, {
+                },
+                {
                     vendor: 'Позитив',
-                    dishes: [{title: 'Лапша по армянски', price: 35, quantity: 1}, {
-                        title: 'Стейк из лосося',
-                        price: 35,
-                        quantity: 1
-                    }]
-                }]
-            }]
+
+                    categories: [{
+                        categoryName: 'Первое блюдо', dishes: [
+                            {title: 'Суп сырный', price: 35},
+                            {title: 'Суп с лапшой', price: 40},
+                            {title: 'Борщ красный', price: 40},
+                            {title: 'Борщ зеленый', price: 35}]
+                    }
+                        , {
+                            categoryName: 'Второе блюдо', dishes: [
+                                {title: 'Стейк из лосося', price: 40},
+                                {title: 'Стейк из говядины', price: 45}]
+                        },
+                        {
+                            categoryName: 'Напитки', dishes: [
+                                {title: 'Лимонад', price: 40}]
+                        }
+                    ]
+                }],
         };
 
         MealOrderApp.reducer = (state, action) => {
@@ -187,15 +134,6 @@
                 return MealOrderApp.initialState;
             }
             switch (action.type) {
-                case MealOrderApp.UserAction.SET_CURRENT_DATE: {
-                    const menu = state.menus.filter(menu => menu.date.getTime() === action.date.getTime());
-                    const newOrder = state.orders.find(order => order.date.getTime() === action.date.getTime());
-                    return Object.assign({}, state, {
-                            menuForDay: menu,
-                            currentOrder: newOrder,
-                        }
-                    );
-                }
                 default : {
                     return state;
                 }

From 7acf542b511dc0eb1e8ba1d69f96c45bfdfddd73 Mon Sep 17 00:00:00 2001
From: Paul <paulageyev@gmail.com>
Date: Thu, 26 Apr 2018 18:19:15 +0300
Subject: [PATCH 212/253] Add docs

---
 client/user/src/mealorder/meal-order-client-app.html  | 4 +++-
 client/user/src/mealorder/menu/meal-order-drawer.html | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/client/user/src/mealorder/meal-order-client-app.html b/client/user/src/mealorder/meal-order-client-app.html
index e370241e..178ba98e 100644
--- a/client/user/src/mealorder/meal-order-client-app.html
+++ b/client/user/src/mealorder/meal-order-client-app.html
@@ -221,7 +221,6 @@
 
             static get properties() {
                 return {
-
                     /**
                      * Menu for a current day.
                      *
@@ -254,6 +253,9 @@
                         type: Object,
                     },
 
+                    /**
+                     * The current server time for the calendar.
+                     */
                     serverTime: {
                         type: Object,
                         statePath: 'serverTime'
diff --git a/client/user/src/mealorder/menu/meal-order-drawer.html b/client/user/src/mealorder/menu/meal-order-drawer.html
index f6719304..0198ab99 100644
--- a/client/user/src/mealorder/menu/meal-order-drawer.html
+++ b/client/user/src/mealorder/menu/meal-order-drawer.html
@@ -17,11 +17,11 @@
   ~ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
   ~ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   -->
+<link rel="import" href="../../../bower_components/app-layout/app-toolbar/app-toolbar.html">
 <link rel="import" href="../../../bower_components/app-route/app-location.html">
 <link rel="import" href="../../../bower_components/app-route/app-route.html">
 <link rel="import" href="../../../bower_components/iron-pages/iron-pages.html">
 <link rel="import" href="../../../bower_components/app-datepicker/app-datepicker.html">
-<link rel="import" href="../../../bower_components/app-layout/app-toolbar/app-toolbar.html">
 
 <dom-module id="meal-order-drawer">
     <template>

From 2f2d198a328a4fba9da5df013bbc58b0de2938be Mon Sep 17 00:00:00 2001
From: Paul <paulageyev@gmail.com>
Date: Thu, 26 Apr 2018 18:35:38 +0300
Subject: [PATCH 213/253] Remove the order property from the
 `meal-order-drawer` component

---
 .../src/mealorder/menu/meal-order-drawer.html | 29 ++--------
 .../menu/meal-order-menu-container.html       | 54 +++++++++----------
 2 files changed, 29 insertions(+), 54 deletions(-)

diff --git a/client/user/src/mealorder/menu/meal-order-drawer.html b/client/user/src/mealorder/menu/meal-order-drawer.html
index 0198ab99..c34575af 100644
--- a/client/user/src/mealorder/menu/meal-order-drawer.html
+++ b/client/user/src/mealorder/menu/meal-order-drawer.html
@@ -129,24 +129,11 @@
             static get properties() {
                 return {
                     /**
-                     * Current user's meal order.
-                     *
-                     * @typedef {Object} Order the current order
-                     *
-                     * @typedef {Object} Date contains day, month, year
-                     * @property {Number} day
-                     * @property {Number} month
-                     * @property {Number} year
-                     *
-                     * @typedef {Array} Cart array that contains the vendor and dishes
-                     * @property {String} Vendor a vendor name
-                     * @typedef {Array} Dishes array contains the dish title, price, quantity
-                     * @property {String} title
-                     * @property {String} price
-                     * @property {String} quantity
+                     * Selected day.
                      */
-                    order: {
-                        type: Array,
+                    selectedDay: {
+                        type: Object,
+                        computed: '_changeSelectedDay(routeData.date)'
                     },
 
                     /**
@@ -170,14 +157,6 @@
                     routeData: {
                         type: Object,
                     },
-
-                    /**
-                     * Selected day.
-                     */
-                    selectedDay: {
-                        type: Object,
-                        computed: '_changeSelectedDay(routeData.date)'
-                    }
                 }
             }
 
diff --git a/client/user/src/mealorder/menu/meal-order-menu-container.html b/client/user/src/mealorder/menu/meal-order-menu-container.html
index ef4cc021..e548e9c1 100644
--- a/client/user/src/mealorder/menu/meal-order-menu-container.html
+++ b/client/user/src/mealorder/menu/meal-order-menu-container.html
@@ -112,30 +112,10 @@
             static get properties() {
                 return {
                     /**
-                     * Menu for a current day.
-                     *
-                     * @typedef {Object} Menu the menu for the current date
-                     *
-                     * @property {String} Vendor a vendor name
-                     *
-                     * @typedef {Object} Date contains day, month, year
-                     * @property {Number} day
-                     * @property {Number} month
-                     * @property {Number} year
-                     *
-                     * @typedef {Array} Categories array contains the category name and dishes
-                     * @typedef {Array} Dishes array contains the dish title, price, quantity
-                     * @property {String} title
-                     * @property {String} price
-                     * @property {String} quantity
+                     * The current server time for the calendar.
                      */
-                    menus: {
-                        type: Array,
-                    },
-
-                    menuForDay: {
+                    serverTime: {
                         type: Object,
-                        computed: '_getMenuForDay(date)'
                     },
 
                     /**
@@ -157,12 +137,26 @@
                     },
 
                     /**
-                     * The current server time for the calendar.
+                     * Menu for a current day.
+                     *
+                     * @typedef {Object} Menu the menu for the current date
+                     *
+                     * @property {String} Vendor a vendor name
+                     *
+                     * @typedef {Object} Date contains day, month, year
+                     * @property {Number} day
+                     * @property {Number} month
+                     * @property {Number} year
+                     *
+                     * @typedef {Array} Categories array contains the category name and dishes
+                     * @typedef {Array} Dishes array contains the dish title, price, quantity
+                     * @property {String} title
+                     * @property {String} price
+                     * @property {String} quantity
                      */
-                    serverTime: {
-                        type: Object,
+                    menus: {
+                        type: Array,
                     },
-
                 };
             }
 
@@ -190,15 +184,16 @@
             _getMenuDatesForWeek(menus) {
                 const weekDates = [];
                 let menuDates = [];
+                const DAYS_IN_PERIOD = 8;
 
-                for (let i = 0; i < 8; i++) {
+                for (let i = 0; i < DAYS_IN_PERIOD; i++) {
                     let tempDate = new Date();
                     tempDate.setDate(this.serverTime.getDate() + i);
                     tempDate.setMonth(this.serverTime.getMonth());
                     weekDates.push(tempDate);
                 }
 
-                const dates = this.menus.filter(menu => menu.date);
+                const dates = menus.filter(menu => menu.date);
                 for (let i = 0; i < dates.length; i++) {
                     menuDates.push(dates[i].date);
                 }
@@ -207,9 +202,10 @@
                     .filter((s, i, a) => a.indexOf(s) === i)
                     .map(s => new Date(s));
 
+                const HOURS_PER_DAY = 86400000;
                 for (let i = 0; i < menuDates.length; i++) {
                     const diff = weekDates[i].getTime() - menuDates[i].getTime();
-                    if (diff >= 0 && diff < 86400000) {
+                    if (diff >= 0 && diff < HOURS_PER_DAY) {
                         weekDates[i].hasMenu = true;
                     }
                 }

From 98f34b0f5c68d5d9f1f255bdd6ee202f4a173f10 Mon Sep 17 00:00:00 2001
From: Paul <paulageyev@gmail.com>
Date: Thu, 26 Apr 2018 18:55:17 +0300
Subject: [PATCH 214/253] Rename properties for the menu

---
 .../src/mealorder/menu/meal-order-menu-container.html  |  5 +++--
 .../src/mealorder/menu/meal-order-vendor-menus.html    | 10 +++++-----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/client/user/src/mealorder/menu/meal-order-menu-container.html b/client/user/src/mealorder/menu/meal-order-menu-container.html
index 8e0db217..9b3fb2f2 100644
--- a/client/user/src/mealorder/menu/meal-order-menu-container.html
+++ b/client/user/src/mealorder/menu/meal-order-menu-container.html
@@ -79,7 +79,7 @@
 
         <paper-tabs id="paper-tabs" selected="[[date]]"
                     attr-for-selected='data-key'>
-            <template is="dom-repeat" items="{{currentWeek}}" as="calendar">
+            <template is="dom-repeat" items="[[_getMenuDatesForWeek(menus)]]" as="calendar">
                 <paper-tab class="paper-tab"
                            data-key$="[[_getDate(calendar)]]"
                            link disabled="[[!calendar.hasMenu]]">
@@ -94,7 +94,7 @@
                 </paper-tab>
             </template>
         </paper-tabs>
-            <meal-order-vendor-menus items="[[menuForDay]]"></meal-order-vendor-menus>
+            <meal-order-vendor-menus menu-for-day="[[_getMenuForDay(date)]]"></meal-order-vendor-menus>
     </template>
     <script>
         /**
@@ -180,6 +180,7 @@
             _getMenuForDay(date) {
                 const routeDate = new Date(date);
                 const menus = this.menus.filter(menu => menu.date);
+                console.log(menus.filter(menu => menu.date.getTime() === routeDate.getTime()));
                 return menus.filter(menu => menu.date.getTime() === routeDate.getTime());
             }
 
diff --git a/client/user/src/mealorder/menu/meal-order-vendor-menus.html b/client/user/src/mealorder/menu/meal-order-vendor-menus.html
index aa02c1f4..2fdaa6bc 100644
--- a/client/user/src/mealorder/menu/meal-order-vendor-menus.html
+++ b/client/user/src/mealorder/menu/meal-order-vendor-menus.html
@@ -130,7 +130,7 @@
                      *
                      * @property {{name:String vendor name, categories:array a menu of a vendor for a day}}.
                      */
-                    items: {
+                    menuForDay: {
                         type: Array,
                     },
 
@@ -139,7 +139,7 @@
                      */
                     filtered: {
                         type: Array,
-                        computed: '_filteredItems(items,filter)',
+                        computed: '_filteredItems(menuForDay,filter)',
                         reflectToAttribute: true
                     },
 
@@ -162,8 +162,8 @@
             _filteredItems() {
                 const predicate = this.filter;
                 const filtered = [];
-                for (let i = 0; i < this.items.length; i++) {
-                    const vendorCategories = this.items[i].categories;
+                for (let i = 0; i < this.menuForDay.length; i++) {
+                    const vendorCategories = this.menuForDay[i].categories;
                     let newVendorCategories = [];
                     for (let j = 0; j < vendorCategories.length; j++) {
                         let vendorDishes = vendorCategories[j].dishes;
@@ -173,7 +173,7 @@
                             dishes: newVendorDishes
                         });
                     }
-                    filtered.push({vendor: this.items[i].vendor, categories: newVendorCategories});
+                    filtered.push({vendor: this.menuForDay[i].vendor, categories: newVendorCategories});
                 }
                 return filtered;
             }

From 3c7accf0436bf3ae834ae39d65a39fcbda7ddfd8 Mon Sep 17 00:00:00 2001
From: Paul <paulageyev@gmail.com>
Date: Thu, 26 Apr 2018 19:01:33 +0300
Subject: [PATCH 215/253] Remove unnecessary actions

---
 client/user/src/mealorder/shell/actions/user-actions.html | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/client/user/src/mealorder/shell/actions/user-actions.html b/client/user/src/mealorder/shell/actions/user-actions.html
index da79f71a..eb8318c8 100644
--- a/client/user/src/mealorder/shell/actions/user-actions.html
+++ b/client/user/src/mealorder/shell/actions/user-actions.html
@@ -20,8 +20,5 @@
 
 <script>
     MealOrderApp.UserAction = {
-        SET_CURRENT_MENU: "SET_CURRENT_MENU",
-        SET_CURRENT_ORDER: 'SET_CURRENT_ORDER',
-        SET_CURRENT_DATE: 'SET_CURRENT_DATE'
     }
 </script>

From 318ec3707a5faae6b919b999e84876c012d16d0f Mon Sep 17 00:00:00 2001
From: Paul <paulageyev@gmail.com>
Date: Thu, 26 Apr 2018 19:16:13 +0300
Subject: [PATCH 216/253] Add if statement for the existence of the menu for
 the day

---
 .../src/mealorder/meal-order-client-app.html  | 11 +++++++-
 .../menu/meal-order-menu-container.html       |  1 -
 .../menu/meal-order-vendor-menus.html         | 25 +++++++++++--------
 .../mealorder/shell/actions/user-actions.html |  1 +
 .../mealorder/shell/reducers/reducers.html    |  4 +++
 5 files changed, 30 insertions(+), 12 deletions(-)

diff --git a/client/user/src/mealorder/meal-order-client-app.html b/client/user/src/mealorder/meal-order-client-app.html
index 4eb1d877..237617b0 100644
--- a/client/user/src/mealorder/meal-order-client-app.html
+++ b/client/user/src/mealorder/meal-order-client-app.html
@@ -266,6 +266,15 @@
                 }
             }
 
+            static get actions() {
+                return {
+                    addDishToOrder: order => ({
+                        type: MealOrderApp.UserAction.ADD_DISH_TO_ORDER,
+                        order
+                    })
+                }
+            }
+
             static get observers() {
                 return [
                     '_pageChanged(routeData.page)'
@@ -296,7 +305,7 @@
                 const order = {};
                 order.dish = e.detail;
                 order.date = this.routeData.date;
-                //this.dispatch('addDish', order);
+                this.dispatch('addDishToOrder', order);
             }
         }
 
diff --git a/client/user/src/mealorder/menu/meal-order-menu-container.html b/client/user/src/mealorder/menu/meal-order-menu-container.html
index 9b3fb2f2..728e418f 100644
--- a/client/user/src/mealorder/menu/meal-order-menu-container.html
+++ b/client/user/src/mealorder/menu/meal-order-menu-container.html
@@ -180,7 +180,6 @@
             _getMenuForDay(date) {
                 const routeDate = new Date(date);
                 const menus = this.menus.filter(menu => menu.date);
-                console.log(menus.filter(menu => menu.date.getTime() === routeDate.getTime()));
                 return menus.filter(menu => menu.date.getTime() === routeDate.getTime());
             }
 
diff --git a/client/user/src/mealorder/menu/meal-order-vendor-menus.html b/client/user/src/mealorder/menu/meal-order-vendor-menus.html
index 2fdaa6bc..639a27d5 100644
--- a/client/user/src/mealorder/menu/meal-order-vendor-menus.html
+++ b/client/user/src/mealorder/menu/meal-order-vendor-menus.html
@@ -162,18 +162,23 @@
             _filteredItems() {
                 const predicate = this.filter;
                 const filtered = [];
-                for (let i = 0; i < this.menuForDay.length; i++) {
-                    const vendorCategories = this.menuForDay[i].categories;
-                    let newVendorCategories = [];
-                    for (let j = 0; j < vendorCategories.length; j++) {
-                        let vendorDishes = vendorCategories[j].dishes;
-                        let newVendorDishes = vendorDishes.filter(dish => dish.title.toLowerCase().includes(predicate.toLowerCase()));
-                        newVendorCategories.push({
-                            categoryName: vendorCategories[j].categoryName,
-                            dishes: newVendorDishes
+                if (this.menuForDay) {
+                    for (let i = 0; i < this.menuForDay.length; i++) {
+                        const vendorCategories = this.menuForDay[i].categories;
+                        let newVendorCategories = [];
+                        for (let j = 0; j < vendorCategories.length; j++) {
+                            let vendorDishes = vendorCategories[j].dishes;
+                            let newVendorDishes = vendorDishes.filter(dish => dish.title.toLowerCase().includes(predicate.toLowerCase()));
+                            newVendorCategories.push({
+                                categoryName: vendorCategories[j].categoryName,
+                                dishes: newVendorDishes
+                            });
+                        }
+                        filtered.push({
+                            vendor: this.menuForDay[i].vendor,
+                            categories: newVendorCategories
                         });
                     }
-                    filtered.push({vendor: this.menuForDay[i].vendor, categories: newVendorCategories});
                 }
                 return filtered;
             }
diff --git a/client/user/src/mealorder/shell/actions/user-actions.html b/client/user/src/mealorder/shell/actions/user-actions.html
index eb8318c8..c7afeca7 100644
--- a/client/user/src/mealorder/shell/actions/user-actions.html
+++ b/client/user/src/mealorder/shell/actions/user-actions.html
@@ -20,5 +20,6 @@
 
 <script>
     MealOrderApp.UserAction = {
+        ADD_DISH_TO_ORDER: "ADD_DISH_TO_ORDER"
     }
 </script>
diff --git a/client/user/src/mealorder/shell/reducers/reducers.html b/client/user/src/mealorder/shell/reducers/reducers.html
index 7a52a405..5e36924c 100644
--- a/client/user/src/mealorder/shell/reducers/reducers.html
+++ b/client/user/src/mealorder/shell/reducers/reducers.html
@@ -130,10 +130,14 @@
         };
 
         MealOrderApp.reducer = (state, action) => {
+
             if (!state) {
                 return MealOrderApp.initialState;
             }
             switch (action.type) {
+                case MealOrderApp.UserAction.ADD_DISH_TO_ORDER: {
+                    return state;
+                }
                 default : {
                     return state;
                 }

From b80913355ec8aa1a2c08ad5fec22853f33dc449f Mon Sep 17 00:00:00 2001
From: Paul <paulageyev@gmail.com>
Date: Thu, 26 Apr 2018 20:49:29 +0300
Subject: [PATCH 217/253] Refactor
 `REMOVE_DISH_FROM_ORDER`,`REMOVE_DISHES_BY_VENDOR` actions

---
 .../src/mealorder/menu/meal-order-drawer.html |  3 +-
 .../mealorder/menu/meal-order-user-cart.html  | 87 ++++++++++++-------
 .../mealorder/menu/meal-order-user-order.html | 38 ++++++--
 .../mealorder/shell/actions/user-actions.html |  3 +-
 .../mealorder/shell/reducers/reducers.html    | 52 ++++++++++-
 5 files changed, 141 insertions(+), 42 deletions(-)

diff --git a/client/user/src/mealorder/menu/meal-order-drawer.html b/client/user/src/mealorder/menu/meal-order-drawer.html
index 123c85e3..d1421b2a 100644
--- a/client/user/src/mealorder/menu/meal-order-drawer.html
+++ b/client/user/src/mealorder/menu/meal-order-drawer.html
@@ -23,6 +23,7 @@
 <link rel="import" href="../../../bower_components/iron-pages/iron-pages.html">
 <link rel="import" href="../../../bower_components/app-datepicker/app-datepicker.html">
 <link rel="import" href="meal-order-user-cart.html">
+
 <dom-module id="meal-order-drawer">
     <template>
         <style>
@@ -94,7 +95,7 @@
                         </div>
                     </div>
                 </app-toolbar>
-                <meal-order-user-cart data-page="menu"></meal-order-user-cart>
+                <meal-order-user-cart data-page="menu" date="[[routeData.date]]"></meal-order-user-cart>
             </div>
             <div data-page="history">
                 <app-toolbar>
diff --git a/client/user/src/mealorder/menu/meal-order-user-cart.html b/client/user/src/mealorder/menu/meal-order-user-cart.html
index e98ddebd..17219097 100644
--- a/client/user/src/mealorder/menu/meal-order-user-cart.html
+++ b/client/user/src/mealorder/menu/meal-order-user-cart.html
@@ -18,8 +18,10 @@
   ~ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   -->
 <script src="../../../bower_components/webcomponentsjs/webcomponents-lite.js"></script>
+<link rel="import" href="../shell/meal-order-app-namespace.html">
 <link rel="import" href="../../../bower_components/polymer/polymer-element.html">
 <link rel="import" href="meal-order-user-order.html">
+<link rel="import" href="../shell/redux-store.html">
 
 <dom-module id="meal-order-user-cart">
     <template>
@@ -29,6 +31,7 @@
                 overflow-y: auto;
                 max-height: 93vh;
             }
+
             #total {
                 display: flex;
                 justify-content: space-between;
@@ -37,16 +40,19 @@
             }
         </style>
         <div id="cart">
-            <dom-repeat items="[[order]]" as="orderByVendor">
+            <dom-repeat items="[[currentOrder.order]]" as="orderByVendor">
                 <template>
-                    <meal-order-user-order order="[[orderByVendor]]"></meal-order-user-order>
+                    <meal-order-user-order
+                            on-user-order-vendor-removed="_removeDishFromOrder"
+                            on-user-order-dish-removed="_removeDishesByVendor"
+                            current-order="[[orderByVendor]]"></meal-order-user-order>
                 </template>
             </dom-repeat>
-            <dom-if if="[[order.length]]">
+            <dom-if if="[[currentOrder.order.length]]">
                 <template>
                     <div id="total">
                         <div class="amount">Общая сумма:</div>
-                        <div class="price">[[total]] ₴</div>
+                        <div class="price">[[_getTotalAmount(currentOrder)]] ₴</div>
                     </div>
                 </template>
             </dom-if>
@@ -59,7 +65,7 @@
          * @customElement
          * @polymer
          */
-        class MealOrderUserCart extends Polymer.Element {
+        class MealOrderUserCart extends MealOrderApp.ReduxMixin(Polymer.Element) {
             static get is() {
                 return 'meal-order-user-cart';
             }
@@ -67,45 +73,68 @@
             static get properties() {
                 return {
                     /**
-                     * Fired on dish remove button tap.
-                     *
-                     * @event `dish-removed`
-                     * @param {dish} contains vendor, title.
-                     */
-
-                    /**
-                     * Fired when a dish add button is tapped.
-                     *
-                     * @event `order-removed`
-                     * @param {order} contains vendor.
+                     * Selected day.
                      */
+                    date: {
+                        type: Object,
+                    },
 
                     /**
-                     * Array to be displayed in a user cart.
+                     * Array to be displayed in a user's order.
                      */
-                    order: {
+                    currentOrder: {
                         type: Array,
+                        statePath: 'currentOrder'
                     },
-                    /**
-                     * Total cost of an order for current day.
-                     */
-                    total: {
-                        type: Number,
-                        computed: '_getTotalAmount(order)'
-                    }
                 }
             }
 
-            _getTotalAmount() {
+            static get actions() {
+                return {
+                    getOrderedItems: date => ({
+                        type: MealOrderApp.UserAction.GET_ORDERED_ITEMS,
+                        date
+                    }),
+                    removeDishFromOrder: dish => ({
+                        type: MealOrderApp.UserAction.REMOVE_DISH_FROM_ORDER,
+                        dish
+                    }),
+                    removeDishesByVendor: vendor => ({
+                        type: MealOrderApp.UserAction.REMOVE_DISHES_BY_VENDOR,
+                        vendor
+                    })
+                }
+            }
+
+            static get observers() {
+                return [
+                    '_getCurrentOrder(date)'
+                ];
+            }
+
+            _getCurrentOrder(date) {
+                this.dispatch('getOrderedItems', new Date(date));
+            }
+
+            _getTotalAmount(currentOrder) {
                 let sum = 0;
-                for (let i = 0; i < this.order.length; i++) {
-                    for (let j = 0; j < this.order[i].dishes.length; j++) {
-                        sum += this.order[i].dishes[j].price * this.order[i].dishes[j].quantity;
+                for (let i = 0; i < currentOrder.order.length; i++) {
+                    for (let j = 0; j < currentOrder.order[i].dishes.length; j++) {
+                        sum += currentOrder.order[i].dishes[j].price * currentOrder.order[i].dishes[j].quantity;
                     }
                 }
                 return sum;
             }
+
+            _removeDishFromOrder(dish) {
+                this.dispatch('removeDishFromOrder', dish);
+            }
+
+            _removeDishesByVendor(vendor) {
+                this.dispatch('removeDishesByVendor', vendor);
+            }
         }
+
         window.customElements.define(MealOrderUserCart.is, MealOrderUserCart);
     </script>
 </dom-module>
diff --git a/client/user/src/mealorder/menu/meal-order-user-order.html b/client/user/src/mealorder/menu/meal-order-user-order.html
index cb197ff9..00783e98 100644
--- a/client/user/src/mealorder/menu/meal-order-user-order.html
+++ b/client/user/src/mealorder/menu/meal-order-user-order.html
@@ -57,10 +57,11 @@
             }
         </style>
         <div class="vendor">
-            <div>[[order.vendor]]</div>
-            <paper-icon-button icon="delete" class="icon-delete" on-click="_removeDishesByVendor"></paper-icon-button>
+            <div>[[currentOrder.vendor]]</div>
+            <paper-icon-button icon="delete" class="icon-delete"
+                               on-click="_removeDishesByVendor"></paper-icon-button>
         </div>
-        <dom-repeat items="[[order.dishes]]" as="dish">
+        <dom-repeat items="[[currentOrder.dishes]]" as="dish">
             <template>
                 <div class="order-details">
                     <div class="order-title">[[dish.title]]</div>
@@ -73,7 +74,7 @@
     </template>
     <script>
         /**
-         * user-order is user's order for current date, for current vendor.
+         * user-order component is user's order for current date, for current vendor.
          *
          * @customElement
          * @polymer
@@ -85,26 +86,45 @@
 
             static get properties() {
                 return {
+                    /**
+                     * Fired by clicking on the `Remove dish` button.
+                     *
+                     * @event `user-order-dish-removed`
+                     * @param {dish} contains dishes
+                     */
+
+                    /**
+                     * Fired by clicking on the `Remove dishes by vendor` button.
+                     *
+                     * @event `user-order-vendor-removed`
+                     * @param {vendor} contains vendor.
+                     */
+
                     /**
                      * Order for a current vendor.
                      */
-                    order: {
+                    currentOrder: {
                         type: Array
                     }
                 }
             }
 
             _removeDishesByVendor() {
-                this.dispatchEvent(new CustomEvent('user-order-vendor-removed', {composed: true, detail: this.order.vendor}));
+                this.dispatchEvent(new CustomEvent('user-order-vendor-removed', {
+                    detail: this.currentOrder.vendor
+                }));
             }
 
             _removeDish(e) {
                 const dish = {};
-                dish.vendor = this.order.vendor;
-                dish.name = this.order.dishes[e.model.index].title;
-                this.dispatchEvent(new CustomEvent('user-order-dish-removed', {composed: true, detail: dish}));
+                dish.vendor = this.currentOrder.vendor;
+                dish.name = this.currentOrder.dishes[e.model.index].title;
+                this.dispatchEvent(new CustomEvent('user-order-dish-removed', {
+                    detail: dish
+                }));
             }
         }
+
         window.customElements.define(MealOrderUserOrder.is, MealOrderUserOrder);
     </script>
 </dom-module>
diff --git a/client/user/src/mealorder/shell/actions/user-actions.html b/client/user/src/mealorder/shell/actions/user-actions.html
index 754e9d5e..0bbd38da 100644
--- a/client/user/src/mealorder/shell/actions/user-actions.html
+++ b/client/user/src/mealorder/shell/actions/user-actions.html
@@ -22,7 +22,8 @@
     MealOrderApp.UserAction = {
         ADD_DISH_TO_ORDER: "ADD_DISH_TO_ORDER",
         ADD_DISH: 'ADD_DISH',
-        REMOVE_DISH: 'REMOVE_DISH',
+        GET_ORDERED_ITEMS: 'GET_ORDERED_ITEMS',
+        REMOVE_DISH_FROM_ORDER: 'REMOVE_DISH_FROM_ORDER',
         REMOVE_DISHES_BY_VENDOR: 'REMOVE_DISHES_BY_VENDOR',
     }
 </script>
diff --git a/client/user/src/mealorder/shell/reducers/reducers.html b/client/user/src/mealorder/shell/reducers/reducers.html
index 5d2ff0b0..793d788e 100644
--- a/client/user/src/mealorder/shell/reducers/reducers.html
+++ b/client/user/src/mealorder/shell/reducers/reducers.html
@@ -127,23 +127,71 @@
                         }
                     ]
                 }],
+            orders: [{
+                date: new Date('2018-03-21'),
+                order: [{
+                    vendor: "Пюре",
+                    dishes: [
+                        {title: 'Борщ украинский', price: 35, quantity: 1},
+                        {title: 'Солянка', price: 40, quantity: 1},
+                        {title: 'Суп гороховый', price: 40, quantity: 1},
+                        {title: 'Уха', price: 35, quantity: 1},
+                        {title: 'Суп-пюре грибной', price: 40, quantity: 1},
+                        {title: 'Суп куриный', price: 40, quantity: 1},]
+                }, {
+                    vendor: 'Позитив',
+                    dishes: [{title: 'Суп куриный', price: 35, quantity: 1}, {
+                        title: 'Стейк из лосося',
+                        price: 35,
+                        quantity: 1
+                    }]
+                }]
+            }, {
+                date: new Date('2018-03-22'),
+                order: [{
+                    vendor: "Пюре",
+                    dishes: [
+                        {title: 'Щи русские', price: 48, quantity: 1},
+                        {title: 'Солянка', price: 40, quantity: 1},
+                        {title: 'Суп гороховый', price: 40, quantity: 1},
+                        {title: 'Уха', price: 35, quantity: 1},
+                        {title: 'Суп-пюре грибной', price: 40, quantity: 1},
+                        {title: 'Суп куриный', price: 40, quantity: 1},]
+                }, {
+                    vendor: 'Позитив',
+                    dishes: [{title: 'Лапша по армянски', price: 35, quantity: 1}, {
+                        title: 'Стейк из лосося',
+                        price: 35,
+                        quantity: 1
+                    }]
+                }]
+            },],
+
+            currentOrder: [],
         };
 
         MealOrderApp.reducer = (state, action) => {
-
             if (!state) {
                 return MealOrderApp.initialState;
             }
             switch (action.type) {
+
                 case MealOrderApp.UserAction.ADD_DISH_TO_ORDER: {
                     return state;
                 }
-                case MealOrderApp.UserAction.REMOVE_DISH: {
+                case MealOrderApp.UserAction.REMOVE_DISH_FROM_ORDER: {
                     return state;
                 }
                 case MealOrderApp.UserAction.REMOVE_DISHES_BY_VENDOR: {
                     return state;
                 }
+                case MealOrderApp.UserAction.GET_ORDERED_ITEMS: {
+                    const newOrder = state.orders.find(order => order.date.getTime() === action.date.getTime());
+                    return Object.assign({}, state, {
+                            currentOrder: newOrder
+                        }
+                    );
+                }
                 default : {
                     return state;
                 }

From 901952beddb9dba6d46a0e37870b756cb79071da Mon Sep 17 00:00:00 2001
From: Paul <paulageyev@gmail.com>
Date: Thu, 26 Apr 2018 21:50:51 +0300
Subject: [PATCH 218/253] Extract the `app-toolbar` to the component

---
 .../src/mealorder/meal-order-client-app.html  |  96 +------------
 .../src/mealorder/meal-order-toolbar.html     | 129 ++++++++++++++++++
 .../src/mealorder/menu/meal-order-drawer.html |  23 ++--
 .../menu/meal-order-menu-container.html       |   2 +-
 4 files changed, 146 insertions(+), 104 deletions(-)
 create mode 100644 client/user/src/mealorder/meal-order-toolbar.html

diff --git a/client/user/src/mealorder/meal-order-client-app.html b/client/user/src/mealorder/meal-order-client-app.html
index 178ba98e..c12d9b32 100644
--- a/client/user/src/mealorder/meal-order-client-app.html
+++ b/client/user/src/mealorder/meal-order-client-app.html
@@ -17,9 +17,6 @@
   ~ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
   ~ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   -->
-<link rel="import" href="shell/meal-order-app-namespace.html">
-<script src="../../bower_components/webcomponentsjs/webcomponents-lite.js"></script>
-
 <link rel="import" href="../../bower_components/polymer/polymer-element.html">
 <link rel="import" href="../../bower_components/app-layout/app-drawer/app-drawer.html">
 <link rel="import"
@@ -39,10 +36,11 @@
 <link rel="import" href="../../bower_components/iron-icons/iron-icons.html">
 <link rel="import" href="../../bower_components/iron-icons/maps-icons.html">
 <link rel="import" href="../../bower_components/paper-styles/color.html">
+<link rel="import" href="./shell/meal-order-app-namespace.html">
 <link rel="import" href="./shell/redux-store.html">
-<link rel="import" href="./menu/meal-order-menu-container.html">
+<link rel="import" href="./meal-order-toolbar.html">
 <link rel="import" href="./menu/meal-order-drawer.html">
-
+<link rel="import" href="./menu/meal-order-menu-container.html">
 <dom-module id="meal-order-client-app">
     <template>
         <style>
@@ -52,10 +50,6 @@
                 right: 300px;
             }
 
-            #main-title {
-                font-size: 1.375em;
-            }
-
             app-header-layout {
                 background-color: var(--paper-grey-100);
             }
@@ -69,28 +63,6 @@
                 display: none;
             }
 
-            app-header app-toolbar .app-toolbar-container {
-                display: flex;
-                width: 100%;
-                align-items: center;
-                justify-content: space-between;
-            }
-
-            app-header .title-link {
-                font-size: 0.8em;
-                text-decoration: none;
-                color: var(--paper-grey-50);
-            }
-
-            app-header .title-link:hover .route-title {
-                color: var(--paper-light-blue-500);
-            }
-
-            app-header .link-icon {
-                display: none;
-                color: var(--paper-grey-50);
-            }
-
             app-header .app-toolbar-content {
                 font-size: 0.75em;
             }
@@ -105,30 +77,6 @@
                 --app-drawer-width: 300px;
             }
 
-            #menu-history {
-                margin-right: 44px;
-            }
-
-            .app-header-iron-container {
-                display: flex;
-                justify-content: space-around;
-                align-items: center;
-            }
-
-            @media only screen and (max-width: 600px) {
-                .app-header-iron-container {
-                    width: 100px;
-                }
-
-                .route-title {
-                    display: none;
-                }
-
-                app-header .link-icon {
-                    display: block;
-                }
-
-            }
         </style>
         <app-location route="{{route}}"
                       use-hash-as-path></app-location>
@@ -139,7 +87,7 @@
                 data="{{routeData}}"></app-route>
 
         <app-drawer-layout fullbleed>
-            <app-drawer slot="drawer" align="right" class$="[[_getClassForDrawer(routeData.page)]]">
+            <app-drawer slot="drawer" align="right" class$="[[_getDrawerClass(routeData.page)]]">
                 <iron-pages id="app-drawer-iron"
                             selected="[[routeData.page]]"
                             attr-for-selected="data-page"
@@ -151,37 +99,7 @@
 
             <app-header-layout>
                 <app-header slot="header" reveals effects="waterfall">
-                    <app-toolbar>
-                        <div class="app-toolbar-container">
-                            <div id="main-title">Заказ обедов</div>
-                            <iron-pages id="app-header-iron"
-                                        selected="[[routeData.page]]"
-                                        attr-for-selected="data-page"
-                                        fallback-selection="view404"
-                                        role="main">
-                                <div data-page="menu" class="app-header-iron-container">
-                                    <a class="title-link" href="/#/history/">
-                                        <div class="route-title">История заказов</div>
-                                        <iron-icon class="link-icon"
-                                                   icon="maps:icons:history"></iron-icon>
-                                    </a>
-                                    <iron-icon class="drawer-icon"
-                                               icon="icons:shopping-cart" drawer-toggle></iron-icon>
-                                </div>
-                                <div data-page="history" class="app-header-iron-container">
-                                    <a class="title-link" href="/#/menu/">
-                                        <div id="menu-history" class="route-title">Сделать заказ
-                                        </div>
-                                        <iron-icon class="link-icon"
-                                                   icon="maps:icons:add"></iron-icon>
-                                    </a>
-                                    <iron-icon class="drawer-icon"
-                                               icon="icons:date-range"
-                                               drawer-toggle></iron-icon>
-                                </div>
-                            </iron-pages>
-                        </div>
-                    </app-toolbar>
+                    <meal-order-toolbar page="[[routeData.page]]"></meal-order-toolbar>
                 </app-header>
                 <iron-pages id="app-header-layout-iron"
                             selected="[[routeData.page]]"
@@ -226,7 +144,7 @@
                      *
                      * @typedef {Object} Menu the menu for the current date
                      *
-                     * @property {String} Vendor a vendor name
+                     * @property {String} vendor a vendor name
                      *
                      * @typedef {Object} Date contains day, month, year
                      * @property {Number} day
@@ -270,7 +188,7 @@
                 ];
             }
 
-            _getClassForDrawer(page) {
+            _getDrawerClass(page) {
                 if (page === "history") {
                     return "wide";
                 }
diff --git a/client/user/src/mealorder/meal-order-toolbar.html b/client/user/src/mealorder/meal-order-toolbar.html
new file mode 100644
index 00000000..e609ec85
--- /dev/null
+++ b/client/user/src/mealorder/meal-order-toolbar.html
@@ -0,0 +1,129 @@
+<!--
+  ~ Copyright 2018, TeamDev Ltd. All rights reserved.
+  ~
+  ~ Redistribution and use in source and/or binary forms, with or without
+  ~ modification, must retain the above copyright notice and the following
+  ~ disclaimer.
+  ~
+  ~ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+  ~ "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+  ~ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+  ~ A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+  ~ OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+  ~ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+  ~ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+  ~ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+  ~ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  ~ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+  ~ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+  -->
+<link rel="import" href="../../bower_components/polymer/polymer-element.html">
+<link rel="import" href="../../bower_components/iron-pages/iron-pages.html">
+<link rel="import" href="../../bower_components/app-layout/app-toolbar/app-toolbar.html">
+<link rel="import" href="../../bower_components/iron-icons/iron-icons.html">
+<link rel="import" href="../../bower_components/iron-icons/maps-icons.html">
+
+<dom-module id="meal-order-toolbar">
+    <template>
+        <style>
+            .app-toolbar-container {
+                display: flex;
+                width: 100%;
+                align-items: center;
+                justify-content: space-between;
+            }
+
+            .app-header-iron-container {
+                display: flex;
+                justify-content: space-around;
+                align-items: center;
+            }
+
+            #main-title {
+                font-size: 1.375em;
+            }
+
+            .title-link {
+                font-size: 0.8em;
+                text-decoration: none;
+                color: var(--paper-grey-50);
+            }
+
+            .title-link:hover .route-title {
+                color: var(--paper-light-blue-500);
+            }
+
+            #menu-history {
+                margin-right: 44px;
+            }
+
+            .link-icon {
+                display: none;
+                color: var(--paper-grey-50);
+            }
+
+            @media only screen and (max-width: 600px) {
+
+                .app-header-iron-container {
+                    width: 100px;
+                }
+
+                .route-title {
+                    display: none;
+                }
+
+                .link-icon {
+                    display: block;
+                }
+
+            }
+        </style>
+        <app-toolbar>
+            <div class="app-toolbar-container">
+                <div id="main-title">Заказ обедов</div>
+                <iron-pages id="app-header-iron"
+                            selected="[[page]]"
+                            attr-for-selected="data-page"
+                            fallback-selection="view404"
+                            role="main">
+                    <div data-page="menu" class="app-header-iron-container">
+                        <a class="title-link" href="/#/history/">
+                            <div class="route-title">История заказов</div>
+                            <iron-icon class="link-icon"
+                                       icon="maps:icons:history"></iron-icon>
+                        </a>
+                        <iron-icon class="link-icon"
+                                   icon="icons:shopping-cart" drawer-toggle></iron-icon>
+                    </div>
+                    <div data-page="history" class="app-header-iron-container">
+                        <a class="title-link" href="/#/menu/">
+                            <div id="menu-history" class="route-title">Сделать заказ</div>
+                            <iron-icon class="link-icon"
+                                       icon="maps:icons:add"></iron-icon>
+                        </a>
+                        <iron-icon class="link-icon"
+                                   icon="icons:date-range"
+                                   drawer-toggle></iron-icon>
+                    </div>
+                </iron-pages>
+            </div>
+        </app-toolbar>
+    </template>
+    <script>
+        class MealOrderToolbar extends (Polymer.Element) {
+            static get is() {
+                return 'meal-order-toolbar';
+            }
+
+            static get properties() {
+                return {
+                    page: {
+                        type: Object,
+                    }
+                }
+            }
+        }
+
+        window.customElements.define(MealOrderToolbar.is, MealOrderToolbar);
+    </script>
+</dom-module>
diff --git a/client/user/src/mealorder/menu/meal-order-drawer.html b/client/user/src/mealorder/menu/meal-order-drawer.html
index c34575af..42473d95 100644
--- a/client/user/src/mealorder/menu/meal-order-drawer.html
+++ b/client/user/src/mealorder/menu/meal-order-drawer.html
@@ -133,7 +133,7 @@
                      */
                     selectedDay: {
                         type: Object,
-                        computed: '_changeSelectedDay(routeData.date)'
+                        computed: '_getSelectedDay(routeData.date)'
                     },
 
                     /**
@@ -141,7 +141,7 @@
                      */
                     inputDate: {
                         type: String,
-                        computed: '_changeCalendarDate(routeData.date)',
+                        computed: '_getCalendarDay(routeData.date)',
                     },
 
                     /**
@@ -166,20 +166,15 @@
                 ];
             }
 
-            _changeSelectedDay() {
-                const date = new Date(this.routeData.date);
-
-                let dayOfTheWeek = date.toLocaleDateString("ru-RU", {weekday: 'long'});
-                dayOfTheWeek = dayOfTheWeek.charAt(0).toUpperCase() + dayOfTheWeek.slice(1);
-
-                const day = {
-                    day: date.getDate(),
-                    dayOfTheWeek: dayOfTheWeek,
-                };
-                return day;
+            _getSelectedDay() {
+                const dayOfTheWeek = new Date(this.routeData.date).toLocaleDateString("ru-RU", {weekday: 'long'});
+                const selectedDay = {};
+                selectedDay.day = new Date(this.routeData.date).getDate();
+                selectedDay.dayOfTheWeek = dayOfTheWeek.charAt(0).toUpperCase() + dayOfTheWeek.slice(1);;
+                return selectedDay;
             }
 
-            _changeCalendarDate() {
+            _getCalendarDay() {
                 const routeDate = new Date(this.routeData.date);
                 return (routeDate.getFullYear() +
                     "/" + (routeDate.getMonth() + 1) + "/" + routeDate.getDate());
diff --git a/client/user/src/mealorder/menu/meal-order-menu-container.html b/client/user/src/mealorder/menu/meal-order-menu-container.html
index e548e9c1..ddd27b39 100644
--- a/client/user/src/mealorder/menu/meal-order-menu-container.html
+++ b/client/user/src/mealorder/menu/meal-order-menu-container.html
@@ -141,7 +141,7 @@
                      *
                      * @typedef {Object} Menu the menu for the current date
                      *
-                     * @property {String} Vendor a vendor name
+                     * @property {String} vendor a vendor name
                      *
                      * @typedef {Object} Date contains day, month, year
                      * @property {Number} day

From ed7c1d7429880a271ff4410c5eac2fda285e688a Mon Sep 17 00:00:00 2001
From: Paul <paulageyev@gmail.com>
Date: Thu, 26 Apr 2018 22:14:13 +0300
Subject: [PATCH 219/253] Add drawer toggle and docs for the
 `meal-order-toolbar`

---
 .../src/mealorder/meal-order-client-app.html  | 20 +++++++-------
 .../src/mealorder/meal-order-toolbar.html     | 27 +++++++++++++++----
 2 files changed, 32 insertions(+), 15 deletions(-)

diff --git a/client/user/src/mealorder/meal-order-client-app.html b/client/user/src/mealorder/meal-order-client-app.html
index c12d9b32..08227245 100644
--- a/client/user/src/mealorder/meal-order-client-app.html
+++ b/client/user/src/mealorder/meal-order-client-app.html
@@ -87,19 +87,15 @@
                 data="{{routeData}}"></app-route>
 
         <app-drawer-layout fullbleed>
-            <app-drawer slot="drawer" align="right" class$="[[_getDrawerClass(routeData.page)]]">
-                <iron-pages id="app-drawer-iron"
-                            selected="[[routeData.page]]"
-                            attr-for-selected="data-page"
-                            fallback-selection="view404"
-                            role="main">
-                </iron-pages>
+            <app-drawer id="drawer" slot="drawer" align="right"
+                        class$="[[_getDrawerClass(routeData.page)]]">
                 <meal-order-drawer></meal-order-drawer>
             </app-drawer>
 
             <app-header-layout>
                 <app-header slot="header" reveals effects="waterfall">
-                    <meal-order-toolbar page="[[routeData.page]]"></meal-order-toolbar>
+                    <meal-order-toolbar on-drawer-toggle="_drawerToggle"
+                                        page="[[routeData.page]]"></meal-order-toolbar>
                 </app-header>
                 <iron-pages id="app-header-layout-iron"
                             selected="[[routeData.page]]"
@@ -197,16 +193,20 @@
             _pageChanged() {
                 const DATE_LENGTH = 10;
                 if (!this.routeData.page || (this.routeData.page.startsWith("menu") && !this.routeData.date)) {
-                    this.set('route.path', '/menu/' + this.serverTime.toISOString().slice(0,DATE_LENGTH));
+                    this.set('route.path', '/menu/' + this.serverTime.toISOString().slice(0, DATE_LENGTH));
                 }
                 if (this.routeData.page.startsWith("history")) {
                     if (!this.routeData.date) {
                         let yesterday = new Date(this.serverTime);
-                        yesterday.setDate(yesterday.getDate()-1);
+                        yesterday.setDate(yesterday.getDate() - 1);
                         this.set('routeData.date', yesterday.toISOString().slice(0, DATE_LENGTH));
                     }
                 }
             }
+
+            _drawerToggle() {
+                this.$.drawer.toggle();
+            }
         }
 
         window.customElements.define(MealOrderClientApp.is, MealOrderClientApp);
diff --git a/client/user/src/mealorder/meal-order-toolbar.html b/client/user/src/mealorder/meal-order-toolbar.html
index e609ec85..a06c826a 100644
--- a/client/user/src/mealorder/meal-order-toolbar.html
+++ b/client/user/src/mealorder/meal-order-toolbar.html
@@ -92,8 +92,9 @@
                             <iron-icon class="link-icon"
                                        icon="maps:icons:history"></iron-icon>
                         </a>
-                        <iron-icon class="link-icon"
-                                   icon="icons:shopping-cart" drawer-toggle></iron-icon>
+                        <iron-icon on-click="_drawerToggle"
+                                   class="link-icon"
+                                   icon="icons:shopping-cart"></iron-icon>
                     </div>
                     <div data-page="history" class="app-header-iron-container">
                         <a class="title-link" href="/#/menu/">
@@ -101,15 +102,24 @@
                             <iron-icon class="link-icon"
                                        icon="maps:icons:add"></iron-icon>
                         </a>
-                        <iron-icon class="link-icon"
-                                   icon="icons:date-range"
-                                   drawer-toggle></iron-icon>
+                        <iron-icon on-click="_drawerToggle"
+                                   class="link-icon"
+                                   icon="icons:date-range"></iron-icon>
                     </div>
                 </iron-pages>
             </div>
         </app-toolbar>
     </template>
     <script>
+        /**
+         * meal-order-toolbar is container for the `app-toolbar`
+         *
+         * Contains the main title and the link title and also icon for drawer toggle
+         * on depending on menu and history routing.
+         *
+         * @customElement
+         * @polymer
+         */
         class MealOrderToolbar extends (Polymer.Element) {
             static get is() {
                 return 'meal-order-toolbar';
@@ -117,11 +127,18 @@
 
             static get properties() {
                 return {
+                    /**
+                     * Current page.
+                     */
                     page: {
                         type: Object,
                     }
                 }
             }
+
+            _drawerToggle() {
+                this.dispatchEvent(new CustomEvent('drawer-toggle',));
+            }
         }
 
         window.customElements.define(MealOrderToolbar.is, MealOrderToolbar);

From b88632e7b2aa165b0d112db989fa449fa0029af9 Mon Sep 17 00:00:00 2001
From: Paul <paulageyev@gmail.com>
Date: Thu, 26 Apr 2018 22:24:03 +0300
Subject: [PATCH 220/253] Apply two way data binding for routing

---
 .../user/src/mealorder/meal-order-client-app.html   |  2 +-
 .../user/src/mealorder/menu/meal-order-drawer.html  | 13 ++-----------
 2 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/client/user/src/mealorder/meal-order-client-app.html b/client/user/src/mealorder/meal-order-client-app.html
index 08227245..e6c11513 100644
--- a/client/user/src/mealorder/meal-order-client-app.html
+++ b/client/user/src/mealorder/meal-order-client-app.html
@@ -89,7 +89,7 @@
         <app-drawer-layout fullbleed>
             <app-drawer id="drawer" slot="drawer" align="right"
                         class$="[[_getDrawerClass(routeData.page)]]">
-                <meal-order-drawer></meal-order-drawer>
+                <meal-order-drawer route-data="{{routeData}}"></meal-order-drawer>
             </app-drawer>
 
             <app-header-layout>
diff --git a/client/user/src/mealorder/menu/meal-order-drawer.html b/client/user/src/mealorder/menu/meal-order-drawer.html
index 42473d95..39703e79 100644
--- a/client/user/src/mealorder/menu/meal-order-drawer.html
+++ b/client/user/src/mealorder/menu/meal-order-drawer.html
@@ -18,8 +18,6 @@
   ~ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   -->
 <link rel="import" href="../../../bower_components/app-layout/app-toolbar/app-toolbar.html">
-<link rel="import" href="../../../bower_components/app-route/app-location.html">
-<link rel="import" href="../../../bower_components/app-route/app-route.html">
 <link rel="import" href="../../../bower_components/iron-pages/iron-pages.html">
 <link rel="import" href="../../../bower_components/app-datepicker/app-datepicker.html">
 
@@ -70,14 +68,6 @@
             }
 
         </style>
-        <app-location route="{{route}}"
-                      use-hash-as-path></app-location>
-
-        <app-route
-                route="{{route}}"
-                pattern="/:page/:date"
-                data="{{routeData}}">
-        </app-route>
 
         <iron-pages
                 selected="[[routeData.page]]"
@@ -156,6 +146,7 @@
                      */
                     routeData: {
                         type: Object,
+                        notify: true,
                     },
                 }
             }
@@ -181,7 +172,7 @@
             }
 
             _calendarDateChanged() {
-                if (this.routeData.page && this.routeData.page.startsWith("history")) {
+                if (this.routeData && this.routeData.page.startsWith("history")) {
                     const date = this.outputDate.replace(/\//g, '-');
                     const newRouteData = {};
                     newRouteData.page = 'history';

From 1e342a009c2ad51dee369992fd828d4b46b2939d Mon Sep 17 00:00:00 2001
From: Paul <paulageyev@gmail.com>
Date: Thu, 26 Apr 2018 22:30:54 +0300
Subject: [PATCH 221/253] Remove unnecessary semicolon

---
 client/user/src/mealorder/menu/meal-order-drawer.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/user/src/mealorder/menu/meal-order-drawer.html b/client/user/src/mealorder/menu/meal-order-drawer.html
index 39703e79..02559376 100644
--- a/client/user/src/mealorder/menu/meal-order-drawer.html
+++ b/client/user/src/mealorder/menu/meal-order-drawer.html
@@ -161,7 +161,7 @@
                 const dayOfTheWeek = new Date(this.routeData.date).toLocaleDateString("ru-RU", {weekday: 'long'});
                 const selectedDay = {};
                 selectedDay.day = new Date(this.routeData.date).getDate();
-                selectedDay.dayOfTheWeek = dayOfTheWeek.charAt(0).toUpperCase() + dayOfTheWeek.slice(1);;
+                selectedDay.dayOfTheWeek = dayOfTheWeek.charAt(0).toUpperCase() + dayOfTheWeek.slice(1);
                 return selectedDay;
             }
 

From fee38f08ba6f5962a19eb72315229c54f98c5d1e Mon Sep 17 00:00:00 2001
From: Paul <paulageyev@gmail.com>
Date: Fri, 27 Apr 2018 15:32:23 +0300
Subject: [PATCH 222/253] Apply the date format for the `app-datepicker`

---
 .../src/mealorder/meal-order-client-app.html  | 32 ++++-------
 .../src/mealorder/meal-order-toolbar.html     | 10 ++--
 .../src/mealorder/menu/meal-order-drawer.html | 54 +++++++++----------
 .../menu/meal-order-menu-container.html       | 39 +++++++-------
 .../mealorder/shell/actions/user-actions.html |  3 +-
 5 files changed, 59 insertions(+), 79 deletions(-)

diff --git a/client/user/src/mealorder/meal-order-client-app.html b/client/user/src/mealorder/meal-order-client-app.html
index e6c11513..b1eeb44b 100644
--- a/client/user/src/mealorder/meal-order-client-app.html
+++ b/client/user/src/mealorder/meal-order-client-app.html
@@ -56,15 +56,7 @@
 
             app-drawer-layout {
                 background-color: var(--paper-grey-100);
-                color: var(--google-grey-700);
-            }
-
-            app-drawer-layout:not([narrow]) [drawer-toggle] {
-                display: none;
-            }
 
-            app-header .app-toolbar-content {
-                font-size: 0.75em;
             }
 
             app-drawer {
@@ -76,7 +68,6 @@
             app-drawer.wide {
                 --app-drawer-width: 300px;
             }
-
         </style>
         <app-location route="{{route}}"
                       use-hash-as-path></app-location>
@@ -94,8 +85,9 @@
 
             <app-header-layout>
                 <app-header slot="header" reveals effects="waterfall">
-                    <meal-order-toolbar on-drawer-toggle="_drawerToggle"
-                                        page="[[routeData.page]]"></meal-order-toolbar>
+                    <meal-order-toolbar on-toggle-drawer="_toggleDrawer"
+                                        page="[[routeData.page]]">
+                    </meal-order-toolbar>
                 </app-header>
                 <iron-pages id="app-header-layout-iron"
                             selected="[[routeData.page]]"
@@ -105,15 +97,13 @@
                     <meal-order-menu-container
                             data-page="menu"
                             server-time="[[serverTime]]"
-                            date="[[routeData.date]]"
+                            selected-date="[[routeData.date]]"
                             menus="[[menus]]"></meal-order-menu-container>
                     <div data-page="history">
                         <!--user history component-->
                     </div>
                 </iron-pages>
-
             </app-header-layout>
-
         </app-drawer-layout>
     </template>
     <script>
@@ -190,6 +180,10 @@
                 }
             }
 
+            _toggleDrawer() {
+                this.$.drawer.toggle();
+            }
+
             _pageChanged() {
                 const DATE_LENGTH = 10;
                 if (!this.routeData.page || (this.routeData.page.startsWith("menu") && !this.routeData.date)) {
@@ -197,16 +191,12 @@
                 }
                 if (this.routeData.page.startsWith("history")) {
                     if (!this.routeData.date) {
-                        let yesterday = new Date(this.serverTime);
-                        yesterday.setDate(yesterday.getDate() - 1);
-                        this.set('routeData.date', yesterday.toISOString().slice(0, DATE_LENGTH));
+                        const newDate = new Date(this.serverTime);
+                        newDate.setDate(newDate.getDate() - 1);
+                        this.set('routeData.date', newDate.toISOString().slice(0, DATE_LENGTH));
                     }
                 }
             }
-
-            _drawerToggle() {
-                this.$.drawer.toggle();
-            }
         }
 
         window.customElements.define(MealOrderClientApp.is, MealOrderClientApp);
diff --git a/client/user/src/mealorder/meal-order-toolbar.html b/client/user/src/mealorder/meal-order-toolbar.html
index a06c826a..83d452ff 100644
--- a/client/user/src/mealorder/meal-order-toolbar.html
+++ b/client/user/src/mealorder/meal-order-toolbar.html
@@ -63,7 +63,6 @@
             }
 
             @media only screen and (max-width: 600px) {
-
                 .app-header-iron-container {
                     width: 100px;
                 }
@@ -75,7 +74,6 @@
                 .link-icon {
                     display: block;
                 }
-
             }
         </style>
         <app-toolbar>
@@ -92,7 +90,7 @@
                             <iron-icon class="link-icon"
                                        icon="maps:icons:history"></iron-icon>
                         </a>
-                        <iron-icon on-click="_drawerToggle"
+                        <iron-icon on-click="_toggleDrawer"
                                    class="link-icon"
                                    icon="icons:shopping-cart"></iron-icon>
                     </div>
@@ -102,7 +100,7 @@
                             <iron-icon class="link-icon"
                                        icon="maps:icons:add"></iron-icon>
                         </a>
-                        <iron-icon on-click="_drawerToggle"
+                        <iron-icon on-click="_toggleDrawer"
                                    class="link-icon"
                                    icon="icons:date-range"></iron-icon>
                     </div>
@@ -136,8 +134,8 @@
                 }
             }
 
-            _drawerToggle() {
-                this.dispatchEvent(new CustomEvent('drawer-toggle',));
+            _toggleDrawer() {
+                this.dispatchEvent(new CustomEvent('toggle-drawer',));
             }
         }
 
diff --git a/client/user/src/mealorder/menu/meal-order-drawer.html b/client/user/src/mealorder/menu/meal-order-drawer.html
index 02559376..46b1f161 100644
--- a/client/user/src/mealorder/menu/meal-order-drawer.html
+++ b/client/user/src/mealorder/menu/meal-order-drawer.html
@@ -30,6 +30,7 @@
                 align-items: center;
                 width: 100%;
                 z-index: 1;
+                color: var(--paper-grey-700);
             }
 
             .app-toolbar-header .app-toolbar-content {
@@ -37,13 +38,14 @@
             }
 
             #day {
-                font-size: 0.7em;
-                font-weight: lighter;
-                text-align: center;
+                font-size: 22px;
             }
 
             #day-of-the-week {
-                font-size: 22px;
+                font-size: 0.7em;
+                font-weight: lighter;
+                text-align: center;
+                text-transform: capitalize;
             }
 
             #date-picker {
@@ -66,7 +68,6 @@
                     display: none;
                 };
             }
-
         </style>
 
         <iron-pages
@@ -79,12 +80,11 @@
                     <div class="app-toolbar-header">
                         <div class="app-toolbar-content">Заказ</div>
                         <div>
-                            <div id="day">[[selectedDay.dayOfTheWeek]]</div>
-                            <div id="day-of-the-week">[[selectedDay.day]]</div>
+                            <div id="day-of-the-week">[[selectedDayOfTheWeek]]</div>
+                            <div id="day">[[selectedDay]]</div>
                         </div>
                     </div>
                 </app-toolbar>
-
                 <!--cart component-->
             </div>
             <div data-page="history">
@@ -93,11 +93,14 @@
                         <div class="app-toolbar-content">История заказов</div>
                     </div>
                 </app-toolbar>
-
-                <app-datepicker id="date-picker" view="vertical"
-                                input-date="[[inputDate]]" date="{{outputDate}}"
-                                auto-update-date="true"
-                                locale="ru-RU"></app-datepicker>
+                <app-datepicker
+                        id="date-picker"
+                        format="yyyy-mm-dd"
+                        view="vertical"
+                        input-date="[[routeData.date]]"
+                        date="{{outputDate}}"
+                        auto-update-date="true"
+                        locale="ru-RU"></app-datepicker>
             </div>
         </iron-pages>
     </template>
@@ -127,18 +130,18 @@
                     },
 
                     /**
-                     * Date that the user can select on the calendar.
+                     * Selected day of the week.
                      */
-                    inputDate: {
-                        type: String,
-                        computed: '_getCalendarDay(routeData.date)',
+                    selectedDayOfTheWeek: {
+                        type: Object,
+                        computed: '_getSelectedDayOfTheWeek(routeData.date)'
                     },
 
                     /**
                      * Chosen day.
                      */
                     outputDate: {
-                        type: Date,
+                        type: String,
                     },
 
                     /**
@@ -158,25 +161,18 @@
             }
 
             _getSelectedDay() {
-                const dayOfTheWeek = new Date(this.routeData.date).toLocaleDateString("ru-RU", {weekday: 'long'});
-                const selectedDay = {};
-                selectedDay.day = new Date(this.routeData.date).getDate();
-                selectedDay.dayOfTheWeek = dayOfTheWeek.charAt(0).toUpperCase() + dayOfTheWeek.slice(1);
-                return selectedDay;
+                return new Date(this.routeData.date).getDate();
             }
 
-            _getCalendarDay() {
-                const routeDate = new Date(this.routeData.date);
-                return (routeDate.getFullYear() +
-                    "/" + (routeDate.getMonth() + 1) + "/" + routeDate.getDate());
+            _getSelectedDayOfTheWeek() {
+                return new Date(this.routeData.date).toLocaleDateString("ru-RU", {weekday: 'long'});
             }
 
             _calendarDateChanged() {
                 if (this.routeData && this.routeData.page.startsWith("history")) {
-                    const date = this.outputDate.replace(/\//g, '-');
                     const newRouteData = {};
                     newRouteData.page = 'history';
-                    newRouteData.date = date;
+                    newRouteData.date = this.outputDate;
                     this.set('routeData', newRouteData);
                 }
             }
diff --git a/client/user/src/mealorder/menu/meal-order-menu-container.html b/client/user/src/mealorder/menu/meal-order-menu-container.html
index ddd27b39..90e3b316 100644
--- a/client/user/src/mealorder/menu/meal-order-menu-container.html
+++ b/client/user/src/mealorder/menu/meal-order-menu-container.html
@@ -26,6 +26,7 @@
 <link rel="import" href="../../../bower_components/paper-styles/color.html">
 <link rel="import" href="../shell/redux-store.html">
 <link rel="import" href="../shell/actions/user-actions.html">
+
 <dom-module id="meal-order-menu-container">
     <template>
         <style>
@@ -54,7 +55,7 @@
                 @apply --layout-horizontal;
                 @apply --layout-center-center;
                 text-decoration: none;
-                color: #323232;
+                color: var(--paper-grey-900);
                 font-size: 1.5em;
             }
 
@@ -75,9 +76,9 @@
             }
         </style>
 
-        <paper-tabs id="paper-tabs" selected="[[date]]"
+        <paper-tabs id="paper-tabs" selected="[[selectedDate]]"
                     attr-for-selected='data-key'>
-            <template is="dom-repeat" items="{{currentWeek}}" as="calendar">
+            <template is="dom-repeat" items="{{displayedDays}}" as="calendar">
                 <paper-tab class="paper-tab"
                            data-key$="[[_getDate(calendar)]]"
                            link disabled="[[!calendar.hasMenu]]">
@@ -121,7 +122,7 @@
                     /**
                      * Selected day.
                      */
-                    date: {
+                    selectedDate: {
                         type: Object,
                     },
 
@@ -131,9 +132,9 @@
                      * @typedef {Object} Date
                      * @typedef {Boolean} hasMenu If menu for this date exists
                      */
-                    currentWeek: {
+                    displayedDays: {
                         type: Array,
-                        computed: '_getMenuDatesForWeek(menus)'
+                        computed: '_getDisplayedDays(menus)'
                     },
 
                     /**
@@ -170,27 +171,25 @@
             }
 
             _getDayOfTheWeek(date) {
-                let dayOfTheWeek = date.toLocaleDateString("ru-RU", {weekday: 'short'});
-                dayOfTheWeek = dayOfTheWeek.charAt(0).toUpperCase() + dayOfTheWeek.slice(1);
-                return dayOfTheWeek;
+                const dayOfTheWeek = date.toLocaleDateString("ru-RU", {weekday: 'short'});
+                return dayOfTheWeek.charAt(0).toUpperCase() + dayOfTheWeek.slice(1);
             }
 
-            _getMenuForDay(date) {
+            _getDisplayedMenu(date) {
                 const routeDate = new Date(date);
                 const menus = this.menus.filter(menu => menu.date);
                 return menus.filter(menu => menu.date.getTime() === routeDate.getTime());
             }
 
-            _getMenuDatesForWeek(menus) {
+            _getDisplayedDays(menus) {
                 const weekDates = [];
-                let menuDates = [];
+                const menuDates = [];
                 const DAYS_IN_PERIOD = 8;
 
                 for (let i = 0; i < DAYS_IN_PERIOD; i++) {
-                    let tempDate = new Date();
-                    tempDate.setDate(this.serverTime.getDate() + i);
-                    tempDate.setMonth(this.serverTime.getMonth());
-                    weekDates.push(tempDate);
+                    const newDate = new Date(this.serverTime);
+                    newDate.setDate(newDate.getDate() + i);
+                    weekDates.push(newDate);
                 }
 
                 const dates = menus.filter(menu => menu.date);
@@ -198,14 +197,12 @@
                     menuDates.push(dates[i].date);
                 }
 
-                menuDates = menuDates.map(s => s.toString())
+                const uniqueDates = menuDates.map(s => s.toString())
                     .filter((s, i, a) => a.indexOf(s) === i)
                     .map(s => new Date(s));
 
-                const HOURS_PER_DAY = 86400000;
-                for (let i = 0; i < menuDates.length; i++) {
-                    const diff = weekDates[i].getTime() - menuDates[i].getTime();
-                    if (diff >= 0 && diff < HOURS_PER_DAY) {
+                for (let i = 0; i < uniqueDates.length; i++) {
+                    if (weekDates[i].getTime() === uniqueDates[i].getTime()) {
                         weekDates[i].hasMenu = true;
                     }
                 }
diff --git a/client/user/src/mealorder/shell/actions/user-actions.html b/client/user/src/mealorder/shell/actions/user-actions.html
index eb8318c8..c622379f 100644
--- a/client/user/src/mealorder/shell/actions/user-actions.html
+++ b/client/user/src/mealorder/shell/actions/user-actions.html
@@ -19,6 +19,5 @@
   -->
 
 <script>
-    MealOrderApp.UserAction = {
-    }
+    MealOrderApp.UserAction = {}
 </script>

From d607fcf3fe693724732c510070d9c29b8681cd12 Mon Sep 17 00:00:00 2001
From: Paul <paulageyev@gmail.com>
Date: Fri, 27 Apr 2018 16:14:47 +0300
Subject: [PATCH 223/253] Add tests

---
 .../src/mealorder/menu/meal-order-drawer.html |  1 +
 .../mealorder/meal-order-client-app_test.html | 67 ---------------
 .../mealorder/meal-order-drawer_test.html     | 66 ++++++++++-----
 ...meal-order-menu-container_action-test.html | 80 ------------------
 .../meal-order-menu-container_test.html       | 34 +-------
 .../mealorder/meal-order-toolbar_test.html    | 83 +++++++++++++++++++
 6 files changed, 132 insertions(+), 199 deletions(-)
 delete mode 100644 client/user/test/mealorder/meal-order-menu-container_action-test.html
 create mode 100644 client/user/test/mealorder/meal-order-toolbar_test.html

diff --git a/client/user/src/mealorder/menu/meal-order-drawer.html b/client/user/src/mealorder/menu/meal-order-drawer.html
index 46b1f161..99243ffa 100644
--- a/client/user/src/mealorder/menu/meal-order-drawer.html
+++ b/client/user/src/mealorder/menu/meal-order-drawer.html
@@ -71,6 +71,7 @@
         </style>
 
         <iron-pages
+                id="app-drawer-iron"
                 selected="[[routeData.page]]"
                 attr-for-selected="data-page"
                 fallback-selection="view404"
diff --git a/client/user/test/mealorder/meal-order-client-app_test.html b/client/user/test/mealorder/meal-order-client-app_test.html
index 93ae5c3b..9f6309aa 100644
--- a/client/user/test/mealorder/meal-order-client-app_test.html
+++ b/client/user/test/mealorder/meal-order-client-app_test.html
@@ -68,73 +68,6 @@
             assert.equal('2018-3-21', component.routeData.date);
         });
 
-
-        test('should instantiate the `app-header` with main-title', function () {
-            const elementShadowRoot = component.shadowRoot;
-            const mainTitle = elementShadowRoot.querySelector("#main-title");
-            assert.equal(mainTitle.innerHTML, 'Заказ обедов');
-        });
-
-        test('should instantiate the `app-toolbar` with data-page `menu` with routing title', function (done) {
-            setLocation('/#/menu/2018-03-23');
-            const pages = component.shadowRoot.querySelector('#app-header-iron');
-            pages.forceSynchronousItemUpdate();
-            const routeLinkTitle = pages.selectedItem.getElementsByClassName("route-title").item(0).innerHTML;
-            flush(function () {
-                assert.equal(routeLinkTitle, 'История заказов');
-                done();
-            });
-        });
-
-        test('should instantiate the `app-toolbar` with data-page `history` with routing title', function (done) {
-            setLocation('/#/history/2018-03-23');
-            const pages = component.shadowRoot.querySelector('#app-header-iron');
-            pages.forceSynchronousItemUpdate();
-            const routeLinkTitle = pages.selectedItem.getElementsByClassName("route-title").item(0).innerHTML;
-            flush(function () {
-                assert.equal(routeLinkTitle, 'Сделать заказ');
-                done();
-            });
-        });
-
-        test('should instantiate the `app-toolbar` with data-page `menu`' +
-            ' and the component `app-toolbar-content` with routing title', function (done) {
-            setLocation('/#/menu/2018-03-23');
-            const pages = component.shadowRoot.querySelector('#app-drawer-iron');
-            pages.forceSynchronousItemUpdate();
-            const drawerTitle = pages.selectedItem.getElementsByClassName("app-toolbar-content").item(0).innerHTML;
-            flush(function () {
-                assert.equal(drawerTitle, 'Заказ');
-                done();
-            });
-        });
-
-        test('should instantiate the `app-toolbar` with data-page `menu`' +
-            ' and day, and day of the week', function (done) {
-            setLocation('/#/menu/2018-03-23');
-            const pages = component.shadowRoot.querySelector('#app-drawer-iron');
-            pages.forceSynchronousItemUpdate();
-            const day = pages.querySelector("#day").innerHTML;
-            const dayOfTheWeek = pages.querySelector("#day-of-the-week").innerHTML;
-            flush(function () {
-                assert.equal(day, 'Пятница');
-                assert.equal(dayOfTheWeek, '23');
-                done();
-            });
-        });
-
-        test('should instantiate the `app-toolbar` with data-page `history`' +
-            ' and the component `app-toolbar-content` with routing title', function (done) {
-            setLocation('/#/history/2018-03-23');
-            const pages = component.shadowRoot.querySelector('#app-drawer-iron');
-            pages.forceSynchronousItemUpdate();
-            const drawerTitle = pages.selectedItem.getElementsByClassName("app-toolbar-content").item(0).innerHTML;
-            flush(function () {
-                assert.equal(drawerTitle, 'История заказов');
-                done();
-            });
-        });
-
         test('should instantiate the `meal-order-drawer` component', function (done) {
             const elementShadowRoot = component.shadowRoot;
             const drawer = elementShadowRoot.querySelector("meal-order-drawer");
diff --git a/client/user/test/mealorder/meal-order-drawer_test.html b/client/user/test/mealorder/meal-order-drawer_test.html
index babc8cf2..9d9e65ab 100644
--- a/client/user/test/mealorder/meal-order-drawer_test.html
+++ b/client/user/test/mealorder/meal-order-drawer_test.html
@@ -54,13 +54,6 @@
             component = fixture('MealOrderDrawer');
         });
 
-        test('should parse `routeData.page` correctly', function () {
-            setLocation('/#/history/');
-            assert.equal('history', component.routeData.page);
-            setLocation('/#/menu/');
-            assert.equal('menu', component.routeData.page);
-        });
-
         test('should instantiate the `meal-order-drawer` component', function (done) {
             const elementShadowRoot = component.shadowRoot;
             const datePicker = elementShadowRoot.querySelector("app-datepicker");
@@ -68,20 +61,6 @@
             done();
         });
 
-        test('should fire `changed-history-date` event on the changed URL ' +
-            ' with the `history` routing and the date', function (done) {
-            component.addEventListener('changed-history-date', function (e) {
-                const date = {};
-                date.year = 2018;
-                date.month = 4;
-                date.day = 20;
-                assert.deepEqual(e.detail, date);
-                done();
-            });
-            setLocation('/#/menu/');
-            setLocation('/#/history/2018-4-20');
-        });
-
         test('should change URL by selecting the date in the calendar with `history` routing', function (done) {
             const STRING_DATE = "2018/04/20";
 
@@ -95,6 +74,51 @@
             setLocation('/#/history/');
         });
 
+        test('should instantiate the `app-toolbar` with data-page `menu`' +
+            ' and the component `app-toolbar-content` with routing title', function (done) {
+            const newRouteData = {};
+            newRouteData.page = "menu";
+            component.routeData = newRouteData;
+            const pages = component.shadowRoot.querySelector('#app-drawer-iron');
+            pages.forceSynchronousItemUpdate();
+            const drawerTitle = pages.selectedItem.getElementsByClassName("app-toolbar-content").item(0).innerHTML;
+            flush(function () {
+                assert.equal(drawerTitle, 'Заказ');
+                done();
+            });
+        });
+
+        test('should instantiate the `app-toolbar` with data-page `menu`' +
+            ' and day, and day of the week', function (done) {
+            const newRouteData = {};
+            newRouteData.page = "menu";
+            newRouteData.date = "2018-04-20";
+            component.routeData = newRouteData;
+            const pages = component.shadowRoot.querySelector('#app-drawer-iron');
+            pages.forceSynchronousItemUpdate();
+            const day = pages.querySelector("#day").innerHTML;
+            const dayOfTheWeek = pages.querySelector("#day-of-the-week").innerHTML;
+            flush(function () {
+                assert.equal(dayOfTheWeek, 'пятница');
+                assert.equal(day, '20');
+                done();
+            });
+        });
+
+        test('should instantiate the `app-toolbar` with data-page `history`' +
+            ' and the component `app-toolbar-content` with routing title', function (done) {
+            const newRouteData = {};
+            newRouteData.page = "history";
+            component.routeData = newRouteData;
+            const pages = component.shadowRoot.querySelector('#app-drawer-iron');
+            pages.forceSynchronousItemUpdate();
+            const drawerTitle = pages.selectedItem.getElementsByClassName("app-toolbar-content").item(0).innerHTML;
+            flush(function () {
+                assert.equal(drawerTitle, 'История заказов');
+                done();
+            });
+        });
+
     });
 </script>
 </body>
diff --git a/client/user/test/mealorder/meal-order-menu-container_action-test.html b/client/user/test/mealorder/meal-order-menu-container_action-test.html
deleted file mode 100644
index d492e7c0..00000000
--- a/client/user/test/mealorder/meal-order-menu-container_action-test.html
+++ /dev/null
@@ -1,80 +0,0 @@
-<!DOCTYPE html>
-<!--
-  ~ Copyright 2018, TeamDev Ltd. All rights reserved.
-  ~
-  ~ Redistribution and use in source and/or binary forms, with or without
-  ~ modification, must retain the above copyright notice and the following
-  ~ disclaimer.
-  ~
-  ~ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-  ~ "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-  ~ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-  ~ A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-  ~ OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-  ~ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-  ~ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-  ~ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-  ~ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-  ~ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-  ~ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-  -->
-
-<html lang="en">
-<head>
-    <meta charset="utf-8">
-    <meta name="viewport"
-          content="width=device-width, minimum-scale=1, initial-scale=1, user-scalable=yes">
-
-    <title>meal-order-menu-container test</title>
-
-    <script src="../../bower_components/webcomponentsjs/webcomponents-loader.js"></script>
-    <script src="../../bower_components/web-component-tester/browser.js"></script>
-    <script src="../../node_modules/redux/dist/redux.js"></script>
-    <script src="test_variables.js"></script>
-    <link rel="import" href="../../src/mealorder/menu/meal-order-menu-container.html">
-
-</head>
-<body>
-
-<test-fixture id="MealOrderMenuContainer">
-    <template>
-        <meal-order-menu-container></meal-order-menu-container>
-    </template>
-</test-fixture>
-
-<script>
-    suite('meal-order-menu-container', function () {
-        let mock;
-
-        setup(() => {
-            mock = sinon.mock(MealOrderApp.store);
-        });
-
-        test('should fire `CHANGE_CURRENT_MENU`, `CHANGE_CURRENT_ORDER` actions with default date.', function () {
-            const setCurrentMenuAction = {
-                type: MealOrderApp.UserAction.SET_CURRENT_MENU,
-                date: {
-                    day: 21,
-                    month: 3,
-                    year: 2018
-                }
-            };
-            const setCurrentOrderAction = {
-                type: MealOrderApp.UserAction.SET_CURRENT_ORDER,
-                date: {
-                    day: 21,
-                    month: 3,
-                    year: 2018
-                }
-            };
-            mock.expects('dispatch').withArgs(setCurrentMenuAction);
-            mock.expects('dispatch').withArgs(setCurrentOrderAction);
-            fixture('MealOrderMenuContainer');
-            mock.verify();
-            mock.restore();
-        });
-    });
-</script>
-
-</body>
-</html>
diff --git a/client/user/test/mealorder/meal-order-menu-container_test.html b/client/user/test/mealorder/meal-order-menu-container_test.html
index 8df42ca5..f2f65453 100644
--- a/client/user/test/mealorder/meal-order-menu-container_test.html
+++ b/client/user/test/mealorder/meal-order-menu-container_test.html
@@ -42,11 +42,6 @@
 </test-fixture>
 
 <script>
-    function setLocation(url) {
-        window.history.pushState({}, '', url);
-        Polymer.Base.fire('location-changed', {}, {node: window});
-    }
-
     suite('meal-order-menu-container', function () {
         let component;
 
@@ -55,20 +50,6 @@
             component.calendar = MealOrderAppTest.initialState.calendar;
         });
 
-        test('should parse `routeData.page` correctly', function () {
-            setLocation('/#/history/');
-            assert.equal('history', component.routeData.page);
-            setLocation('/#/menu/');
-            assert.equal('menu', component.routeData.page);
-        });
-
-        test('should parse `routeData.date` correctly', function () {
-            setLocation('/#/history/2018-3-21');
-            assert.equal('2018-3-21', component.routeData.date);
-            setLocation('/#/menu/2018-3-21');
-            assert.equal('2018-3-21', component.routeData.date);
-        });
-
         test('should instantiate the component `paper-tabs`', function (done) {
             flush(function () {
                 const elementShadowRoot = component.shadowRoot;
@@ -78,22 +59,13 @@
             });
         });
 
-        test('should parse `routeData.date` by the default selected paper-tab', function () {
+        test('should select the paper-tab by the selected day', function () {
             const elementShadowRoot = component.shadowRoot;
             const paperTabs = elementShadowRoot.querySelector("#paper-tabs");
-            assert.equal(component.routeData.date, paperTabs.selected);
+            component.selectedDate = new Date("2018-03-23");
+            assert.equal(component.selectedDate, paperTabs.selected);
         });
 
-        test('should parse changed `routeData.date` by the selected paper-tab', function (done) {
-            const elementShadowRoot = component.shadowRoot;
-
-            flush(function () {
-                const paperTabs = elementShadowRoot.querySelector("#paper-tabs");
-                paperTabs.select('2018-03-23');
-                assert.equal(component.routeData.date, '2018-3-23');
-                done();
-            });
-        });
     });
 </script>
 </body>
diff --git a/client/user/test/mealorder/meal-order-toolbar_test.html b/client/user/test/mealorder/meal-order-toolbar_test.html
new file mode 100644
index 00000000..71318e22
--- /dev/null
+++ b/client/user/test/mealorder/meal-order-toolbar_test.html
@@ -0,0 +1,83 @@
+<!doctype html>
+<!--
+  ~ Copyright 2018, TeamDev Ltd. All rights reserved.
+  ~
+  ~ Redistribution and use in source and/or binary forms, with or without
+  ~ modification, must retain the above copyright notice and the following
+  ~ disclaimer.
+  ~
+  ~ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+  ~ "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+  ~ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+  ~ A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+  ~ OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+  ~ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+  ~ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+  ~ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+  ~ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  ~ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+  ~ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+  -->
+
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <meta name="viewport"
+          content="width=device-width, minimum-scale=1, initial-scale=1, user-scalable=yes">
+
+    <title>meal-order-toolbar test</title>
+
+    <script src="../../bower_components/webcomponentsjs/webcomponents-loader.js"></script>
+    <script src="../../bower_components/web-component-tester/browser.js"></script>
+    <script src="../../node_modules/redux/dist/redux.js"></script>
+    <script src="test_variables.js"></script>
+    <link rel="import" href="../../src/mealorder/meal-order-toolbar.html">
+</head>
+<body>
+
+<test-fixture id="MealOrderToolBar">
+    <template>
+        <meal-order-toolbar></meal-order-toolbar>
+    </template>
+</test-fixture>
+
+<script>
+    suite('meal-order-client-app', function () {
+        let component;
+
+        setup(() => {
+            component = fixture('MealOrderToolBar');
+        });
+
+        test('should instantiate the `app-header` with main-title', function () {
+            const elementShadowRoot = component.shadowRoot;
+            const mainTitle = elementShadowRoot.querySelector("#main-title");
+            assert.equal(mainTitle.innerHTML, 'Заказ обедов');
+        });
+
+        test('should instantiate the `app-toolbar` with data-page `menu` with routing title', function (done) {
+            component.page = "menu";
+            const pages = component.shadowRoot.querySelector('#app-header-iron');
+            pages.forceSynchronousItemUpdate();
+            const routeLinkTitle = pages.selectedItem.getElementsByClassName("route-title").item(0).innerHTML;
+            flush(function () {
+                assert.equal(routeLinkTitle, 'История заказов');
+                done();
+            });
+        });
+
+        test('should instantiate the `app-toolbar` with data-page `history` with routing title', function (done) {
+            component.page = "history";
+            const pages = component.shadowRoot.querySelector('#app-header-iron');
+            pages.forceSynchronousItemUpdate();
+            const routeLinkTitle = pages.selectedItem.getElementsByClassName("route-title").item(0).innerHTML;
+            flush(function () {
+                assert.equal(routeLinkTitle, 'Сделать заказ');
+                done();
+            });
+        });
+
+    });
+</script>
+</body>
+</html>

From 846a757cd3faf4c64719cd8245672db9f678f498 Mon Sep 17 00:00:00 2001
From: Paul <paulageyev@gmail.com>
Date: Fri, 27 Apr 2018 17:21:02 +0300
Subject: [PATCH 224/253] Add tests using MealOrderApp namespace

---
 .../src/mealorder/meal-order-toolbar.html     |  54 ++---
 .../src/mealorder/menu/meal-order-drawer.html | 135 ++++++------
 .../menu/meal-order-menu-container.html       | 207 +++++++++---------
 .../mealorder/shell/actions/user-actions.html |   1 -
 .../user/src/mealorder/shell/redux-store.html |   3 +-
 .../mealorder/meal-order-client-app_test.html |  13 +-
 .../mealorder/meal-order-drawer_test.html     |   1 -
 .../meal-order-menu-container_test.html       |   2 -
 .../mealorder/meal-order-toolbar_test.html    |   2 -
 client/user/test/mealorder/test_variables.js  |  77 -------
 10 files changed, 213 insertions(+), 282 deletions(-)

diff --git a/client/user/src/mealorder/meal-order-toolbar.html b/client/user/src/mealorder/meal-order-toolbar.html
index 83d452ff..6ae68aeb 100644
--- a/client/user/src/mealorder/meal-order-toolbar.html
+++ b/client/user/src/mealorder/meal-order-toolbar.html
@@ -22,6 +22,7 @@
 <link rel="import" href="../../bower_components/app-layout/app-toolbar/app-toolbar.html">
 <link rel="import" href="../../bower_components/iron-icons/iron-icons.html">
 <link rel="import" href="../../bower_components/iron-icons/maps-icons.html">
+<link rel="import" href="./shell/meal-order-app-namespace.html">
 
 <dom-module id="meal-order-toolbar">
     <template>
@@ -109,36 +110,39 @@
         </app-toolbar>
     </template>
     <script>
-        /**
-         * meal-order-toolbar is container for the `app-toolbar`
-         *
-         * Contains the main title and the link title and also icon for drawer toggle
-         * on depending on menu and history routing.
-         *
-         * @customElement
-         * @polymer
-         */
-        class MealOrderToolbar extends (Polymer.Element) {
-            static get is() {
-                return 'meal-order-toolbar';
-            }
+        {
+            /**
+             * meal-order-toolbar is container for the `app-toolbar`
+             *
+             * Contains the main title and the link title and also icon for drawer toggle
+             * on depending on menu and history routing.
+             *
+             * @customElement
+             * @polymer
+             */
+            class MealOrderToolbar extends (Polymer.Element) {
+                static get is() {
+                    return 'meal-order-toolbar';
+                }
 
-            static get properties() {
-                return {
-                    /**
-                     * Current page.
-                     */
-                    page: {
-                        type: Object,
+                static get properties() {
+                    return {
+                        /**
+                         * Current page.
+                         */
+                        page: {
+                            type: Object,
+                        }
                     }
                 }
-            }
 
-            _toggleDrawer() {
-                this.dispatchEvent(new CustomEvent('toggle-drawer',));
+                _toggleDrawer() {
+                    this.dispatchEvent(new CustomEvent('toggle-drawer',));
+                }
             }
-        }
 
-        window.customElements.define(MealOrderToolbar.is, MealOrderToolbar);
+            window.customElements.define(MealOrderToolbar.is, MealOrderToolbar);
+            MealOrderApp.MealOrderToolbar = MealOrderToolbar;
+        }
     </script>
 </dom-module>
diff --git a/client/user/src/mealorder/menu/meal-order-drawer.html b/client/user/src/mealorder/menu/meal-order-drawer.html
index 99243ffa..39ea184b 100644
--- a/client/user/src/mealorder/menu/meal-order-drawer.html
+++ b/client/user/src/mealorder/menu/meal-order-drawer.html
@@ -20,7 +20,7 @@
 <link rel="import" href="../../../bower_components/app-layout/app-toolbar/app-toolbar.html">
 <link rel="import" href="../../../bower_components/iron-pages/iron-pages.html">
 <link rel="import" href="../../../bower_components/app-datepicker/app-datepicker.html">
-
+<link rel="import" href="../shell/meal-order-app-namespace.html">
 <dom-module id="meal-order-drawer">
     <template>
         <style>
@@ -106,79 +106,82 @@
         </iron-pages>
     </template>
     <script>
-        /**
-         * meal-order-drawer is container for the user's order and
-         * the calendar of the history of the user's orders.
-         *
-         * Contains an order for the selected day and calendar.
-         *
-         * @customElement
-         * @polymer
-         */
-        class MealOrderDrawer extends Polymer.Element {
-            static get is() {
-                return 'meal-order-drawer';
-            }
+        {
+            /**
+             * meal-order-drawer is container for the user's order and
+             * the calendar of the history of the user's orders.
+             *
+             * Contains an order for the selected day and calendar.
+             *
+             * @customElement
+             * @polymer
+             */
+            class MealOrderDrawer extends Polymer.Element {
+                static get is() {
+                    return 'meal-order-drawer';
+                }
 
-            static get properties() {
-                return {
-                    /**
-                     * Selected day.
-                     */
-                    selectedDay: {
-                        type: Object,
-                        computed: '_getSelectedDay(routeData.date)'
-                    },
-
-                    /**
-                     * Selected day of the week.
-                     */
-                    selectedDayOfTheWeek: {
-                        type: Object,
-                        computed: '_getSelectedDayOfTheWeek(routeData.date)'
-                    },
-
-                    /**
-                     * Chosen day.
-                     */
-                    outputDate: {
-                        type: String,
-                    },
-
-                    /**
-                     * Used for routing.
-                     */
-                    routeData: {
-                        type: Object,
-                        notify: true,
-                    },
+                static get properties() {
+                    return {
+                        /**
+                         * Selected day.
+                         */
+                        selectedDay: {
+                            type: Object,
+                            computed: '_getSelectedDay(routeData.date)'
+                        },
+
+                        /**
+                         * Selected day of the week.
+                         */
+                        selectedDayOfTheWeek: {
+                            type: Object,
+                            computed: '_getSelectedDayOfTheWeek(routeData.date)'
+                        },
+
+                        /**
+                         * Chosen day.
+                         */
+                        outputDate: {
+                            type: String,
+                        },
+
+                        /**
+                         * Used for routing.
+                         */
+                        routeData: {
+                            type: Object,
+                            notify: true,
+                        },
+                    }
                 }
-            }
 
-            static get observers() {
-                return [
-                    ' _calendarDateChanged(outputDate)'
-                ];
-            }
+                static get observers() {
+                    return [
+                        ' _calendarDateChanged(outputDate)'
+                    ];
+                }
 
-            _getSelectedDay() {
-                return new Date(this.routeData.date).getDate();
-            }
+                _getSelectedDay() {
+                    return new Date(this.routeData.date).getDate();
+                }
 
-            _getSelectedDayOfTheWeek() {
-                return new Date(this.routeData.date).toLocaleDateString("ru-RU", {weekday: 'long'});
-            }
+                _getSelectedDayOfTheWeek() {
+                    return new Date(this.routeData.date).toLocaleDateString("ru-RU", {weekday: 'long'});
+                }
 
-            _calendarDateChanged() {
-                if (this.routeData && this.routeData.page.startsWith("history")) {
-                    const newRouteData = {};
-                    newRouteData.page = 'history';
-                    newRouteData.date = this.outputDate;
-                    this.set('routeData', newRouteData);
+                _calendarDateChanged() {
+                    if (this.routeData && this.routeData.page.startsWith("history")) {
+                        const newRouteData = {};
+                        newRouteData.page = 'history';
+                        newRouteData.date = this.outputDate;
+                        this.set('routeData', newRouteData);
+                    }
                 }
             }
-        }
 
-        window.customElements.define(MealOrderDrawer.is, MealOrderDrawer);
+            window.customElements.define(MealOrderDrawer.is, MealOrderDrawer);
+            MealOrderApp.MealOrderDrawer = MealOrderDrawer;
+        }
     </script>
 </dom-module>
diff --git a/client/user/src/mealorder/menu/meal-order-menu-container.html b/client/user/src/mealorder/menu/meal-order-menu-container.html
index 90e3b316..5b2580a0 100644
--- a/client/user/src/mealorder/menu/meal-order-menu-container.html
+++ b/client/user/src/mealorder/menu/meal-order-menu-container.html
@@ -17,13 +17,13 @@
   ~ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
   ~ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   -->
-<script src="../../../bower_components/webcomponentsjs/webcomponents-lite.js"></script>
 <link rel="import" href="../../../bower_components/polymer/polymer-element.html">
 <link rel="import" href="../../../bower_components/paper-tabs/paper-tabs.html">
 <link rel="import" href="../../../bower_components/app-route/app-location.html">
 <link rel="import" href="../../../bower_components/app-route/app-route.html">
 <link rel="import" href="../../../bower_components/iron-pages/iron-pages.html">
 <link rel="import" href="../../../bower_components/paper-styles/color.html">
+<link rel="import" href="../shell/meal-order-app-namespace.html">
 <link rel="import" href="../shell/redux-store.html">
 <link rel="import" href="../shell/actions/user-actions.html">
 
@@ -96,120 +96,123 @@
         <!--meal-order-vendor-menus-->
     </template>
     <script>
-        /**
-         * menu-order is container for the vendors' menus and navigation.
-         *
-         * Contains a menu for the current date and tabs for quick date navigation.
-         *
-         * @customElement
-         * @polymer
-         * @appliesMixin MealOrderApp.ReduxMixin
-         */
-        class MealOrderMenuContainer extends (Polymer.Element) {
-            static get is() {
-                return 'meal-order-menu-container';
-            }
+        {
+            /**
+             * menu-order is container for the vendors' menus and navigation.
+             *
+             * Contains a menu for the current date and tabs for quick date navigation.
+             *
+             * @customElement
+             * @polymer
+             * @appliesMixin MealOrderApp.ReduxMixin
+             */
+            class MealOrderMenuContainer extends (Polymer.Element) {
+                static get is() {
+                    return 'meal-order-menu-container';
+                }
 
-            static get properties() {
-                return {
-                    /**
-                     * The current server time for the calendar.
-                     */
-                    serverTime: {
-                        type: Object,
-                    },
-
-                    /**
-                     * Selected day.
-                     */
-                    selectedDate: {
-                        type: Object,
-                    },
-
-                    /**
-                     * Array of dates with menu which may not exist.
-                     *
-                     * @typedef {Object} Date
-                     * @typedef {Boolean} hasMenu If menu for this date exists
-                     */
-                    displayedDays: {
-                        type: Array,
-                        computed: '_getDisplayedDays(menus)'
-                    },
-
-                    /**
-                     * Menu for a current day.
-                     *
-                     * @typedef {Object} Menu the menu for the current date
-                     *
-                     * @property {String} vendor a vendor name
-                     *
-                     * @typedef {Object} Date contains day, month, year
-                     * @property {Number} day
-                     * @property {Number} month
-                     * @property {Number} year
-                     *
-                     * @typedef {Array} Categories array contains the category name and dishes
-                     * @typedef {Array} Dishes array contains the dish title, price, quantity
-                     * @property {String} title
-                     * @property {String} price
-                     * @property {String} quantity
-                     */
-                    menus: {
-                        type: Array,
-                    },
-                };
-            }
+                static get properties() {
+                    return {
+                        /**
+                         * The current server time for the calendar.
+                         */
+                        serverTime: {
+                            type: Object,
+                        },
+
+                        /**
+                         * Selected day.
+                         */
+                        selectedDate: {
+                            type: Object,
+                        },
+
+                        /**
+                         * Array of dates with menu which may not exist.
+                         *
+                         * @typedef {Object} Date
+                         * @typedef {Boolean} hasMenu If menu for this date exists
+                         */
+                        displayedDays: {
+                            type: Array,
+                            computed: '_getDisplayedDays(menus)'
+                        },
+
+                        /**
+                         * Menu for a current day.
+                         *
+                         * @typedef {Object} Menu the menu for the current date
+                         *
+                         * @property {String} vendor a vendor name
+                         *
+                         * @typedef {Object} Date contains day, month, year
+                         * @property {Number} day
+                         * @property {Number} month
+                         * @property {Number} year
+                         *
+                         * @typedef {Array} Categories array contains the category name and dishes
+                         * @typedef {Array} Dishes array contains the dish title, price, quantity
+                         * @property {String} title
+                         * @property {String} price
+                         * @property {String} quantity
+                         */
+                        menus: {
+                            type: Array,
+                        },
+                    };
+                }
 
-            _getDay(date) {
-                return date.getDate();
-            }
+                _getDay(date) {
+                    return date.getDate();
+                }
 
-            _getDate(date) {
-                const DATE_LENGTH = 10;
-                return date.toISOString().slice(0, DATE_LENGTH);
-            }
+                _getDate(date) {
+                    const DATE_LENGTH = 10;
+                    return date.toISOString().slice(0, DATE_LENGTH);
+                }
 
-            _getDayOfTheWeek(date) {
-                const dayOfTheWeek = date.toLocaleDateString("ru-RU", {weekday: 'short'});
-                return dayOfTheWeek.charAt(0).toUpperCase() + dayOfTheWeek.slice(1);
-            }
+                _getDayOfTheWeek(date) {
+                    const dayOfTheWeek = date.toLocaleDateString("ru-RU", {weekday: 'short'});
+                    return dayOfTheWeek.charAt(0).toUpperCase() + dayOfTheWeek.slice(1);
+                }
 
-            _getDisplayedMenu(date) {
-                const routeDate = new Date(date);
-                const menus = this.menus.filter(menu => menu.date);
-                return menus.filter(menu => menu.date.getTime() === routeDate.getTime());
-            }
+                _getDisplayedMenu(date) {
+                    const routeDate = new Date(date);
+                    const menus = this.menus.filter(menu => menu.date);
+                    return menus.filter(menu => menu.date.getTime() === routeDate.getTime());
+                }
 
-            _getDisplayedDays(menus) {
-                const weekDates = [];
-                const menuDates = [];
-                const DAYS_IN_PERIOD = 8;
+                _getDisplayedDays(menus) {
+                    const weekDates = [];
+                    const menuDates = [];
+                    const DAYS_IN_PERIOD = 8;
 
-                for (let i = 0; i < DAYS_IN_PERIOD; i++) {
-                    const newDate = new Date(this.serverTime);
-                    newDate.setDate(newDate.getDate() + i);
-                    weekDates.push(newDate);
-                }
+                    for (let i = 0; i < DAYS_IN_PERIOD; i++) {
+                        const newDate = new Date(this.serverTime);
+                        newDate.setDate(newDate.getDate() + i);
+                        weekDates.push(newDate);
+                    }
 
-                const dates = menus.filter(menu => menu.date);
-                for (let i = 0; i < dates.length; i++) {
-                    menuDates.push(dates[i].date);
-                }
+                    const dates = menus.filter(menu => menu.date);
+                    for (let i = 0; i < dates.length; i++) {
+                        menuDates.push(dates[i].date);
+                    }
 
-                const uniqueDates = menuDates.map(s => s.toString())
-                    .filter((s, i, a) => a.indexOf(s) === i)
-                    .map(s => new Date(s));
+                    const uniqueDates = menuDates.map(s => s.toString())
+                        .filter((s, i, a) => a.indexOf(s) === i)
+                        .map(s => new Date(s));
 
-                for (let i = 0; i < uniqueDates.length; i++) {
-                    if (weekDates[i].getTime() === uniqueDates[i].getTime()) {
-                        weekDates[i].hasMenu = true;
+                    for (let i = 0; i < uniqueDates.length; i++) {
+                        if (weekDates[i].getTime() === uniqueDates[i].getTime()) {
+                            weekDates[i].hasMenu = true;
+                        }
                     }
+                    return weekDates;
                 }
-                return weekDates;
             }
-        }
 
-        window.customElements.define(MealOrderMenuContainer.is, MealOrderMenuContainer);
+            window.customElements.define(MealOrderMenuContainer.is, MealOrderMenuContainer);
+            MealOrderApp.MealOrderMenuContainer = MealOrderMenuContainer;
+        }
     </script>
 </dom-module>
diff --git a/client/user/src/mealorder/shell/actions/user-actions.html b/client/user/src/mealorder/shell/actions/user-actions.html
index c622379f..73c583b4 100644
--- a/client/user/src/mealorder/shell/actions/user-actions.html
+++ b/client/user/src/mealorder/shell/actions/user-actions.html
@@ -17,7 +17,6 @@
   ~ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
   ~ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   -->
-
 <script>
     MealOrderApp.UserAction = {}
 </script>
diff --git a/client/user/src/mealorder/shell/redux-store.html b/client/user/src/mealorder/shell/redux-store.html
index ef87ca10..bad13dc4 100644
--- a/client/user/src/mealorder/shell/redux-store.html
+++ b/client/user/src/mealorder/shell/redux-store.html
@@ -17,9 +17,8 @@
   ~ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
   ~ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   -->
-
 <link rel="import" href="../../../bower_components/polymer-redux/polymer-redux.html">
-<link rel="import" href="reducers/reducers.html">
+<link rel="import" href="./reducers/reducers.html">
 <script>
     {
         /* global Redux, PolymerRedux */
diff --git a/client/user/test/mealorder/meal-order-client-app_test.html b/client/user/test/mealorder/meal-order-client-app_test.html
index 9f6309aa..487907f5 100644
--- a/client/user/test/mealorder/meal-order-client-app_test.html
+++ b/client/user/test/mealorder/meal-order-client-app_test.html
@@ -18,7 +18,6 @@
   ~ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
   ~ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   -->
-
 <html lang="en">
 <head>
     <meta charset="utf-8">
@@ -30,7 +29,6 @@
     <script src="../../bower_components/webcomponentsjs/webcomponents-loader.js"></script>
     <script src="../../bower_components/web-component-tester/browser.js"></script>
     <script src="../../node_modules/redux/dist/redux.js"></script>
-    <script src="test_variables.js"></script>
     <link rel="import" href="../../src/mealorder/meal-order-client-app.html">
 </head>
 <body>
@@ -68,10 +66,17 @@
             assert.equal('2018-3-21', component.routeData.date);
         });
 
+        test('should instantiate the `meal-order-toolbar` component', function (done) {
+            const elementShadowRoot = component.shadowRoot;
+            const drawer = elementShadowRoot.querySelector("meal-order-toolbar");
+            assert.equal(drawer.tagName.toLocaleLowerCase(), MealOrderApp.MealOrderToolbar.is);
+            done();
+        });
+
         test('should instantiate the `meal-order-drawer` component', function (done) {
             const elementShadowRoot = component.shadowRoot;
             const drawer = elementShadowRoot.querySelector("meal-order-drawer");
-            assert.equal(drawer.tagName.toLocaleLowerCase(), "meal-order-drawer");
+            assert.equal(drawer.tagName.toLocaleLowerCase(), MealOrderApp.MealOrderDrawer.is);
             done();
         });
 
@@ -80,7 +85,7 @@
             setLocation('/#/menu/2018-03-23');
             const pages = component.shadowRoot.querySelector('#app-header-layout-iron');
             pages.forceSynchronousItemUpdate();
-            assert.equal(pages.selectedItem.tagName.toLocaleLowerCase(), "meal-order-menu-container");
+            assert.equal(pages.selectedItem.tagName.toLocaleLowerCase(),  MealOrderApp.MealOrderMenuContainer.is);
         });
 
     });
diff --git a/client/user/test/mealorder/meal-order-drawer_test.html b/client/user/test/mealorder/meal-order-drawer_test.html
index 9d9e65ab..e43a829d 100644
--- a/client/user/test/mealorder/meal-order-drawer_test.html
+++ b/client/user/test/mealorder/meal-order-drawer_test.html
@@ -31,7 +31,6 @@
     <script src="../../bower_components/web-component-tester/browser.js"></script>
     <script src="../../node_modules/redux/dist/redux.js"></script>
     <link rel="import" href="../../src/mealorder/menu/meal-order-drawer.html">
-
 </head>
 <body>
 
diff --git a/client/user/test/mealorder/meal-order-menu-container_test.html b/client/user/test/mealorder/meal-order-menu-container_test.html
index f2f65453..176fab0d 100644
--- a/client/user/test/mealorder/meal-order-menu-container_test.html
+++ b/client/user/test/mealorder/meal-order-menu-container_test.html
@@ -30,7 +30,6 @@
     <script src="../../bower_components/webcomponentsjs/webcomponents-loader.js"></script>
     <script src="../../bower_components/web-component-tester/browser.js"></script>
     <script src="../../node_modules/redux/dist/redux.js"></script>
-    <script src="test_variables.js"></script>
     <link rel="import" href="../../src/mealorder/menu/meal-order-menu-container.html">
 </head>
 <body>
@@ -47,7 +46,6 @@
 
         setup(() => {
             component = fixture('MealOrderMenuContainer');
-            component.calendar = MealOrderAppTest.initialState.calendar;
         });
 
         test('should instantiate the component `paper-tabs`', function (done) {
diff --git a/client/user/test/mealorder/meal-order-toolbar_test.html b/client/user/test/mealorder/meal-order-toolbar_test.html
index 71318e22..0ccc11f1 100644
--- a/client/user/test/mealorder/meal-order-toolbar_test.html
+++ b/client/user/test/mealorder/meal-order-toolbar_test.html
@@ -29,8 +29,6 @@
 
     <script src="../../bower_components/webcomponentsjs/webcomponents-loader.js"></script>
     <script src="../../bower_components/web-component-tester/browser.js"></script>
-    <script src="../../node_modules/redux/dist/redux.js"></script>
-    <script src="test_variables.js"></script>
     <link rel="import" href="../../src/mealorder/meal-order-toolbar.html">
 </head>
 <body>
diff --git a/client/user/test/mealorder/test_variables.js b/client/user/test/mealorder/test_variables.js
index d414e1ad..179099e8 100644
--- a/client/user/test/mealorder/test_variables.js
+++ b/client/user/test/mealorder/test_variables.js
@@ -19,81 +19,4 @@
  */
 {
     window.MealOrderAppTest = window.MealOrderAppTest || {};
-
-    const arrayOfDates = [{
-        date: {
-            year: '2018',
-            month: '03',
-            day: '21',
-        },
-        dayOfTheWeek: 'Ср',
-        hasMenu: true
-    },
-        {
-            date: {
-                year: '2018',
-                month: '03',
-                day: '22',
-            },
-            dayOfTheWeek: 'Чт',
-            hasMenu: true
-        },
-        {
-            date: {
-                year: '2018',
-                month: '03',
-                day: '23',
-            },
-            dayOfTheWeek: 'Пт',
-            hasMenu: true
-        },
-        {
-            date: {
-                year: '2018',
-                month: '03',
-                day: '24',
-            },
-            dayOfTheWeek: 'Сб',
-            hasMenu: false
-        },
-        {
-            date: {
-                year: '2018',
-                month: '03',
-                day: '25',
-            },
-            dayOfTheWeek: 'Вс',
-            hasMenu: false
-        }
-        , {
-            date: {
-                year: '2018',
-                month: '03',
-                day: '26',
-            },
-            dayOfTheWeek: 'Пн',
-            hasMenu: true
-        }
-        , {
-            date: {
-                year: '2018',
-                month: '03',
-                day: '27',
-            },
-            dayOfTheWeek: 'Вт',
-            hasMenu: true
-        }
-        , {
-            date: {
-                year: '2018',
-                month: '03',
-                day: '28',
-            },
-            dayOfTheWeek: 'Ср',
-            hasMenu: true
-        }];
-
-    MealOrderAppTest.initialState = {
-        calendar: arrayOfDates,
-    };
 }

From 13d2241cde50d8e3d24ebf308ddec87d0c05ac32 Mon Sep 17 00:00:00 2001
From: Paul <paulageyev@gmail.com>
Date: Fri, 27 Apr 2018 17:25:27 +0300
Subject: [PATCH 225/253] Refactor tests

---
 client/user/test/mealorder/meal-order-client-app_test.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/user/test/mealorder/meal-order-client-app_test.html b/client/user/test/mealorder/meal-order-client-app_test.html
index 487907f5..1cec8c05 100644
--- a/client/user/test/mealorder/meal-order-client-app_test.html
+++ b/client/user/test/mealorder/meal-order-client-app_test.html
@@ -85,7 +85,7 @@
             setLocation('/#/menu/2018-03-23');
             const pages = component.shadowRoot.querySelector('#app-header-layout-iron');
             pages.forceSynchronousItemUpdate();
-            assert.equal(pages.selectedItem.tagName.toLocaleLowerCase(),  MealOrderApp.MealOrderMenuContainer.is);
+            assert.equal(pages.selectedItem.tagName.toLocaleLowerCase(), MealOrderApp.MealOrderMenuContainer.is);
         });
 
     });

From 2e6de8d4e7d16f1bfef85cec66152f3ca9ca3347 Mon Sep 17 00:00:00 2001
From: Paul <paulageyev@gmail.com>
Date: Fri, 27 Apr 2018 18:50:34 +0300
Subject: [PATCH 226/253] Add tests for the `meal-order-vendor-menus` component

---
 .../menu/meal-order-menu-container.html       | 11 ++--
 .../menu/meal-order-vendor-menu.html          |  1 -
 .../menu/meal-order-vendor-menus.html         | 10 +--
 .../menu/meal-order-drawer_test.html          |  8 +--
 .../menu/meal-order-menu-container_test.html  |  8 +--
 .../menu/meal-order-vendor-menu_test.html     |  8 ++-
 .../menu/meal-order-vendor-menus_test.html    | 64 +++++++++++++++++++
 client/user/test/mealorder/test_variables.js  |  7 +-
 8 files changed, 95 insertions(+), 22 deletions(-)
 create mode 100644 client/user/test/mealorder/menu/meal-order-vendor-menus_test.html

diff --git a/client/user/src/mealorder/menu/meal-order-menu-container.html b/client/user/src/mealorder/menu/meal-order-menu-container.html
index c77378dc..2b23468b 100644
--- a/client/user/src/mealorder/menu/meal-order-menu-container.html
+++ b/client/user/src/mealorder/menu/meal-order-menu-container.html
@@ -95,7 +95,8 @@
                 </paper-tab>
             </template>
         </paper-tabs>
-            <meal-order-vendor-menus menu-for-day="[[_getMenuForDay(date)]]"></meal-order-vendor-menus>
+        <meal-order-vendor-menus
+                menu-for-day="[[_getDisplayedMenu(selectedDate)]]"></meal-order-vendor-menus>
     </template>
     <script>
         {
@@ -179,9 +180,11 @@
                 }
 
                 _getDisplayedMenu(date) {
-                    const routeDate = new Date(date);
-                    const menus = this.menus.filter(menu => menu.date);
-                    return menus.filter(menu => menu.date.getTime() === routeDate.getTime());
+                    if (this.menus) {
+                        const routeDate = new Date(date);
+                        const menus = this.menus.filter(menu => menu.date);
+                        return menus.filter(menu => menu.date.getTime() === routeDate.getTime());
+                    }
                 }
 
                 _getDisplayedDays(menus) {
diff --git a/client/user/src/mealorder/menu/meal-order-vendor-menu.html b/client/user/src/mealorder/menu/meal-order-vendor-menu.html
index c08bdaec..25efd562 100644
--- a/client/user/src/mealorder/menu/meal-order-vendor-menu.html
+++ b/client/user/src/mealorder/menu/meal-order-vendor-menu.html
@@ -17,7 +17,6 @@
   ~ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
   ~ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   -->
-
 <script src="../../../bower_components/webcomponentsjs/webcomponents-lite.js"></script>
 <link rel="import" href="../../../bower_components/polymer/polymer-element.html">
 <link rel="import" href="../../../bower_components/paper-item/paper-item.html">
diff --git a/client/user/src/mealorder/menu/meal-order-vendor-menus.html b/client/user/src/mealorder/menu/meal-order-vendor-menus.html
index 639a27d5..c26926d4 100644
--- a/client/user/src/mealorder/menu/meal-order-vendor-menus.html
+++ b/client/user/src/mealorder/menu/meal-order-vendor-menus.html
@@ -24,8 +24,8 @@
 <link rel="import" href="../../../bower_components/paper-icon-button/paper-icon-button.html">
 <link rel="import" href="../../../bower_components/iron-icons/iron-icons.html">
 <link rel="import" href="../../../bower_components/paper-search/paper-search-bar.html">
-
 <link rel="import" href="meal-order-vendor-menu.html">
+
 <dom-module id="meal-order-vendor-menus">
     <template>
         <style>
@@ -34,6 +34,7 @@
                     width: 70%;
                     margin: 2% auto 0 auto;
                     border-bottom: 1px solid var(--paper-grey-300);
+                    color: var(--paper-grey-700);
                 };
             }
 
@@ -84,17 +85,17 @@
             }
         </style>
 
-        <paper-search-bar query="{{filter}}" hide-filter-button="true"
+        <paper-search-bar id="paper-search" query="{{filter}}" hide-filter-button="true"
                           placeholder="Поиск"></paper-search-bar>
 
-        <iron-list scroll-target="document" id="list" items="[[filtered]]" as="item"
+        <iron-list scroll-target="document" id="list" items="[[filtered]]" as="menu"
                    selection-enabled
                    multi-selection>
             <template>
                 <div class="non-select">
                     <div class="item">
                         <div class="pad">
-                            <meal-order-vendor-menu menu="[[item]]"
+                            <meal-order-vendor-menu menu="[[menu]]"
                                                     on-vendor-menu-resize="_resize"></meal-order-vendor-menu>
                         </div>
                     </div>
@@ -163,6 +164,7 @@
                 const predicate = this.filter;
                 const filtered = [];
                 if (this.menuForDay) {
+                    console.log(this.menuForDay);
                     for (let i = 0; i < this.menuForDay.length; i++) {
                         const vendorCategories = this.menuForDay[i].categories;
                         let newVendorCategories = [];
diff --git a/client/user/test/mealorder/menu/meal-order-drawer_test.html b/client/user/test/mealorder/menu/meal-order-drawer_test.html
index e43a829d..7f99915a 100644
--- a/client/user/test/mealorder/menu/meal-order-drawer_test.html
+++ b/client/user/test/mealorder/menu/meal-order-drawer_test.html
@@ -27,10 +27,10 @@
 
     <title>meal-order-client test</title>
 
-    <script src="../../bower_components/webcomponentsjs/webcomponents-loader.js"></script>
-    <script src="../../bower_components/web-component-tester/browser.js"></script>
-    <script src="../../node_modules/redux/dist/redux.js"></script>
-    <link rel="import" href="../../src/mealorder/menu/meal-order-drawer.html">
+    <script src="../../../bower_components/webcomponentsjs/webcomponents-loader.js"></script>
+    <script src="../../../bower_components/web-component-tester/browser.js"></script>
+    <script src="../../../node_modules/redux/dist/redux.js"></script>
+    <link rel="import" href="../../../src/mealorder/menu/meal-order-drawer.html">
 </head>
 <body>
 
diff --git a/client/user/test/mealorder/menu/meal-order-menu-container_test.html b/client/user/test/mealorder/menu/meal-order-menu-container_test.html
index 176fab0d..bc553203 100644
--- a/client/user/test/mealorder/menu/meal-order-menu-container_test.html
+++ b/client/user/test/mealorder/menu/meal-order-menu-container_test.html
@@ -27,10 +27,10 @@
 
     <title>meal-order-menu-container test</title>
 
-    <script src="../../bower_components/webcomponentsjs/webcomponents-loader.js"></script>
-    <script src="../../bower_components/web-component-tester/browser.js"></script>
-    <script src="../../node_modules/redux/dist/redux.js"></script>
-    <link rel="import" href="../../src/mealorder/menu/meal-order-menu-container.html">
+    <script src="../../../bower_components/webcomponentsjs/webcomponents-loader.js"></script>
+    <script src="../../../bower_components/web-component-tester/browser.js"></script>
+    <script src="../../../node_modules/redux/dist/redux.js"></script>
+    <link rel="import" href="../../../src/mealorder/menu/meal-order-menu-container.html">
 </head>
 <body>
 
diff --git a/client/user/test/mealorder/menu/meal-order-vendor-menu_test.html b/client/user/test/mealorder/menu/meal-order-vendor-menu_test.html
index 48b46bc4..c79a3105 100644
--- a/client/user/test/mealorder/menu/meal-order-vendor-menu_test.html
+++ b/client/user/test/mealorder/menu/meal-order-vendor-menu_test.html
@@ -26,6 +26,7 @@
           content="width=device-width, minimum-scale=1, initial-scale=1, user-scalable=yes">
 
     <title>meal-order-vendor-menu test</title>
+
     <link rel="import" href="../../../src/mealorder/shell/meal-order-app-namespace.html">
     <script src="../../../bower_components/webcomponentsjs/webcomponents-loader.js"></script>
     <script src="../../../bower_components/web-component-tester/browser.js"></script>
@@ -48,20 +49,22 @@
 
         setup(() => {
             component = fixture('SimpleMenu');
-            component.menu = MealOrderAppTest.initialMenu;
+            component.menu = MealOrderAppTest.initialMenu[0];
         });
+
         test('should store menu correctly', function () {
             const CATEGORIES = 2;
             const DISHES_LENGTH = 5;
             const DISH_COST = 35;
 
-            assert.equal('Пюре', component.menu.name);
+            assert.equal('Пюре', component.menu.vendor);
             assert.equal(CATEGORIES, component.menu.categories.length);
             assert.equal('Первое блюдо', component.menu.categories[0].categoryName);
             assert.equal(DISHES_LENGTH, component.menu.categories[0].dishes.length);
             assert.equal('Суп гречневый', component.menu.categories[0].dishes[0].title);
             assert.equal(DISH_COST, component.menu.categories[0].dishes[0].price);
         });
+
         test('should expand and collapse on click', function () {
             const header = component.shadowRoot.querySelector('.menu-caption');
             const menu = component.shadowRoot.querySelector('#menu');
@@ -70,6 +73,7 @@
             header.click();
             assert.equal('expanded', menu.className);
         });
+
         test('should send `add-dish` event', function (done) {
             flush(function () {
                 const addButton = component.shadowRoot.querySelector('#menu > div:nth-child(1) > div:nth-child(3) > paper-item > .add-dish-icon > paper-icon-button');
diff --git a/client/user/test/mealorder/menu/meal-order-vendor-menus_test.html b/client/user/test/mealorder/menu/meal-order-vendor-menus_test.html
new file mode 100644
index 00000000..845e54a2
--- /dev/null
+++ b/client/user/test/mealorder/menu/meal-order-vendor-menus_test.html
@@ -0,0 +1,64 @@
+<!doctype html>
+<!--
+  ~ Copyright 2018, TeamDev Ltd. All rights reserved.
+  ~
+  ~ Redistribution and use in source and/or binary forms, with or without
+  ~ modification, must retain the above copyright notice and the following
+  ~ disclaimer.
+  ~
+  ~ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+  ~ "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+  ~ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+  ~ A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+  ~ OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+  ~ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+  ~ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+  ~ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+  ~ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  ~ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+  ~ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+  -->
+
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <meta name="viewport"
+          content="width=device-width, minimum-scale=1, initial-scale=1, user-scalable=yes">
+
+    <title>meal-order-vendor-menu test</title>
+    <link rel="import" href="../../../src/mealorder/shell/meal-order-app-namespace.html">
+    <script src="../../../bower_components/webcomponentsjs/webcomponents-loader.js"></script>
+    <script src="../../../bower_components/web-component-tester/browser.js"></script>
+    <script src="../../../node_modules/redux/dist/redux.js"></script>
+    <link rel="import" href="../../../src/mealorder/menu/meal-order-vendor-menus.html">
+    <script src="../test_variables.js"></script>
+
+</head>
+<body>
+
+<test-fixture id="VendorMenus">
+    <template>
+        <meal-order-vendor-menus></meal-order-vendor-menus>
+    </template>
+</test-fixture>
+
+<script>
+    suite('meal-order-vendor-menu', function () {
+        let component;
+
+        setup(() => {
+            component = fixture('VendorMenus');
+            component.menuForDay = MealOrderAppTest.initialMenu;
+        });
+
+        test('should filter menu correctly', function () {
+            const paperSearch = component.shadowRoot.querySelector('#paper-search');
+            paperSearch.query = "Суп";
+            assert.equal(component.filtered[0].categories[0].dishes.length,3);
+        });
+
+    });
+</script>
+
+</body>
+</html>
diff --git a/client/user/test/mealorder/test_variables.js b/client/user/test/mealorder/test_variables.js
index 4496bc59..f0698a97 100644
--- a/client/user/test/mealorder/test_variables.js
+++ b/client/user/test/mealorder/test_variables.js
@@ -20,8 +20,9 @@
 {
     window.MealOrderAppTest = window.MealOrderAppTest || {};
 
-    MealOrderAppTest.initialMenu = {
-        name: 'Пюре',
+    MealOrderAppTest.initialMenu = [{
+        vendor: 'Пюре',
+        date: new Date('2018-03-22'),
         categories: [{
             categoryName: 'Первое блюдо', dishes: [
                 {title: 'Суп гречневый', price: 35},
@@ -36,5 +37,5 @@
                     {title: 'Куриные крылышки', price: 45}]
             }
         ]
-    };
+    }];
 }

From bfdfc588b67e1862f97c3847fd79817dae5c67fb Mon Sep 17 00:00:00 2001
From: Paul <paulageyev@gmail.com>
Date: Fri, 27 Apr 2018 19:11:12 +0300
Subject: [PATCH 227/253] Add font color

---
 .../mealorder/menu/meal-order-user-cart.html  |  1 +
 .../menu/meal-order-vendor-menus.html         |  1 -
 .../menu/meal-order-vendor-menus_test.html    |  3 +-
 .../meal-order-vendor-user-cart_test.html     | 52 +++++++++++++++++++
 .../meal-order-vendor-user-order_test.html    | 52 +++++++++++++++++++
 5 files changed, 107 insertions(+), 2 deletions(-)
 create mode 100644 client/user/test/mealorder/menu/meal-order-vendor-user-cart_test.html
 create mode 100644 client/user/test/mealorder/menu/meal-order-vendor-user-order_test.html

diff --git a/client/user/src/mealorder/menu/meal-order-user-cart.html b/client/user/src/mealorder/menu/meal-order-user-cart.html
index 17219097..9010a36e 100644
--- a/client/user/src/mealorder/menu/meal-order-user-cart.html
+++ b/client/user/src/mealorder/menu/meal-order-user-cart.html
@@ -30,6 +30,7 @@
                 overflow-x: hidden;
                 overflow-y: auto;
                 max-height: 93vh;
+                color: var(--paper-grey-700);
             }
 
             #total {
diff --git a/client/user/src/mealorder/menu/meal-order-vendor-menus.html b/client/user/src/mealorder/menu/meal-order-vendor-menus.html
index c26926d4..07dd33a7 100644
--- a/client/user/src/mealorder/menu/meal-order-vendor-menus.html
+++ b/client/user/src/mealorder/menu/meal-order-vendor-menus.html
@@ -164,7 +164,6 @@
                 const predicate = this.filter;
                 const filtered = [];
                 if (this.menuForDay) {
-                    console.log(this.menuForDay);
                     for (let i = 0; i < this.menuForDay.length; i++) {
                         const vendorCategories = this.menuForDay[i].categories;
                         let newVendorCategories = [];
diff --git a/client/user/test/mealorder/menu/meal-order-vendor-menus_test.html b/client/user/test/mealorder/menu/meal-order-vendor-menus_test.html
index 845e54a2..944da598 100644
--- a/client/user/test/mealorder/menu/meal-order-vendor-menus_test.html
+++ b/client/user/test/mealorder/menu/meal-order-vendor-menus_test.html
@@ -52,9 +52,10 @@
         });
 
         test('should filter menu correctly', function () {
+            const NUMBER_OF_DISHES = 3;
             const paperSearch = component.shadowRoot.querySelector('#paper-search');
             paperSearch.query = "Суп";
-            assert.equal(component.filtered[0].categories[0].dishes.length,3);
+            assert.equal(component.filtered[0].categories[0].dishes.length, NUMBER_OF_DISHES);
         });
 
     });
diff --git a/client/user/test/mealorder/menu/meal-order-vendor-user-cart_test.html b/client/user/test/mealorder/menu/meal-order-vendor-user-cart_test.html
new file mode 100644
index 00000000..c1b74483
--- /dev/null
+++ b/client/user/test/mealorder/menu/meal-order-vendor-user-cart_test.html
@@ -0,0 +1,52 @@
+<!doctype html>
+<!--
+  ~ Copyright 2018, TeamDev Ltd. All rights reserved.
+  ~
+  ~ Redistribution and use in source and/or binary forms, with or without
+  ~ modification, must retain the above copyright notice and the following
+  ~ disclaimer.
+  ~
+  ~ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+  ~ "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+  ~ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+  ~ A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+  ~ OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+  ~ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+  ~ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+  ~ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+  ~ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  ~ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+  ~ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+  -->
+
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <meta name="viewport"
+          content="width=device-width, minimum-scale=1, initial-scale=1, user-scalable=yes">
+
+    <title>meal-order-vendor-menu test</title>
+    <link rel="import" href="../../../src/mealorder/shell/meal-order-app-namespace.html">
+    <script src="../../../bower_components/webcomponentsjs/webcomponents-loader.js"></script>
+    <script src="../../../bower_components/web-component-tester/browser.js"></script>
+    <script src="../../../node_modules/redux/dist/redux.js"></script>
+    <link rel="import" href="../../../src/mealorder/menu/meal-order-user-cart.html">
+    <script src="../test_variables.js"></script>
+
+</head>
+<body>
+
+<test-fixture id="UserCart">
+    <template>
+        <meal-order-user-cart></meal-order-user-cart>
+    </template>
+</test-fixture>
+
+<script>
+    suite('meal-order-user-cart', function () {
+
+    });
+</script>
+
+</body>
+</html>
diff --git a/client/user/test/mealorder/menu/meal-order-vendor-user-order_test.html b/client/user/test/mealorder/menu/meal-order-vendor-user-order_test.html
new file mode 100644
index 00000000..2d44b48d
--- /dev/null
+++ b/client/user/test/mealorder/menu/meal-order-vendor-user-order_test.html
@@ -0,0 +1,52 @@
+<!doctype html>
+<!--
+  ~ Copyright 2018, TeamDev Ltd. All rights reserved.
+  ~
+  ~ Redistribution and use in source and/or binary forms, with or without
+  ~ modification, must retain the above copyright notice and the following
+  ~ disclaimer.
+  ~
+  ~ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+  ~ "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+  ~ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+  ~ A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+  ~ OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+  ~ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+  ~ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+  ~ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+  ~ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  ~ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+  ~ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+  -->
+
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <meta name="viewport"
+          content="width=device-width, minimum-scale=1, initial-scale=1, user-scalable=yes">
+
+    <title>meal-order-vendor-menu test</title>
+    <link rel="import" href="../../../src/mealorder/shell/meal-order-app-namespace.html">
+    <script src="../../../bower_components/webcomponentsjs/webcomponents-loader.js"></script>
+    <script src="../../../bower_components/web-component-tester/browser.js"></script>
+    <script src="../../../node_modules/redux/dist/redux.js"></script>
+    <link rel="import" href="../../../src/mealorder/menu/meal-order-user-order.html">
+    <script src="../test_variables.js"></script>
+
+</head>
+<body>
+
+<test-fixture id="UserOrder">
+    <template>
+        <meal-order-user-order></meal-order-user-order>
+    </template>
+</test-fixture>
+
+<script>
+    suite('meal-order-vendor-menu', function () {
+
+    });
+</script>
+
+</body>
+</html>

From 221668674dbfb60d7cfc2761ecf8b9ebe7fe6492 Mon Sep 17 00:00:00 2001
From: Paul Ageyev <paulageyev@gmail.com>
Date: Sat, 28 Apr 2018 10:19:32 +0300
Subject: [PATCH 228/253] Refactor test for filtering the vendor menus

---
 client/user/src/mealorder/menu/meal-order-vendor-menus.html    | 1 -
 .../user/test/mealorder/menu/meal-order-vendor-menus_test.html | 3 ++-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/user/src/mealorder/menu/meal-order-vendor-menus.html b/client/user/src/mealorder/menu/meal-order-vendor-menus.html
index c26926d4..07dd33a7 100644
--- a/client/user/src/mealorder/menu/meal-order-vendor-menus.html
+++ b/client/user/src/mealorder/menu/meal-order-vendor-menus.html
@@ -164,7 +164,6 @@
                 const predicate = this.filter;
                 const filtered = [];
                 if (this.menuForDay) {
-                    console.log(this.menuForDay);
                     for (let i = 0; i < this.menuForDay.length; i++) {
                         const vendorCategories = this.menuForDay[i].categories;
                         let newVendorCategories = [];
diff --git a/client/user/test/mealorder/menu/meal-order-vendor-menus_test.html b/client/user/test/mealorder/menu/meal-order-vendor-menus_test.html
index 845e54a2..944da598 100644
--- a/client/user/test/mealorder/menu/meal-order-vendor-menus_test.html
+++ b/client/user/test/mealorder/menu/meal-order-vendor-menus_test.html
@@ -52,9 +52,10 @@
         });
 
         test('should filter menu correctly', function () {
+            const NUMBER_OF_DISHES = 3;
             const paperSearch = component.shadowRoot.querySelector('#paper-search');
             paperSearch.query = "Суп";
-            assert.equal(component.filtered[0].categories[0].dishes.length,3);
+            assert.equal(component.filtered[0].categories[0].dishes.length, NUMBER_OF_DISHES);
         });
 
     });

From 1f7f843a16340641f8502f2183b4a8e0d12aaa4f Mon Sep 17 00:00:00 2001
From: Paul Ageyev <paulageyev@gmail.com>
Date: Sat, 28 Apr 2018 11:38:56 +0300
Subject: [PATCH 229/253] Add a test to add a dish to order

---
 client/user/bower.json                        |  3 +-
 client/user/package-lock.json                 | 95 -------------------
 .../src/mealorder/meal-order-client-app.html  |  2 +-
 .../menu/meal-order-vendor-menus.html         |  1 -
 .../meal-order-client-app-action_test.html    | 68 +++++++++++++
 .../menu/meal-order-vendor-menus_test.html    |  1 +
 6 files changed, 72 insertions(+), 98 deletions(-)
 create mode 100644 client/user/test/mealorder/meal-order-client-app-action_test.html

diff --git a/client/user/bower.json b/client/user/bower.json
index 646cf7e8..829a34a2 100644
--- a/client/user/bower.json
+++ b/client/user/bower.json
@@ -15,7 +15,8 @@
     "iron-list": "PolymerElements/iron-list#^2.0.14",
     "paper-item": "PolymerElements/paper-item#^2.1.0",
     "paper-button": "PolymerElements/paper-button#^2.1.0",
-    "app-datepicker": "motss/app-datepicker#^2.12.0"
+    "app-datepicker": "motss/app-datepicker#^2.12.0",
+    "paper-search": "Collaborne/paper-search#^2.0.9"
   },
   "devDependencies": {
     "web-component-tester": "Polymer/web-component-tester#^6.0.0",
diff --git a/client/user/package-lock.json b/client/user/package-lock.json
index 99ce4e34..84be0c03 100644
--- a/client/user/package-lock.json
+++ b/client/user/package-lock.json
@@ -4,39 +4,11 @@
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
-    "@sinonjs/formatio": {
-      "version": "2.0.0",
-      "resolved": "http://registry.npmjs.org/@sinonjs/formatio/-/formatio-2.0.0.tgz",
-      "integrity": "sha512-ls6CAMA6/5gG+O/IdsBcblvnd8qcO/l1TYoNeAzp3wcISOxlPXQEus0mLcdwazEkWjaBdaJ3TaxmNgCLWwvWzg==",
-      "requires": {
-        "samsam": "1.3.0"
-      }
-    },
-    "diff": {
-      "version": "3.5.0",
-      "resolved": "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz",
-      "integrity": "sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA=="
-    },
-    "has-flag": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0="
-    },
-    "isarray": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-      "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8="
-    },
     "js-tokens": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz",
       "integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls="
     },
-    "just-extend": {
-      "version": "1.1.27",
-      "resolved": "https://registry.npmjs.org/just-extend/-/just-extend-1.1.27.tgz",
-      "integrity": "sha512-mJVp13Ix6gFo3SBAy9U/kL+oeZqzlYYYLQBwXVBlVzIsZwBqGREnOro24oC/8s8aox+rJhtZ2DiQof++IrkA+g=="
-    },
     "lodash": {
       "version": "4.17.5",
       "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.5.tgz",
@@ -47,16 +19,6 @@
       "resolved": "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.7.tgz",
       "integrity": "sha512-jzqTi3vk4J5Dxq43cNjB0ekfCjPLHixoY2Sc0WHTo+0r928taLqe/VCt02vY5uQBvg0rdXgL3xWkK4X0MCmZcw=="
     },
-    "lodash.get": {
-      "version": "4.4.2",
-      "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz",
-      "integrity": "sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk="
-    },
-    "lolex": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/lolex/-/lolex-2.3.2.tgz",
-      "integrity": "sha512-A5pN2tkFj7H0dGIAM6MFvHKMJcPnjZsOMvR7ujCjfgW5TbV6H9vb1PgxLtHvjqNZTHsUolz+6/WEO0N1xNx2ng=="
-    },
     "loose-envify": {
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.3.1.tgz",
@@ -65,26 +27,6 @@
         "js-tokens": "3.0.2"
       }
     },
-    "nise": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/nise/-/nise-1.3.2.tgz",
-      "integrity": "sha512-KPKb+wvETBiwb4eTwtR/OsA2+iijXP+VnlSFYJo3EHjm2yjek1NWxHOUQat3i7xNLm1Bm18UA5j5Wor0yO2GtA==",
-      "requires": {
-        "@sinonjs/formatio": "2.0.0",
-        "just-extend": "1.1.27",
-        "lolex": "2.3.2",
-        "path-to-regexp": "1.7.0",
-        "text-encoding": "0.6.4"
-      }
-    },
-    "path-to-regexp": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.7.0.tgz",
-      "integrity": "sha1-Wf3g9DW62suhA6hOnTvGTpa5k30=",
-      "requires": {
-        "isarray": "0.0.1"
-      }
-    },
     "redux": {
       "version": "3.7.2",
       "resolved": "https://registry.npmjs.org/redux/-/redux-3.7.2.tgz",
@@ -96,47 +38,10 @@
         "symbol-observable": "1.2.0"
       }
     },
-    "samsam": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/samsam/-/samsam-1.3.0.tgz",
-      "integrity": "sha512-1HwIYD/8UlOtFS3QO3w7ey+SdSDFE4HRNLZoZRYVQefrOY3l17epswImeB1ijgJFQJodIaHcwkp3r/myBjFVbg=="
-    },
-    "sinon": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/sinon/-/sinon-4.5.0.tgz",
-      "integrity": "sha512-trdx+mB0VBBgoYucy6a9L7/jfQOmvGeaKZT4OOJ+lPAtI8623xyGr8wLiE4eojzBS8G9yXbhx42GHUOVLr4X2w==",
-      "requires": {
-        "@sinonjs/formatio": "2.0.0",
-        "diff": "3.5.0",
-        "lodash.get": "4.4.2",
-        "lolex": "2.3.2",
-        "nise": "1.3.2",
-        "supports-color": "5.4.0",
-        "type-detect": "4.0.8"
-      }
-    },
-    "supports-color": {
-      "version": "5.4.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz",
-      "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==",
-      "requires": {
-        "has-flag": "3.0.0"
-      }
-    },
     "symbol-observable": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.2.0.tgz",
       "integrity": "sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ=="
-    },
-    "text-encoding": {
-      "version": "0.6.4",
-      "resolved": "https://registry.npmjs.org/text-encoding/-/text-encoding-0.6.4.tgz",
-      "integrity": "sha1-45mpgiV6J22uQou5KEXLcb3CbRk="
-    },
-    "type-detect": {
-      "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz",
-      "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g=="
     }
   }
 }
diff --git a/client/user/src/mealorder/meal-order-client-app.html b/client/user/src/mealorder/meal-order-client-app.html
index c8e79f1b..c52a30e5 100644
--- a/client/user/src/mealorder/meal-order-client-app.html
+++ b/client/user/src/mealorder/meal-order-client-app.html
@@ -212,7 +212,7 @@
             _addDishToOrder(e) {
                 const order = {};
                 order.dish = e.detail;
-                order.date = this.routeData.date;
+                order.date = new Date(this.routeData.date);
                 this.dispatch('addDishToOrder', order);
             }
         }
diff --git a/client/user/src/mealorder/menu/meal-order-vendor-menus.html b/client/user/src/mealorder/menu/meal-order-vendor-menus.html
index 07dd33a7..64250cb7 100644
--- a/client/user/src/mealorder/menu/meal-order-vendor-menus.html
+++ b/client/user/src/mealorder/menu/meal-order-vendor-menus.html
@@ -33,7 +33,6 @@
                 --iron-list-items-container: {
                     width: 70%;
                     margin: 2% auto 0 auto;
-                    border-bottom: 1px solid var(--paper-grey-300);
                     color: var(--paper-grey-700);
                 };
             }
diff --git a/client/user/test/mealorder/meal-order-client-app-action_test.html b/client/user/test/mealorder/meal-order-client-app-action_test.html
new file mode 100644
index 00000000..ffec265e
--- /dev/null
+++ b/client/user/test/mealorder/meal-order-client-app-action_test.html
@@ -0,0 +1,68 @@
+<!doctype html>
+<!--
+  ~ Copyright 2018, TeamDev Ltd. All rights reserved.
+  ~
+  ~ Redistribution and use in source and/or binary forms, with or without
+  ~ modification, must retain the above copyright notice and the following
+  ~ disclaimer.
+  ~
+  ~ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+  ~ "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+  ~ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+  ~ A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+  ~ OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+  ~ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+  ~ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+  ~ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+  ~ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  ~ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+  ~ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+  -->
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <meta name="viewport"
+          content="width=device-width, minimum-scale=1, initial-scale=1, user-scalable=yes">
+
+    <title>meal-order-client test</title>
+
+    <script src="../../bower_components/webcomponentsjs/webcomponents-loader.js"></script>
+    <script src="../../bower_components/web-component-tester/browser.js"></script>
+    <script src="../../node_modules/redux/dist/redux.js"></script>
+    <link rel="import" href="../../src/mealorder/meal-order-client-app.html">
+</head>
+<body>
+
+<test-fixture id="MealOrderClientApp">
+    <template>
+        <meal-order-client-app></meal-order-client-app>
+    </template>
+</test-fixture>
+
+<script>
+
+    suite('meal-order-client-app', function () {
+
+        setup(() => {
+            mock = sinon.mock(MealOrderApp.store);
+        });
+
+        test('should responds on `dish-added` event and fire `ADD_DISH_TO_ORDER` action.', function () {
+            const DISH = {vendor: "Позитив", price: 15, title: "Картофель"};
+            const ORDER = {};
+            ORDER.dish = {vendor: "Позитив", price: 15, title: "Картофель"};
+            ORDER.date = new Date("2018-03-21");
+
+            const expectedAction = {type: MealOrderApp.UserAction.ADD_DISH_TO_ORDER, order: ORDER};
+            mock.expects('dispatch').withArgs(expectedAction);
+            const component = fixture('MealOrderClientApp');
+            const container = component.shadowRoot.querySelector('meal-order-menu-container');
+            container.dispatchEvent((new CustomEvent('dish-added', {composed: true, detail: DISH})));
+            mock.verify();
+            mock.restore();
+        });
+
+    });
+</script>
+</body>
+</html>
diff --git a/client/user/test/mealorder/menu/meal-order-vendor-menus_test.html b/client/user/test/mealorder/menu/meal-order-vendor-menus_test.html
index 944da598..c66464fe 100644
--- a/client/user/test/mealorder/menu/meal-order-vendor-menus_test.html
+++ b/client/user/test/mealorder/menu/meal-order-vendor-menus_test.html
@@ -55,6 +55,7 @@
             const NUMBER_OF_DISHES = 3;
             const paperSearch = component.shadowRoot.querySelector('#paper-search');
             paperSearch.query = "Суп";
+            console.log(component.filtered[0].categories[0].dishes);
             assert.equal(component.filtered[0].categories[0].dishes.length, NUMBER_OF_DISHES);
         });
 

From f50737cfa27f1ffe7e7de1a3aa0fc88e7ecf9fc2 Mon Sep 17 00:00:00 2001
From: Paul Ageyev <paulageyev@gmail.com>
Date: Sat, 28 Apr 2018 14:18:10 +0300
Subject: [PATCH 230/253] Add tests for `dish-removed`, `vendor-removed` events

---
 .eslintrc.json                                |  3 +-
 .../src/mealorder/menu/meal-order-drawer.html |  2 +-
 .../mealorder/menu/meal-order-user-cart.html  | 17 +++++-----
 .../mealorder/menu/meal-order-user-order.html |  3 ++
 .../mealorder/shell/actions/user-actions.html |  2 +-
 .../mealorder/shell/reducers/reducers.html    |  2 +-
 .../meal-order-client-app-action_test.html    |  6 ++--
 .../mealorder/meal-order-client-app_test.html |  8 ++---
 .../menu/meal-order-drawer_test.html          |  6 ----
 .../menu/meal-order-vendor-menus_test.html    |  2 --
 .../meal-order-vendor-user-order_test.html    | 33 +++++++++++++++++--
 client/user/test/mealorder/test_variables.js  | 21 ++++++++++++
 12 files changed, 74 insertions(+), 31 deletions(-)

diff --git a/.eslintrc.json b/.eslintrc.json
index 23562c0c..d68d49cb 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -51,6 +51,7 @@
     "fixture": false,
     "setup": false,
     "flush": false,
-    "sinon": false
+    "sinon": false,
+    "mock": false
   }
 }
diff --git a/client/user/src/mealorder/menu/meal-order-drawer.html b/client/user/src/mealorder/menu/meal-order-drawer.html
index 401d41a3..2a2b9cf7 100644
--- a/client/user/src/mealorder/menu/meal-order-drawer.html
+++ b/client/user/src/mealorder/menu/meal-order-drawer.html
@@ -88,7 +88,7 @@
                         </div>
                     </div>
                 </app-toolbar>
-                <meal-order-user-cart data-page="menu" date="[[routeData.date]]"></meal-order-user-cart>
+                <meal-order-user-cart data-page="menu" selected-date="[[routeData.date]]"></meal-order-user-cart>
             </div>
             <div data-page="history">
                 <app-toolbar>
diff --git a/client/user/src/mealorder/menu/meal-order-user-cart.html b/client/user/src/mealorder/menu/meal-order-user-cart.html
index 9010a36e..711a25db 100644
--- a/client/user/src/mealorder/menu/meal-order-user-cart.html
+++ b/client/user/src/mealorder/menu/meal-order-user-cart.html
@@ -22,6 +22,7 @@
 <link rel="import" href="../../../bower_components/polymer/polymer-element.html">
 <link rel="import" href="meal-order-user-order.html">
 <link rel="import" href="../shell/redux-store.html">
+<link rel="import" href="../shell/actions/user-actions.html">
 
 <dom-module id="meal-order-user-cart">
     <template>
@@ -76,8 +77,8 @@
                     /**
                      * Selected day.
                      */
-                    date: {
-                        type: Object,
+                    selectedDate: {
+                        type: Date,
                     },
 
                     /**
@@ -100,8 +101,8 @@
                         type: MealOrderApp.UserAction.REMOVE_DISH_FROM_ORDER,
                         dish
                     }),
-                    removeDishesByVendor: vendor => ({
-                        type: MealOrderApp.UserAction.REMOVE_DISHES_BY_VENDOR,
+                    removeVendorFromOrder: vendor => ({
+                        type: MealOrderApp.UserAction.REMOVE_VENDOR_FROM_ORDER,
                         vendor
                     })
                 }
@@ -109,12 +110,12 @@
 
             static get observers() {
                 return [
-                    '_getCurrentOrder(date)'
+                    '_getCurrentOrder(selectedDate)'
                 ];
             }
 
-            _getCurrentOrder(date) {
-                this.dispatch('getOrderedItems', new Date(date));
+            _getCurrentOrder(selectedDate) {
+                this.dispatch('getOrderedItems', new Date(selectedDate));
             }
 
             _getTotalAmount(currentOrder) {
@@ -132,7 +133,7 @@
             }
 
             _removeDishesByVendor(vendor) {
-                this.dispatch('removeDishesByVendor', vendor);
+                this.dispatch('removeVendorFromOrder', vendor);
             }
         }
 
diff --git a/client/user/src/mealorder/menu/meal-order-user-order.html b/client/user/src/mealorder/menu/meal-order-user-order.html
index 00783e98..6354556d 100644
--- a/client/user/src/mealorder/menu/meal-order-user-order.html
+++ b/client/user/src/mealorder/menu/meal-order-user-order.html
@@ -61,6 +61,8 @@
             <paper-icon-button icon="delete" class="icon-delete"
                                on-click="_removeDishesByVendor"></paper-icon-button>
         </div>
+
+        <div class="dishes">
         <dom-repeat items="[[currentOrder.dishes]]" as="dish">
             <template>
                 <div class="order-details">
@@ -71,6 +73,7 @@
                 </div>
             </template>
         </dom-repeat>
+        </div>
     </template>
     <script>
         /**
diff --git a/client/user/src/mealorder/shell/actions/user-actions.html b/client/user/src/mealorder/shell/actions/user-actions.html
index d95d23b2..aca5a3cc 100644
--- a/client/user/src/mealorder/shell/actions/user-actions.html
+++ b/client/user/src/mealorder/shell/actions/user-actions.html
@@ -23,6 +23,6 @@
         ADD_DISH: 'ADD_DISH',
         GET_ORDERED_ITEMS: 'GET_ORDERED_ITEMS',
         REMOVE_DISH_FROM_ORDER: 'REMOVE_DISH_FROM_ORDER',
-        REMOVE_DISHES_BY_VENDOR: 'REMOVE_DISHES_BY_VENDOR',
+        REMOVE_VENDOR_FROM_ORDER: 'REMOVE_VENDOR_FROM_ORDER',
     }
 </script>
diff --git a/client/user/src/mealorder/shell/reducers/reducers.html b/client/user/src/mealorder/shell/reducers/reducers.html
index 793d788e..ed3470cf 100644
--- a/client/user/src/mealorder/shell/reducers/reducers.html
+++ b/client/user/src/mealorder/shell/reducers/reducers.html
@@ -182,7 +182,7 @@
                 case MealOrderApp.UserAction.REMOVE_DISH_FROM_ORDER: {
                     return state;
                 }
-                case MealOrderApp.UserAction.REMOVE_DISHES_BY_VENDOR: {
+                case MealOrderApp.UserAction.REMOVE_VENDOR_FROM_ORDER: {
                     return state;
                 }
                 case MealOrderApp.UserAction.GET_ORDERED_ITEMS: {
diff --git a/client/user/test/mealorder/meal-order-client-app-action_test.html b/client/user/test/mealorder/meal-order-client-app-action_test.html
index ffec265e..c56f8dc5 100644
--- a/client/user/test/mealorder/meal-order-client-app-action_test.html
+++ b/client/user/test/mealorder/meal-order-client-app-action_test.html
@@ -40,14 +40,13 @@
 </test-fixture>
 
 <script>
-
     suite('meal-order-client-app', function () {
 
         setup(() => {
             mock = sinon.mock(MealOrderApp.store);
         });
 
-        test('should responds on `dish-added` event and fire `ADD_DISH_TO_ORDER` action.', function () {
+        /*test('should responds on `dish-added` event and fire `ADD_DISH_TO_ORDER` action.', function () {
             const DISH = {vendor: "Позитив", price: 15, title: "Картофель"};
             const ORDER = {};
             ORDER.dish = {vendor: "Позитив", price: 15, title: "Картофель"};
@@ -60,8 +59,7 @@
             container.dispatchEvent((new CustomEvent('dish-added', {composed: true, detail: DISH})));
             mock.verify();
             mock.restore();
-        });
-
+        });*/
     });
 </script>
 </body>
diff --git a/client/user/test/mealorder/meal-order-client-app_test.html b/client/user/test/mealorder/meal-order-client-app_test.html
index 1cec8c05..e5a20e80 100644
--- a/client/user/test/mealorder/meal-order-client-app_test.html
+++ b/client/user/test/mealorder/meal-order-client-app_test.html
@@ -60,10 +60,10 @@
         });
 
         test('should parse `routeData.date` correctly', function () {
-            setLocation('/#/history/2018-3-21');
-            assert.equal('2018-3-21', component.routeData.date);
-            setLocation('/#/menu/2018-3-21');
-            assert.equal('2018-3-21', component.routeData.date);
+            setLocation('/#/history/2018-03-21');
+            assert.equal('2018-03-21', component.routeData.date);
+            setLocation('/#/menu/2018-03-21');
+            assert.equal('2018-03-21', component.routeData.date);
         });
 
         test('should instantiate the `meal-order-toolbar` component', function (done) {
diff --git a/client/user/test/mealorder/menu/meal-order-drawer_test.html b/client/user/test/mealorder/menu/meal-order-drawer_test.html
index 7f99915a..70fb2d64 100644
--- a/client/user/test/mealorder/menu/meal-order-drawer_test.html
+++ b/client/user/test/mealorder/menu/meal-order-drawer_test.html
@@ -41,11 +41,6 @@
 </test-fixture>
 
 <script>
-    function setLocation(url) {
-        window.history.pushState({}, '', url);
-        Polymer.Base.fire('location-changed', {}, {node: window});
-    }
-
     suite('meal-order-drawer', function () {
         let component;
 
@@ -70,7 +65,6 @@
                 assert.equal(datePicker.inputDate , STRING_DATE);
                 done();
             });
-            setLocation('/#/history/');
         });
 
         test('should instantiate the `app-toolbar` with data-page `menu`' +
diff --git a/client/user/test/mealorder/menu/meal-order-vendor-menus_test.html b/client/user/test/mealorder/menu/meal-order-vendor-menus_test.html
index 944da598..6a02a37d 100644
--- a/client/user/test/mealorder/menu/meal-order-vendor-menus_test.html
+++ b/client/user/test/mealorder/menu/meal-order-vendor-menus_test.html
@@ -57,9 +57,7 @@
             paperSearch.query = "Суп";
             assert.equal(component.filtered[0].categories[0].dishes.length, NUMBER_OF_DISHES);
         });
-
     });
 </script>
-
 </body>
 </html>
diff --git a/client/user/test/mealorder/menu/meal-order-vendor-user-order_test.html b/client/user/test/mealorder/menu/meal-order-vendor-user-order_test.html
index 2d44b48d..b9ec31b4 100644
--- a/client/user/test/mealorder/menu/meal-order-vendor-user-order_test.html
+++ b/client/user/test/mealorder/menu/meal-order-vendor-user-order_test.html
@@ -25,7 +25,7 @@
     <meta name="viewport"
           content="width=device-width, minimum-scale=1, initial-scale=1, user-scalable=yes">
 
-    <title>meal-order-vendor-menu test</title>
+    <title>meal-order-user-order test</title>
     <link rel="import" href="../../../src/mealorder/shell/meal-order-app-namespace.html">
     <script src="../../../bower_components/webcomponentsjs/webcomponents-loader.js"></script>
     <script src="../../../bower_components/web-component-tester/browser.js"></script>
@@ -43,10 +43,37 @@
 </test-fixture>
 
 <script>
-    suite('meal-order-vendor-menu', function () {
+    suite('meal-order-user-order', function () {
+        let component;
 
+        setup(() => {
+            component = fixture('UserOrder');
+            component.currentOrder = MealOrderAppTest.ininitalOrder[0].order[0];
+        });
+
+        test('should fire `user-order-vendor-removed` event on `Remove vendor` icon click.', function (done) {
+            const REMOVE_VENDOR_BUTTON = 'paper-icon-button';
+            const removeVendorButton = component.shadowRoot.querySelector(REMOVE_VENDOR_BUTTON);
+            component.addEventListener('user-order-vendor-removed', function (e) {
+                assert.equal(e.detail, MealOrderAppTest.ininitalOrder[0].order[0].vendor);
+                done();
+            });
+            removeVendorButton.click();
+        });
+
+        test('should fire `user-order-dish-removed` event on `Remove dish` icon click.', function (done) {
+            flush(function () {
+                const REMOVE_DISH_BUTTON = '.dishes > .order-details > paper-icon-button';
+                const removeDishButton = component.shadowRoot.querySelectorAll(REMOVE_DISH_BUTTON)[0];
+                component.addEventListener('user-order-dish-removed', function (e) {
+                    assert.equal(e.detail.vendor, MealOrderAppTest.ininitalOrder[0].order[0].vendor);
+                    assert.equal(e.detail.name, MealOrderAppTest.ininitalOrder[0].order[0].dishes[0].title);
+                    done();
+                });
+                removeDishButton.click();
+            });
+        });
     });
 </script>
-
 </body>
 </html>
diff --git a/client/user/test/mealorder/test_variables.js b/client/user/test/mealorder/test_variables.js
index f0698a97..48334189 100644
--- a/client/user/test/mealorder/test_variables.js
+++ b/client/user/test/mealorder/test_variables.js
@@ -38,4 +38,25 @@
             }
         ]
     }];
+
+    MealOrderAppTest.ininitalOrder = [{
+            date: new Date('2018-03-21'),
+            order: [{
+                vendor: "Пюре",
+                dishes: [
+                    {title: 'Борщ украинский', price: 35, quantity: 1},
+                    {title: 'Солянка', price: 40, quantity: 1},
+                    {title: 'Суп гороховый', price: 40, quantity: 1},
+                    {title: 'Уха', price: 35, quantity: 1},
+                    {title: 'Суп-пюре грибной', price: 40, quantity: 1},
+                    {title: 'Суп куриный', price: 40, quantity: 1},]
+            }, {
+                vendor: 'Позитив',
+                dishes: [{title: 'Суп куриный', price: 35, quantity: 1}, {
+                    title: 'Стейк из лосося',
+                    price: 35,
+                    quantity: 1
+                }]
+            }]
+    }]
 }

From 763d3528df0a1c3262f3681db324b41ccc150a76 Mon Sep 17 00:00:00 2001
From: Paul Ageyev <paulageyev@gmail.com>
Date: Sat, 28 Apr 2018 15:59:28 +0300
Subject: [PATCH 231/253] Add tests for the `meal-order-user-cart` component

---
 .../mealorder/menu/meal-order-user-cart.html  |   8 +-
 .../mealorder/menu/meal-order-user-order.html |   1 +
 .../meal-order-client-app-action_test.html    |  11 +-
 .../menu/meal-order-vendor-menus_test.html    |   1 -
 ...l-order-vendor-user-cart-actions_test.html | 109 ++++++++++++++++++
 .../meal-order-vendor-user-cart_test.html     |  31 +++--
 6 files changed, 144 insertions(+), 17 deletions(-)
 create mode 100644 client/user/test/mealorder/menu/meal-order-vendor-user-cart-actions_test.html

diff --git a/client/user/src/mealorder/menu/meal-order-user-cart.html b/client/user/src/mealorder/menu/meal-order-user-cart.html
index 711a25db..2a33794c 100644
--- a/client/user/src/mealorder/menu/meal-order-user-cart.html
+++ b/client/user/src/mealorder/menu/meal-order-user-cart.html
@@ -97,14 +97,14 @@
                         type: MealOrderApp.UserAction.GET_ORDERED_ITEMS,
                         date
                     }),
+                    removeVendorFromOrder: vendor => ({
+                        type: MealOrderApp.UserAction.REMOVE_VENDOR_FROM_ORDER,
+                        vendor
+                    }),
                     removeDishFromOrder: dish => ({
                         type: MealOrderApp.UserAction.REMOVE_DISH_FROM_ORDER,
                         dish
                     }),
-                    removeVendorFromOrder: vendor => ({
-                        type: MealOrderApp.UserAction.REMOVE_VENDOR_FROM_ORDER,
-                        vendor
-                    })
                 }
             }
 
diff --git a/client/user/src/mealorder/menu/meal-order-user-order.html b/client/user/src/mealorder/menu/meal-order-user-order.html
index 6354556d..b96b2f29 100644
--- a/client/user/src/mealorder/menu/meal-order-user-order.html
+++ b/client/user/src/mealorder/menu/meal-order-user-order.html
@@ -73,6 +73,7 @@
                 </div>
             </template>
         </dom-repeat>
+            <
         </div>
     </template>
     <script>
diff --git a/client/user/test/mealorder/meal-order-client-app-action_test.html b/client/user/test/mealorder/meal-order-client-app-action_test.html
index c56f8dc5..944d1bab 100644
--- a/client/user/test/mealorder/meal-order-client-app-action_test.html
+++ b/client/user/test/mealorder/meal-order-client-app-action_test.html
@@ -46,20 +46,23 @@
             mock = sinon.mock(MealOrderApp.store);
         });
 
-        /*test('should responds on `dish-added` event and fire `ADD_DISH_TO_ORDER` action.', function () {
+        test('should responds on `dish-added` event and fire `ADD_DISH_TO_ORDER` action.', function () {
             const DISH = {vendor: "Позитив", price: 15, title: "Картофель"};
             const ORDER = {};
             ORDER.dish = {vendor: "Позитив", price: 15, title: "Картофель"};
             ORDER.date = new Date("2018-03-21");
 
-            const expectedAction = {type: MealOrderApp.UserAction.ADD_DISH_TO_ORDER, order: ORDER};
-            mock.expects('dispatch').withArgs(expectedAction);
+            const expectedGetOrderedItemsAction = {type: MealOrderApp.UserAction.GET_ORDERED_ITEMS, date: ORDER.date};
+            const expectedAddDishToOrderAction = {type: MealOrderApp.UserAction.ADD_DISH_TO_ORDER, order: ORDER};
+
+            mock.expects('dispatch').withArgs(expectedGetOrderedItemsAction);
+            mock.expects('dispatch').withArgs(expectedAddDishToOrderAction);
             const component = fixture('MealOrderClientApp');
             const container = component.shadowRoot.querySelector('meal-order-menu-container');
             container.dispatchEvent((new CustomEvent('dish-added', {composed: true, detail: DISH})));
             mock.verify();
             mock.restore();
-        });*/
+        });
     });
 </script>
 </body>
diff --git a/client/user/test/mealorder/menu/meal-order-vendor-menus_test.html b/client/user/test/mealorder/menu/meal-order-vendor-menus_test.html
index 6a02a37d..eb436bc3 100644
--- a/client/user/test/mealorder/menu/meal-order-vendor-menus_test.html
+++ b/client/user/test/mealorder/menu/meal-order-vendor-menus_test.html
@@ -32,7 +32,6 @@
     <script src="../../../node_modules/redux/dist/redux.js"></script>
     <link rel="import" href="../../../src/mealorder/menu/meal-order-vendor-menus.html">
     <script src="../test_variables.js"></script>
-
 </head>
 <body>
 
diff --git a/client/user/test/mealorder/menu/meal-order-vendor-user-cart-actions_test.html b/client/user/test/mealorder/menu/meal-order-vendor-user-cart-actions_test.html
new file mode 100644
index 00000000..eb85ce5b
--- /dev/null
+++ b/client/user/test/mealorder/menu/meal-order-vendor-user-cart-actions_test.html
@@ -0,0 +1,109 @@
+<!doctype html>
+<!--
+  ~ Copyright 2018, TeamDev Ltd. All rights reserved.
+  ~
+  ~ Redistribution and use in source and/or binary forms, with or without
+  ~ modification, must retain the above copyright notice and the following
+  ~ disclaimer.
+  ~
+  ~ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+  ~ "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+  ~ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+  ~ A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+  ~ OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+  ~ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+  ~ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+  ~ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+  ~ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  ~ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+  ~ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+  -->
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <meta name="viewport"
+          content="width=device-width, minimum-scale=1, initial-scale=1, user-scalable=yes">
+
+    <title>meal-order-client test</title>
+
+    <script src="../../../bower_components/webcomponentsjs/webcomponents-loader.js"></script>
+    <script src="../../../bower_components/web-component-tester/browser.js"></script>
+    <script src="../../../node_modules/redux/dist/redux.js"></script>
+    <script src="../test_variables.js"></script>
+    <link rel="import" href="../../../src/mealorder/menu/meal-order-user-cart.html">
+</head>
+<body>
+
+<test-fixture id="MealOrderUserCart">
+    <template>
+        <meal-order-user-cart></meal-order-user-cart>
+    </template>
+</test-fixture>
+
+<script>
+    suite('meal-order-client-app', function () {
+
+        setup(() => {
+            mock = sinon.mock(MealOrderApp.store);
+        });
+
+        test('should responds on `vendor-removed` event and fire `REMOVE_VENDOR_FROM_ORDER` action.', function (done) {
+            const DATE = new Date("2018-03-21");
+            const VENDOR = "Пюре";
+
+            const expectedGetOrderedItemsAction = {
+                type: MealOrderApp.UserAction.GET_ORDERED_ITEMS,
+                date: DATE
+            };
+            const expectedRemoveVendorFromOrderAction = {
+                type: MealOrderApp.UserAction.REMOVE_VENDOR_FROM_ORDER,
+                vendor: VENDOR
+            };
+
+            mock.expects('dispatch').withArgs(expectedGetOrderedItemsAction);
+
+            const component = fixture('MealOrderUserCart');
+            component.selectedDate = new Date("2018-03-21");
+            component.currentOrder = MealOrderAppTest.ininitalOrder[0];
+            mock.verify();
+            let userOrder;
+            flush(function () {
+                mock.expects('dispatch').withArgs(expectedRemoveVendorFromOrderAction);
+                // mock.verify();
+                userOrder = component.shadowRoot.querySelector('meal-order-user-order');
+                userOrder.dispatchEvent((new CustomEvent('user-order-vendor-removed', {detail: VENDOR})));
+                done();
+            });
+        });
+
+        test('should responds on `dish-removed` event and fire `REMOVE_DISH_FROM_ORDER` action.', function (done) {
+            const DATE = new Date("2018-03-21");
+            const DISH = {vendor: "Пюре", name: "Борщ украинский"};
+            const expectedGetOrderedItemsAction = {
+                type: MealOrderApp.UserAction.GET_ORDERED_ITEMS,
+                date: DATE
+            };
+            const expectedRemoveDishFromOrderAction = {
+                type: MealOrderApp.UserAction.REMOVE_DISH_FROM_ORDER,
+                vendor: DISH
+            };
+
+            mock.expects('dispatch').withArgs(expectedGetOrderedItemsAction);
+
+            const component = fixture('MealOrderUserCart');
+            component.selectedDate = new Date("2018-03-21");
+            component.currentOrder = MealOrderAppTest.ininitalOrder[0];
+            mock.verify();
+            let userOrder;
+            flush(function () {
+                mock.expects('dispatch').withArgs(expectedRemoveDishFromOrderAction);
+                // mock.verify();
+                userOrder = component.shadowRoot.querySelector('meal-order-user-order');
+                userOrder.dispatchEvent((new CustomEvent('user-order-dish-removed', {detail: DISH})));
+                done();
+            });
+        });
+    });
+</script>
+</body>
+</html>
diff --git a/client/user/test/mealorder/menu/meal-order-vendor-user-cart_test.html b/client/user/test/mealorder/menu/meal-order-vendor-user-cart_test.html
index c1b74483..15efa4d1 100644
--- a/client/user/test/mealorder/menu/meal-order-vendor-user-cart_test.html
+++ b/client/user/test/mealorder/menu/meal-order-vendor-user-cart_test.html
@@ -18,35 +18,50 @@
   ~ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
   ~ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   -->
-
 <html lang="en">
 <head>
     <meta charset="utf-8">
     <meta name="viewport"
           content="width=device-width, minimum-scale=1, initial-scale=1, user-scalable=yes">
 
-    <title>meal-order-vendor-menu test</title>
-    <link rel="import" href="../../../src/mealorder/shell/meal-order-app-namespace.html">
+    <title>meal-order-client test</title>
+
     <script src="../../../bower_components/webcomponentsjs/webcomponents-loader.js"></script>
     <script src="../../../bower_components/web-component-tester/browser.js"></script>
     <script src="../../../node_modules/redux/dist/redux.js"></script>
-    <link rel="import" href="../../../src/mealorder/menu/meal-order-user-cart.html">
     <script src="../test_variables.js"></script>
-
+    <link rel="import" href="../../../src/mealorder/menu/meal-order-user-cart.html">
 </head>
 <body>
 
-<test-fixture id="UserCart">
+<test-fixture id="MealOrderUserCart">
     <template>
         <meal-order-user-cart></meal-order-user-cart>
     </template>
 </test-fixture>
 
 <script>
-    suite('meal-order-user-cart', function () {
+    suite('meal-order-client-app', function () {
+        let component;
+
+        setup(() => {
+            component = fixture('MealOrderUserCart');
+            component.currentOrder = MealOrderAppTest.ininitalOrder[0];
+        });
 
+        test('should store order correctly', function () {
+            assert.equal(component.currentOrder.date.getTime(), new Date('2018-03-21').getTime());
+            assert.equal(component.currentOrder.order[0].vendor, "Пюре");
+            assert.equal(component.currentOrder.order[0].dishes.length, 6);
+            assert.equal(component.currentOrder.order[0].dishes[0].title, "Борщ украинский");
+            assert.equal(component.currentOrder.order[0].dishes[0].price, 35);
+            assert.equal(component.currentOrder.order[0].dishes[0].quantity, 1);
+        });
+
+        test('should calculate the total price of the order', function () {
+            assert.equal(component._getTotalAmount(component.currentOrder), 300);
+        });
     });
 </script>
-
 </body>
 </html>

From 29032aa478fffe0ed2a5f670c67e93f4af2f6f52 Mon Sep 17 00:00:00 2001
From: Paul Ageyev <paulageyev@gmail.com>
Date: Sat, 28 Apr 2018 16:03:57 +0300
Subject: [PATCH 232/253] Refactor tests

---
 .eslintrc.json                                  |  3 ++-
 .../meal-order-client-app-action_test.html      |  2 --
 .../mealorder/meal-order-client-app_test.html   |  1 -
 .../test/mealorder/meal-order-toolbar_test.html |  2 --
 .../menu/meal-order-menu-container_test.html    |  1 -
 .../menu/meal-order-vendor-menu_test.html       | 17 ++++++++---------
 .../menu/meal-order-vendor-menus_test.html      |  3 ---
 7 files changed, 10 insertions(+), 19 deletions(-)

diff --git a/.eslintrc.json b/.eslintrc.json
index 23562c0c..c7a0a5cf 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -51,6 +51,7 @@
     "fixture": false,
     "setup": false,
     "flush": false,
-    "sinon": false
+    "sinon": false,
+    "mock": false,
   }
 }
diff --git a/client/user/test/mealorder/meal-order-client-app-action_test.html b/client/user/test/mealorder/meal-order-client-app-action_test.html
index ffec265e..74721092 100644
--- a/client/user/test/mealorder/meal-order-client-app-action_test.html
+++ b/client/user/test/mealorder/meal-order-client-app-action_test.html
@@ -40,7 +40,6 @@
 </test-fixture>
 
 <script>
-
     suite('meal-order-client-app', function () {
 
         setup(() => {
@@ -61,7 +60,6 @@
             mock.verify();
             mock.restore();
         });
-
     });
 </script>
 </body>
diff --git a/client/user/test/mealorder/meal-order-client-app_test.html b/client/user/test/mealorder/meal-order-client-app_test.html
index 1cec8c05..5af5f8a5 100644
--- a/client/user/test/mealorder/meal-order-client-app_test.html
+++ b/client/user/test/mealorder/meal-order-client-app_test.html
@@ -87,7 +87,6 @@
             pages.forceSynchronousItemUpdate();
             assert.equal(pages.selectedItem.tagName.toLocaleLowerCase(), MealOrderApp.MealOrderMenuContainer.is);
         });
-
     });
 </script>
 </body>
diff --git a/client/user/test/mealorder/meal-order-toolbar_test.html b/client/user/test/mealorder/meal-order-toolbar_test.html
index 0ccc11f1..e997e256 100644
--- a/client/user/test/mealorder/meal-order-toolbar_test.html
+++ b/client/user/test/mealorder/meal-order-toolbar_test.html
@@ -18,7 +18,6 @@
   ~ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
   ~ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   -->
-
 <html lang="en">
 <head>
     <meta charset="utf-8">
@@ -74,7 +73,6 @@
                 done();
             });
         });
-
     });
 </script>
 </body>
diff --git a/client/user/test/mealorder/menu/meal-order-menu-container_test.html b/client/user/test/mealorder/menu/meal-order-menu-container_test.html
index bc553203..0d40d046 100644
--- a/client/user/test/mealorder/menu/meal-order-menu-container_test.html
+++ b/client/user/test/mealorder/menu/meal-order-menu-container_test.html
@@ -63,7 +63,6 @@
             component.selectedDate = new Date("2018-03-23");
             assert.equal(component.selectedDate, paperTabs.selected);
         });
-
     });
 </script>
 </body>
diff --git a/client/user/test/mealorder/menu/meal-order-vendor-menu_test.html b/client/user/test/mealorder/menu/meal-order-vendor-menu_test.html
index c79a3105..ddf75920 100644
--- a/client/user/test/mealorder/menu/meal-order-vendor-menu_test.html
+++ b/client/user/test/mealorder/menu/meal-order-vendor-menu_test.html
@@ -57,21 +57,21 @@
             const DISHES_LENGTH = 5;
             const DISH_COST = 35;
 
-            assert.equal('Пюре', component.menu.vendor);
-            assert.equal(CATEGORIES, component.menu.categories.length);
-            assert.equal('Первое блюдо', component.menu.categories[0].categoryName);
-            assert.equal(DISHES_LENGTH, component.menu.categories[0].dishes.length);
-            assert.equal('Суп гречневый', component.menu.categories[0].dishes[0].title);
-            assert.equal(DISH_COST, component.menu.categories[0].dishes[0].price);
+            assert.equal(component.menu.vendor, 'Пюре');
+            assert.equal(component.menu.categories.length, CATEGORIES);
+            assert.equal(component.menu.categories[0].categoryName, 'Первое блюдо');
+            assert.equal(component.menu.categories[0].dishes.length, DISHES_LENGTH);
+            assert.equal(component.menu.categories[0].dishes[0].title, 'Суп гречневый');
+            assert.equal(component.menu.categories[0].dishes[0].price, DISH_COST);
         });
 
         test('should expand and collapse on click', function () {
             const header = component.shadowRoot.querySelector('.menu-caption');
             const menu = component.shadowRoot.querySelector('#menu');
             header.click();
-            assert.equal('collapsed', menu.className);
+            assert.equal(menu.className, 'collapsed');
             header.click();
-            assert.equal('expanded', menu.className);
+            assert.equal(menu.className, 'expanded');
         });
 
         test('should send `add-dish` event', function (done) {
@@ -85,6 +85,5 @@
         });
     });
 </script>
-
 </body>
 </html>
diff --git a/client/user/test/mealorder/menu/meal-order-vendor-menus_test.html b/client/user/test/mealorder/menu/meal-order-vendor-menus_test.html
index c66464fe..6a02a37d 100644
--- a/client/user/test/mealorder/menu/meal-order-vendor-menus_test.html
+++ b/client/user/test/mealorder/menu/meal-order-vendor-menus_test.html
@@ -55,12 +55,9 @@
             const NUMBER_OF_DISHES = 3;
             const paperSearch = component.shadowRoot.querySelector('#paper-search');
             paperSearch.query = "Суп";
-            console.log(component.filtered[0].categories[0].dishes);
             assert.equal(component.filtered[0].categories[0].dishes.length, NUMBER_OF_DISHES);
         });
-
     });
 </script>
-
 </body>
 </html>

From 0bba82f9b3c9faff60eded18e8f504ccc433c309 Mon Sep 17 00:00:00 2001
From: Paul Ageyev <paulageyev@gmail.com>
Date: Sat, 28 Apr 2018 16:07:08 +0300
Subject: [PATCH 233/253] Add constants to tests

---
 .../menu/meal-order-vendor-user-cart_test.html       | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/client/user/test/mealorder/menu/meal-order-vendor-user-cart_test.html b/client/user/test/mealorder/menu/meal-order-vendor-user-cart_test.html
index 15efa4d1..ab471164 100644
--- a/client/user/test/mealorder/menu/meal-order-vendor-user-cart_test.html
+++ b/client/user/test/mealorder/menu/meal-order-vendor-user-cart_test.html
@@ -50,16 +50,20 @@
         });
 
         test('should store order correctly', function () {
+            const NUMBER_OF_DISHES = 6;
+            const PRICE = 35;
+            const QUANTITY = 1;
             assert.equal(component.currentOrder.date.getTime(), new Date('2018-03-21').getTime());
             assert.equal(component.currentOrder.order[0].vendor, "Пюре");
-            assert.equal(component.currentOrder.order[0].dishes.length, 6);
+            assert.equal(component.currentOrder.order[0].dishes.length, NUMBER_OF_DISHES);
             assert.equal(component.currentOrder.order[0].dishes[0].title, "Борщ украинский");
-            assert.equal(component.currentOrder.order[0].dishes[0].price, 35);
-            assert.equal(component.currentOrder.order[0].dishes[0].quantity, 1);
+            assert.equal(component.currentOrder.order[0].dishes[0].price, PRICE);
+            assert.equal(component.currentOrder.order[0].dishes[0].quantity, QUANTITY);
         });
 
         test('should calculate the total price of the order', function () {
-            assert.equal(component._getTotalAmount(component.currentOrder), 300);
+            const TOTAL_PRICE = 300;
+            assert.equal(component._getTotalAmount(component.currentOrder), TOTAL_PRICE);
         });
     });
 </script>

From c878b9c22ce4a1daa9c18bdd7a77c42c3a4c682a Mon Sep 17 00:00:00 2001
From: Paul Ageyev <paulageyev@gmail.com>
Date: Sat, 28 Apr 2018 16:08:15 +0300
Subject: [PATCH 234/253] Add a modified mock as global

---
 .eslintrc.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.eslintrc.json b/.eslintrc.json
index c7a0a5cf..c9fcbffb 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -52,6 +52,6 @@
     "setup": false,
     "flush": false,
     "sinon": false,
-    "mock": false,
+    "mock": true
   }
 }

From 4267efb9bb9891b642b6c6c6baf8734d6d3d6c13 Mon Sep 17 00:00:00 2001
From: Paul Ageyev <paulageyev@gmail.com>
Date: Sat, 28 Apr 2018 17:01:12 +0300
Subject: [PATCH 235/253] Add redux store to the `meal-order-user-history`
 component

---
 .../src/mealorder/meal-order-client-app.html  |  4 +-
 .../mealorder/menu/meal-order-menu-order.html |  2 +-
 .../menu/meal-order-user-history.html         | 83 +++++++++++++------
 .../mealorder/shell/actions/user-actions.html |  1 +
 .../mealorder/shell/reducers/reducers.html    | 27 +++---
 5 files changed, 77 insertions(+), 40 deletions(-)

diff --git a/client/user/src/mealorder/meal-order-client-app.html b/client/user/src/mealorder/meal-order-client-app.html
index 70281ee6..d833cc74 100644
--- a/client/user/src/mealorder/meal-order-client-app.html
+++ b/client/user/src/mealorder/meal-order-client-app.html
@@ -41,6 +41,8 @@
 <link rel="import" href="./meal-order-toolbar.html">
 <link rel="import" href="./menu/meal-order-drawer.html">
 <link rel="import" href="./menu/meal-order-menu-container.html">
+<link rel="import" href="./menu/meal-order-user-history.html">
+
 <dom-module id="meal-order-client-app">
     <template>
         <style>
@@ -102,7 +104,7 @@
                             on-dish-added="_addDishToOrder">
                     </meal-order-menu-container>
                     <div data-page="history">
-                        <!--user history component-->
+                        <meal-order-user-history selected-date="[[routeData.date]]"></meal-order-user-history>
                     </div>
                 </iron-pages>
             </app-header-layout>
diff --git a/client/user/src/mealorder/menu/meal-order-menu-order.html b/client/user/src/mealorder/menu/meal-order-menu-order.html
index 104e8028..01b8befa 100644
--- a/client/user/src/mealorder/menu/meal-order-menu-order.html
+++ b/client/user/src/mealorder/menu/meal-order-menu-order.html
@@ -108,7 +108,7 @@
             </template>
         </paper-tabs>
 
-        <meal-order-vendor-menus items="[[menu]]" on-dish-added="addDishToOrder"></meal-order-vendor-menus>
+        <meal-order-vendor-menus menu-for-day="[[menu]]" on-dish-added="addDishToOrder"></meal-order-vendor-menus>
 
     </template>
     <script>
diff --git a/client/user/src/mealorder/menu/meal-order-user-history.html b/client/user/src/mealorder/menu/meal-order-user-history.html
index 748e571a..7b02e827 100644
--- a/client/user/src/mealorder/menu/meal-order-user-history.html
+++ b/client/user/src/mealorder/menu/meal-order-user-history.html
@@ -17,16 +17,19 @@
   ~ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
   ~ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   -->
-<script src="../../../bower_components/webcomponentsjs/webcomponents-lite.js"></script>
 <link rel="import" href="../../../bower_components/polymer/polymer-element.html">
 <link rel="import" href="../../../bower_components/iron-list/iron-list.html">
 <link rel="import" href="../../../bower_components/paper-card/paper-card.html">
+<link rel="import" href="../shell/redux-store.html">
+<link rel="import" href="../shell/actions/user-actions.html">
+
 <dom-module id="meal-order-user-history">
     <template>
         <style>
             #history {
                 width: 70%;
                 margin: 3% auto;
+                color: var(--paper-grey-700);
             }
 
             #title-for-mobile {
@@ -36,12 +39,13 @@
             .header {
                 display: flex;
                 justify-content: space-between;
-                background-color: var(--paper-grey-300);
-                height: 40px;
+                background-color: var(--paper-grey-200);
+                height: 50px;
                 align-items: center;
             }
 
             .vendor-title {
+                color: var(--paper-grey-900);
                 font-size: 22px;
                 font-weight: bolder;
                 margin-top: 2%;
@@ -69,7 +73,7 @@
                 display: flex;
                 justify-content: space-between;
                 background-color: #FFFFFF;
-                height: 40px;
+                height: 50px;
                 margin-bottom: 2px;
                 align-items: center;
             }
@@ -109,17 +113,15 @@
         <div id="history">
             <div id="title-for-mobile">История заказов</div>
 
-            <iron-list items="[[cart]]" as="item">
+            <iron-list items="[[currentHistory.order]]" as="item">
                 <template>
                     <div>
                         <div class="vendor-title">[[item.vendor]]</div>
-
                         <div class="header">
                             <div class="history-title">Наименование</div>
-                            <div class="history-price">Цена</div>
+                            <div class="history-price">Цена, ₴</div>
                             <div class="history-quantity">Количество</div>
                         </div>
-
                         <dom-repeat items="[[item.dishes]]" as="dish">
                             <template>
                                 <div class="dishes">
@@ -132,9 +134,9 @@
                     </div>
                 </template>
             </iron-list>
-            <dom-if if="[[totalSum]]">
+            <dom-if if="[[totalPrice]]">
                 <template>
-                    <div class="total-sum">Общая сумма: [[totalSum]] ₴</div>
+                    <div class="total-sum">Общая сумма: [[totalPrice]] ₴</div>
                 </template>
             </dom-if>
         </div>
@@ -146,42 +148,73 @@
          * @customElement
          * @polymer
          */
-        class MealOrderUserHistory extends Polymer.Element {
+        class MealOrderUserHistory extends MealOrderApp.ReduxMixin(Polymer.Element) {
             static get is() {
                 return 'meal-order-user-history';
             }
 
             static get properties() {
                 return {
+                    /**
+                     * Selected day.
+                     */
+                    selectedDate: {
+                        type: Object,
+                    },
+
                     /**
                      * An array containing items to be displayed.
                      */
-                    cart: {
-                        type: Array
+                    currentHistory: {
+                        type: Array,
+                        statePath: 'currentHistory'
                     },
+
                     /**
-                     * Total amount of the order.
+                     * Total price of the order.
                      */
-                    totalSum: {
+                    totalPrice: {
                         type: Number,
-                        computed: '_getTotalSum(cart)',
+                        computed: '_getTotalPrice(currentHistory)',
                     }
                 }
             }
 
-            _getTotalSum(cart) {
-                let totalSum = 0;
-                for (let i = 0; i < cart.length; i++) {
-                    const dishes = cart[i].dishes;
-                    let sum = 0;
-                    for (let i = 0; i < dishes.length; i++) {
-                        sum += (dishes[i].price) * dishes[i].quantity;
+            static get actions() {
+                return {
+                    getCurrentHistory: date => ({
+                        type: MealOrderApp.UserAction.GET_CURRENT_HISTORY,
+                        date
+                    }),
+                }
+            }
+
+            static get observers() {
+                return [
+                    '_getCurrentHistory(selectedDate)'
+                ];
+            }
+
+            _getCurrentHistory(selectedDate) {
+                this.dispatch('getCurrentHistory', new Date(selectedDate));
+            }
+
+            _getTotalPrice(currentHistory) {
+                if (currentHistory) {
+                    let totalPrice = 0;
+                    for (let i = 0; i < currentHistory.length; i++) {
+                        const dishes = currentHistory[i].dishes;
+                        let sum = 0;
+                        for (let i = 0; i < dishes.length; i++) {
+                            sum += (dishes[i].price) * dishes[i].quantity;
+                        }
+                        totalPrice += sum;
                     }
-                    totalSum += sum;
+                    return totalPrice;
                 }
-                return totalSum;
             }
         }
+
         window.customElements.define(MealOrderUserHistory.is, MealOrderUserHistory);
     </script>
 </dom-module>
diff --git a/client/user/src/mealorder/shell/actions/user-actions.html b/client/user/src/mealorder/shell/actions/user-actions.html
index cdcb9898..ea3e57ba 100644
--- a/client/user/src/mealorder/shell/actions/user-actions.html
+++ b/client/user/src/mealorder/shell/actions/user-actions.html
@@ -23,5 +23,6 @@
         GET_ORDERED_ITEMS: 'GET_ORDERED_ITEMS',
         REMOVE_DISH_FROM_ORDER: 'REMOVE_DISH_FROM_ORDER',
         REMOVE_VENDOR_FROM_ORDER: 'REMOVE_VENDOR_FROM_ORDER',
+        GET_CURRENT_HISTORY: 'GET_CURRENT_HISTORY',
     }
 </script>
diff --git a/client/user/src/mealorder/shell/reducers/reducers.html b/client/user/src/mealorder/shell/reducers/reducers.html
index f9b6b287..e399fc7b 100644
--- a/client/user/src/mealorder/shell/reducers/reducers.html
+++ b/client/user/src/mealorder/shell/reducers/reducers.html
@@ -63,7 +63,7 @@
                         },
                         {
                             categoryName: 'Напитки', dishes: [
-                                {title: 'Лимонад', price: 40}]
+                            {title: 'Лимонад', price: 40}]
                         }
                     ]
                 },
@@ -102,7 +102,7 @@
                         },
                         {
                             categoryName: 'Напитки', dishes: [
-                                {title: 'Лимонад', price: 40}]
+                            {title: 'Лимонад', price: 40}]
                         }
                     ]
                 },
@@ -123,7 +123,7 @@
                         },
                         {
                             categoryName: 'Напитки', dishes: [
-                                {title: 'Лимонад', price: 40}]
+                            {title: 'Лимонад', price: 40}]
                         }
                     ]
                 }],
@@ -170,11 +170,8 @@
             currentOrder: [],
 
             history: [{
-                date: {
-                    year: '2018',
-                    month: '04',
-                    day: '10',
-                }, order: [{
+                date: new Date('2018-03-20'),
+                order: [{
                     vendor: "Пюре",
                     dishes: [
                         {title: 'Борщ украинский', price: 35, quantity: 1},
@@ -192,11 +189,8 @@
                     }]
                 }]
             }, {
-                date: {
-                    year: '2018',
-                    month: '04',
-                    day: '09',
-                }, order: [{
+                date: new Date('2018-03-19'),
+                order: [{
                     vendor: "Пюре",
                     dishes: [
                         {title: 'Грибное пюре', price: 45, quantity: 1},
@@ -239,6 +233,13 @@
                         }
                     );
                 }
+                case MealOrderApp.UserAction.GET_CURRENT_HISTORY: {
+                    const newHistory = state.history.find(history => history.date.getTime() === action.date.getTime());
+                    return Object.assign({}, state, {
+                            currentHistory: newHistory
+                        }
+                    );
+                }
                 default : {
                     return state;
                 }

From 5bbe79d544e26fa34bd8bc02807775ae4e6e9046 Mon Sep 17 00:00:00 2001
From: Paul Ageyev <paulageyev@gmail.com>
Date: Sat, 28 Apr 2018 17:51:13 +0300
Subject: [PATCH 236/253] Add tests for the `meal-order-user-history` component

---
 .../meal-order-user-history.html              | 37 ++++-----
 .../src/mealorder/meal-order-client-app.html  |  2 +-
 .../mealorder/menu/meal-order-menu-order.html |  2 +-
 .../mealorder/shell/reducers/reducers.html    |  2 +-
 .../history/meal-order-user-history_test.html | 76 +++++++++++++++++++
 .../meal-order-client-app-action_test.html    | 21 ++++-
 client/user/test/mealorder/test_variables.js  | 59 +++++++++-----
 7 files changed, 151 insertions(+), 48 deletions(-)
 rename client/user/src/mealorder/{menu => history}/meal-order-user-history.html (87%)
 create mode 100644 client/user/test/mealorder/history/meal-order-user-history_test.html

diff --git a/client/user/src/mealorder/menu/meal-order-user-history.html b/client/user/src/mealorder/history/meal-order-user-history.html
similarity index 87%
rename from client/user/src/mealorder/menu/meal-order-user-history.html
rename to client/user/src/mealorder/history/meal-order-user-history.html
index 7b02e827..656c62dc 100644
--- a/client/user/src/mealorder/menu/meal-order-user-history.html
+++ b/client/user/src/mealorder/history/meal-order-user-history.html
@@ -28,8 +28,9 @@
         <style>
             #history {
                 width: 70%;
-                margin: 3% auto;
+                margin: 3% auto 0 auto;
                 color: var(--paper-grey-700);
+                padding-bottom: 3%;
             }
 
             #title-for-mobile {
@@ -112,7 +113,6 @@
         </style>
         <div id="history">
             <div id="title-for-mobile">История заказов</div>
-
             <iron-list items="[[currentHistory.order]]" as="item">
                 <template>
                     <div>
@@ -134,9 +134,9 @@
                     </div>
                 </template>
             </iron-list>
-            <dom-if if="[[totalPrice]]">
+            <dom-if if="[[currentHistory.order]]">
                 <template>
-                    <div class="total-sum">Общая сумма: [[totalPrice]] ₴</div>
+                    <div class="total-sum">Общая сумма: [[_getTotalPrice(currentHistory)]] ₴</div>
                 </template>
             </dom-if>
         </div>
@@ -166,17 +166,10 @@
                      * An array containing items to be displayed.
                      */
                     currentHistory: {
-                        type: Array,
-                        statePath: 'currentHistory'
+                        type: Object,
+                        statePath: 'currentHistory',
                     },
 
-                    /**
-                     * Total price of the order.
-                     */
-                    totalPrice: {
-                        type: Number,
-                        computed: '_getTotalPrice(currentHistory)',
-                    }
                 }
             }
 
@@ -200,18 +193,16 @@
             }
 
             _getTotalPrice(currentHistory) {
-                if (currentHistory) {
-                    let totalPrice = 0;
-                    for (let i = 0; i < currentHistory.length; i++) {
-                        const dishes = currentHistory[i].dishes;
-                        let sum = 0;
-                        for (let i = 0; i < dishes.length; i++) {
-                            sum += (dishes[i].price) * dishes[i].quantity;
-                        }
-                        totalPrice += sum;
+                let totalPrice = 0;
+                for (let i = 0; i < currentHistory.order.length; i++) {
+                    const dishes = currentHistory.order[i].dishes;
+                    let sum = 0;
+                    for (let i = 0; i < dishes.length; i++) {
+                        sum += (dishes[i].price) * dishes[i].quantity;
                     }
-                    return totalPrice;
+                    totalPrice += sum;
                 }
+                return totalPrice;
             }
         }
 
diff --git a/client/user/src/mealorder/meal-order-client-app.html b/client/user/src/mealorder/meal-order-client-app.html
index d833cc74..6420dc75 100644
--- a/client/user/src/mealorder/meal-order-client-app.html
+++ b/client/user/src/mealorder/meal-order-client-app.html
@@ -41,7 +41,7 @@
 <link rel="import" href="./meal-order-toolbar.html">
 <link rel="import" href="./menu/meal-order-drawer.html">
 <link rel="import" href="./menu/meal-order-menu-container.html">
-<link rel="import" href="./menu/meal-order-user-history.html">
+<link rel="import" href="./history/meal-order-user-history.html">
 
 <dom-module id="meal-order-client-app">
     <template>
diff --git a/client/user/src/mealorder/menu/meal-order-menu-order.html b/client/user/src/mealorder/menu/meal-order-menu-order.html
index 01b8befa..12cacf2c 100644
--- a/client/user/src/mealorder/menu/meal-order-menu-order.html
+++ b/client/user/src/mealorder/menu/meal-order-menu-order.html
@@ -26,7 +26,7 @@
 <link rel="import" href="../shell/redux-store.html">
 <link rel="import" href="../../../bower_components/polymer/lib/elements/dom-repeat.html">
 
-<link rel="import" href="meal-order-user-history.html">
+<link rel="import" href="../history/meal-order-user-history.html">
 <link rel="import" href="../menu/meal-order-vendor-menus.html">
 <dom-module id="meal-order-menu-order">
     <template>
diff --git a/client/user/src/mealorder/shell/reducers/reducers.html b/client/user/src/mealorder/shell/reducers/reducers.html
index e399fc7b..d77ed3d5 100644
--- a/client/user/src/mealorder/shell/reducers/reducers.html
+++ b/client/user/src/mealorder/shell/reducers/reducers.html
@@ -208,7 +208,7 @@
                     }]
                 }]
             }],
-            currentHistory: [],
+            currentHistory: {},
         };
 
         MealOrderApp.reducer = (state, action) => {
diff --git a/client/user/test/mealorder/history/meal-order-user-history_test.html b/client/user/test/mealorder/history/meal-order-user-history_test.html
new file mode 100644
index 00000000..f39d1ecf
--- /dev/null
+++ b/client/user/test/mealorder/history/meal-order-user-history_test.html
@@ -0,0 +1,76 @@
+<!doctype html>
+<!--
+  ~ Copyright 2018, TeamDev Ltd. All rights reserved.
+  ~
+  ~ Redistribution and use in source and/or binary forms, with or without
+  ~ modification, must retain the above copyright notice and the following
+  ~ disclaimer.
+  ~
+  ~ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+  ~ "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+  ~ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+  ~ A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+  ~ OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+  ~ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+  ~ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+  ~ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+  ~ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  ~ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+  ~ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+  -->
+
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <meta name="viewport"
+          content="width=device-width, minimum-scale=1, initial-scale=1, user-scalable=yes">
+
+    <title>meal-order-user-history test</title>
+
+    <link rel="import" href="../../../src/mealorder/shell/meal-order-app-namespace.html">
+    <script src="../../../bower_components/webcomponentsjs/webcomponents-loader.js"></script>
+    <script src="../../../bower_components/web-component-tester/browser.js"></script>
+    <script src="../../../node_modules/redux/dist/redux.js"></script>
+    <script src="../test_variables.js"></script>
+    <link rel="import" href="../../../src/mealorder/history/meal-order-user-history.html">
+
+</head>
+<body>
+
+<test-fixture id="UserHistory">
+    <template>
+        <meal-order-user-history></meal-order-user-history>
+    </template>
+</test-fixture>
+
+<script>
+    suite('meal-order-vendor-menu', function () {
+        let component;
+
+        setup(() => {
+            component = fixture('UserHistory');
+            component.selectedDate = new Date('2018-03-20');
+            component.currentHistory = MealOrderAppTest.ininitalHistory[0];
+        });
+
+        test('should store history correctly', function () {
+            const NUMBER_OF_DISHES = 6;
+            const PRICE = 35;
+            const QUANTITY = 1;
+            assert.equal(component.currentHistory.date.getTime(), new Date('2018-03-20').getTime());
+            assert.equal(component.currentHistory.order[0].vendor, "Пюре");
+            assert.equal(component.currentHistory.order[0].dishes.length, NUMBER_OF_DISHES);
+            assert.equal(component.currentHistory.order[0].dishes[0].title, "Борщ украинский");
+            assert.equal(component.currentHistory.order[0].dishes[0].price, PRICE);
+            assert.equal(component.currentHistory.order[0].dishes[0].quantity, QUANTITY);
+
+        });
+
+        test('should calculate the total price of the order', function () {
+            const TOTAL_PRICE = 300;
+            assert.equal(component._getTotalPrice(component.currentHistory), TOTAL_PRICE);
+        });
+    });
+</script>
+</body>
+</html>
diff --git a/client/user/test/mealorder/meal-order-client-app-action_test.html b/client/user/test/mealorder/meal-order-client-app-action_test.html
index 944d1bab..4f1b0b42 100644
--- a/client/user/test/mealorder/meal-order-client-app-action_test.html
+++ b/client/user/test/mealorder/meal-order-client-app-action_test.html
@@ -52,14 +52,29 @@
             ORDER.dish = {vendor: "Позитив", price: 15, title: "Картофель"};
             ORDER.date = new Date("2018-03-21");
 
-            const expectedGetOrderedItemsAction = {type: MealOrderApp.UserAction.GET_ORDERED_ITEMS, date: ORDER.date};
-            const expectedAddDishToOrderAction = {type: MealOrderApp.UserAction.ADD_DISH_TO_ORDER, order: ORDER};
+            const expectedGetOrderedItemsAction = {
+                type: MealOrderApp.UserAction.GET_ORDERED_ITEMS,
+                date: ORDER.date
+            };
+            const expectedGetCurrentHistoryAction = {
+                type: MealOrderApp.UserAction.GET_CURRENT_HISTORY,
+                date: ORDER.date
+            };
+            const expectedAddDishToOrderAction = {
+                type: MealOrderApp.UserAction.ADD_DISH_TO_ORDER,
+                order: ORDER
+            };
 
             mock.expects('dispatch').withArgs(expectedGetOrderedItemsAction);
+            mock.expects('dispatch').withArgs(expectedGetCurrentHistoryAction);
             mock.expects('dispatch').withArgs(expectedAddDishToOrderAction);
+
             const component = fixture('MealOrderClientApp');
             const container = component.shadowRoot.querySelector('meal-order-menu-container');
-            container.dispatchEvent((new CustomEvent('dish-added', {composed: true, detail: DISH})));
+            container.dispatchEvent((new CustomEvent('dish-added', {
+                composed: true,
+                detail: DISH
+            })));
             mock.verify();
             mock.restore();
         });
diff --git a/client/user/test/mealorder/test_variables.js b/client/user/test/mealorder/test_variables.js
index 48334189..4a4e5b9e 100644
--- a/client/user/test/mealorder/test_variables.js
+++ b/client/user/test/mealorder/test_variables.js
@@ -40,23 +40,44 @@
     }];
 
     MealOrderAppTest.ininitalOrder = [{
-            date: new Date('2018-03-21'),
-            order: [{
-                vendor: "Пюре",
-                dishes: [
-                    {title: 'Борщ украинский', price: 35, quantity: 1},
-                    {title: 'Солянка', price: 40, quantity: 1},
-                    {title: 'Суп гороховый', price: 40, quantity: 1},
-                    {title: 'Уха', price: 35, quantity: 1},
-                    {title: 'Суп-пюре грибной', price: 40, quantity: 1},
-                    {title: 'Суп куриный', price: 40, quantity: 1},]
-            }, {
-                vendor: 'Позитив',
-                dishes: [{title: 'Суп куриный', price: 35, quantity: 1}, {
-                    title: 'Стейк из лосося',
-                    price: 35,
-                    quantity: 1
-                }]
+        date: new Date('2018-03-21'),
+        order: [{
+            vendor: "Пюре",
+            dishes: [
+                {title: 'Борщ украинский', price: 35, quantity: 1},
+                {title: 'Солянка', price: 40, quantity: 1},
+                {title: 'Суп гороховый', price: 40, quantity: 1},
+                {title: 'Уха', price: 35, quantity: 1},
+                {title: 'Суп-пюре грибной', price: 40, quantity: 1},
+                {title: 'Суп куриный', price: 40, quantity: 1},]
+        }, {
+            vendor: 'Позитив',
+            dishes: [{title: 'Суп куриный', price: 35, quantity: 1}, {
+                title: 'Стейк из лосося',
+                price: 35,
+                quantity: 1
             }]
-    }]
-}
+        }]
+    }];
+
+    MealOrderAppTest.ininitalHistory = [{
+        date: new Date('2018-03-20'),
+        order: [{
+            vendor: "Пюре",
+            dishes: [
+                {title: 'Борщ украинский', price: 35, quantity: 1},
+                {title: 'Солянка', price: 40, quantity: 1},
+                {title: 'Суп гороховый', price: 40, quantity: 1},
+                {title: 'Уха', price: 35, quantity: 1},
+                {title: 'Суп-пюре грибной', price: 40, quantity: 1},
+                {title: 'Суп куриный', price: 40, quantity: 1},]
+        }, {
+            vendor: 'Позитив',
+            dishes: [{title: 'Суп куриный', price: 35, quantity: 1}, {
+                title: 'Стейк из лосося',
+                price: 35,
+                quantity: 1
+            }]
+        }]
+    }];
+}
\ No newline at end of file

From 3bbb00d1f05a1cdd019bf9ee7727040a77ed133a Mon Sep 17 00:00:00 2001
From: Paul <paulageyev@gmail.com>
Date: Mon, 30 Apr 2018 13:51:44 +0300
Subject: [PATCH 237/253] Change the server time to a Date type

---
 client/user/index.html                                 |  9 ++++-----
 client/user/src/mealorder/meal-order-client-app.html   |  2 +-
 client/user/src/mealorder/menu/meal-order-drawer.html  |  1 +
 .../src/mealorder/menu/meal-order-menu-container.html  |  2 +-
 client/user/src/mealorder/shell/reducers/reducers.html |  1 -
 .../test/mealorder/meal-order-client-app_test.html     | 10 ++++------
 client/user/test/mealorder/meal-order-drawer_test.html |  2 --
 .../test/mealorder/meal-order-menu-container_test.html |  2 --
 .../user/test/mealorder/meal-order-toolbar_test.html   |  2 --
 9 files changed, 11 insertions(+), 20 deletions(-)

diff --git a/client/user/index.html b/client/user/index.html
index 0a6889bb..f3bd02d2 100644
--- a/client/user/index.html
+++ b/client/user/index.html
@@ -1,4 +1,3 @@
-<!doctype html>
 <!--
   ~ Copyright 2018, TeamDev Ltd. All rights reserved.
   ~
@@ -23,10 +22,10 @@
     <meta charset="utf-8">
     <meta name="viewport"
           content="width=device-width, minimum-scale=1, initial-scale=1, user-scalable=yes">
-    <script src="bower_components/webcomponentsjs/webcomponents-loader.js"></script>
-    <script src="node_modules/redux/dist/redux.js"></script>
-    <link rel="icon" href="images/favicon-16x16.png" type="image/png">
-    <link rel=import href="src/mealorder/meal-order-client-app.html">
+    <script src="./bower_components/webcomponentsjs/webcomponents-loader.js"></script>
+    <script src="./node_modules/redux/dist/redux.js"></script>
+    <link rel="icon" href="./images/favicon-16x16.png" type="image/png">
+    <link rel=import href="./src/mealorder/meal-order-client-app.html">
     <title>MealOrder</title>
 </head>
 <style>
diff --git a/client/user/src/mealorder/meal-order-client-app.html b/client/user/src/mealorder/meal-order-client-app.html
index b1eeb44b..fc77e9b7 100644
--- a/client/user/src/mealorder/meal-order-client-app.html
+++ b/client/user/src/mealorder/meal-order-client-app.html
@@ -161,7 +161,7 @@
                      * The current server time for the calendar.
                      */
                     serverTime: {
-                        type: Object,
+                        type: Date,
                         statePath: 'serverTime'
                     }
 
diff --git a/client/user/src/mealorder/menu/meal-order-drawer.html b/client/user/src/mealorder/menu/meal-order-drawer.html
index 39ea184b..22e67d8d 100644
--- a/client/user/src/mealorder/menu/meal-order-drawer.html
+++ b/client/user/src/mealorder/menu/meal-order-drawer.html
@@ -21,6 +21,7 @@
 <link rel="import" href="../../../bower_components/iron-pages/iron-pages.html">
 <link rel="import" href="../../../bower_components/app-datepicker/app-datepicker.html">
 <link rel="import" href="../shell/meal-order-app-namespace.html">
+
 <dom-module id="meal-order-drawer">
     <template>
         <style>
diff --git a/client/user/src/mealorder/menu/meal-order-menu-container.html b/client/user/src/mealorder/menu/meal-order-menu-container.html
index 5b2580a0..601fdb04 100644
--- a/client/user/src/mealorder/menu/meal-order-menu-container.html
+++ b/client/user/src/mealorder/menu/meal-order-menu-container.html
@@ -117,7 +117,7 @@
                          * The current server time for the calendar.
                          */
                         serverTime: {
-                            type: Object,
+                            type: Date,
                         },
 
                         /**
diff --git a/client/user/src/mealorder/shell/reducers/reducers.html b/client/user/src/mealorder/shell/reducers/reducers.html
index 7a52a405..117c7ae8 100644
--- a/client/user/src/mealorder/shell/reducers/reducers.html
+++ b/client/user/src/mealorder/shell/reducers/reducers.html
@@ -140,5 +140,4 @@
             }
         }
     }
-
 </script>
diff --git a/client/user/test/mealorder/meal-order-client-app_test.html b/client/user/test/mealorder/meal-order-client-app_test.html
index 1cec8c05..c9ed87e2 100644
--- a/client/user/test/mealorder/meal-order-client-app_test.html
+++ b/client/user/test/mealorder/meal-order-client-app_test.html
@@ -1,4 +1,3 @@
-<!doctype html>
 <!--
   ~ Copyright 2018, TeamDev Ltd. All rights reserved.
   ~
@@ -60,10 +59,10 @@
         });
 
         test('should parse `routeData.date` correctly', function () {
-            setLocation('/#/history/2018-3-21');
-            assert.equal('2018-3-21', component.routeData.date);
-            setLocation('/#/menu/2018-3-21');
-            assert.equal('2018-3-21', component.routeData.date);
+            setLocation('/#/history/2018-03-21');
+            assert.equal('2018-03-21', component.routeData.date);
+            setLocation('/#/menu/2018-03-21');
+            assert.equal('2018-03-21', component.routeData.date);
         });
 
         test('should instantiate the `meal-order-toolbar` component', function (done) {
@@ -87,7 +86,6 @@
             pages.forceSynchronousItemUpdate();
             assert.equal(pages.selectedItem.tagName.toLocaleLowerCase(), MealOrderApp.MealOrderMenuContainer.is);
         });
-
     });
 </script>
 </body>
diff --git a/client/user/test/mealorder/meal-order-drawer_test.html b/client/user/test/mealorder/meal-order-drawer_test.html
index e43a829d..2fd17997 100644
--- a/client/user/test/mealorder/meal-order-drawer_test.html
+++ b/client/user/test/mealorder/meal-order-drawer_test.html
@@ -1,4 +1,3 @@
-<!doctype html>
 <!--
   ~ Copyright 2018, TeamDev Ltd. All rights reserved.
   ~
@@ -18,7 +17,6 @@
   ~ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
   ~ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   -->
-
 <html lang="en">
 <head>
     <meta charset="utf-8">
diff --git a/client/user/test/mealorder/meal-order-menu-container_test.html b/client/user/test/mealorder/meal-order-menu-container_test.html
index 176fab0d..ed16986a 100644
--- a/client/user/test/mealorder/meal-order-menu-container_test.html
+++ b/client/user/test/mealorder/meal-order-menu-container_test.html
@@ -1,4 +1,3 @@
-<!DOCTYPE html>
 <!--
   ~ Copyright 2018, TeamDev Ltd. All rights reserved.
   ~
@@ -18,7 +17,6 @@
   ~ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
   ~ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   -->
-
 <html lang="en">
 <head>
     <meta charset="utf-8">
diff --git a/client/user/test/mealorder/meal-order-toolbar_test.html b/client/user/test/mealorder/meal-order-toolbar_test.html
index 0ccc11f1..1d7104c1 100644
--- a/client/user/test/mealorder/meal-order-toolbar_test.html
+++ b/client/user/test/mealorder/meal-order-toolbar_test.html
@@ -1,4 +1,3 @@
-<!doctype html>
 <!--
   ~ Copyright 2018, TeamDev Ltd. All rights reserved.
   ~
@@ -18,7 +17,6 @@
   ~ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
   ~ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   -->
-
 <html lang="en">
 <head>
     <meta charset="utf-8">

From a66577336d86e29c058b529e72249933fee4d0e7 Mon Sep 17 00:00:00 2001
From: Paul <paulageyev@gmail.com>
Date: Mon, 30 Apr 2018 14:26:14 +0300
Subject: [PATCH 238/253] Refactor CSS and tests

---
 .../menu/meal-order-vendor-menu.html          | 23 ++++++++-----------
 .../menu/meal-order-vendor-menus.html         |  6 ++---
 .../menu/meal-order-vendor-menu_test.html     | 12 +++++-----
 .../menu/meal-order-vendor-menus_test.html    |  2 --
 4 files changed, 18 insertions(+), 25 deletions(-)

diff --git a/client/user/src/mealorder/menu/meal-order-vendor-menu.html b/client/user/src/mealorder/menu/meal-order-vendor-menu.html
index 25efd562..0ef58972 100644
--- a/client/user/src/mealorder/menu/meal-order-vendor-menu.html
+++ b/client/user/src/mealorder/menu/meal-order-vendor-menu.html
@@ -35,15 +35,7 @@
                 border-bottom: 1px solid var(--paper-grey-200);
             }
 
-            .menu-dishes {
-                display: flex;
-                justify-content: space-between;
-                align-items: center;
-                border-top: 1px solid var(--paper-grey-50);
-                border-bottom: 1px solid var(--paper-grey-50);
-            }
-
-            .wrapper {
+            .menu-header {
                 display: flex;
                 justify-content: space-between;
                 align-items: center;
@@ -59,6 +51,10 @@
                 padding: 2px 1% 2px 2%;
             }
 
+            .menu-dishes {
+                height: 50px;
+            }
+
             .bold {
                 font-weight: bold;
             }
@@ -70,7 +66,7 @@
             }
 
             .dish-price {
-                width: 50px;
+                width: 60px;
                 text-align: right;
             }
 
@@ -117,20 +113,19 @@
                     <dom-if if="[[item.dishes.length]]">
                         <template>
                             <div>
-                                <div class="wrapper">
+                                <div class="menu-header">
                                     <paper-item>
                                         <div class="dish-title bold">
                                             [[item.categoryName]]
                                         </div>
                                         <div class="dish-price bold">
-                                            Цена
+                                            Цена, ₴
                                         </div>
                                         <div class="add-dish-icon">
 
                                         </div>
                                     </paper-item>
                                 </div>
-
                                 <dom-repeat items="[[item.dishes]]" as="dish">
                                     <template>
                                         <div class="menu-dishes">
@@ -139,7 +134,7 @@
                                                     [[dish.title]]
                                                 </div>
                                                 <div class="dish-price">
-                                                    [[dish.price]]₴
+                                                    [[dish.price]]
                                                 </div>
                                                 <div class="add-dish-icon">
                                                     <paper-icon-button icon="add"
diff --git a/client/user/src/mealorder/menu/meal-order-vendor-menus.html b/client/user/src/mealorder/menu/meal-order-vendor-menus.html
index 64250cb7..29791863 100644
--- a/client/user/src/mealorder/menu/meal-order-vendor-menus.html
+++ b/client/user/src/mealorder/menu/meal-order-vendor-menus.html
@@ -17,14 +17,13 @@
   ~ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
   ~ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   -->
-
 <script src="../../../bower_components/webcomponentsjs/webcomponents-lite.js"></script>
 <link rel="import" href="../../../bower_components/polymer/polymer-element.html">
 <link rel="import" href="../../../bower_components/iron-list/iron-list.html">
 <link rel="import" href="../../../bower_components/paper-icon-button/paper-icon-button.html">
 <link rel="import" href="../../../bower_components/iron-icons/iron-icons.html">
 <link rel="import" href="../../../bower_components/paper-search/paper-search-bar.html">
-<link rel="import" href="meal-order-vendor-menu.html">
+<link rel="import" href="./meal-order-vendor-menu.html">
 
 <dom-module id="meal-order-vendor-menus">
     <template>
@@ -39,8 +38,8 @@
 
             paper-search-bar {
                 margin: 0 auto;
+                height: 50px;
                 width: 70%;
-                border-radius: 5px;
                 background-color: white;
             }
 
@@ -77,6 +76,7 @@
 
                 iron-list {
                     --iron-list-items-container: {
+                        color: var(--paper-grey-700);
                         margin: 4% auto;
                         width: 100%;
                     }
diff --git a/client/user/test/mealorder/menu/meal-order-vendor-menu_test.html b/client/user/test/mealorder/menu/meal-order-vendor-menu_test.html
index ddf75920..54edc4cf 100644
--- a/client/user/test/mealorder/menu/meal-order-vendor-menu_test.html
+++ b/client/user/test/mealorder/menu/meal-order-vendor-menu_test.html
@@ -18,7 +18,6 @@
   ~ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
   ~ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   -->
-
 <html lang="en">
 <head>
     <meta charset="utf-8">
@@ -37,7 +36,7 @@
 </head>
 <body>
 
-<test-fixture id="SimpleMenu">
+<test-fixture id="VendorMenu">
     <template>
         <meal-order-vendor-menu></meal-order-vendor-menu>
     </template>
@@ -48,19 +47,19 @@
         let component;
 
         setup(() => {
-            component = fixture('SimpleMenu');
+            component = fixture('VendorMenu');
             component.menu = MealOrderAppTest.initialMenu[0];
         });
 
         test('should store menu correctly', function () {
             const CATEGORIES = 2;
-            const DISHES_LENGTH = 5;
+            const NUMBER_OF_DISHES = 5;
             const DISH_COST = 35;
 
             assert.equal(component.menu.vendor, 'Пюре');
             assert.equal(component.menu.categories.length, CATEGORIES);
             assert.equal(component.menu.categories[0].categoryName, 'Первое блюдо');
-            assert.equal(component.menu.categories[0].dishes.length, DISHES_LENGTH);
+            assert.equal(component.menu.categories[0].dishes.length, NUMBER_OF_DISHES);
             assert.equal(component.menu.categories[0].dishes[0].title, 'Суп гречневый');
             assert.equal(component.menu.categories[0].dishes[0].price, DISH_COST);
         });
@@ -76,7 +75,8 @@
 
         test('should send `add-dish` event', function (done) {
             flush(function () {
-                const addButton = component.shadowRoot.querySelector('#menu > div:nth-child(1) > div:nth-child(3) > paper-item > .add-dish-icon > paper-icon-button');
+                const ADD_BUTTON = "#menu > div:nth-child(1) > div:nth-child(3) > paper-item > .add-dish-icon > paper-icon-button";
+                const addButton = component.shadowRoot.querySelector(ADD_BUTTON);
                 component.addEventListener('dish-added', function () {
                     done();
                 });
diff --git a/client/user/test/mealorder/menu/meal-order-vendor-menus_test.html b/client/user/test/mealorder/menu/meal-order-vendor-menus_test.html
index 6a02a37d..50124808 100644
--- a/client/user/test/mealorder/menu/meal-order-vendor-menus_test.html
+++ b/client/user/test/mealorder/menu/meal-order-vendor-menus_test.html
@@ -1,4 +1,3 @@
-<!doctype html>
 <!--
   ~ Copyright 2018, TeamDev Ltd. All rights reserved.
   ~
@@ -18,7 +17,6 @@
   ~ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
   ~ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   -->
-
 <html lang="en">
 <head>
     <meta charset="utf-8">

From fbaad40bffb01d2c3a155626b0917a3341f70dd3 Mon Sep 17 00:00:00 2001
From: Paul <paulageyev@gmail.com>
Date: Mon, 30 Apr 2018 14:41:58 +0300
Subject: [PATCH 239/253] Remove unnecessary action, refactor CSS and tests

---
 client/user/src/mealorder/menu/meal-order-drawer.html         | 1 +
 client/user/src/mealorder/menu/meal-order-user-cart.html      | 2 +-
 client/user/src/mealorder/menu/meal-order-user-order.html     | 2 --
 client/user/src/mealorder/shell/actions/user-actions.html     | 1 -
 .../menu/meal-order-vendor-user-cart-actions_test.html        | 4 ++--
 .../test/mealorder/menu/meal-order-vendor-user-cart_test.html | 4 ++--
 6 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/client/user/src/mealorder/menu/meal-order-drawer.html b/client/user/src/mealorder/menu/meal-order-drawer.html
index 3f538de9..4a13fe47 100644
--- a/client/user/src/mealorder/menu/meal-order-drawer.html
+++ b/client/user/src/mealorder/menu/meal-order-drawer.html
@@ -21,6 +21,7 @@
 <link rel="import" href="../../../bower_components/iron-pages/iron-pages.html">
 <link rel="import" href="../../../bower_components/app-datepicker/app-datepicker.html">
 <link rel="import" href="../shell/meal-order-app-namespace.html">
+<link rel="import" href="../menu/meal-order-user-cart.html">
 <dom-module id="meal-order-drawer">
     <template>
         <style>
diff --git a/client/user/src/mealorder/menu/meal-order-user-cart.html b/client/user/src/mealorder/menu/meal-order-user-cart.html
index 2a33794c..e3027ef8 100644
--- a/client/user/src/mealorder/menu/meal-order-user-cart.html
+++ b/client/user/src/mealorder/menu/meal-order-user-cart.html
@@ -20,7 +20,7 @@
 <script src="../../../bower_components/webcomponentsjs/webcomponents-lite.js"></script>
 <link rel="import" href="../shell/meal-order-app-namespace.html">
 <link rel="import" href="../../../bower_components/polymer/polymer-element.html">
-<link rel="import" href="meal-order-user-order.html">
+<link rel="import" href="./meal-order-user-order.html">
 <link rel="import" href="../shell/redux-store.html">
 <link rel="import" href="../shell/actions/user-actions.html">
 
diff --git a/client/user/src/mealorder/menu/meal-order-user-order.html b/client/user/src/mealorder/menu/meal-order-user-order.html
index b96b2f29..5878df38 100644
--- a/client/user/src/mealorder/menu/meal-order-user-order.html
+++ b/client/user/src/mealorder/menu/meal-order-user-order.html
@@ -61,7 +61,6 @@
             <paper-icon-button icon="delete" class="icon-delete"
                                on-click="_removeDishesByVendor"></paper-icon-button>
         </div>
-
         <div class="dishes">
         <dom-repeat items="[[currentOrder.dishes]]" as="dish">
             <template>
@@ -73,7 +72,6 @@
                 </div>
             </template>
         </dom-repeat>
-            <
         </div>
     </template>
     <script>
diff --git a/client/user/src/mealorder/shell/actions/user-actions.html b/client/user/src/mealorder/shell/actions/user-actions.html
index aca5a3cc..cdcb9898 100644
--- a/client/user/src/mealorder/shell/actions/user-actions.html
+++ b/client/user/src/mealorder/shell/actions/user-actions.html
@@ -20,7 +20,6 @@
 <script>
     MealOrderApp.UserAction = {
         ADD_DISH_TO_ORDER: "ADD_DISH_TO_ORDER",
-        ADD_DISH: 'ADD_DISH',
         GET_ORDERED_ITEMS: 'GET_ORDERED_ITEMS',
         REMOVE_DISH_FROM_ORDER: 'REMOVE_DISH_FROM_ORDER',
         REMOVE_VENDOR_FROM_ORDER: 'REMOVE_VENDOR_FROM_ORDER',
diff --git a/client/user/test/mealorder/menu/meal-order-vendor-user-cart-actions_test.html b/client/user/test/mealorder/menu/meal-order-vendor-user-cart-actions_test.html
index eb85ce5b..72dfd532 100644
--- a/client/user/test/mealorder/menu/meal-order-vendor-user-cart-actions_test.html
+++ b/client/user/test/mealorder/menu/meal-order-vendor-user-cart-actions_test.html
@@ -24,7 +24,7 @@
     <meta name="viewport"
           content="width=device-width, minimum-scale=1, initial-scale=1, user-scalable=yes">
 
-    <title>meal-order-client test</title>
+    <title>meal-order-user-cart action test</title>
 
     <script src="../../../bower_components/webcomponentsjs/webcomponents-loader.js"></script>
     <script src="../../../bower_components/web-component-tester/browser.js"></script>
@@ -41,7 +41,7 @@
 </test-fixture>
 
 <script>
-    suite('meal-order-client-app', function () {
+    suite('meal-order-user-cart', function () {
 
         setup(() => {
             mock = sinon.mock(MealOrderApp.store);
diff --git a/client/user/test/mealorder/menu/meal-order-vendor-user-cart_test.html b/client/user/test/mealorder/menu/meal-order-vendor-user-cart_test.html
index ab471164..9643c6c8 100644
--- a/client/user/test/mealorder/menu/meal-order-vendor-user-cart_test.html
+++ b/client/user/test/mealorder/menu/meal-order-vendor-user-cart_test.html
@@ -24,7 +24,7 @@
     <meta name="viewport"
           content="width=device-width, minimum-scale=1, initial-scale=1, user-scalable=yes">
 
-    <title>meal-order-client test</title>
+    <title>meal-order-user-cart test</title>
 
     <script src="../../../bower_components/webcomponentsjs/webcomponents-loader.js"></script>
     <script src="../../../bower_components/web-component-tester/browser.js"></script>
@@ -41,7 +41,7 @@
 </test-fixture>
 
 <script>
-    suite('meal-order-client-app', function () {
+    suite('meal-order-user-cart', function () {
         let component;
 
         setup(() => {

From a8415236954d9f6a4be9d649dad8efba4119cc77 Mon Sep 17 00:00:00 2001
From: Paul <paulageyev@gmail.com>
Date: Mon, 30 Apr 2018 15:42:20 +0300
Subject: [PATCH 240/253] Refactor CSS

---
 .../mealorder/history/meal-order-user-history.html  | 13 ++++++-------
 client/user/src/mealorder/shell/utils/Utils.js      |  0
 2 files changed, 6 insertions(+), 7 deletions(-)
 delete mode 100644 client/user/src/mealorder/shell/utils/Utils.js

diff --git a/client/user/src/mealorder/history/meal-order-user-history.html b/client/user/src/mealorder/history/meal-order-user-history.html
index 656c62dc..1a2ebabd 100644
--- a/client/user/src/mealorder/history/meal-order-user-history.html
+++ b/client/user/src/mealorder/history/meal-order-user-history.html
@@ -46,11 +46,11 @@
             }
 
             .vendor-title {
-                color: var(--paper-grey-900);
+                color: var(--paper-grey-700);
                 font-size: 22px;
                 font-weight: bolder;
                 margin-top: 2%;
-                margin-bottom: 2px;
+                margin-bottom: 5px;
             }
 
             .history-title {
@@ -85,7 +85,7 @@
                 align-items: center;
                 background-color: #FFFFFF;
                 font-weight: bolder;
-                height: 40px;
+                height: 50px;
                 padding-right: 2%;
             }
 
@@ -96,7 +96,6 @@
 
                 .history-quantity {
                     width: 40%;
-
                 }
 
                 #history {
@@ -196,11 +195,11 @@
                 let totalPrice = 0;
                 for (let i = 0; i < currentHistory.order.length; i++) {
                     const dishes = currentHistory.order[i].dishes;
-                    let sum = 0;
+                    let priceByVendor = 0;
                     for (let i = 0; i < dishes.length; i++) {
-                        sum += (dishes[i].price) * dishes[i].quantity;
+                        priceByVendor += (dishes[i].price) * dishes[i].quantity;
                     }
-                    totalPrice += sum;
+                    totalPrice += priceByVendor;
                 }
                 return totalPrice;
             }
diff --git a/client/user/src/mealorder/shell/utils/Utils.js b/client/user/src/mealorder/shell/utils/Utils.js
deleted file mode 100644
index e69de29b..00000000

From e3f80f11c1eddf45871f422282fe55a5c8ea9429 Mon Sep 17 00:00:00 2001
From: Paul <paulageyev@gmail.com>
Date: Mon, 30 Apr 2018 15:43:09 +0300
Subject: [PATCH 241/253] Remove unnecessary utils

---
 client/user/src/mealorder/shell/utils/Utils.js | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 client/user/src/mealorder/shell/utils/Utils.js

diff --git a/client/user/src/mealorder/shell/utils/Utils.js b/client/user/src/mealorder/shell/utils/Utils.js
deleted file mode 100644
index e69de29b..00000000

From 071ec623516be59c035ab7011e1ef933d909022f Mon Sep 17 00:00:00 2001
From: Paul <paulageyev@gmail.com>
Date: Mon, 30 Apr 2018 23:06:44 +0300
Subject: [PATCH 242/253] Refactor tests for user actions

---
 .../mealorder/menu/meal-order-user-cart.html  | 41 +++++++++----------
 .../mealorder/menu/meal-order-user-order.html |  6 +--
 ...=> meal-order-user-cart-actions_test.html} | 17 ++++----
 ...st.html => meal-order-user-cart_test.html} |  0
 ...t.html => meal-order-user-order_test.html} |  0
 5 files changed, 30 insertions(+), 34 deletions(-)
 rename client/user/test/mealorder/menu/{meal-order-vendor-user-cart-actions_test.html => meal-order-user-cart-actions_test.html} (90%)
 rename client/user/test/mealorder/menu/{meal-order-vendor-user-cart_test.html => meal-order-user-cart_test.html} (100%)
 rename client/user/test/mealorder/menu/{meal-order-vendor-user-order_test.html => meal-order-user-order_test.html} (100%)

diff --git a/client/user/src/mealorder/menu/meal-order-user-cart.html b/client/user/src/mealorder/menu/meal-order-user-cart.html
index e3027ef8..067353df 100644
--- a/client/user/src/mealorder/menu/meal-order-user-cart.html
+++ b/client/user/src/mealorder/menu/meal-order-user-cart.html
@@ -17,7 +17,7 @@
   ~ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
   ~ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   -->
-<script src="../../../bower_components/webcomponentsjs/webcomponents-lite.js"></script>
+<!--<script src="../../../bower_components/webcomponentsjs/webcomponents-lite.js"></script>-->
 <link rel="import" href="../shell/meal-order-app-namespace.html">
 <link rel="import" href="../../../bower_components/polymer/polymer-element.html">
 <link rel="import" href="./meal-order-user-order.html">
@@ -42,22 +42,18 @@
             }
         </style>
         <div id="cart">
-            <dom-repeat items="[[currentOrder.order]]" as="orderByVendor">
-                <template>
-                    <meal-order-user-order
-                            on-user-order-vendor-removed="_removeDishFromOrder"
-                            on-user-order-dish-removed="_removeDishesByVendor"
-                            current-order="[[orderByVendor]]"></meal-order-user-order>
-                </template>
-            </dom-repeat>
-            <dom-if if="[[currentOrder.order.length]]">
-                <template>
-                    <div id="total">
-                        <div class="amount">Общая сумма:</div>
-                        <div class="price">[[_getTotalAmount(currentOrder)]] ₴</div>
-                    </div>
-                </template>
-            </dom-if>
+            <template is="dom-repeat" items="[[currentOrder.order]]" as="orderByVendor">
+                <meal-order-user-order
+                        on-user-order-vendor-removed="_removeDishesByVendor"
+                        on-user-order-dish-removed="_removeDishFromOrder"
+                        current-order="[[orderByVendor]]"></meal-order-user-order>
+            </template>
+            <template is="dom-if" if="[[currentOrder.order.length]]">
+                <div id="total">
+                    <div class="amount">Общая сумма:</div>
+                    <div class="price">[[_getTotalAmount(currentOrder)]] ₴</div>
+                </div>
+            </template>
         </div>
     </template>
     <script>
@@ -97,7 +93,7 @@
                         type: MealOrderApp.UserAction.GET_ORDERED_ITEMS,
                         date
                     }),
-                    removeVendorFromOrder: vendor => ({
+                    removeDishesByVendor: vendor => ({
                         type: MealOrderApp.UserAction.REMOVE_VENDOR_FROM_ORDER,
                         vendor
                     }),
@@ -128,12 +124,13 @@
                 return sum;
             }
 
-            _removeDishFromOrder(dish) {
-                this.dispatch('removeDishFromOrder', dish);
+            _removeDishFromOrder(event) {
+
+                this.dispatch('removeDishFromOrder', event.detail);
             }
 
-            _removeDishesByVendor(vendor) {
-                this.dispatch('removeVendorFromOrder', vendor);
+            _removeDishesByVendor(event) {
+                this.dispatch('removeDishesByVendor', event.detail);
             }
         }
 
diff --git a/client/user/src/mealorder/menu/meal-order-user-order.html b/client/user/src/mealorder/menu/meal-order-user-order.html
index 5878df38..1add9151 100644
--- a/client/user/src/mealorder/menu/meal-order-user-order.html
+++ b/client/user/src/mealorder/menu/meal-order-user-order.html
@@ -17,7 +17,7 @@
   ~ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
   ~ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   -->
-<script src="../../../bower_components/webcomponentsjs/webcomponents-lite.js"></script>
+<!--<script src="../../../bower_components/webcomponentsjs/webcomponents-lite.js"></script>-->
 <link rel="import" href="../../../bower_components/polymer/polymer-element.html">
 <link rel="import" href="../../../bower_components/paper-icon-button/paper-icon-button.html">
 <link rel="import" href="../../../bower_components/iron-icons/iron-icons.html">
@@ -62,8 +62,7 @@
                                on-click="_removeDishesByVendor"></paper-icon-button>
         </div>
         <div class="dishes">
-        <dom-repeat items="[[currentOrder.dishes]]" as="dish">
-            <template>
+            <template is="dom-repeat" items="[[currentOrder.dishes]]" as="dish">
                 <div class="order-details">
                     <div class="order-title">[[dish.title]]</div>
                     <div class="order-price">[[dish.price]] ₴</div>
@@ -71,7 +70,6 @@
                     <paper-icon-button icon="remove" on-click="_removeDish"></paper-icon-button>
                 </div>
             </template>
-        </dom-repeat>
         </div>
     </template>
     <script>
diff --git a/client/user/test/mealorder/menu/meal-order-vendor-user-cart-actions_test.html b/client/user/test/mealorder/menu/meal-order-user-cart-actions_test.html
similarity index 90%
rename from client/user/test/mealorder/menu/meal-order-vendor-user-cart-actions_test.html
rename to client/user/test/mealorder/menu/meal-order-user-cart-actions_test.html
index 72dfd532..59305a7e 100644
--- a/client/user/test/mealorder/menu/meal-order-vendor-user-cart-actions_test.html
+++ b/client/user/test/mealorder/menu/meal-order-user-cart-actions_test.html
@@ -47,7 +47,7 @@
             mock = sinon.mock(MealOrderApp.store);
         });
 
-        test('should responds on `vendor-removed` event and fire `REMOVE_VENDOR_FROM_ORDER` action.', function (done) {
+        test('should respond on `vendor-removed` event and fire `REMOVE_VENDOR_FROM_ORDER` action.', function (done) {
             const DATE = new Date("2018-03-21");
             const VENDOR = "Пюре";
 
@@ -61,17 +61,17 @@
             };
 
             mock.expects('dispatch').withArgs(expectedGetOrderedItemsAction);
+            mock.expects('dispatch').withArgs(expectedRemoveVendorFromOrderAction);
 
             const component = fixture('MealOrderUserCart');
             component.selectedDate = new Date("2018-03-21");
             component.currentOrder = MealOrderAppTest.ininitalOrder[0];
-            mock.verify();
+
             let userOrder;
             flush(function () {
-                mock.expects('dispatch').withArgs(expectedRemoveVendorFromOrderAction);
-                // mock.verify();
                 userOrder = component.shadowRoot.querySelector('meal-order-user-order');
                 userOrder.dispatchEvent((new CustomEvent('user-order-vendor-removed', {detail: VENDOR})));
+                mock.verify();
                 done();
             });
         });
@@ -79,27 +79,28 @@
         test('should responds on `dish-removed` event and fire `REMOVE_DISH_FROM_ORDER` action.', function (done) {
             const DATE = new Date("2018-03-21");
             const DISH = {vendor: "Пюре", name: "Борщ украинский"};
+
             const expectedGetOrderedItemsAction = {
                 type: MealOrderApp.UserAction.GET_ORDERED_ITEMS,
                 date: DATE
             };
             const expectedRemoveDishFromOrderAction = {
                 type: MealOrderApp.UserAction.REMOVE_DISH_FROM_ORDER,
-                vendor: DISH
+                dish: DISH
             };
 
             mock.expects('dispatch').withArgs(expectedGetOrderedItemsAction);
+            mock.expects('dispatch').withArgs(expectedRemoveDishFromOrderAction);
 
             const component = fixture('MealOrderUserCart');
             component.selectedDate = new Date("2018-03-21");
             component.currentOrder = MealOrderAppTest.ininitalOrder[0];
-            mock.verify();
+
             let userOrder;
             flush(function () {
-                mock.expects('dispatch').withArgs(expectedRemoveDishFromOrderAction);
-                // mock.verify();
                 userOrder = component.shadowRoot.querySelector('meal-order-user-order');
                 userOrder.dispatchEvent((new CustomEvent('user-order-dish-removed', {detail: DISH})));
+                mock.verify();
                 done();
             });
         });
diff --git a/client/user/test/mealorder/menu/meal-order-vendor-user-cart_test.html b/client/user/test/mealorder/menu/meal-order-user-cart_test.html
similarity index 100%
rename from client/user/test/mealorder/menu/meal-order-vendor-user-cart_test.html
rename to client/user/test/mealorder/menu/meal-order-user-cart_test.html
diff --git a/client/user/test/mealorder/menu/meal-order-vendor-user-order_test.html b/client/user/test/mealorder/menu/meal-order-user-order_test.html
similarity index 100%
rename from client/user/test/mealorder/menu/meal-order-vendor-user-order_test.html
rename to client/user/test/mealorder/menu/meal-order-user-order_test.html

From 215119420ffb176f73ab559919602a332b17da31 Mon Sep 17 00:00:00 2001
From: Paul Ageyev <paulageyev@gmail.com>
Date: Tue, 1 May 2018 13:32:04 +0300
Subject: [PATCH 243/253] Remove unnecessary component imports

---
 .../src/mealorder/meal-order-client-app.html  | 180 +++++++++---------
 .../src/mealorder/meal-order-toolbar.html     |  13 +-
 .../src/mealorder/menu/meal-order-drawer.html |   3 +-
 .../menu/meal-order-menu-container.html       |   6 +-
 .../mealorder/shell/reducers/reducers.html    |   2 -
 .../mealorder/meal-order-client-app_test.html |   2 -
 .../mealorder/meal-order-drawer_test.html     |   3 -
 .../meal-order-menu-container_test.html       |   2 -
 .../mealorder/meal-order-toolbar_test.html    |   3 -
 9 files changed, 97 insertions(+), 117 deletions(-)

diff --git a/client/user/src/mealorder/meal-order-client-app.html b/client/user/src/mealorder/meal-order-client-app.html
index b1eeb44b..efacd803 100644
--- a/client/user/src/mealorder/meal-order-client-app.html
+++ b/client/user/src/mealorder/meal-order-client-app.html
@@ -18,29 +18,22 @@
   ~ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   -->
 <link rel="import" href="../../bower_components/polymer/polymer-element.html">
-<link rel="import" href="../../bower_components/app-layout/app-drawer/app-drawer.html">
 <link rel="import"
       href="../../bower_components/app-layout/app-drawer-layout/app-drawer-layout.html">
-<link rel="import" href="../../bower_components/app-layout/app-header/app-header.html">
 <link rel="import"
       href="../../bower_components/app-layout/app-header-layout/app-header-layout.html">
-<link rel="import"
-      href="../../bower_components/app-layout/app-scroll-effects/app-scroll-effects.html">
-<link rel="import" href="../../bower_components/app-layout/app-toolbar/app-toolbar.html">
+<link rel="import" href="../../bower_components/app-layout/app-scroll-effects/effects/waterfall.html">
+<link rel="import" href="../../bower_components/app-layout/app-drawer/app-drawer.html">
+<link rel="import" href="../../bower_components/app-layout/app-header/app-header.html">
 <link rel="import" href="../../bower_components/app-route/app-location.html">
 <link rel="import" href="../../bower_components/app-route/app-route.html">
 <link rel="import" href="../../bower_components/iron-pages/iron-pages.html">
-<link rel="import" href="../../bower_components/iron-selector/iron-selector.html">
-<link rel="import" href="../../bower_components/paper-icon-button/paper-icon-button.html">
-<link rel="import" href="../../bower_components/paper-tabs/paper-tabs.html">
-<link rel="import" href="../../bower_components/iron-icons/iron-icons.html">
-<link rel="import" href="../../bower_components/iron-icons/maps-icons.html">
-<link rel="import" href="../../bower_components/paper-styles/color.html">
 <link rel="import" href="./shell/meal-order-app-namespace.html">
 <link rel="import" href="./shell/redux-store.html">
 <link rel="import" href="./meal-order-toolbar.html">
 <link rel="import" href="./menu/meal-order-drawer.html">
 <link rel="import" href="./menu/meal-order-menu-container.html">
+
 <dom-module id="meal-order-client-app">
     <template>
         <style>
@@ -69,6 +62,7 @@
                 --app-drawer-width: 300px;
             }
         </style>
+
         <app-location route="{{route}}"
                       use-hash-as-path></app-location>
 
@@ -107,98 +101,100 @@
         </app-drawer-layout>
     </template>
     <script>
-        /**
-         * Main client meal order component.
-         *
-         * Consists of 2 pages:
-         * 1. A page with the vendor menus and the user's shopping cart.
-         * 2. A page with the user's history.
-         *
-         * @customElement
-         * @polymer
-         * @appliesMixin MealOrderApp.ReduxMixin
-         */
-        class MealOrderClientApp extends MealOrderApp.ReduxMixin(Polymer.Element) {
-            static get is() {
-                return 'meal-order-client-app';
-            }
+        {
+            /**
+             * Main client meal order component.
+             *
+             * Consists of 2 pages:
+             * 1. A page with the vendor menus and the user's shopping cart.
+             * 2. A page with the user's history.
+             *
+             * @customElement
+             * @polymer
+             * @appliesMixin MealOrderApp.ReduxMixin
+             */
+            class MealOrderClientApp extends MealOrderApp.ReduxMixin(Polymer.Element) {
+                static get is() {
+                    return 'meal-order-client-app';
+                }
 
-            static get properties() {
-                return {
-                    /**
-                     * Menu for a current day.
-                     *
-                     * @typedef {Object} Menu the menu for the current date
-                     *
-                     * @property {String} vendor a vendor name
-                     *
-                     * @typedef {Object} Date contains day, month, year
-                     * @property {Number} day
-                     * @property {Number} month
-                     * @property {Number} year
-                     *
-                     * @typedef {Array} Categories array contains the category name and dishes
-                     * @typedef {Array} Dishes array contains the dish title, price, quantity
-                     * @property {String} title
-                     * @property {String} price
-                     * @property {String} quantity
-                     */
-                    menus: {
-                        type: Array,
-                        statePath: 'menus'
-                    },
-
-                    /**
-                     * Route data parsed using `app-route`.
-                     *
-                     * Used for routing.
-                     */
-                    routeData: {
-                        type: Object,
-                    },
-
-                    /**
-                     * The current server time for the calendar.
-                     */
-                    serverTime: {
-                        type: Object,
-                        statePath: 'serverTime'
-                    }
+                static get properties() {
+                    return {
+                        /**
+                         * Menu for a current day.
+                         *
+                         * @typedef {Object} Menu the menu for the current date
+                         *
+                         * @property {String} vendor a vendor name
+                         *
+                         * @typedef {Object} Date contains day, month, year
+                         * @property {Number} day
+                         * @property {Number} month
+                         * @property {Number} year
+                         *
+                         * @typedef {Array} Categories array contains the category name and dishes
+                         * @typedef {Array} Dishes array contains the dish title, price, quantity
+                         * @property {String} title
+                         * @property {String} price
+                         * @property {String} quantity
+                         */
+                        menus: {
+                            type: Array,
+                            statePath: 'menus'
+                        },
+
+                        /**
+                         * Route data parsed using `app-route`.
+                         *
+                         * Used for routing.
+                         */
+                        routeData: {
+                            type: Object,
+                        },
+
+                        /**
+                         * The current server time for the calendar.
+                         */
+                        serverTime: {
+                            type: Object,
+                            statePath: 'serverTime'
+                        }
 
+                    }
                 }
-            }
-
-            static get observers() {
-                return [
-                    '_pageChanged(routeData.page)'
-                ];
-            }
 
-            _getDrawerClass(page) {
-                if (page === "history") {
-                    return "wide";
+                static get observers() {
+                    return [
+                        '_pageChanged(routeData.page)'
+                    ];
                 }
-            }
 
-            _toggleDrawer() {
-                this.$.drawer.toggle();
-            }
+                _getDrawerClass(page) {
+                    if (page === "history") {
+                        return "wide";
+                    }
+                }
 
-            _pageChanged() {
-                const DATE_LENGTH = 10;
-                if (!this.routeData.page || (this.routeData.page.startsWith("menu") && !this.routeData.date)) {
-                    this.set('route.path', '/menu/' + this.serverTime.toISOString().slice(0, DATE_LENGTH));
+                _toggleDrawer() {
+                    this.$.drawer.toggle();
                 }
-                if (this.routeData.page.startsWith("history")) {
-                    if (!this.routeData.date) {
-                        const newDate = new Date(this.serverTime);
-                        newDate.setDate(newDate.getDate() - 1);
-                        this.set('routeData.date', newDate.toISOString().slice(0, DATE_LENGTH));
+
+                _pageChanged() {
+                    const DATE_LENGTH = 10;
+                    if (!this.routeData.page || (this.routeData.page.startsWith("menu") && !this.routeData.date)) {
+                        this.set('route.path', '/menu/' + this.serverTime.toISOString().slice(0, DATE_LENGTH));
+                    }
+                    if (this.routeData.page.startsWith("history")) {
+                        if (!this.routeData.date) {
+                            const newDate = new Date(this.serverTime);
+                            newDate.setDate(newDate.getDate() - 1);
+                            this.set('routeData.date', newDate.toISOString().slice(0, DATE_LENGTH));
+                        }
                     }
                 }
             }
-        }
 
-        window.customElements.define(MealOrderClientApp.is, MealOrderClientApp);
+            window.customElements.define(MealOrderClientApp.is, MealOrderClientApp);
+        }
     </script>
 </dom-module>
diff --git a/client/user/src/mealorder/meal-order-toolbar.html b/client/user/src/mealorder/meal-order-toolbar.html
index 6ae68aeb..1839c8d4 100644
--- a/client/user/src/mealorder/meal-order-toolbar.html
+++ b/client/user/src/mealorder/meal-order-toolbar.html
@@ -21,7 +21,6 @@
 <link rel="import" href="../../bower_components/iron-pages/iron-pages.html">
 <link rel="import" href="../../bower_components/app-layout/app-toolbar/app-toolbar.html">
 <link rel="import" href="../../bower_components/iron-icons/iron-icons.html">
-<link rel="import" href="../../bower_components/iron-icons/maps-icons.html">
 <link rel="import" href="./shell/meal-order-app-namespace.html">
 
 <dom-module id="meal-order-toolbar">
@@ -44,13 +43,13 @@
                 font-size: 1.375em;
             }
 
-            .title-link {
+            .link-title {
                 font-size: 0.8em;
                 text-decoration: none;
                 color: var(--paper-grey-50);
             }
 
-            .title-link:hover .route-title {
+            .link-title:hover .route-title {
                 color: var(--paper-light-blue-500);
             }
 
@@ -86,20 +85,20 @@
                             fallback-selection="view404"
                             role="main">
                     <div data-page="menu" class="app-header-iron-container">
-                        <a class="title-link" href="/#/history/">
+                        <a class="link-title" href="/#/history/">
                             <div class="route-title">История заказов</div>
                             <iron-icon class="link-icon"
-                                       icon="maps:icons:history"></iron-icon>
+                                       icon="icons:history"></iron-icon>
                         </a>
                         <iron-icon on-click="_toggleDrawer"
                                    class="link-icon"
                                    icon="icons:shopping-cart"></iron-icon>
                     </div>
                     <div data-page="history" class="app-header-iron-container">
-                        <a class="title-link" href="/#/menu/">
+                        <a class="link-title" href="/#/menu/">
                             <div id="menu-history" class="route-title">Сделать заказ</div>
                             <iron-icon class="link-icon"
-                                       icon="maps:icons:add"></iron-icon>
+                                       icon="icons:add"></iron-icon>
                         </a>
                         <iron-icon on-click="_toggleDrawer"
                                    class="link-icon"
diff --git a/client/user/src/mealorder/menu/meal-order-drawer.html b/client/user/src/mealorder/menu/meal-order-drawer.html
index 39ea184b..7e915874 100644
--- a/client/user/src/mealorder/menu/meal-order-drawer.html
+++ b/client/user/src/mealorder/menu/meal-order-drawer.html
@@ -19,8 +19,9 @@
   -->
 <link rel="import" href="../../../bower_components/app-layout/app-toolbar/app-toolbar.html">
 <link rel="import" href="../../../bower_components/iron-pages/iron-pages.html">
-<link rel="import" href="../../../bower_components/app-datepicker/app-datepicker.html">
 <link rel="import" href="../shell/meal-order-app-namespace.html">
+<link rel="import" href="../../../bower_components/app-datepicker/app-datepicker.html">
+
 <dom-module id="meal-order-drawer">
     <template>
         <style>
diff --git a/client/user/src/mealorder/menu/meal-order-menu-container.html b/client/user/src/mealorder/menu/meal-order-menu-container.html
index 5b2580a0..b9f23035 100644
--- a/client/user/src/mealorder/menu/meal-order-menu-container.html
+++ b/client/user/src/mealorder/menu/meal-order-menu-container.html
@@ -19,13 +19,9 @@
   -->
 <link rel="import" href="../../../bower_components/polymer/polymer-element.html">
 <link rel="import" href="../../../bower_components/paper-tabs/paper-tabs.html">
-<link rel="import" href="../../../bower_components/app-route/app-location.html">
-<link rel="import" href="../../../bower_components/app-route/app-route.html">
-<link rel="import" href="../../../bower_components/iron-pages/iron-pages.html">
-<link rel="import" href="../../../bower_components/paper-styles/color.html">
+<link rel="import" href="../../../bower_components/polymer/lib/elements/dom-repeat.html">
 <link rel="import" href="../shell/meal-order-app-namespace.html">
 <link rel="import" href="../shell/redux-store.html">
-<link rel="import" href="../shell/actions/user-actions.html">
 
 <dom-module id="meal-order-menu-container">
     <template>
diff --git a/client/user/src/mealorder/shell/reducers/reducers.html b/client/user/src/mealorder/shell/reducers/reducers.html
index 7a52a405..ee021f4a 100644
--- a/client/user/src/mealorder/shell/reducers/reducers.html
+++ b/client/user/src/mealorder/shell/reducers/reducers.html
@@ -18,8 +18,6 @@
   ~ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   -->
 <link rel="import" href="../meal-order-app-namespace.html">
-<link rel="import" href="../redux-store.html">
-
 <script>
     {
         MealOrderApp.initialState = {
diff --git a/client/user/test/mealorder/meal-order-client-app_test.html b/client/user/test/mealorder/meal-order-client-app_test.html
index 1cec8c05..b6958145 100644
--- a/client/user/test/mealorder/meal-order-client-app_test.html
+++ b/client/user/test/mealorder/meal-order-client-app_test.html
@@ -1,4 +1,3 @@
-<!doctype html>
 <!--
   ~ Copyright 2018, TeamDev Ltd. All rights reserved.
   ~
@@ -87,7 +86,6 @@
             pages.forceSynchronousItemUpdate();
             assert.equal(pages.selectedItem.tagName.toLocaleLowerCase(), MealOrderApp.MealOrderMenuContainer.is);
         });
-
     });
 </script>
 </body>
diff --git a/client/user/test/mealorder/meal-order-drawer_test.html b/client/user/test/mealorder/meal-order-drawer_test.html
index e43a829d..f78adc84 100644
--- a/client/user/test/mealorder/meal-order-drawer_test.html
+++ b/client/user/test/mealorder/meal-order-drawer_test.html
@@ -1,4 +1,3 @@
-<!doctype html>
 <!--
   ~ Copyright 2018, TeamDev Ltd. All rights reserved.
   ~
@@ -18,7 +17,6 @@
   ~ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
   ~ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   -->
-
 <html lang="en">
 <head>
     <meta charset="utf-8">
@@ -117,7 +115,6 @@
                 done();
             });
         });
-
     });
 </script>
 </body>
diff --git a/client/user/test/mealorder/meal-order-menu-container_test.html b/client/user/test/mealorder/meal-order-menu-container_test.html
index 176fab0d..3e730d9f 100644
--- a/client/user/test/mealorder/meal-order-menu-container_test.html
+++ b/client/user/test/mealorder/meal-order-menu-container_test.html
@@ -1,4 +1,3 @@
-<!DOCTYPE html>
 <!--
   ~ Copyright 2018, TeamDev Ltd. All rights reserved.
   ~
@@ -63,7 +62,6 @@
             component.selectedDate = new Date("2018-03-23");
             assert.equal(component.selectedDate, paperTabs.selected);
         });
-
     });
 </script>
 </body>
diff --git a/client/user/test/mealorder/meal-order-toolbar_test.html b/client/user/test/mealorder/meal-order-toolbar_test.html
index 0ccc11f1..ae489529 100644
--- a/client/user/test/mealorder/meal-order-toolbar_test.html
+++ b/client/user/test/mealorder/meal-order-toolbar_test.html
@@ -1,4 +1,3 @@
-<!doctype html>
 <!--
   ~ Copyright 2018, TeamDev Ltd. All rights reserved.
   ~
@@ -18,7 +17,6 @@
   ~ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
   ~ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   -->
-
 <html lang="en">
 <head>
     <meta charset="utf-8">
@@ -74,7 +72,6 @@
                 done();
             });
         });
-
     });
 </script>
 </body>

From 206cce1fdafefae137e3c8fa10c647b8bdcf010e Mon Sep 17 00:00:00 2001
From: Paul Ageyev <paulageyev@gmail.com>
Date: Tue, 1 May 2018 13:45:53 +0300
Subject: [PATCH 244/253] Remove unnecessary dependencies from the bower

---
 client/user/bower.json | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/client/user/bower.json b/client/user/bower.json
index 646cf7e8..0f7d1b39 100644
--- a/client/user/bower.json
+++ b/client/user/bower.json
@@ -6,15 +6,10 @@
     "polymer": "Polymer/polymer#^2.0.0",
     "app-layout": "PolymerElements/app-layout#^2.0.0",
     "app-route": "PolymerElements/app-route#^2.0.0",
-    "iron-form": "PolymerElements/iron-form#^2.0.0",
     "polymer-redux": "^1.0.5",
     "iron-pages": "PolymerElements/iron-pages#^2.1.0",
-    "paper-icon-button": "PolymerElements/paper-icon-button#^2.2.0",
     "paper-tabs": "PolymerElements/paper-tabs#^2.1.0",
     "iron-icons": "PolymerElements/iron-icons#^2.1.1",
-    "iron-list": "PolymerElements/iron-list#^2.0.14",
-    "paper-item": "PolymerElements/paper-item#^2.1.0",
-    "paper-button": "PolymerElements/paper-button#^2.1.0",
     "app-datepicker": "motss/app-datepicker#^2.12.0"
   },
   "devDependencies": {

From 85c72cbad50f2b073fc3ab3efc3104bf79c9284d Mon Sep 17 00:00:00 2001
From: Paul Ageyev <paulageyev@gmail.com>
Date: Tue, 1 May 2018 14:09:09 +0300
Subject: [PATCH 245/253] Apply `dom-repeat` template

---
 client/user/bower.json                        |   2 +-
 .../src/mealorder/meal-order-client-app.html  |  76 +++----
 .../menu/meal-order-vendor-menu.html          | 186 +++++++++---------
 .../menu/meal-order-vendor-menus.html         | 148 +++++++-------
 .../menu/meal-order-vendor-menu_test.html     |   6 +-
 .../menu/meal-order-vendor-menus_test.html    |   5 +-
 6 files changed, 210 insertions(+), 213 deletions(-)

diff --git a/client/user/bower.json b/client/user/bower.json
index fbcb16de..6ce9c276 100644
--- a/client/user/bower.json
+++ b/client/user/bower.json
@@ -11,7 +11,7 @@
     "paper-tabs": "PolymerElements/paper-tabs#^2.1.0",
     "iron-icons": "PolymerElements/iron-icons#^2.1.1",
     "iron-list": "PolymerElements/iron-list#^2.0.14",
-    "paper-item": "PolymerElements/paper-item#^2.1.0",
+    "paper-item": "PolymerElements/paper-item#^2.1.1",
     "paper-button": "PolymerElements/paper-button#^2.1.0",
     "app-datepicker": "motss/app-datepicker#^2.12.0",
     "paper-search": "Collaborne/paper-search#^2.0.9"
diff --git a/client/user/src/mealorder/meal-order-client-app.html b/client/user/src/mealorder/meal-order-client-app.html
index 0c47fe3e..e825ce99 100644
--- a/client/user/src/mealorder/meal-order-client-app.html
+++ b/client/user/src/mealorder/meal-order-client-app.html
@@ -23,7 +23,8 @@
 <link rel="import" href="../../bower_components/app-layout/app-header/app-header.html">
 <link rel="import"
       href="../../bower_components/app-layout/app-header-layout/app-header-layout.html">
-<link rel="import" href="../../bower_components/app-layout/app-scroll-effects/effects/waterfall.html">
+<link rel="import"
+      href="../../bower_components/app-layout/app-scroll-effects/effects/waterfall.html">
 <link rel="import" href="../../bower_components/app-layout/app-drawer/app-drawer.html">
 <link rel="import" href="../../bower_components/app-layout/app-header/app-header.html">
 <link rel="import" href="../../bower_components/app-route/app-location.html">
@@ -155,13 +156,13 @@
                             type: Object,
                         },
 
-                    /**
-                     * The current server time for the calendar.
-                     */
-                    serverTime: {
-                        type: Date,
-                        statePath: 'serverTime'
-                    }
+                        /**
+                         * The current server time for the calendar.
+                         */
+                        serverTime: {
+                            type: Date,
+                            statePath: 'serverTime'
+                        }
 
                     }
                 }
@@ -171,20 +172,21 @@
                         '_pageChanged(routeData.page)'
                     ];
                 }
-            static get actions() {
-                return {
-                    addDishToOrder: order => ({
-                        type: MealOrderApp.UserAction.ADD_DISH_TO_ORDER,
-                        order
-                    })
+
+                static get actions() {
+                    return {
+                        addDishToOrder: order => ({
+                            type: MealOrderApp.UserAction.ADD_DISH_TO_ORDER,
+                            order
+                        })
+                    }
                 }
-            }
 
-            static get observers() {
-                return [
-                    '_pageChanged(routeData.page)'
-                ];
-            }
+                static get observers() {
+                    return [
+                        '_pageChanged(routeData.page)'
+                    ];
+                }
 
                 _getDrawerClass(page) {
                     if (page === "history") {
@@ -197,27 +199,27 @@
                 }
 
 
-            _pageChanged() {
-                const DATE_LENGTH = 10;
-                if (!this.routeData.page || (this.routeData.page.startsWith("menu") && !this.routeData.date)) {
-                    this.set('route.path', '/menu/' + this.serverTime.toISOString().slice(0, DATE_LENGTH));
-                }
-                if (this.routeData.page.startsWith("history")) {
-                    if (!this.routeData.date) {
-                        const newDate = new Date(this.serverTime);
-                        newDate.setDate(newDate.getDate() - 1);
-                        this.set('routeData.date', newDate.toISOString().slice(0, DATE_LENGTH));
+                _pageChanged() {
+                    const DATE_LENGTH = 10;
+                    if (!this.routeData.page || (this.routeData.page.startsWith("menu") && !this.routeData.date)) {
+                        this.set('route.path', '/menu/' + this.serverTime.toISOString().slice(0, DATE_LENGTH));
+                    }
+                    if (this.routeData.page.startsWith("history")) {
+                        if (!this.routeData.date) {
+                            const newDate = new Date(this.serverTime);
+                            newDate.setDate(newDate.getDate() - 1);
+                            this.set('routeData.date', newDate.toISOString().slice(0, DATE_LENGTH));
+                        }
                     }
                 }
-            }
 
-            _addDishToOrder(e) {
-                const order = {};
-                order.dish = e.detail;
-                order.date = new Date(this.routeData.date);
-                this.dispatch('addDishToOrder', order);
+                _addDishToOrder(e) {
+                    const order = {};
+                    order.dish = e.detail;
+                    order.date = new Date(this.routeData.date);
+                    this.dispatch('addDishToOrder', order);
+                }
             }
-        }
 
             window.customElements.define(MealOrderClientApp.is, MealOrderClientApp);
         }
diff --git a/client/user/src/mealorder/menu/meal-order-vendor-menu.html b/client/user/src/mealorder/menu/meal-order-vendor-menu.html
index 0ef58972..0c33427c 100644
--- a/client/user/src/mealorder/menu/meal-order-vendor-menu.html
+++ b/client/user/src/mealorder/menu/meal-order-vendor-menu.html
@@ -17,13 +17,12 @@
   ~ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
   ~ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   -->
-<script src="../../../bower_components/webcomponentsjs/webcomponents-lite.js"></script>
 <link rel="import" href="../../../bower_components/polymer/polymer-element.html">
+<link rel="import" href="../../../bower_components/polymer/lib/elements/dom-repeat.html">
+<link rel="import" href="../../../bower_components/polymer/lib/elements/dom-if.html">
 <link rel="import" href="../../../bower_components/paper-item/paper-item.html">
 <link rel="import" href="../../../bower_components/paper-icon-button/paper-icon-button.html">
 <link rel="import" href="../../../bower_components/iron-icons/iron-icons.html">
-<link rel="import" href="../../../bower_components/paper-input/paper-input.html">
-<link rel="import" href="../../../bower_components/paper-item/paper-item.html">
 
 <dom-module id="meal-order-vendor-menu">
     <template>
@@ -108,114 +107,113 @@
             </paper-item>
         </div>
         <div id="menu" class="expanded">
-            <dom-repeat items="[[menu.categories]]" as="item">
-                <template>
-                    <dom-if if="[[item.dishes.length]]">
-                        <template>
-                            <div>
-                                <div class="menu-header">
-                                    <paper-item>
-                                        <div class="dish-title bold">
-                                            [[item.categoryName]]
-                                        </div>
-                                        <div class="dish-price bold">
-                                            Цена, ₴
-                                        </div>
-                                        <div class="add-dish-icon">
-
-                                        </div>
-                                    </paper-item>
+            <template is="dom-repeat" items="[[menu.categories]]" as="item">
+                <template is="dom-if" if="[[item.dishes.length]]">
+                    <div>
+                        <div class="menu-header">
+                            <paper-item>
+                                <div class="dish-title bold">
+                                    [[item.categoryName]]
+                                </div>
+                                <div class="dish-price bold">
+                                    Цена, ₴
+                                </div>
+                                <div class="add-dish-icon">
+
                                 </div>
-                                <dom-repeat items="[[item.dishes]]" as="dish">
-                                    <template>
-                                        <div class="menu-dishes">
-                                            <paper-item>
-                                                <div class="dish-title">
-                                                    [[dish.title]]
-                                                </div>
-                                                <div class="dish-price">
-                                                    [[dish.price]]
-                                                </div>
-                                                <div class="add-dish-icon">
-                                                    <paper-icon-button icon="add"
-                                                                       on-click="_addDish"></paper-icon-button>
-                                                </div>
-                                            </paper-item>
-                                        </div>
-                                    </template>
-                                </dom-repeat>
+                            </paper-item>
+                        </div>
+                        <template is="dom-repeat" items="[[item.dishes]]" as="dish">
+                            <div class="menu-dishes">
+                                <paper-item>
+                                    <div class="dish-title">
+                                        [[dish.title]]
+                                    </div>
+                                    <div class="dish-price">
+                                        [[dish.price]]
+                                    </div>
+                                    <div class="add-dish-icon">
+                                        <paper-icon-button icon="add"
+                                                           on-click="_addDish"></paper-icon-button>
+                                    </div>
+                                </paper-item>
                             </div>
                         </template>
-                    </dom-if>
+                    </div>
                 </template>
-            </dom-repeat>
+            </template>
         </div>
     </template>
     <script>
-        /**
-         * meal-order-vendor-menu represents a menu of a vendor for a single day.
-         *
-         * Contains a list of categories with dish titles and prices.
-         *
-         * @customElement
-         * @polymer
-         */
-        class MealOrderVendorMenu extends Polymer.Element {
-            static get is() {
-                return 'meal-order-vendor-menu';
-            }
+        {
+            /**
+             * meal-order-vendor-menu represents a menu of a vendor for a single day.
+             *
+             * Contains a list of categories with dish titles and prices.
+             *
+             * @customElement
+             * @polymer
+             */
+            class MealOrderVendorMenu extends Polymer.Element {
+                static get is() {
+                    return 'meal-order-vendor-menu';
+                }
 
-            static get properties() {
-                return {
-                    /**
-                     * Fired on `add-button` click.
-                     *
-                     * @action `dish-added`
-                     * @param {dish} contains vendor, category and dish title
-                     */
-
-                    /**
-                     * Menu of a vendor.
-                     *
-                     * @property name is name of a vendor.
-                     * @property {array} categories list of categories with dishes.
-                     */
-                    menu: {
-                        type: Object
+                static get properties() {
+                    return {
+                        /**
+                         * Fired on `add-button` click.
+                         *
+                         * @action `dish-added`
+                         * @param {dish} contains vendor, category and dish title
+                         */
+
+                        /**
+                         * Menu of a vendor.
+                         *
+                         * @property name is name of a vendor.
+                         * @property {array} categories list of categories with dishes.
+                         */
+                        menu: {
+                            type: Object
+                        }
                     }
                 }
-            }
 
-            _getExpandIcon() {
-                if (this.$.menu.className === 'expanded') {
-                    return 'expand-less';
-                }
-                else {
-                    return 'expand-more';
+                _getExpandIcon() {
+                    if (this.$.menu.className === 'expanded') {
+                        return 'expand-less';
+                    }
+                    else {
+                        return 'expand-more';
+                    }
                 }
-            }
 
-            _toggle() {
-                if (this.$.menu.className === 'collapsed') {
-                    this.$.menu.className = 'expanded';
-                    this.$.expand.icon = 'expand-less';
+                _toggle() {
+                    if (this.$.menu.className === 'collapsed') {
+                        this.$.menu.className = 'expanded';
+                        this.$.expand.icon = 'expand-less';
+                    }
+                    else {
+                        this.$.menu.className = 'collapsed';
+                        this.$.expand.icon = 'expand-more';
+                    }
+                    this.dispatchEvent(new CustomEvent('vendor-menu-resize'));
                 }
-                else {
-                    this.$.menu.className = 'collapsed';
-                    this.$.expand.icon = 'expand-more';
+
+                _addDish(e) {
+                    const dish = {};
+                    dish.vendor = this.menu.vendor;
+                    dish.price = this.menu.categories[e.model.parentModel.index].dishes[e.model.index].price;
+                    dish.title = this.menu.categories[e.model.parentModel.index].dishes[e.model.index].title;
+                    this.dispatchEvent(new CustomEvent('dish-added', {
+                        composed: true,
+                        detail: dish
+                    }));
                 }
-                this.dispatchEvent(new CustomEvent('vendor-menu-resize'));
             }
 
-            _addDish(e) {
-                const dish = {};
-                dish.vendor = this.menu.vendor;
-                dish.price = this.menu.categories[e.model.parentModel.index].dishes[e.model.index].price;
-                dish.title = this.menu.categories[e.model.parentModel.index].dishes[e.model.index].title;
-                this.dispatchEvent(new CustomEvent('dish-added', {composed: true, detail: dish}));
-            }
+            window.customElements.define(MealOrderVendorMenu.is, MealOrderVendorMenu);
         }
-
-        window.customElements.define(MealOrderVendorMenu.is, MealOrderVendorMenu);
     </script>
 </dom-module>
diff --git a/client/user/src/mealorder/menu/meal-order-vendor-menus.html b/client/user/src/mealorder/menu/meal-order-vendor-menus.html
index 29791863..1914371f 100644
--- a/client/user/src/mealorder/menu/meal-order-vendor-menus.html
+++ b/client/user/src/mealorder/menu/meal-order-vendor-menus.html
@@ -17,11 +17,8 @@
   ~ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
   ~ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   -->
-<script src="../../../bower_components/webcomponentsjs/webcomponents-lite.js"></script>
 <link rel="import" href="../../../bower_components/polymer/polymer-element.html">
 <link rel="import" href="../../../bower_components/iron-list/iron-list.html">
-<link rel="import" href="../../../bower_components/paper-icon-button/paper-icon-button.html">
-<link rel="import" href="../../../bower_components/iron-icons/iron-icons.html">
 <link rel="import" href="../../../bower_components/paper-search/paper-search-bar.html">
 <link rel="import" href="./meal-order-vendor-menu.html">
 
@@ -103,87 +100,90 @@
         </iron-list>
     </template>
     <script>
-        /**
-         * vendor-menus represents an expanding list of menus for current date and filter.
-         *
-         * Contains search by dish keywords.
-         *
-         * @customElement
-         * @polymer
-         */
-        class MealOrderVendorMenus extends Polymer.Element {
-            static get is() {
-                return 'meal-order-vendor-menus';
-            }
+        {
+            /**
+             * vendor-menus represents an expanding list of menus for current date and filter.
+             *
+             * Contains search by dish keywords.
+             *
+             * @customElement
+             * @polymer
+             */
+            class MealOrderVendorMenus extends Polymer.Element {
+                static get is() {
+                    return 'meal-order-vendor-menus';
+                }
 
-            static get properties() {
-                return {
-                    /**
-                     * Fired when a dish add button is tapped.
-                     *
-                     * @event `dish-added`
-                     * @param {dish} contains vendor, category, title.
-                     */
-
-                    /**
-                     * Full menu for day.
-                     *
-                     * @property {{name:String vendor name, categories:array a menu of a vendor for a day}}.
-                     */
-                    menuForDay: {
-                        type: Array,
-                    },
-
-                    /**
-                     * Menu with filter applied.
-                     */
-                    filtered: {
-                        type: Array,
-                        computed: '_filteredItems(menuForDay,filter)',
-                        reflectToAttribute: true
-                    },
-
-                    /**
-                     * Inputted key word or word part to search in menu.
-                     */
-                    filter: {
-                        type: String,
-                        value: '',
-                        notify: true
-                    }
+                static get properties() {
+                    return {
+                        /**
+                         * Fired when a dish add button is tapped.
+                         *
+                         * @event `dish-added`
+                         * @param {dish} contains vendor, category, title.
+                         */
+
+                        /**
+                         * Full menu for day.
+                         *
+                         * @property {{name:String vendor name, categories:array a menu of a vendor for a day}}.
+                         */
+                        menuForDay: {
+                            type: Array,
+                        },
+
+                        /**
+                         * Menu with filter applied.
+                         */
+                        filtered: {
+                            type: Array,
+                            computed: '_filteredItems(menuForDay,filter)',
+                            reflectToAttribute: true
+                        },
+
+                        /**
+                         * Inputted key word or word part to search in menu.
+                         */
+                        filter: {
+                            type: String,
+                            value: '',
+                            notify: true
+                        }
 
+                    }
                 }
-            }
 
-            _resize() {
-                this.shadowRoot.querySelector("#list").notifyResize();
-            }
+                _resize() {
+                    this.shadowRoot.querySelector("#list").notifyResize();
+                }
 
-            _filteredItems() {
-                const predicate = this.filter;
-                const filtered = [];
-                if (this.menuForDay) {
-                    for (let i = 0; i < this.menuForDay.length; i++) {
-                        const vendorCategories = this.menuForDay[i].categories;
-                        let newVendorCategories = [];
-                        for (let j = 0; j < vendorCategories.length; j++) {
-                            let vendorDishes = vendorCategories[j].dishes;
-                            let newVendorDishes = vendorDishes.filter(dish => dish.title.toLowerCase().includes(predicate.toLowerCase()));
-                            newVendorCategories.push({
-                                categoryName: vendorCategories[j].categoryName,
-                                dishes: newVendorDishes
+                _filteredItems() {
+                    const predicate = this.filter;
+                    const filtered = [];
+                    if (this.menuForDay) {
+                        for (let i = 0; i < this.menuForDay.length; i++) {
+                            const vendorCategories = this.menuForDay[i].categories;
+                            const newVendorCategories = [];
+                            for (let j = 0; j < vendorCategories.length; j++) {
+                                const vendorDishes = vendorCategories[j].dishes;
+                                const newVendorDishes = vendorDishes
+                                    .filter(dish => dish.title.toLowerCase().includes(predicate.toLowerCase()));
+                                newVendorCategories.push({
+                                    categoryName: vendorCategories[j].categoryName,
+                                    dishes: newVendorDishes
+                                });
+                            }
+                            filtered.push({
+                                vendor: this.menuForDay[i].vendor,
+                                categories: newVendorCategories
                             });
                         }
-                        filtered.push({
-                            vendor: this.menuForDay[i].vendor,
-                            categories: newVendorCategories
-                        });
                     }
+                    return filtered;
                 }
-                return filtered;
             }
-        }
 
-        window.customElements.define(MealOrderVendorMenus.is, MealOrderVendorMenus);
+            window.customElements.define(MealOrderVendorMenus.is, MealOrderVendorMenus);
+        }
     </script>
 </dom-module>
diff --git a/client/user/test/mealorder/menu/meal-order-vendor-menu_test.html b/client/user/test/mealorder/menu/meal-order-vendor-menu_test.html
index 54edc4cf..a7e50d51 100644
--- a/client/user/test/mealorder/menu/meal-order-vendor-menu_test.html
+++ b/client/user/test/mealorder/menu/meal-order-vendor-menu_test.html
@@ -1,4 +1,3 @@
-<!doctype html>
 <!--
   ~ Copyright 2018, TeamDev Ltd. All rights reserved.
   ~
@@ -26,13 +25,12 @@
 
     <title>meal-order-vendor-menu test</title>
 
-    <link rel="import" href="../../../src/mealorder/shell/meal-order-app-namespace.html">
     <script src="../../../bower_components/webcomponentsjs/webcomponents-loader.js"></script>
     <script src="../../../bower_components/web-component-tester/browser.js"></script>
     <script src="../../../node_modules/redux/dist/redux.js"></script>
-    <link rel="import" href="../../../src/mealorder/menu/meal-order-vendor-menu.html">
     <script src="../test_variables.js"></script>
-
+    <link rel="import" href="../../../src/mealorder/shell/meal-order-app-namespace.html">
+    <link rel="import" href="../../../src/mealorder/menu/meal-order-vendor-menu.html">
 </head>
 <body>
 
diff --git a/client/user/test/mealorder/menu/meal-order-vendor-menus_test.html b/client/user/test/mealorder/menu/meal-order-vendor-menus_test.html
index 50124808..63b3ba95 100644
--- a/client/user/test/mealorder/menu/meal-order-vendor-menus_test.html
+++ b/client/user/test/mealorder/menu/meal-order-vendor-menus_test.html
@@ -24,13 +24,12 @@
           content="width=device-width, minimum-scale=1, initial-scale=1, user-scalable=yes">
 
     <title>meal-order-vendor-menu test</title>
-    <link rel="import" href="../../../src/mealorder/shell/meal-order-app-namespace.html">
     <script src="../../../bower_components/webcomponentsjs/webcomponents-loader.js"></script>
     <script src="../../../bower_components/web-component-tester/browser.js"></script>
     <script src="../../../node_modules/redux/dist/redux.js"></script>
-    <link rel="import" href="../../../src/mealorder/menu/meal-order-vendor-menus.html">
     <script src="../test_variables.js"></script>
-
+    <link rel="import" href="../../../src/mealorder/shell/meal-order-app-namespace.html">
+    <link rel="import" href="../../../src/mealorder/menu/meal-order-vendor-menus.html">
 </head>
 <body>
 

From 2412f42c39b1f1e4a0655db28f6fe3aca7bd58d0 Mon Sep 17 00:00:00 2001
From: Paul Ageyev <paulageyev@gmail.com>
Date: Tue, 1 May 2018 14:22:15 +0300
Subject: [PATCH 246/253] Rename action to remove the vendor from the order

---
 .../mealorder/menu/meal-order-user-cart.html  | 135 +++++++++---------
 .../mealorder/menu/meal-order-user-order.html |  91 ++++++------
 .../mealorder/shell/actions/user-actions.html |   2 +-
 .../mealorder/shell/reducers/reducers.html    |   2 +-
 .../meal-order-client-app-action_test.html    |   2 +-
 .../meal-order-user-cart-actions_test.html    |   9 +-
 .../menu/meal-order-user-cart_test.html       |   1 -
 7 files changed, 120 insertions(+), 122 deletions(-)

diff --git a/client/user/src/mealorder/menu/meal-order-user-cart.html b/client/user/src/mealorder/menu/meal-order-user-cart.html
index 067353df..669823db 100644
--- a/client/user/src/mealorder/menu/meal-order-user-cart.html
+++ b/client/user/src/mealorder/menu/meal-order-user-cart.html
@@ -17,12 +17,12 @@
   ~ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
   ~ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   -->
-<!--<script src="../../../bower_components/webcomponentsjs/webcomponents-lite.js"></script>-->
-<link rel="import" href="../shell/meal-order-app-namespace.html">
 <link rel="import" href="../../../bower_components/polymer/polymer-element.html">
-<link rel="import" href="./meal-order-user-order.html">
+<link rel="import" href="../../../bower_components/polymer/lib/elements/dom-repeat.html">
+<link rel="import" href="../../../bower_components/polymer/lib/elements/dom-if.html">
+<link rel="import" href="../shell/meal-order-app-namespace.html">
 <link rel="import" href="../shell/redux-store.html">
-<link rel="import" href="../shell/actions/user-actions.html">
+<link rel="import" href="./meal-order-user-order.html">
 
 <dom-module id="meal-order-user-cart">
     <template>
@@ -57,83 +57,84 @@
         </div>
     </template>
     <script>
-        /**
-         * user-cart is user's order for current date.
-         *
-         * @customElement
-         * @polymer
-         */
-        class MealOrderUserCart extends MealOrderApp.ReduxMixin(Polymer.Element) {
-            static get is() {
-                return 'meal-order-user-cart';
-            }
+        {
+            /**
+             * user-cart is user's order for current date.
+             *
+             * @customElement
+             * @polymer
+             */
+            class MealOrderUserCart extends MealOrderApp.ReduxMixin(Polymer.Element) {
+                static get is() {
+                    return 'meal-order-user-cart';
+                }
 
-            static get properties() {
-                return {
-                    /**
-                     * Selected day.
-                     */
-                    selectedDate: {
-                        type: Date,
-                    },
+                static get properties() {
+                    return {
+                        /**
+                         * Selected day.
+                         */
+                        selectedDate: {
+                            type: Date,
+                        },
 
-                    /**
-                     * Array to be displayed in a user's order.
-                     */
-                    currentOrder: {
-                        type: Array,
-                        statePath: 'currentOrder'
-                    },
+                        /**
+                         * Array to be displayed in a user's order.
+                         */
+                        currentOrder: {
+                            type: Array,
+                            statePath: 'currentOrder'
+                        },
+                    }
                 }
-            }
 
-            static get actions() {
-                return {
-                    getOrderedItems: date => ({
-                        type: MealOrderApp.UserAction.GET_ORDERED_ITEMS,
-                        date
-                    }),
-                    removeDishesByVendor: vendor => ({
-                        type: MealOrderApp.UserAction.REMOVE_VENDOR_FROM_ORDER,
-                        vendor
-                    }),
-                    removeDishFromOrder: dish => ({
-                        type: MealOrderApp.UserAction.REMOVE_DISH_FROM_ORDER,
-                        dish
-                    }),
+                static get actions() {
+                    return {
+                        getOrderedItems: date => ({
+                            type: MealOrderApp.UserAction.GET_ORDERED_ITEMS,
+                            date
+                        }),
+                        removeDishesByVendor: vendor => ({
+                            type: MealOrderApp.UserAction.REMOVE_DISHES_BY_VENDOR,
+                            vendor
+                        }),
+                        removeDishFromOrder: dish => ({
+                            type: MealOrderApp.UserAction.REMOVE_DISH_FROM_ORDER,
+                            dish
+                        }),
+                    }
                 }
-            }
 
-            static get observers() {
-                return [
-                    '_getCurrentOrder(selectedDate)'
-                ];
-            }
+                static get observers() {
+                    return [
+                        '_getCurrentOrder(selectedDate)'
+                    ];
+                }
 
-            _getCurrentOrder(selectedDate) {
-                this.dispatch('getOrderedItems', new Date(selectedDate));
-            }
+                _getCurrentOrder(selectedDate) {
+                    this.dispatch('getOrderedItems', new Date(selectedDate));
+                }
 
-            _getTotalAmount(currentOrder) {
-                let sum = 0;
-                for (let i = 0; i < currentOrder.order.length; i++) {
-                    for (let j = 0; j < currentOrder.order[i].dishes.length; j++) {
-                        sum += currentOrder.order[i].dishes[j].price * currentOrder.order[i].dishes[j].quantity;
+                _getTotalAmount(currentOrder) {
+                    let sum = 0;
+                    for (let i = 0; i < currentOrder.order.length; i++) {
+                        for (let j = 0; j < currentOrder.order[i].dishes.length; j++) {
+                            sum += currentOrder.order[i].dishes[j].price * currentOrder.order[i].dishes[j].quantity;
+                        }
                     }
+                    return sum;
                 }
-                return sum;
-            }
 
-            _removeDishFromOrder(event) {
+                _removeDishFromOrder(event) {
+                    this.dispatch('removeDishFromOrder', event.detail);
+                }
 
-                this.dispatch('removeDishFromOrder', event.detail);
+                _removeDishesByVendor(event) {
+                    this.dispatch('removeDishesByVendor', event.detail);
+                }
             }
 
-            _removeDishesByVendor(event) {
-                this.dispatch('removeDishesByVendor', event.detail);
-            }
+            window.customElements.define(MealOrderUserCart.is, MealOrderUserCart);
         }
-
-        window.customElements.define(MealOrderUserCart.is, MealOrderUserCart);
     </script>
 </dom-module>
diff --git a/client/user/src/mealorder/menu/meal-order-user-order.html b/client/user/src/mealorder/menu/meal-order-user-order.html
index 1add9151..8ede100d 100644
--- a/client/user/src/mealorder/menu/meal-order-user-order.html
+++ b/client/user/src/mealorder/menu/meal-order-user-order.html
@@ -17,7 +17,6 @@
   ~ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
   ~ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   -->
-<!--<script src="../../../bower_components/webcomponentsjs/webcomponents-lite.js"></script>-->
 <link rel="import" href="../../../bower_components/polymer/polymer-element.html">
 <link rel="import" href="../../../bower_components/paper-icon-button/paper-icon-button.html">
 <link rel="import" href="../../../bower_components/iron-icons/iron-icons.html">
@@ -73,58 +72,60 @@
         </div>
     </template>
     <script>
-        /**
-         * user-order component is user's order for current date, for current vendor.
-         *
-         * @customElement
-         * @polymer
-         */
-        class MealOrderUserOrder extends Polymer.Element {
-            static get is() {
-                return 'meal-order-user-order';
-            }
+        {
+            /**
+             * user-order component is user's order for current date, for current vendor.
+             *
+             * @customElement
+             * @polymer
+             */
+            class MealOrderUserOrder extends Polymer.Element {
+                static get is() {
+                    return 'meal-order-user-order';
+                }
 
-            static get properties() {
-                return {
-                    /**
-                     * Fired by clicking on the `Remove dish` button.
-                     *
-                     * @event `user-order-dish-removed`
-                     * @param {dish} contains dishes
-                     */
+                static get properties() {
+                    return {
+                        /**
+                         * Fired by clicking on the `Remove dish` button.
+                         *
+                         * @event `user-order-dish-removed`
+                         * @param {dish} contains dishes
+                         */
 
-                    /**
-                     * Fired by clicking on the `Remove dishes by vendor` button.
-                     *
-                     * @event `user-order-vendor-removed`
-                     * @param {vendor} contains vendor.
-                     */
+                        /**
+                         * Fired by clicking on the `Remove dishes by vendor` button.
+                         *
+                         * @event `user-order-vendor-removed`
+                         * @param {vendor} contains vendor.
+                         */
 
-                    /**
-                     * Order for a current vendor.
-                     */
-                    currentOrder: {
-                        type: Array
+                        /**
+                         * Order for a current vendor.
+                         */
+                        currentOrder: {
+                            type: Array
+                        }
                     }
                 }
-            }
 
-            _removeDishesByVendor() {
-                this.dispatchEvent(new CustomEvent('user-order-vendor-removed', {
-                    detail: this.currentOrder.vendor
-                }));
-            }
+                _removeDishesByVendor() {
+                    this.dispatchEvent(new CustomEvent('user-order-vendor-removed', {
+                        detail: this.currentOrder.vendor
+                    }));
+                }
 
-            _removeDish(e) {
-                const dish = {};
-                dish.vendor = this.currentOrder.vendor;
-                dish.name = this.currentOrder.dishes[e.model.index].title;
-                this.dispatchEvent(new CustomEvent('user-order-dish-removed', {
-                    detail: dish
-                }));
+                _removeDish(e) {
+                    const dish = {};
+                    dish.vendor = this.currentOrder.vendor;
+                    dish.name = this.currentOrder.dishes[e.model.index].title;
+                    this.dispatchEvent(new CustomEvent('user-order-dish-removed', {
+                        detail: dish
+                    }));
+                }
             }
-        }
 
-        window.customElements.define(MealOrderUserOrder.is, MealOrderUserOrder);
+            window.customElements.define(MealOrderUserOrder.is, MealOrderUserOrder);
+        }
     </script>
 </dom-module>
diff --git a/client/user/src/mealorder/shell/actions/user-actions.html b/client/user/src/mealorder/shell/actions/user-actions.html
index cdcb9898..39553245 100644
--- a/client/user/src/mealorder/shell/actions/user-actions.html
+++ b/client/user/src/mealorder/shell/actions/user-actions.html
@@ -22,6 +22,6 @@
         ADD_DISH_TO_ORDER: "ADD_DISH_TO_ORDER",
         GET_ORDERED_ITEMS: 'GET_ORDERED_ITEMS',
         REMOVE_DISH_FROM_ORDER: 'REMOVE_DISH_FROM_ORDER',
-        REMOVE_VENDOR_FROM_ORDER: 'REMOVE_VENDOR_FROM_ORDER',
+        REMOVE_DISHES_BY_VENDOR: 'REMOVE_DISHES_BY_VENDOR',
     }
 </script>
diff --git a/client/user/src/mealorder/shell/reducers/reducers.html b/client/user/src/mealorder/shell/reducers/reducers.html
index df6ed986..ae095721 100644
--- a/client/user/src/mealorder/shell/reducers/reducers.html
+++ b/client/user/src/mealorder/shell/reducers/reducers.html
@@ -180,7 +180,7 @@
                 case MealOrderApp.UserAction.REMOVE_DISH_FROM_ORDER: {
                     return state;
                 }
-                case MealOrderApp.UserAction.REMOVE_VENDOR_FROM_ORDER: {
+                case MealOrderApp.UserAction.REMOVE_DISHES_BY_VENDOR: {
                     return state;
                 }
                 case MealOrderApp.UserAction.GET_ORDERED_ITEMS: {
diff --git a/client/user/test/mealorder/meal-order-client-app-action_test.html b/client/user/test/mealorder/meal-order-client-app-action_test.html
index 944d1bab..bb9a6b58 100644
--- a/client/user/test/mealorder/meal-order-client-app-action_test.html
+++ b/client/user/test/mealorder/meal-order-client-app-action_test.html
@@ -46,7 +46,7 @@
             mock = sinon.mock(MealOrderApp.store);
         });
 
-        test('should responds on `dish-added` event and fire `ADD_DISH_TO_ORDER` action.', function () {
+        test('should respond on `dish-added` event and fire `ADD_DISH_TO_ORDER` action.', function () {
             const DISH = {vendor: "Позитив", price: 15, title: "Картофель"};
             const ORDER = {};
             ORDER.dish = {vendor: "Позитив", price: 15, title: "Картофель"};
diff --git a/client/user/test/mealorder/menu/meal-order-user-cart-actions_test.html b/client/user/test/mealorder/menu/meal-order-user-cart-actions_test.html
index 59305a7e..c668a234 100644
--- a/client/user/test/mealorder/menu/meal-order-user-cart-actions_test.html
+++ b/client/user/test/mealorder/menu/meal-order-user-cart-actions_test.html
@@ -1,4 +1,3 @@
-<!doctype html>
 <!--
   ~ Copyright 2018, TeamDev Ltd. All rights reserved.
   ~
@@ -67,16 +66,15 @@
             component.selectedDate = new Date("2018-03-21");
             component.currentOrder = MealOrderAppTest.ininitalOrder[0];
 
-            let userOrder;
             flush(function () {
-                userOrder = component.shadowRoot.querySelector('meal-order-user-order');
+                const userOrder = component.shadowRoot.querySelector('meal-order-user-order');
                 userOrder.dispatchEvent((new CustomEvent('user-order-vendor-removed', {detail: VENDOR})));
                 mock.verify();
                 done();
             });
         });
 
-        test('should responds on `dish-removed` event and fire `REMOVE_DISH_FROM_ORDER` action.', function (done) {
+        test('should respond on `dish-removed` event and fire `REMOVE_DISH_FROM_ORDER` action.', function (done) {
             const DATE = new Date("2018-03-21");
             const DISH = {vendor: "Пюре", name: "Борщ украинский"};
 
@@ -96,9 +94,8 @@
             component.selectedDate = new Date("2018-03-21");
             component.currentOrder = MealOrderAppTest.ininitalOrder[0];
 
-            let userOrder;
             flush(function () {
-                userOrder = component.shadowRoot.querySelector('meal-order-user-order');
+                const userOrder = component.shadowRoot.querySelector('meal-order-user-order');
                 userOrder.dispatchEvent((new CustomEvent('user-order-dish-removed', {detail: DISH})));
                 mock.verify();
                 done();
diff --git a/client/user/test/mealorder/menu/meal-order-user-cart_test.html b/client/user/test/mealorder/menu/meal-order-user-cart_test.html
index 9643c6c8..fdd3190b 100644
--- a/client/user/test/mealorder/menu/meal-order-user-cart_test.html
+++ b/client/user/test/mealorder/menu/meal-order-user-cart_test.html
@@ -1,4 +1,3 @@
-<!doctype html>
 <!--
   ~ Copyright 2018, TeamDev Ltd. All rights reserved.
   ~

From 84791e9a8451cd180d9bec756874853621ee741f Mon Sep 17 00:00:00 2001
From: Paul Ageyev <paulageyev@gmail.com>
Date: Tue, 1 May 2018 14:23:17 +0300
Subject: [PATCH 247/253] Refactor test description

---
 .../user/test/mealorder/meal-order-client-app-action_test.html  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/user/test/mealorder/meal-order-client-app-action_test.html b/client/user/test/mealorder/meal-order-client-app-action_test.html
index 74721092..94a3c7af 100644
--- a/client/user/test/mealorder/meal-order-client-app-action_test.html
+++ b/client/user/test/mealorder/meal-order-client-app-action_test.html
@@ -46,7 +46,7 @@
             mock = sinon.mock(MealOrderApp.store);
         });
 
-        test('should responds on `dish-added` event and fire `ADD_DISH_TO_ORDER` action.', function () {
+        test('should respond on `dish-added` event and fire `ADD_DISH_TO_ORDER` action.', function () {
             const DISH = {vendor: "Позитив", price: 15, title: "Картофель"};
             const ORDER = {};
             ORDER.dish = {vendor: "Позитив", price: 15, title: "Картофель"};

From 4b157d7cfe238e90662e0e32ad48093f376fd91f Mon Sep 17 00:00:00 2001
From: Paul Ageyev <paulageyev@gmail.com>
Date: Tue, 1 May 2018 14:42:26 +0300
Subject: [PATCH 248/253] Import user actions to reducer

---
 client/user/src/mealorder/shell/redux-store.html                | 1 +
 .../test/mealorder/menu/meal-order-user-cart-actions_test.html  | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/client/user/src/mealorder/shell/redux-store.html b/client/user/src/mealorder/shell/redux-store.html
index bad13dc4..ddedbaac 100644
--- a/client/user/src/mealorder/shell/redux-store.html
+++ b/client/user/src/mealorder/shell/redux-store.html
@@ -18,6 +18,7 @@
   ~ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   -->
 <link rel="import" href="../../../bower_components/polymer-redux/polymer-redux.html">
+<link rel="import" href="./actions/user-actions.html">
 <link rel="import" href="./reducers/reducers.html">
 <script>
     {
diff --git a/client/user/test/mealorder/menu/meal-order-user-cart-actions_test.html b/client/user/test/mealorder/menu/meal-order-user-cart-actions_test.html
index c668a234..4ef9a2e1 100644
--- a/client/user/test/mealorder/menu/meal-order-user-cart-actions_test.html
+++ b/client/user/test/mealorder/menu/meal-order-user-cart-actions_test.html
@@ -55,7 +55,7 @@
                 date: DATE
             };
             const expectedRemoveVendorFromOrderAction = {
-                type: MealOrderApp.UserAction.REMOVE_VENDOR_FROM_ORDER,
+                type: MealOrderApp.UserAction.REMOVE_DISHES_BY_VENDOR,
                 vendor: VENDOR
             };
 

From 67631aea1d6702659a32c1a041aaf17d63d4b1b2 Mon Sep 17 00:00:00 2001
From: Paul Ageyev <paulageyev@gmail.com>
Date: Tue, 1 May 2018 14:47:40 +0300
Subject: [PATCH 249/253] Apply 15px font size for user history

---
 .../history/meal-order-user-history.html      | 132 +++++++++---------
 .../src/mealorder/meal-order-client-app.html  |   3 +-
 .../history/meal-order-user-history_test.html |   5 +-
 3 files changed, 70 insertions(+), 70 deletions(-)

diff --git a/client/user/src/mealorder/history/meal-order-user-history.html b/client/user/src/mealorder/history/meal-order-user-history.html
index 1a2ebabd..ff45f2a9 100644
--- a/client/user/src/mealorder/history/meal-order-user-history.html
+++ b/client/user/src/mealorder/history/meal-order-user-history.html
@@ -18,10 +18,11 @@
   ~ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   -->
 <link rel="import" href="../../../bower_components/polymer/polymer-element.html">
+<link rel="import" href="../../../bower_components/polymer/lib/elements/dom-repeat.html">
+<link rel="import" href="../../../bower_components/polymer/lib/elements/dom-if.html">
 <link rel="import" href="../../../bower_components/iron-list/iron-list.html">
-<link rel="import" href="../../../bower_components/paper-card/paper-card.html">
+<link rel="import" href="../shell/meal-order-app-namespace.html">
 <link rel="import" href="../shell/redux-store.html">
-<link rel="import" href="../shell/actions/user-actions.html">
 
 <dom-module id="meal-order-user-history">
     <template>
@@ -29,8 +30,9 @@
             #history {
                 width: 70%;
                 margin: 3% auto 0 auto;
-                color: var(--paper-grey-700);
                 padding-bottom: 3%;
+                color: var(--paper-grey-700);
+                font-size: 15px;
             }
 
             #title-for-mobile {
@@ -121,15 +123,13 @@
                             <div class="history-price">Цена, ₴</div>
                             <div class="history-quantity">Количество</div>
                         </div>
-                        <dom-repeat items="[[item.dishes]]" as="dish">
-                            <template>
-                                <div class="dishes">
-                                    <div class="history-title">[[dish.title]]</div>
-                                    <div class="history-price">[[dish.price]]</div>
-                                    <div class="history-quantity">[[dish.quantity]]</div>
-                                </div>
-                            </template>
-                        </dom-repeat>
+                        <template is="dom-repeat" items="[[item.dishes]]" as="dish">
+                            <div class="dishes">
+                                <div class="history-title">[[dish.title]]</div>
+                                <div class="history-price">[[dish.price]]</div>
+                                <div class="history-quantity">[[dish.quantity]]</div>
+                            </div>
+                        </template>
                     </div>
                 </template>
             </iron-list>
@@ -141,70 +141,72 @@
         </div>
     </template>
     <script>
-        /**
-         * User's history for individual day.
-         *
-         * @customElement
-         * @polymer
-         */
-        class MealOrderUserHistory extends MealOrderApp.ReduxMixin(Polymer.Element) {
-            static get is() {
-                return 'meal-order-user-history';
-            }
+        {
+            /**
+             * User's history for individual day.
+             *
+             * @customElement
+             * @polymer
+             */
+            class MealOrderUserHistory extends MealOrderApp.ReduxMixin(Polymer.Element) {
+                static get is() {
+                    return 'meal-order-user-history';
+                }
 
-            static get properties() {
-                return {
-                    /**
-                     * Selected day.
-                     */
-                    selectedDate: {
-                        type: Object,
-                    },
-
-                    /**
-                     * An array containing items to be displayed.
-                     */
-                    currentHistory: {
-                        type: Object,
-                        statePath: 'currentHistory',
-                    },
+                static get properties() {
+                    return {
+                        /**
+                         * Selected day.
+                         */
+                        selectedDate: {
+                            type: Object,
+                        },
+
+                        /**
+                         * An array containing items to be displayed.
+                         */
+                        currentHistory: {
+                            type: Object,
+                            statePath: 'currentHistory',
+                        },
 
+                    }
                 }
-            }
 
-            static get actions() {
-                return {
-                    getCurrentHistory: date => ({
-                        type: MealOrderApp.UserAction.GET_CURRENT_HISTORY,
-                        date
-                    }),
+                static get actions() {
+                    return {
+                        getCurrentHistory: date => ({
+                            type: MealOrderApp.UserAction.GET_CURRENT_HISTORY,
+                            date
+                        }),
+                    }
                 }
-            }
 
-            static get observers() {
-                return [
-                    '_getCurrentHistory(selectedDate)'
-                ];
-            }
+                static get observers() {
+                    return [
+                        '_getCurrentHistory(selectedDate)'
+                    ];
+                }
 
-            _getCurrentHistory(selectedDate) {
-                this.dispatch('getCurrentHistory', new Date(selectedDate));
-            }
+                _getCurrentHistory(selectedDate) {
+                    this.dispatch('getCurrentHistory', new Date(selectedDate));
+                }
 
-            _getTotalPrice(currentHistory) {
-                let totalPrice = 0;
-                for (let i = 0; i < currentHistory.order.length; i++) {
-                    const dishes = currentHistory.order[i].dishes;
-                    let priceByVendor = 0;
-                    for (let i = 0; i < dishes.length; i++) {
-                        priceByVendor += (dishes[i].price) * dishes[i].quantity;
+                _getTotalPrice(currentHistory) {
+                    let totalPrice = 0;
+                    for (let i = 0; i < currentHistory.order.length; i++) {
+                        const dishes = currentHistory.order[i].dishes;
+                        let priceByVendor = 0;
+                        for (let i = 0; i < dishes.length; i++) {
+                            priceByVendor += (dishes[i].price) * dishes[i].quantity;
+                        }
+                        totalPrice += priceByVendor;
                     }
-                    totalPrice += priceByVendor;
+                    return totalPrice;
                 }
-                return totalPrice;
             }
-        }
 
-        window.customElements.define(MealOrderUserHistory.is, MealOrderUserHistory);
+            window.customElements.define(MealOrderUserHistory.is, MealOrderUserHistory);
+        }
     </script>
 </dom-module>
diff --git a/client/user/src/mealorder/meal-order-client-app.html b/client/user/src/mealorder/meal-order-client-app.html
index e825ce99..6b8056a2 100644
--- a/client/user/src/mealorder/meal-order-client-app.html
+++ b/client/user/src/mealorder/meal-order-client-app.html
@@ -35,6 +35,7 @@
 <link rel="import" href="./meal-order-toolbar.html">
 <link rel="import" href="./menu/meal-order-drawer.html">
 <link rel="import" href="./menu/meal-order-menu-container.html">
+<link rel="import" href="./history/meal-order-user-history.html">
 
 <dom-module id="meal-order-client-app">
     <template>
@@ -98,7 +99,7 @@
                             on-dish-added="_addDishToOrder">
                     </meal-order-menu-container>
                     <div data-page="history">
-                        <!--user history component-->
+                        <meal-order-user-history selected-date="[[routeData.date]]"></meal-order-user-history>
                     </div>
                 </iron-pages>
             </app-header-layout>
diff --git a/client/user/test/mealorder/history/meal-order-user-history_test.html b/client/user/test/mealorder/history/meal-order-user-history_test.html
index f39d1ecf..567c77fd 100644
--- a/client/user/test/mealorder/history/meal-order-user-history_test.html
+++ b/client/user/test/mealorder/history/meal-order-user-history_test.html
@@ -18,7 +18,6 @@
   ~ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
   ~ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   -->
-
 <html lang="en">
 <head>
     <meta charset="utf-8">
@@ -27,13 +26,12 @@
 
     <title>meal-order-user-history test</title>
 
-    <link rel="import" href="../../../src/mealorder/shell/meal-order-app-namespace.html">
     <script src="../../../bower_components/webcomponentsjs/webcomponents-loader.js"></script>
     <script src="../../../bower_components/web-component-tester/browser.js"></script>
     <script src="../../../node_modules/redux/dist/redux.js"></script>
     <script src="../test_variables.js"></script>
+    <link rel="import" href="../../../src/mealorder/shell/meal-order-app-namespace.html">
     <link rel="import" href="../../../src/mealorder/history/meal-order-user-history.html">
-
 </head>
 <body>
 
@@ -63,7 +61,6 @@
             assert.equal(component.currentHistory.order[0].dishes[0].title, "Борщ украинский");
             assert.equal(component.currentHistory.order[0].dishes[0].price, PRICE);
             assert.equal(component.currentHistory.order[0].dishes[0].quantity, QUANTITY);
-
         });
 
         test('should calculate the total price of the order', function () {

From 3f10dfdd65e4768a97e53403a0a41bf26639617e Mon Sep 17 00:00:00 2001
From: Paul Ageyev <paulageyev@gmail.com>
Date: Tue, 1 May 2018 14:50:15 +0300
Subject: [PATCH 250/253] Remove duplicated observer

---
 client/user/src/mealorder/meal-order-client-app.html | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/client/user/src/mealorder/meal-order-client-app.html b/client/user/src/mealorder/meal-order-client-app.html
index e825ce99..90101d2e 100644
--- a/client/user/src/mealorder/meal-order-client-app.html
+++ b/client/user/src/mealorder/meal-order-client-app.html
@@ -167,12 +167,6 @@
                     }
                 }
 
-                static get observers() {
-                    return [
-                        '_pageChanged(routeData.page)'
-                    ];
-                }
-
                 static get actions() {
                     return {
                         addDishToOrder: order => ({
@@ -198,7 +192,6 @@
                     this.$.drawer.toggle();
                 }
 
-
                 _pageChanged() {
                     const DATE_LENGTH = 10;
                     if (!this.routeData.page || (this.routeData.page.startsWith("menu") && !this.routeData.date)) {

From e5186d18fa952b090e3286528f13ca45429c549c Mon Sep 17 00:00:00 2001
From: Paul <paulageyev@gmail.com>
Date: Wed, 2 May 2018 12:45:38 +0300
Subject: [PATCH 251/253] Add docs

---
 .../mealorder/menu/meal-order-vendor-menu.html  |  6 ++----
 .../mealorder/menu/meal-order-vendor-menus.html | 17 +++++++++++++++--
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/client/user/src/mealorder/menu/meal-order-vendor-menu.html b/client/user/src/mealorder/menu/meal-order-vendor-menu.html
index 0c33427c..be9e0d07 100644
--- a/client/user/src/mealorder/menu/meal-order-vendor-menu.html
+++ b/client/user/src/mealorder/menu/meal-order-vendor-menu.html
@@ -98,6 +98,7 @@
                 }
             }
         </style>
+
         <div class="header">
             <paper-item on-click="_toggle" class="menu-caption">
                 <div class="menu-caption">
@@ -164,15 +165,12 @@
                         /**
                          * Fired on `add-button` click.
                          *
-                         * @action `dish-added`
+                         * @event `dish-added`
                          * @param {dish} contains vendor, category and dish title
                          */
 
                         /**
                          * Menu of a vendor.
-                         *
-                         * @property name is name of a vendor.
-                         * @property {array} categories list of categories with dishes.
                          */
                         menu: {
                             type: Object
diff --git a/client/user/src/mealorder/menu/meal-order-vendor-menus.html b/client/user/src/mealorder/menu/meal-order-vendor-menus.html
index 1914371f..67a1a6ab 100644
--- a/client/user/src/mealorder/menu/meal-order-vendor-menus.html
+++ b/client/user/src/mealorder/menu/meal-order-vendor-menus.html
@@ -124,9 +124,22 @@
                          */
 
                         /**
-                         * Full menu for day.
+                         * Menu for a current day.
                          *
-                         * @property {{name:String vendor name, categories:array a menu of a vendor for a day}}.
+                         * @typedef {Object} Menu the menu for the current date
+                         *
+                         * @property {String} vendor a vendor name
+                         *
+                         * @typedef {Object} Date contains day, month, year
+                         * @property {Number} day
+                         * @property {Number} month
+                         * @property {Number} year
+                         *
+                         * @typedef {Array} Categories array contains the category name and dishes
+                         * @typedef {Array} Dishes array contains the dish title, price, quantity
+                         * @property {String} title
+                         * @property {String} price
+                         * @property {String} quantity
                          */
                         menuForDay: {
                             type: Array,

From 7ea7e7b92cadc63e28f099723a1889921b986e5d Mon Sep 17 00:00:00 2001
From: Paul <paulageyev@gmail.com>
Date: Wed, 2 May 2018 12:50:21 +0300
Subject: [PATCH 252/253] Add docs for a user's order

---
 .../src/mealorder/menu/meal-order-user-cart.html | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/client/user/src/mealorder/menu/meal-order-user-cart.html b/client/user/src/mealorder/menu/meal-order-user-cart.html
index 669823db..9256d98a 100644
--- a/client/user/src/mealorder/menu/meal-order-user-cart.html
+++ b/client/user/src/mealorder/menu/meal-order-user-cart.html
@@ -79,7 +79,21 @@
                         },
 
                         /**
-                         * Array to be displayed in a user's order.
+                         * Current user's meal order.
+                         *
+                         * @typedef {Object} Order the current order
+                         *
+                         * @typedef {Object} Date contains day, month, year
+                         * @property {Number} day
+                         * @property {Number} month
+                         * @property {Number} year
+                         *
+                         * @typedef {Array} Cart array that contains the vendor and dishes
+                         * @property {String} vendor a vendor name
+                         * @typedef {Array} Dishes array contains the dish title, price, quantity
+                         * @property {String} title
+                         * @property {String} price
+                         * @property {String} quantity
                          */
                         currentOrder: {
                             type: Array,

From b61841b7e898eff1dc67c7ddaa8f942cbcee32ea Mon Sep 17 00:00:00 2001
From: Paul <paulageyev@gmail.com>
Date: Wed, 2 May 2018 12:52:23 +0300
Subject: [PATCH 253/253] Add docs for a user history

---
 .../history/meal-order-user-history.html        | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/client/user/src/mealorder/history/meal-order-user-history.html b/client/user/src/mealorder/history/meal-order-user-history.html
index ff45f2a9..3763c793 100644
--- a/client/user/src/mealorder/history/meal-order-user-history.html
+++ b/client/user/src/mealorder/history/meal-order-user-history.html
@@ -163,7 +163,22 @@
                         },
 
                         /**
-                         * An array containing items to be displayed.
+                         * User's history for a current day.
+                         *
+                         * @typedef {Object} Menu the menu for the current date
+                         *
+                         * @property {String} vendor a vendor name
+                         *
+                         * @typedef {Object} Date contains day, month, year
+                         * @property {Number} day
+                         * @property {Number} month
+                         * @property {Number} year
+                         *
+                         * @typedef {Array} Categories array contains the category name and dishes
+                         * @typedef {Array} Dishes array contains the dish title, price, quantity
+                         * @property {String} title
+                         * @property {String} price
+                         * @property {String} quantity
                          */
                         currentHistory: {
                             type: Object,