diff --git a/package.json b/package.json index cf3a53a..229943e 100644 --- a/package.json +++ b/package.json @@ -6,13 +6,14 @@ "scripts": { "test": "echo \"Error: no test specified\" && exit 1", "build:cljs": "shadow-cljs release app", - "build:sass": "node-sass --output-style compressed sass/app.sass public/app/style.css | sed 's/^/sass - /'", - "build": "rm -r public/app/*; run-p build:*; sed -i '' 's/\"\\/app\\//\".\\/app\\//g' public/index.html", + "build:html": "sed 's/\"\\/app\\//\".\\/app\\//g' src/html/index.html > public/index.html", + "build:sass": "node-sass --output-style compressed src/sass/app.sass public/app/style.css", + "build": "rm -r public/*; run-p build:*; ", "deploy": "npm run build && gh-pages -d public", "dev:cljs": "shadow-cljs watch app", - "dev:sass": "{ node-sass sass/app.sass public/app/style.css; node-sass -w sass/app.sass public/app/style.css; } | sed 's/^/sass - /'", - "dev": "sed -i '' 's/\"\\.\\/app\\//\"\\/app\\//g' public/index.html; run-p dev:*", - "deploy": "npm rum build && gh-pages -d public" + "dev:html": "sed 's/\"\\.\\/app\\//\"\\/app\\//g' src/html/index.html > public/index.html", + "dev:sass": "npm run build:sass; node-sass -w src/sass/app.sass public/app/style.css", + "dev": "run-p dev:*" }, "author": "Arne Schlüter", "license": "ISC", diff --git a/public/index.html b/public/index.html index 87b1c91..909eb32 100644 --- a/public/index.html +++ b/public/index.html @@ -4,11 +4,11 @@ Airsonic - +
- + diff --git a/shadow-cljs.edn b/shadow-cljs.edn index c645180..354670d 100644 --- a/shadow-cljs.edn +++ b/shadow-cljs.edn @@ -1,6 +1,6 @@ ;; shadow-cljs configuration {:source-paths - ["src"] + ["src/cljs"] :dependencies [[reagent "0.7.0"] diff --git a/src/airsonic_ui/api.cljs b/src/cljs/airsonic_ui/api.cljs similarity index 100% rename from src/airsonic_ui/api.cljs rename to src/cljs/airsonic_ui/api.cljs diff --git a/src/airsonic_ui/audio.cljs b/src/cljs/airsonic_ui/audio.cljs similarity index 100% rename from src/airsonic_ui/audio.cljs rename to src/cljs/airsonic_ui/audio.cljs diff --git a/src/airsonic_ui/config.cljs b/src/cljs/airsonic_ui/config.cljs similarity index 100% rename from src/airsonic_ui/config.cljs rename to src/cljs/airsonic_ui/config.cljs diff --git a/src/airsonic_ui/core.cljs b/src/cljs/airsonic_ui/core.cljs similarity index 100% rename from src/airsonic_ui/core.cljs rename to src/cljs/airsonic_ui/core.cljs diff --git a/src/airsonic_ui/db.cljs b/src/cljs/airsonic_ui/db.cljs similarity index 100% rename from src/airsonic_ui/db.cljs rename to src/cljs/airsonic_ui/db.cljs diff --git a/src/airsonic_ui/events.cljs b/src/cljs/airsonic_ui/events.cljs similarity index 100% rename from src/airsonic_ui/events.cljs rename to src/cljs/airsonic_ui/events.cljs diff --git a/src/airsonic_ui/routes.cljs b/src/cljs/airsonic_ui/routes.cljs similarity index 100% rename from src/airsonic_ui/routes.cljs rename to src/cljs/airsonic_ui/routes.cljs diff --git a/src/airsonic_ui/subs.cljs b/src/cljs/airsonic_ui/subs.cljs similarity index 100% rename from src/airsonic_ui/subs.cljs rename to src/cljs/airsonic_ui/subs.cljs diff --git a/src/airsonic_ui/views.cljs b/src/cljs/airsonic_ui/views.cljs similarity index 100% rename from src/airsonic_ui/views.cljs rename to src/cljs/airsonic_ui/views.cljs diff --git a/src/airsonic_ui/views/album.cljs b/src/cljs/airsonic_ui/views/album.cljs similarity index 100% rename from src/airsonic_ui/views/album.cljs rename to src/cljs/airsonic_ui/views/album.cljs diff --git a/src/airsonic_ui/views/bottom_bar.cljs b/src/cljs/airsonic_ui/views/bottom_bar.cljs similarity index 100% rename from src/airsonic_ui/views/bottom_bar.cljs rename to src/cljs/airsonic_ui/views/bottom_bar.cljs diff --git a/src/airsonic_ui/views/breadcrumbs.cljs b/src/cljs/airsonic_ui/views/breadcrumbs.cljs similarity index 100% rename from src/airsonic_ui/views/breadcrumbs.cljs rename to src/cljs/airsonic_ui/views/breadcrumbs.cljs diff --git a/src/airsonic_ui/views/cover.cljs b/src/cljs/airsonic_ui/views/cover.cljs similarity index 100% rename from src/airsonic_ui/views/cover.cljs rename to src/cljs/airsonic_ui/views/cover.cljs diff --git a/src/airsonic_ui/views/login.cljs b/src/cljs/airsonic_ui/views/login.cljs similarity index 100% rename from src/airsonic_ui/views/login.cljs rename to src/cljs/airsonic_ui/views/login.cljs diff --git a/src/airsonic_ui/views/song.cljs b/src/cljs/airsonic_ui/views/song.cljs similarity index 100% rename from src/airsonic_ui/views/song.cljs rename to src/cljs/airsonic_ui/views/song.cljs diff --git a/src/html/index.html b/src/html/index.html new file mode 100644 index 0000000..87b1c91 --- /dev/null +++ b/src/html/index.html @@ -0,0 +1,14 @@ + + + + + + Airsonic + + + +
+ + + + diff --git a/sass/app.sass b/src/sass/app.sass similarity index 86% rename from sass/app.sass rename to src/sass/app.sass index bdd1e5f..b9bbd35 100644 --- a/sass/app.sass +++ b/src/sass/app.sass @@ -1,4 +1,4 @@ -@import "../node_modules/bulma/bulma" +@import "../../node_modules/bulma/bulma" .progress.is-tiny height: 0.25rem