From e58546a412281c6f076d0a31bbb07f04fa7d2c9b Mon Sep 17 00:00:00 2001
From: Kristina Lim <kristinalim.ph@gmail.com>
Date: Sun, 14 Jul 2019 13:52:47 +0800
Subject: [PATCH] Move offcanvas menu content to separate partial

---
 app/views/shared/menu/_mobile_menu.html.haml  | 29 +------------------
 .../shared/menu/_offcanvas_menu.html.haml     | 28 ++++++++++++++++++
 2 files changed, 29 insertions(+), 28 deletions(-)
 create mode 100644 app/views/shared/menu/_offcanvas_menu.html.haml

diff --git a/app/views/shared/menu/_mobile_menu.html.haml b/app/views/shared/menu/_mobile_menu.html.haml
index 8bd1e071e6..5b8ca59f99 100644
--- a/app/views/shared/menu/_mobile_menu.html.haml
+++ b/app/views/shared/menu/_mobile_menu.html.haml
@@ -21,31 +21,4 @@
     %a{href: main_app.shop_path}
       {{ CurrentHub.hub.name }}
 
-%aside.left-off-canvas-menu.show-for-medium-down
-  %ul.off-canvas-list
-    %li.ofn-logo
-      %a{href: root_path}
-        %img{src: ContentConfig.logo_mobile.url, srcset: ContentConfig.logo_mobile_svg.url, width: "75", height: "26"}
-    - [*1..7].each do |menu_number|
-      - menu_name = "menu_#{menu_number}"
-      - if ContentConfig[menu_name].present?
-        %li.li-menu
-          %a{href: t("#{menu_name}_url") }
-            %span.nav-primary
-              %i{class: ContentConfig["#{menu_name}_icon_name"]}
-              = t "#{menu_name}_title"
-    - if OpenFoodNetwork::I18nConfig.selectable_locales.count > 1
-      %li.language-switcher.li-menu
-        %a
-          %i.ofn-i_071-globe
-          = t('language_name')
-        %ul
-          - OpenFoodNetwork::I18nConfig.selectable_locales.each do |l|
-            - if I18n.locale != l
-              %li
-                %a{href: "?locale=#{l.to_s}" }= t('language_name', locale: l)
-    %li
-    - if spree_current_user.nil?
-      = render 'shared/menu/signed_out'
-    - else
-      = render 'shared/menu/signed_in_offcanvas'
+= render partial: "shared/menu/offcanvas_menu" unless @hide_menu
diff --git a/app/views/shared/menu/_offcanvas_menu.html.haml b/app/views/shared/menu/_offcanvas_menu.html.haml
new file mode 100644
index 0000000000..eae59bae9f
--- /dev/null
+++ b/app/views/shared/menu/_offcanvas_menu.html.haml
@@ -0,0 +1,28 @@
+%aside.left-off-canvas-menu.show-for-medium-down
+  %ul.off-canvas-list
+    %li.ofn-logo
+      %a{href: root_path}
+        %img{src: ContentConfig.logo_mobile.url, srcset: ContentConfig.logo_mobile_svg.url, width: "75", height: "26"}
+    - [*1..7].each do |menu_number|
+      - menu_name = "menu_#{menu_number}"
+      - if ContentConfig[menu_name].present?
+        %li.li-menu
+          %a{href: t("#{menu_name}_url") }
+            %span.nav-primary
+              %i{class: ContentConfig["#{menu_name}_icon_name"]}
+              = t "#{menu_name}_title"
+    - if OpenFoodNetwork::I18nConfig.selectable_locales.count > 1
+      %li.language-switcher.li-menu
+        %a
+          %i.ofn-i_071-globe
+          = t('language_name')
+        %ul
+          - OpenFoodNetwork::I18nConfig.selectable_locales.each do |l|
+            - if I18n.locale != l
+              %li
+                %a{href: "?locale=#{l.to_s}" }= t('language_name', locale: l)
+    %li
+    - if spree_current_user.nil?
+      = render 'shared/menu/signed_out'
+    - else
+      = render 'shared/menu/signed_in_offcanvas'