Shuffle files

kevinkace · Mar 14, 2018 · a77750f · a77750f
1 parent 407bcfd
commit a77750f
Show file tree

Hide file tree

Showing 25 changed files with 39 additions and 37 deletions.
diff --git a/src/error/index.css → src/components/error/index.css b/src/error/index.css → src/components/error/index.css
@@ -1,4 +1,4 @@
-@value fontSerif from "../index.css";
+@value fontSerif from "../../index.css";
 
 .error {
     margin: 1em 0;

diff --git a/src/error/index.js → src/components/error/index.js b/src/error/index.js → src/components/error/index.js
@@ -1,6 +1,6 @@
 import m from "mithril";
 
-import state from "../state";
+import state from "../../state";
 
 import css from "./index.css";
 

diff --git a/src/header/index.css → src/components/header/index.css b/src/header/index.css → src/components/header/index.css
@@ -1,5 +1,5 @@
-@value * as colors from "../palette.css";
-@value animDur from "../index.css";
+@value * as colors from "../../palette.css";
+@value animDur from "../../index.css";
 
 .header {
     position: relative;
@@ -62,5 +62,5 @@
 }
 
 .title {
-    composes: title from "../index.css";
+    composes: title from "../../index.css";
 }
diff --git a/src/header/index.js → src/components/header/index.js b/src/header/index.js → src/components/header/index.js
@@ -1,13 +1,13 @@
 import m from "mithril";
 
-import state from "../state";
+import state from "../../state";
 
 import css from "./index.css";
 import tools from "../tools";
 
 import logo from "../icons/lyrite-logo.svg";
 
-import animResolve from "../lib/animResolve";
+import animResolve from "../../lib/animResolve";
 
 export default {
     oncreate : (vnode) => {

diff --git a/src/home/index.css → src/components/home/index.css b/src/home/index.css → src/components/home/index.css
@@ -1,5 +1,5 @@
-@value * as colors from "../palette.css";
-@value fontSans, fontSerif, animDur from "../index.css";
+@value * as colors from "../../palette.css";
+@value fontSans, fontSerif, animDur from "../../index.css";
 
 .home {
     padding: 1em 0.5em 0;
@@ -22,7 +22,7 @@
 }
 
 .title {
-    composes: title from "../index.css";
+    composes: title from "../../index.css";
 
     font-size: 3em;
     font-weight: bold;
@@ -91,7 +91,7 @@
 }
 
 .loadBtn {
-    composes: button from "../index.css";
+    composes: button from "../../index.css";
 
     color: #fff !important;
     --color: colors.cta;

diff --git a/src/home/index.js → src/components/home/index.js b/src/home/index.js → src/components/home/index.js
@@ -1,6 +1,6 @@
 import m from "mithril";
 
-import state from "../state";
+import state from "../../state";
 
 import css from "./index.css";
 

diff --git a/src/icons/github.svg → src/components/icons/github.svg b/src/icons/github.svg → src/components/icons/github.svg
diff --git a/src/icons/lyrite-logo.svg → src/components/icons/lyrite-logo.svg b/src/icons/lyrite-logo.svg → src/components/icons/lyrite-logo.svg
diff --git a/src/icons/quill.svg → src/components/icons/quill.svg b/src/icons/quill.svg → src/components/icons/quill.svg
diff --git a/src/layout/index.css → src/components/layout/index.css b/src/layout/index.css → src/components/layout/index.css
@@ -1,4 +1,4 @@
-@value animDur from "../index.css";
+@value animDur from "../../index.css";
 
 .github {
     display: block;

diff --git a/src/layout/index.js → src/components/layout/index.js b/src/layout/index.js → src/components/layout/index.js
@@ -1,6 +1,6 @@
 import m from "mithril";
 
-import state from "../state";
+import state from "../../state";
 
 import css from "./index.css";
 import header from "../header";

diff --git a/src/lyrics/edit.css → src/components/lyrics/edit.css b/src/lyrics/edit.css → src/components/lyrics/edit.css
@@ -1,4 +1,4 @@
-@value animDur from "../index.css";
+@value animDur from "../../index.css";
 
 .edit {
     position: absolute;

diff --git a/src/lyrics/edit.js → src/components/lyrics/edit.js b/src/lyrics/edit.js → src/components/lyrics/edit.js
@@ -1,9 +1,9 @@
 import m from "mithril";
 
-import state from "../state";
+import state from "../../state";
 
 import css from "./edit.css";
-import animResolve from "../lib/animResolve";
+import animResolve from "../../lib/animResolve";
 
 export default {
     onbeforeremove : (vnode) =>

diff --git a/src/lyrics/index.css → src/components/lyrics/index.css b/src/lyrics/index.css → src/components/lyrics/index.css
@@ -1,5 +1,5 @@
-@value * as colors from "../palette.css";
-@value animDur from "../index.css";
+@value * as colors from "../../palette.css";
+@value animDur from "../../index.css";
 
 .lyredit {
     position: relative;

diff --git a/src/lyrics/index.js → src/components/lyrics/index.js b/src/lyrics/index.js → src/components/lyrics/index.js
@@ -1,6 +1,6 @@
 import m from "mithril";
 
-import state from "../state";
+import state from "../../state";
 
 import css from "./index.css";
 import edit from "./edit";

diff --git a/src/modal/index.css → src/components/modal/index.css b/src/modal/index.css → src/components/modal/index.css
@@ -1,5 +1,5 @@
-@value * as colors from "../palette.css";
-@value animDur from "../index.css";
+@value * as colors from "../../palette.css";
+@value animDur from "../../index.css";
 
 .modal {
     position: fixed;

diff --git a/src/modal/index.js → src/components/modal/index.js b/src/modal/index.js → src/components/modal/index.js
@@ -1,7 +1,7 @@
 import m from "mithril";
 
-import state from "../state";
-import animResolve from "../lib/animResolve";
+import state from "../../state";
+import animResolve from "../../lib/animResolve";
 
 import css from "./index.css";
 import title from "./title";

diff --git a/src/modal/title.css → src/components/modal/title.css b/src/modal/title.css → src/components/modal/title.css
@@ -1,4 +1,4 @@
-@value * as colors from "../palette.css";
+@value * as colors from "../../palette.css";
 
 .label {
     display: block;
@@ -19,13 +19,13 @@
 }
 
 .add {
-    composes: button from "../index.css";
+    composes: button from "../../index.css";
 
     --color: colors.cta;
     color: #fff;
 }
 
 .cancel {
-    composes: button from "../index.css";
+    composes: button from "../../index.css";
     color: #999;
 }
diff --git a/src/modal/title.js → src/components/modal/title.js b/src/modal/title.js → src/components/modal/title.js
@@ -1,6 +1,6 @@
 import m from "mithril";
 
-import state from "../state";
+import state from "../../state";
 
 import css from "./title.css";
 

diff --git a/src/tools/index.css → src/components/tools/index.css b/src/tools/index.css → src/components/tools/index.css
@@ -1,5 +1,5 @@
-@value * as colors from "../palette.css";
-@value animDur from "../index.css";
+@value * as colors from "../../palette.css";
+@value animDur from "../../index.css";
 
 .tools {
     position: absolute;
@@ -64,7 +64,7 @@
 }
 
 .button {
-    composes: button from "../index.css";
+    composes: button from "../../index.css";
 
     font-family: monospace;
 }

diff --git a/src/tools/index.js → src/components/tools/index.js b/src/tools/index.js → src/components/tools/index.js
@@ -1,6 +1,6 @@
 import m from "mithril";
 
-import state from "../state";
+import state from "../../state";
 
 import css from "./index.css";
 import tooltipCss from "./tooltip.css";

diff --git a/src/tools/tooltip.css → src/components/tools/tooltip.css b/src/tools/tooltip.css → src/components/tools/tooltip.css
@@ -1,4 +1,4 @@
-@value * as colors from "../palette.css";
+@value * as colors from "../../palette.css";
 
 .tooltip {
     position: fixed;

diff --git a/src/lib/animResolve.js b/src/lib/animResolve.js
@@ -11,6 +11,7 @@ export default function(dom, className) {
 
             resd = true;
             rej(false);
+            console.log("anim resolve timeout");
         }, MAX_TIMEOUT);
 
         dom.addEventListener("animationend", () => {

diff --git a/src/routes.js b/src/routes.js
@@ -4,10 +4,10 @@ import m from "mithril";
 
 import state from "./state";
 
-import layout from "./layout";
-import lyrics from "./lyrics";
-import error from "./error";
-import home from "./home";
+import layout from "./components/layout";
+import lyrics from "./components/lyrics";
+import error from "./components/error";
+import home from "./components/home";
 
 export default {
     "/"      : {

diff --git a/src/state/song.js b/src/state/song.js
@@ -4,6 +4,7 @@ import slugify from "slugify";
 
 const titleSplit = "\n\n---\n\n";
 
+// todo: why require
 const songs = [
     require("../songs/smells-like-teen-spirit.txt"),
     require("../songs/judy-is-a-punk.txt"),