Merge branch 'master' of gitlab.com:lilschool/site into feature/packages-page-1-08-19

project/settings.py

@@ -196,11 +196,9 @@ LOGGING = {
             'class': 'logging.StreamHandler',
             'formatter': 'verbose',
         },
-        'log_file': {
+        'sentry': {
-            'level': 'DEBUG',
+            'level': 'WARNING',
-            'filters': ['require_debug_true'],
+            'class': 'raven.contrib.django.raven_compat.handlers.SentryHandler',
-            'class': 'logging.StreamHandler',
-            'formatter': 'verbose',
         },
     },
     'loggers': {
@@ -216,22 +214,12 @@ LOGGING = {
             'handlers': ['console', ],
         },
         '': {
-            'handlers': ['console', 'log_file',],
+            'handlers': ['sentry',],
             'level': "INFO",
         },
     }
 }
 
-if os.path.exists(os.path.join(BASE_DIR, '/media/logs')):
-    LOGGING['handlers']['log_file'] = {
-        'level': 'INFO',
-        'class': 'logging.handlers.RotatingFileHandler',
-        'filename': 'media/logs/main.log',
-        'maxBytes': 1024 * 1024 * 15,  # 5 MB
-        'backupCount': 7,
-        'formatter': 'verbose',
-        'filters': ['require_debug_false'],
-    }
 
 # Static files (CSS, JavaScript, Images)
 # https://docs.djangoproject.com/en/2.0/howto/static-files/

project/templates/blocks/lil_store_js.html

@@ -39,12 +39,13 @@
       isGiftCertificateUrl: {{ is_gift_certificate_url|yesno:"true,false" }},
     },
     data: {},
-    urlIs: (urlPatternNames) => {
+    urlIs: function(urlPatternNames) {
         if(! Array.isArray(urlPatternNames)){
             urlPatternNames = [urlPatternNames];
         }
-        return urlPatternNames.filter(
+        return urlPatternNames.filter(function(urlPatternName){
-          urlPatternName => window.location.pathname.search(window.LIL_STORE.urls[urlPatternName]) > -1).length > 0;
+          return window.location.pathname.search(window.LIL_STORE.urls[urlPatternName]) > -1;
+        }).length > 0;
     },
     isIndexPage: window.location.pathname == '/',
   };

project/templates/lilcity/layer.html

@@ -48,68 +48,69 @@
         }
     </script>
 
-    <!-- Facebook Pixel Code -->
-    <script>
-      !function(f,b,e,v,n,t,s)
-      {if(f.fbq)return;n=f.fbq=function(){n.callMethod?
-      n.callMethod.apply(n,arguments):n.queue.push(arguments)};
-      if(!f._fbq)f._fbq=n;n.push=n;n.loaded=!0;n.version='2.0';
-      n.queue=[];t=b.createElement(e);t.async=!0;
-      t.src=v;s=b.getElementsByTagName(e)[0];
-      s.parentNode.insertBefore(t,s)}(window,document,'script',
-      'https://connect.facebook.net/en_US/fbevents.js');
-        fbq('init', '194961257900508');
-      fbq('track', 'PageView');
-    </script>
-    <noscript>
-      <img height="1" width="1"
-      src="https://www.facebook.com/tr?id=194961257900508&ev=PageView
-      &noscript=1"/>
-    </noscript>
-    <!-- End Facebook Pixel Code -->
-    <!-- Global site tag (gtag.js) - Google Ads: 808701460 -->
-    <script async src="https://www.googletagmanager.com/gtag/js?id=UA-121923960-1"></script>
-    <script>
-       window.dataLayer = window.dataLayer || [];
-       function gtag(){dataLayer.push(arguments);}
-       gtag('js', new Date());
-       //gtag('config', 'AW-808701460');
-       gtag('config', 'UA-121923960-1');
-    </script>
-    <!-- Yandex.Metrika counter -->
-    <script type="text/javascript" >
-        (function (d, w, c) {
-            (w[c] = w[c] || []).push(function() {
-                try {
-                    w.yaCounter49354039 = new Ya.Metrika2({
-                        id:49354039,
-                        clickmap:true,
-                        trackLinks:true,
-                        accurateTrackBounce:true,
-                        webvisor:true
-                    });
-                } catch(e) { }
-            });
 
-            var n = d.getElementsByTagName("script")[0],
-                s = d.createElement("script"),
-                f = function () { n.parentNode.insertBefore(s, n); };
-            s.type = "text/javascript";
-            s.async = true;
-            s.src = "https://mc.yandex.ru/metrika/tag.js";
-
-            if (w.opera == "[object Opera]") {
-                d.addEventListener("DOMContentLoaded", f, false);
-            } else { f(); }
-        })(document, window, "yandex_metrika_callbacks2");
-    </script>
-    <noscript><div><img src="https://mc.yandex.ru/watch/49354039" style="position:absolute; left:-9999px;" alt="" /></div></noscript>
-    <!-- /Yandex.Metrika counter -->
-    {% include "templates/blocks/mixpanel.html" %}
     {% block layer_head %}{% endblock layer_head %}
   </head>
   <body>
     {% block layer_body %}
     {% endblock layer_body %}
+    <!-- Facebook Pixel Code -->
+      <script>
+        !function(f,b,e,v,n,t,s)
+        {if(f.fbq)return;n=f.fbq=function(){n.callMethod?
+        n.callMethod.apply(n,arguments):n.queue.push(arguments)};
+        if(!f._fbq)f._fbq=n;n.push=n;n.loaded=!0;n.version='2.0';
+        n.queue=[];t=b.createElement(e);t.async=!0;
+        t.src=v;s=b.getElementsByTagName(e)[0];
+        s.parentNode.insertBefore(t,s)}(window,document,'script',
+        'https://connect.facebook.net/en_US/fbevents.js');
+          fbq('init', '194961257900508');
+        fbq('track', 'PageView');
+      </script>
+      <noscript>
+        <img height="1" width="1"
+        src="https://www.facebook.com/tr?id=194961257900508&ev=PageView
+        &noscript=1"/>
+      </noscript>
+      <!-- End Facebook Pixel Code -->
+      <!-- Global site tag (gtag.js) - Google Ads: 808701460 -->
+      <script async src="https://www.googletagmanager.com/gtag/js?id=UA-121923960-1"></script>
+      <script>
+         window.dataLayer = window.dataLayer || [];
+         function gtag(){dataLayer.push(arguments);}
+         gtag('js', new Date());
+         //gtag('config', 'AW-808701460');
+         gtag('config', 'UA-121923960-1');
+      </script>
+      <!-- Yandex.Metrika counter -->
+      <script type="text/javascript" >
+          (function (d, w, c) {
+              (w[c] = w[c] || []).push(function() {
+                  try {
+                      w.yaCounter49354039 = new Ya.Metrika2({
+                          id:49354039,
+                          clickmap:true,
+                          trackLinks:true,
+                          accurateTrackBounce:true,
+                          webvisor:true
+                      });
+                  } catch(e) { }
+              });
+
+              var n = d.getElementsByTagName("script")[0],
+                  s = d.createElement("script"),
+                  f = function () { n.parentNode.insertBefore(s, n); };
+              s.type = "text/javascript";
+              s.async = true;
+              s.src = "https://mc.yandex.ru/metrika/tag.js";
+
+              if (w.opera == "[object Opera]") {
+                  d.addEventListener("DOMContentLoaded", f, false);
+              } else { f(); }
+          })(document, window, "yandex_metrika_callbacks2");
+      </script>
+      <noscript><div><img src="https://mc.yandex.ru/watch/49354039" style="position:absolute; left:-9999px;" alt="" /></div></noscript>
+      <!-- /Yandex.Metrika counter -->
+      {% include "templates/blocks/mixpanel.html" %}
   </body>
 </html>