Merge pull request #164 from offen/development

Replace jquery with vue

homepage/theme/static/css/fix.css

@@ -698,6 +698,12 @@ nav ul li ul li a {
 @media only screen and (max-width: 60rem) {
   .nav-list {
     margin: 0;
+    height: 0;
+    overflow: hidden;
+    transition: all .6s;
+  }
+  .nav-list.active {
+    height: 280px;
   }
   .nav-mobile {
     display: block;
@@ -707,9 +713,6 @@ nav ul li ul li a {
     padding: 0;
     padding-top: 4rem;
   }
-  nav ul {
-    display: none;
-  }
   nav ul li {
     float: none;
   }

homepage/theme/static/scripts/fade.js

@@ -1,10 +1,13 @@
-;(function ($) {
+new window.Vue({ // eslint-disable-line no-new
-  $(document).ready(function () {
+  el: 'body.index .icon',
-    $(window).scroll(function () {
+  data: {
-      if ($(window).width() > 480) {
+    progress: 0
-        var scrollProgress = parseInt($(window).scrollTop(), 10)
+  },
-        $('body.index .icon').css('opacity', Math.min(scrollProgress / 100, 1))
+  mounted: function () {
-      }
+    var self = this
+    window.addEventListener('scroll', function () {
+      var scrollTop = parseInt(window.document.documentElement.scrollTop, 10)
+      self.progress = Math.min(scrollTop / 100, 1)
     })
-  })
+  }
-})(window.jQuery)
+})

homepage/theme/static/scripts/menu.js

@@ -1,16 +1,11 @@
-;(function ($) {
+new window.Vue({ // eslint-disable-line no-new
-  $(function () {
+  el: '#navigation',
-    $('nav ul li a:not(:only-child)').click(function (e) {
+  data: {
-      $(this).siblings('.nav-dropdown').toggle()
+    active: false
-      $('.dropdown').not($(this).siblings()).hide()
+  },
-      e.stopPropagation()
+  methods: {
-    })
+    toggle: function () {
-    $('html').click(function () {
+      this.active = !this.active
-      $('.nav-dropdown').hide()
+    }
-    })
+  }
-    $('#nav-toggle').click(function () {
+})
-      $(this).closest('nav').find('ul').slideToggle()
-      $(this).toggleClass('active')
-    })
-  })
-})(window.jQuery)

homepage/theme/templates/base.html

@@ -6,7 +6,7 @@
       {% block title %}{{ title }}{% endblock %}
     </title>
     <meta charset="UTF-8">
-    <meta http-equiv="Content-Security-Policy" content="default-src 'self'; script-src 'self' *.offen.dev; frame-src 'self' *.offen.dev; style-src 'self' 'unsafe-inline'">
+    <meta http-equiv="Content-Security-Policy" content="default-src 'self'; script-src 'self' 'unsafe-eval' *.offen.dev; frame-src 'self' *.offen.dev; style-src 'self' 'unsafe-inline'">
     <meta name="referrer" content="origin">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=5">
@@ -41,16 +41,20 @@
     <div class="menu w-100 cclr-bg-yellow-mid">
       <section class="nav-bar">
         <div class="nav-container">
-          <div class="icon flex">
+          <div class="icon flex" v-bind:style="{ opacity: progress }">
             <a class="link dim" href="/"><img src="/theme/images/offen-icon-white.svg" alt="Offen logo" width="37" height="40" class="logo"></a>
             <header>
               <a class="link dim" href="/"><p class="fLogo normal ma0 ml2 white">Offen</p></a>
             </header>
           </div>
           {% if not funnel %}
-            <nav>
+            <nav id="navigation">
-              <div class="nav-mobile"><span id="nav-toggle"><span></span></span></div>
+              <div class="nav-mobile">
-              <ul class="nav-list">
+                <span id="nav-toggle" v-on:click="toggle" v-bind:class="{ active: active }">
+                  <span></span>
+                </span>
+              </div>
+              <ul class="nav-list" v-bind:class="{ active: active }">
                 {% if not index %}
                 <li>
                   <a class="b link dim cclr-fnt-black-mid" href="/">Summary</a>
@@ -323,7 +327,7 @@
     </footer>
   </div>
   {% block scripts %}
-    {% assets filters="rjsmin", output="scripts/packed.js", "scripts/jquery-3.4.1.min.js", "scripts/menu.js", "scripts/fade.js" %}
+    {% assets filters="rjsmin", output="scripts/packed.js", "scripts/vue.min.js", "scripts/menu.js", "scripts/fade.js" %}
       <script src="/{{ ASSET_URL }}"></script>
     {% endassets %}
   {% endblock %}