diff --git a/mstream.js b/mstream.js index 1636437..d28a884 100755 --- a/mstream.js +++ b/mstream.js @@ -1,7 +1,6 @@ const winston = require('winston'); const express = require('express'); const fs = require('fs'); -const path = require('path'); const bodyParser = require('body-parser'); const jukebox = require('./modules/jukebox.js'); @@ -56,7 +55,6 @@ exports.serveIt = async configFile => { }); // Give access to public folder - mstream.use('/public', express.static(path.join(__dirname, 'public'))); mstream.use('/', express.static(config.program.webAppDirectory)); // JukeBox diff --git a/public/img/default.png b/webapp/assets/img/default.png similarity index 100% rename from public/img/default.png rename to webapp/assets/img/default.png diff --git a/public/img/drag-handle.svg b/webapp/assets/img/drag-handle.svg similarity index 100% rename from public/img/drag-handle.svg rename to webapp/assets/img/drag-handle.svg diff --git a/public/img/folder.svg b/webapp/assets/img/folder.svg similarity index 100% rename from public/img/folder.svg rename to webapp/assets/img/folder.svg diff --git a/public/img/loading.gif b/webapp/assets/img/loading.gif similarity index 100% rename from public/img/loading.gif rename to webapp/assets/img/loading.gif diff --git a/public/img/mstream-icon.svg b/webapp/assets/img/mstream-icon.svg similarity index 100% rename from public/img/mstream-icon.svg rename to webapp/assets/img/mstream-icon.svg diff --git a/public/img/mstream-logo.png b/webapp/assets/img/mstream-logo.png old mode 100755 new mode 100644 similarity index 100% rename from public/img/mstream-logo.png rename to webapp/assets/img/mstream-logo.png diff --git a/public/img/mstream-logo.svg b/webapp/assets/img/mstream-logo.svg similarity index 100% rename from public/img/mstream-logo.svg rename to webapp/assets/img/mstream-logo.svg diff --git a/public/img/music-note.svg b/webapp/assets/img/music-note.svg similarity index 100% rename from public/img/music-note.svg rename to webapp/assets/img/music-note.svg diff --git a/public/img/pause-white.svg b/webapp/assets/img/pause-white.svg similarity index 100% rename from public/img/pause-white.svg rename to webapp/assets/img/pause-white.svg diff --git a/public/img/play-white.svg b/webapp/assets/img/play-white.svg similarity index 100% rename from public/img/play-white.svg rename to webapp/assets/img/play-white.svg diff --git a/public/img/spinner.svg b/webapp/assets/img/spinner.svg similarity index 100% rename from public/img/spinner.svg rename to webapp/assets/img/spinner.svg diff --git a/public/img/star.svg b/webapp/assets/img/star.svg similarity index 100% rename from public/img/star.svg rename to webapp/assets/img/star.svg diff --git a/public/img/struckaxiom.png b/webapp/assets/img/struckaxiom.png old mode 100755 new mode 100644 similarity index 100% rename from public/img/struckaxiom.png rename to webapp/assets/img/struckaxiom.png diff --git a/public/img/struckaxiom_@2X.png b/webapp/assets/img/struckaxiom_@2X.png old mode 100755 new mode 100644 similarity index 100% rename from public/img/struckaxiom_@2X.png rename to webapp/assets/img/struckaxiom_@2X.png diff --git a/public/img/volume-mute.svg b/webapp/assets/img/volume-mute.svg similarity index 100% rename from public/img/volume-mute.svg rename to webapp/assets/img/volume-mute.svg diff --git a/public/img/volume.svg b/webapp/assets/img/volume.svg similarity index 100% rename from public/img/volume.svg rename to webapp/assets/img/volume.svg diff --git a/webapp/assets/js/mstream.js b/webapp/assets/js/mstream.js index b5be2f7..1a88fcf 100644 --- a/webapp/assets/js/mstream.js +++ b/webapp/assets/js/mstream.js @@ -34,7 +34,7 @@ function createFileplaylistHtml(dataDirectory) { } function createMusicfileHtml(fileLocation, title, titleClass) { - return '