Move local jquery and normalize files to standard assets dir. Update …

…lint settings to ignore them.
HyphaApp · May 20, 2019 · 905e00c · 905e00c
1 parent 66c7deb
commit 905e00c
Show file tree

Hide file tree

Showing 7 changed files with 152 additions and 92 deletions.
diff --git a/.eslintignore b/.eslintignore
@@ -0,0 +1 @@
+*.min.js
diff --git a/.eslintrc b/.eslintrc
diff --git a/.eslintrc.yaml b/.eslintrc.yaml
@@ -0,0 +1,146 @@
+extends: eslint:recommended
+env:
+  browser: true
+  commonjs: true
+  es6: true
+globals:
+  jQuery: true
+rules:
+  array-bracket-spacing:
+  - "error"
+  - never
+  block-scoped-var: "error"
+  brace-style:
+  - "error"
+  - stroustrup
+  - allowSingleLine: true
+  comma-dangle:
+  - "error"
+  - never
+  comma-spacing: "error"
+  comma-style:
+  - "error"
+  - last
+  computed-property-spacing:
+  - "error"
+  - never
+  curly:
+  - "error"
+  - all
+  eol-last: "error"
+  eqeqeq:
+  - "error"
+  - smart
+  guard-for-in: "error"
+  indent:
+  - "error"
+  - 4
+  - SwitchCase: 1
+  key-spacing:
+  - "error"
+  - beforeColon: false
+    afterColon: true
+  keyword-spacing:
+  - "error"
+  - before: true
+    after: true
+  linebreak-style:
+  - "error"
+  - unix
+  lines-around-comment:
+  - "error"
+  - beforeBlockComment: true
+    afterBlockComment: false
+  new-parens: "error"
+  no-array-constructor: "error"
+  no-caller: "error"
+  no-catch-shadow: "error"
+  no-eval: "error"
+  no-extend-native: "error"
+  no-extra-bind: "error"
+  no-extra-parens:
+  - "error"
+  - functions
+  no-implied-eval: "error"
+  no-iterator: "error"
+  no-label-var: "error"
+  no-labels: "error"
+  no-lone-blocks: "error"
+  no-loop-func: "error"
+  no-multi-spaces: "error"
+  no-multi-str: "error"
+  no-native-reassign: "error"
+  no-nested-ternary: "error"
+  no-new-func: "error"
+  no-new-object: "error"
+  no-new-wrappers: "error"
+  no-octal-escape: "error"
+  no-process-exit: "error"
+  no-proto: "error"
+  no-return-assign: "error"
+  no-script-url: "error"
+  no-sequences: "error"
+  no-shadow-restricted-names: "error"
+  no-spaced-func: "error"
+  no-trailing-spaces: "error"
+  no-undef-init: "error"
+  no-undefined: "error"
+  no-unused-expressions: "error"
+  no-unused-vars:
+  - "error"
+  - vars: all
+    args: none
+  no-with: "error"
+  object-curly-spacing:
+  - "error"
+  - never
+  one-var:
+  - "error"
+  - never
+  quote-props:
+  - "error"
+  - consistent-as-needed
+  quotes:
+  - "error"
+  - single
+  - avoid-escape
+  semi:
+  - "error"
+  - always
+  semi-spacing:
+  - "error"
+  - before: false
+    after: true
+  space-before-blocks:
+  - "error"
+  - always
+  space-before-function-paren:
+  - "error"
+  - anonymous: always
+    named: never
+  space-in-parens:
+  - "error"
+  - never
+  space-infix-ops: "error"
+  space-unary-ops:
+  - "error"
+  - words: true
+    nonwords: false
+  spaced-comment:
+  - "error"
+  - always
+  strict:
+  - "error"
+  - function
+  yoda:
+  - "error"
+  - never
+  max-nested-callbacks:
+  - "warn"
+  - 3
+  valid-jsdoc:
+  - "warn"
+  - prefer:
+      returns: return
+      property: prop
+    requireReturn: false
diff --git a/public/jquery.min.js → ...h/static_src/src/javascript/jquery.min.js b/public/jquery.min.js → ...h/static_src/src/javascript/jquery.min.js
diff --git a/public/normalize.css → opentech/static_src/src/sass/normalize.scss b/public/normalize.css → opentech/static_src/src/sass/normalize.scss
@@ -1,3 +1,4 @@
+// sass-lint:disable-all
 /*! normalize.css v8.0.1 | MIT License | github.com/necolas/normalize.css */
 
 /* Document

diff --git a/opentech/templates/base-apply.html b/opentech/templates/base-apply.html
@@ -27,14 +27,14 @@
 
         <script>document.querySelector('html').classList.replace('no-js', 'js');</script>
 
-        <link rel="stylesheet" href="{% static 'normalize.css' %}">
+        <link rel="stylesheet" href="{% static 'css/normalize.css' %}">
         <link rel="stylesheet" href="{% static 'css/apply/main.css' %}">
         {# Hijack styling #}
         <link rel="stylesheet" href="{% static 'hijack/hijack-styles.css' %}" />
         {% block extra_css %}{% endblock %}
         <link rel="stylesheet" href="{% static 'css/print.css' %}" media="print">
 
-        <script src="{% static 'jquery.min.js' %}"></script>
+        <script src="{% static 'js/jquery.min.js' %}"></script>
     </head>
 
     <body class="{% block body_class %}light-grey-bg template-{{ page.get_verbose_name|slugify }}{% endblock %}">

diff --git a/opentech/templates/base.html b/opentech/templates/base.html
@@ -54,12 +54,12 @@
 
         <script>document.querySelector('html').classList.replace('no-js', 'js');</script>
 
-        <link rel="stylesheet" href="{% static 'normalize.css' %}">
+        <link rel="stylesheet" href="{% static 'css/normalize.css' %}">
         <link rel="stylesheet" href="{% static 'css/public/main.css' %}">
         {% block extra_css %}{% endblock %}
         <link rel="stylesheet" href="{% static 'css/print.css' %}" media="print">
 
-        <script src="{% static 'jquery.min.js' %}"></script>
+        <script src="{% static 'js/jquery.min.js' %}"></script>
     </head>
 
     <body class="{% block body_class %}template-{{ page.get_verbose_name|slugify }}{% endblock %}">