Finish re-org

jsakas · May 19, 2019 · a6e894a · a6e894a
1 parent bb62030
commit a6e894a
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 8 deletions.
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -129,7 +129,7 @@
         "max-params": "off",
         "max-statements": "off",
         "max-statements-per-line": "error",
-        "multiline-ternary": "error",
+        "multiline-ternary": "off",
         "new-cap": "error",
         "new-parens": "error",
         "newline-after-var": "off",
@@ -203,7 +203,7 @@
         "no-shadow": "error",
         "no-shadow-restricted-names": "error",
         "no-spaced-func": "error",
-        "no-sync": "error",
+        "no-sync": "off",
         "no-tabs": "error",
         "no-template-curly-in-string": "error",
         "no-ternary": "off",

diff --git a/entry/main.js b/entry/main.js
@@ -1,7 +1,6 @@
 import Vue from 'vue';
 
 import Subtractor from 'core/Subtractor';
-import EnvelopeGraph from 'core/envelope/EnvelopeGraph';
 import initQwertyController from 'core/qwerty';
 import MidiController from 'core/midi';
 import { loadPresetFile, savePresetFile } from 'core/preset';
@@ -11,6 +10,7 @@ import { knobToFreq } from 'core/utils/maths';
 import presets from 'presets';
 import defaultPreset from 'presets/default';
 
+import EnvelopeGraph from 'ui/env-graph';
 import initOscilloscope from 'ui/oscilloscope';
 import 'ui/fader';
 import 'ui/knob';

diff --git a/ui/button/Button.scss b/ui/button/Button.scss
@@ -1,5 +1,5 @@
-@import '../style/theme';
-@import '../style/mixins';
+@import 'style/theme';
+@import 'style/mixins';
 
 .button {
   @include control;

diff --git a/ui/button/index.js b/ui/button/index.js
@@ -0,0 +1 @@
+module.exports = require('./Button');
diff --git a/core/envelope/EnvelopeGraph.js → ui/env-graph/EnvelopeGraph.js b/core/envelope/EnvelopeGraph.js → ui/env-graph/EnvelopeGraph.js
@@ -1,5 +1,7 @@
 
-class EnvelopeGraph {
+import { knobToAttack, knobToDecay, knobToRelease } from 'core/utils/maths';
+
+export default class EnvelopeGraph {
     constructor(envelope, canvas) {
       this.envelope = envelope;
       this.canvas = canvas;
@@ -65,5 +67,3 @@ class EnvelopeGraph {
       this.canvas.setAttribute('height', this.height);
     }
 }
-
-export default EnvelopeGraph;
diff --git a/ui/env-graph/index.js b/ui/env-graph/index.js
@@ -0,0 +1 @@
+module.exports = require('./EnvelopeGraph');