From 84dd2d7b9f0217c5faf9f21d2571ee56e48f7744 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kasper=20Rynning-T=C3=B8nnesen?= Date: Wed, 3 May 2017 18:37:16 +0200 Subject: [PATCH] Updated routing somewhat, so it should be possible to run the server without being in the correct folder --- server/{views => public}/assets/css/embed.css | 0 .../assets/css/materialize.min.css | 0 server/{views => public}/assets/css/style.css | 0 .../assets/dist/callback.min.js | 0 .../assets/dist/embed.min.js | 0 .../{views => public}/assets/dist/lib/aes.js | 0 .../assets/dist/lib/color-thief.js | 0 .../assets/dist/lib/jquery-2.1.3.min.js | 0 .../assets/dist/lib/jquery-ui-1.10.3.min.js | 0 .../dist/lib/jquery.ui.touch-punch.min.js | 0 .../assets/dist/lib/materialize.min.js | 0 .../assets/dist/lib/sha256.js | 0 .../assets/dist/lib/socket.io.min.js | 0 .../{views => public}/assets/dist/main.min.js | 0 .../assets/dist/remote.min.js | 0 .../assets/fonts/futura.woff | Bin .../assets/fonts/futura.woff2 | Bin .../fonts/material-design-icons/LICENSE.txt | 0 .../Material-Design-Icons.eot | Bin .../Material-Design-Icons.svg | 0 .../Material-Design-Icons.ttf | Bin .../Material-Design-Icons.woff | Bin .../Material-Design-Icons.woff2 | Bin .../assets/fonts/open_sans.woff | Bin .../assets/fonts/roboto/Roboto-Bold.ttf | Bin .../assets/fonts/roboto/Roboto-Bold.woff | Bin .../assets/fonts/roboto/Roboto-Bold.woff2 | Bin .../assets/fonts/roboto/Roboto-Light.ttf | Bin .../assets/fonts/roboto/Roboto-Light.woff | Bin .../assets/fonts/roboto/Roboto-Light.woff2 | Bin .../assets/fonts/roboto/Roboto-Medium.ttf | Bin .../assets/fonts/roboto/Roboto-Medium.woff | Bin .../assets/fonts/roboto/Roboto-Medium.woff2 | Bin .../assets/fonts/roboto/Roboto-Regular.ttf | Bin .../assets/fonts/roboto/Roboto-Regular.woff | Bin .../assets/fonts/roboto/Roboto-Regular.woff2 | Bin .../assets/fonts/roboto/Roboto-Thin.ttf | Bin .../assets/fonts/roboto/Roboto-Thin.woff | Bin .../assets/fonts/roboto/Roboto-Thin.woff2 | Bin .../assets/html/callback.html | 0 .../{views => public}/assets/html/embed.html | 0 .../assets/html/offline.html | 0 .../assets/images/144x144.png | Bin .../assets/images/GitHub_Logo.png | Bin .../{views => public}/assets/images/Logo.png | Bin .../assets/images/facebook.png | Bin .../assets/images/favicon.png | Bin .../assets/images/glight.png | Bin .../{views => public}/assets/images/gmark.png | Bin .../assets/images/google_play.png | Bin .../assets/images/highlogo.png | Bin .../assets/images/loading.png | Bin .../{views => public}/assets/images/pin.png | Bin server/{views => public}/assets/images/q.png | Bin server/{views => public}/assets/images/s1.png | Bin server/{views => public}/assets/images/s2.png | Bin server/{views => public}/assets/images/s3.png | Bin .../assets/images/spotify.png | Bin .../assets/images/squareicon.png | Bin .../assets/images/squareicon_small.png | Bin .../assets/images/squareicon_small_old.png | Bin .../assets/images/twitter.png | Bin .../assets/images/youtube.png | Bin server/{views => public}/assets/images/z.svg | 0 server/{views => public}/assets/js/admin.js | 0 .../{views => public}/assets/js/callback.js | 0 server/{views => public}/assets/js/chat.js | 0 server/{views => public}/assets/js/crypt.js | 0 server/{views => public}/assets/js/embed.js | 0 .../{views => public}/assets/js/frontpage.js | 0 server/{views => public}/assets/js/helpers.js | 0 .../assets/js/hostcontroller.js | 0 server/{views => public}/assets/js/list.js | 0 .../{views => public}/assets/js/listeners.js | 0 .../assets/js/mobileremote.js | 0 server/{views => public}/assets/js/player.js | 0 .../assets/js/playercontrols.js | 0 .../assets/js/remotecontroller.js | 0 server/{views => public}/assets/js/search.js | 0 .../assets/js/suggestions.js | 0 server/{views => public}/assets/manifest.json | 0 .../layouts/channel.handlebars | 0 .../layouts/frontpage.handlebars | 0 .../{views => public}/layouts/main.handlebars | 0 .../layouts/remote.handlebars | 0 .../partials/panel.handlebars | 0 server/router.js | 98 ++++++++++-------- server/server.js | 21 +++- 88 files changed, 70 insertions(+), 49 deletions(-) rename server/{views => public}/assets/css/embed.css (100%) rename server/{views => public}/assets/css/materialize.min.css (100%) rename server/{views => public}/assets/css/style.css (100%) rename server/{views => public}/assets/dist/callback.min.js (100%) rename server/{views => public}/assets/dist/embed.min.js (100%) rename server/{views => public}/assets/dist/lib/aes.js (100%) rename server/{views => public}/assets/dist/lib/color-thief.js (100%) rename server/{views => public}/assets/dist/lib/jquery-2.1.3.min.js (100%) rename server/{views => public}/assets/dist/lib/jquery-ui-1.10.3.min.js (100%) rename server/{views => public}/assets/dist/lib/jquery.ui.touch-punch.min.js (100%) rename server/{views => public}/assets/dist/lib/materialize.min.js (100%) rename server/{views => public}/assets/dist/lib/sha256.js (100%) rename server/{views => public}/assets/dist/lib/socket.io.min.js (100%) rename server/{views => public}/assets/dist/main.min.js (100%) rename server/{views => public}/assets/dist/remote.min.js (100%) rename server/{views => public}/assets/fonts/futura.woff (100%) rename server/{views => public}/assets/fonts/futura.woff2 (100%) rename server/{views => public}/assets/fonts/material-design-icons/LICENSE.txt (100%) rename server/{views => public}/assets/fonts/material-design-icons/Material-Design-Icons.eot (100%) rename server/{views => public}/assets/fonts/material-design-icons/Material-Design-Icons.svg (100%) rename server/{views => public}/assets/fonts/material-design-icons/Material-Design-Icons.ttf (100%) rename server/{views => public}/assets/fonts/material-design-icons/Material-Design-Icons.woff (100%) rename server/{views => public}/assets/fonts/material-design-icons/Material-Design-Icons.woff2 (100%) rename server/{views => public}/assets/fonts/open_sans.woff (100%) rename server/{views => public}/assets/fonts/roboto/Roboto-Bold.ttf (100%) rename server/{views => public}/assets/fonts/roboto/Roboto-Bold.woff (100%) rename server/{views => public}/assets/fonts/roboto/Roboto-Bold.woff2 (100%) rename server/{views => public}/assets/fonts/roboto/Roboto-Light.ttf (100%) rename server/{views => public}/assets/fonts/roboto/Roboto-Light.woff (100%) rename server/{views => public}/assets/fonts/roboto/Roboto-Light.woff2 (100%) rename server/{views => public}/assets/fonts/roboto/Roboto-Medium.ttf (100%) rename server/{views => public}/assets/fonts/roboto/Roboto-Medium.woff (100%) rename server/{views => public}/assets/fonts/roboto/Roboto-Medium.woff2 (100%) rename server/{views => public}/assets/fonts/roboto/Roboto-Regular.ttf (100%) rename server/{views => public}/assets/fonts/roboto/Roboto-Regular.woff (100%) rename server/{views => public}/assets/fonts/roboto/Roboto-Regular.woff2 (100%) rename server/{views => public}/assets/fonts/roboto/Roboto-Thin.ttf (100%) rename server/{views => public}/assets/fonts/roboto/Roboto-Thin.woff (100%) rename server/{views => public}/assets/fonts/roboto/Roboto-Thin.woff2 (100%) rename server/{views => public}/assets/html/callback.html (100%) rename server/{views => public}/assets/html/embed.html (100%) rename server/{views => public}/assets/html/offline.html (100%) rename server/{views => public}/assets/images/144x144.png (100%) rename server/{views => public}/assets/images/GitHub_Logo.png (100%) rename server/{views => public}/assets/images/Logo.png (100%) rename server/{views => public}/assets/images/facebook.png (100%) rename server/{views => public}/assets/images/favicon.png (100%) rename server/{views => public}/assets/images/glight.png (100%) rename server/{views => public}/assets/images/gmark.png (100%) rename server/{views => public}/assets/images/google_play.png (100%) rename server/{views => public}/assets/images/highlogo.png (100%) rename server/{views => public}/assets/images/loading.png (100%) rename server/{views => public}/assets/images/pin.png (100%) rename server/{views => public}/assets/images/q.png (100%) rename server/{views => public}/assets/images/s1.png (100%) rename server/{views => public}/assets/images/s2.png (100%) rename server/{views => public}/assets/images/s3.png (100%) rename server/{views => public}/assets/images/spotify.png (100%) rename server/{views => public}/assets/images/squareicon.png (100%) rename server/{views => public}/assets/images/squareicon_small.png (100%) rename server/{views => public}/assets/images/squareicon_small_old.png (100%) rename server/{views => public}/assets/images/twitter.png (100%) rename server/{views => public}/assets/images/youtube.png (100%) rename server/{views => public}/assets/images/z.svg (100%) rename server/{views => public}/assets/js/admin.js (100%) rename server/{views => public}/assets/js/callback.js (100%) rename server/{views => public}/assets/js/chat.js (100%) rename server/{views => public}/assets/js/crypt.js (100%) rename server/{views => public}/assets/js/embed.js (100%) rename server/{views => public}/assets/js/frontpage.js (100%) rename server/{views => public}/assets/js/helpers.js (100%) rename server/{views => public}/assets/js/hostcontroller.js (100%) rename server/{views => public}/assets/js/list.js (100%) rename server/{views => public}/assets/js/listeners.js (100%) rename server/{views => public}/assets/js/mobileremote.js (100%) rename server/{views => public}/assets/js/player.js (100%) rename server/{views => public}/assets/js/playercontrols.js (100%) rename server/{views => public}/assets/js/remotecontroller.js (100%) rename server/{views => public}/assets/js/search.js (100%) rename server/{views => public}/assets/js/suggestions.js (100%) rename server/{views => public}/assets/manifest.json (100%) rename server/{views => public}/layouts/channel.handlebars (100%) rename server/{views => public}/layouts/frontpage.handlebars (100%) rename server/{views => public}/layouts/main.handlebars (100%) rename server/{views => public}/layouts/remote.handlebars (100%) rename server/{views => public}/partials/panel.handlebars (100%) diff --git a/server/views/assets/css/embed.css b/server/public/assets/css/embed.css similarity index 100% rename from server/views/assets/css/embed.css rename to server/public/assets/css/embed.css diff --git a/server/views/assets/css/materialize.min.css b/server/public/assets/css/materialize.min.css similarity index 100% rename from server/views/assets/css/materialize.min.css rename to server/public/assets/css/materialize.min.css diff --git a/server/views/assets/css/style.css b/server/public/assets/css/style.css similarity index 100% rename from server/views/assets/css/style.css rename to server/public/assets/css/style.css diff --git a/server/views/assets/dist/callback.min.js b/server/public/assets/dist/callback.min.js similarity index 100% rename from server/views/assets/dist/callback.min.js rename to server/public/assets/dist/callback.min.js diff --git a/server/views/assets/dist/embed.min.js b/server/public/assets/dist/embed.min.js similarity index 100% rename from server/views/assets/dist/embed.min.js rename to server/public/assets/dist/embed.min.js diff --git a/server/views/assets/dist/lib/aes.js b/server/public/assets/dist/lib/aes.js similarity index 100% rename from server/views/assets/dist/lib/aes.js rename to server/public/assets/dist/lib/aes.js diff --git a/server/views/assets/dist/lib/color-thief.js b/server/public/assets/dist/lib/color-thief.js similarity index 100% rename from server/views/assets/dist/lib/color-thief.js rename to server/public/assets/dist/lib/color-thief.js diff --git a/server/views/assets/dist/lib/jquery-2.1.3.min.js b/server/public/assets/dist/lib/jquery-2.1.3.min.js similarity index 100% rename from server/views/assets/dist/lib/jquery-2.1.3.min.js rename to server/public/assets/dist/lib/jquery-2.1.3.min.js diff --git a/server/views/assets/dist/lib/jquery-ui-1.10.3.min.js b/server/public/assets/dist/lib/jquery-ui-1.10.3.min.js similarity index 100% rename from server/views/assets/dist/lib/jquery-ui-1.10.3.min.js rename to server/public/assets/dist/lib/jquery-ui-1.10.3.min.js diff --git a/server/views/assets/dist/lib/jquery.ui.touch-punch.min.js b/server/public/assets/dist/lib/jquery.ui.touch-punch.min.js similarity index 100% rename from server/views/assets/dist/lib/jquery.ui.touch-punch.min.js rename to server/public/assets/dist/lib/jquery.ui.touch-punch.min.js diff --git a/server/views/assets/dist/lib/materialize.min.js b/server/public/assets/dist/lib/materialize.min.js similarity index 100% rename from server/views/assets/dist/lib/materialize.min.js rename to server/public/assets/dist/lib/materialize.min.js diff --git a/server/views/assets/dist/lib/sha256.js b/server/public/assets/dist/lib/sha256.js similarity index 100% rename from server/views/assets/dist/lib/sha256.js rename to server/public/assets/dist/lib/sha256.js diff --git a/server/views/assets/dist/lib/socket.io.min.js b/server/public/assets/dist/lib/socket.io.min.js similarity index 100% rename from server/views/assets/dist/lib/socket.io.min.js rename to server/public/assets/dist/lib/socket.io.min.js diff --git a/server/views/assets/dist/main.min.js b/server/public/assets/dist/main.min.js similarity index 100% rename from server/views/assets/dist/main.min.js rename to server/public/assets/dist/main.min.js diff --git a/server/views/assets/dist/remote.min.js b/server/public/assets/dist/remote.min.js similarity index 100% rename from server/views/assets/dist/remote.min.js rename to server/public/assets/dist/remote.min.js diff --git a/server/views/assets/fonts/futura.woff b/server/public/assets/fonts/futura.woff similarity index 100% rename from server/views/assets/fonts/futura.woff rename to server/public/assets/fonts/futura.woff diff --git a/server/views/assets/fonts/futura.woff2 b/server/public/assets/fonts/futura.woff2 similarity index 100% rename from server/views/assets/fonts/futura.woff2 rename to server/public/assets/fonts/futura.woff2 diff --git a/server/views/assets/fonts/material-design-icons/LICENSE.txt b/server/public/assets/fonts/material-design-icons/LICENSE.txt similarity index 100% rename from server/views/assets/fonts/material-design-icons/LICENSE.txt rename to server/public/assets/fonts/material-design-icons/LICENSE.txt diff --git a/server/views/assets/fonts/material-design-icons/Material-Design-Icons.eot b/server/public/assets/fonts/material-design-icons/Material-Design-Icons.eot similarity index 100% rename from server/views/assets/fonts/material-design-icons/Material-Design-Icons.eot rename to server/public/assets/fonts/material-design-icons/Material-Design-Icons.eot diff --git a/server/views/assets/fonts/material-design-icons/Material-Design-Icons.svg b/server/public/assets/fonts/material-design-icons/Material-Design-Icons.svg similarity index 100% rename from server/views/assets/fonts/material-design-icons/Material-Design-Icons.svg rename to server/public/assets/fonts/material-design-icons/Material-Design-Icons.svg diff --git a/server/views/assets/fonts/material-design-icons/Material-Design-Icons.ttf b/server/public/assets/fonts/material-design-icons/Material-Design-Icons.ttf similarity index 100% rename from server/views/assets/fonts/material-design-icons/Material-Design-Icons.ttf rename to server/public/assets/fonts/material-design-icons/Material-Design-Icons.ttf diff --git a/server/views/assets/fonts/material-design-icons/Material-Design-Icons.woff b/server/public/assets/fonts/material-design-icons/Material-Design-Icons.woff similarity index 100% rename from server/views/assets/fonts/material-design-icons/Material-Design-Icons.woff rename to server/public/assets/fonts/material-design-icons/Material-Design-Icons.woff diff --git a/server/views/assets/fonts/material-design-icons/Material-Design-Icons.woff2 b/server/public/assets/fonts/material-design-icons/Material-Design-Icons.woff2 similarity index 100% rename from server/views/assets/fonts/material-design-icons/Material-Design-Icons.woff2 rename to server/public/assets/fonts/material-design-icons/Material-Design-Icons.woff2 diff --git a/server/views/assets/fonts/open_sans.woff b/server/public/assets/fonts/open_sans.woff similarity index 100% rename from server/views/assets/fonts/open_sans.woff rename to server/public/assets/fonts/open_sans.woff diff --git a/server/views/assets/fonts/roboto/Roboto-Bold.ttf b/server/public/assets/fonts/roboto/Roboto-Bold.ttf similarity index 100% rename from server/views/assets/fonts/roboto/Roboto-Bold.ttf rename to server/public/assets/fonts/roboto/Roboto-Bold.ttf diff --git a/server/views/assets/fonts/roboto/Roboto-Bold.woff b/server/public/assets/fonts/roboto/Roboto-Bold.woff similarity index 100% rename from server/views/assets/fonts/roboto/Roboto-Bold.woff rename to server/public/assets/fonts/roboto/Roboto-Bold.woff diff --git a/server/views/assets/fonts/roboto/Roboto-Bold.woff2 b/server/public/assets/fonts/roboto/Roboto-Bold.woff2 similarity index 100% rename from server/views/assets/fonts/roboto/Roboto-Bold.woff2 rename to server/public/assets/fonts/roboto/Roboto-Bold.woff2 diff --git a/server/views/assets/fonts/roboto/Roboto-Light.ttf b/server/public/assets/fonts/roboto/Roboto-Light.ttf similarity index 100% rename from server/views/assets/fonts/roboto/Roboto-Light.ttf rename to server/public/assets/fonts/roboto/Roboto-Light.ttf diff --git a/server/views/assets/fonts/roboto/Roboto-Light.woff b/server/public/assets/fonts/roboto/Roboto-Light.woff similarity index 100% rename from server/views/assets/fonts/roboto/Roboto-Light.woff rename to server/public/assets/fonts/roboto/Roboto-Light.woff diff --git a/server/views/assets/fonts/roboto/Roboto-Light.woff2 b/server/public/assets/fonts/roboto/Roboto-Light.woff2 similarity index 100% rename from server/views/assets/fonts/roboto/Roboto-Light.woff2 rename to server/public/assets/fonts/roboto/Roboto-Light.woff2 diff --git a/server/views/assets/fonts/roboto/Roboto-Medium.ttf b/server/public/assets/fonts/roboto/Roboto-Medium.ttf similarity index 100% rename from server/views/assets/fonts/roboto/Roboto-Medium.ttf rename to server/public/assets/fonts/roboto/Roboto-Medium.ttf diff --git a/server/views/assets/fonts/roboto/Roboto-Medium.woff b/server/public/assets/fonts/roboto/Roboto-Medium.woff similarity index 100% rename from server/views/assets/fonts/roboto/Roboto-Medium.woff rename to server/public/assets/fonts/roboto/Roboto-Medium.woff diff --git a/server/views/assets/fonts/roboto/Roboto-Medium.woff2 b/server/public/assets/fonts/roboto/Roboto-Medium.woff2 similarity index 100% rename from server/views/assets/fonts/roboto/Roboto-Medium.woff2 rename to server/public/assets/fonts/roboto/Roboto-Medium.woff2 diff --git a/server/views/assets/fonts/roboto/Roboto-Regular.ttf b/server/public/assets/fonts/roboto/Roboto-Regular.ttf similarity index 100% rename from server/views/assets/fonts/roboto/Roboto-Regular.ttf rename to server/public/assets/fonts/roboto/Roboto-Regular.ttf diff --git a/server/views/assets/fonts/roboto/Roboto-Regular.woff b/server/public/assets/fonts/roboto/Roboto-Regular.woff similarity index 100% rename from server/views/assets/fonts/roboto/Roboto-Regular.woff rename to server/public/assets/fonts/roboto/Roboto-Regular.woff diff --git a/server/views/assets/fonts/roboto/Roboto-Regular.woff2 b/server/public/assets/fonts/roboto/Roboto-Regular.woff2 similarity index 100% rename from server/views/assets/fonts/roboto/Roboto-Regular.woff2 rename to server/public/assets/fonts/roboto/Roboto-Regular.woff2 diff --git a/server/views/assets/fonts/roboto/Roboto-Thin.ttf b/server/public/assets/fonts/roboto/Roboto-Thin.ttf similarity index 100% rename from server/views/assets/fonts/roboto/Roboto-Thin.ttf rename to server/public/assets/fonts/roboto/Roboto-Thin.ttf diff --git a/server/views/assets/fonts/roboto/Roboto-Thin.woff b/server/public/assets/fonts/roboto/Roboto-Thin.woff similarity index 100% rename from server/views/assets/fonts/roboto/Roboto-Thin.woff rename to server/public/assets/fonts/roboto/Roboto-Thin.woff diff --git a/server/views/assets/fonts/roboto/Roboto-Thin.woff2 b/server/public/assets/fonts/roboto/Roboto-Thin.woff2 similarity index 100% rename from server/views/assets/fonts/roboto/Roboto-Thin.woff2 rename to server/public/assets/fonts/roboto/Roboto-Thin.woff2 diff --git a/server/views/assets/html/callback.html b/server/public/assets/html/callback.html similarity index 100% rename from server/views/assets/html/callback.html rename to server/public/assets/html/callback.html diff --git a/server/views/assets/html/embed.html b/server/public/assets/html/embed.html similarity index 100% rename from server/views/assets/html/embed.html rename to server/public/assets/html/embed.html diff --git a/server/views/assets/html/offline.html b/server/public/assets/html/offline.html similarity index 100% rename from server/views/assets/html/offline.html rename to server/public/assets/html/offline.html diff --git a/server/views/assets/images/144x144.png b/server/public/assets/images/144x144.png similarity index 100% rename from server/views/assets/images/144x144.png rename to server/public/assets/images/144x144.png diff --git a/server/views/assets/images/GitHub_Logo.png b/server/public/assets/images/GitHub_Logo.png similarity index 100% rename from server/views/assets/images/GitHub_Logo.png rename to server/public/assets/images/GitHub_Logo.png diff --git a/server/views/assets/images/Logo.png b/server/public/assets/images/Logo.png similarity index 100% rename from server/views/assets/images/Logo.png rename to server/public/assets/images/Logo.png diff --git a/server/views/assets/images/facebook.png b/server/public/assets/images/facebook.png similarity index 100% rename from server/views/assets/images/facebook.png rename to server/public/assets/images/facebook.png diff --git a/server/views/assets/images/favicon.png b/server/public/assets/images/favicon.png similarity index 100% rename from server/views/assets/images/favicon.png rename to server/public/assets/images/favicon.png diff --git a/server/views/assets/images/glight.png b/server/public/assets/images/glight.png similarity index 100% rename from server/views/assets/images/glight.png rename to server/public/assets/images/glight.png diff --git a/server/views/assets/images/gmark.png b/server/public/assets/images/gmark.png similarity index 100% rename from server/views/assets/images/gmark.png rename to server/public/assets/images/gmark.png diff --git a/server/views/assets/images/google_play.png b/server/public/assets/images/google_play.png similarity index 100% rename from server/views/assets/images/google_play.png rename to server/public/assets/images/google_play.png diff --git a/server/views/assets/images/highlogo.png b/server/public/assets/images/highlogo.png similarity index 100% rename from server/views/assets/images/highlogo.png rename to server/public/assets/images/highlogo.png diff --git a/server/views/assets/images/loading.png b/server/public/assets/images/loading.png similarity index 100% rename from server/views/assets/images/loading.png rename to server/public/assets/images/loading.png diff --git a/server/views/assets/images/pin.png b/server/public/assets/images/pin.png similarity index 100% rename from server/views/assets/images/pin.png rename to server/public/assets/images/pin.png diff --git a/server/views/assets/images/q.png b/server/public/assets/images/q.png similarity index 100% rename from server/views/assets/images/q.png rename to server/public/assets/images/q.png diff --git a/server/views/assets/images/s1.png b/server/public/assets/images/s1.png similarity index 100% rename from server/views/assets/images/s1.png rename to server/public/assets/images/s1.png diff --git a/server/views/assets/images/s2.png b/server/public/assets/images/s2.png similarity index 100% rename from server/views/assets/images/s2.png rename to server/public/assets/images/s2.png diff --git a/server/views/assets/images/s3.png b/server/public/assets/images/s3.png similarity index 100% rename from server/views/assets/images/s3.png rename to server/public/assets/images/s3.png diff --git a/server/views/assets/images/spotify.png b/server/public/assets/images/spotify.png similarity index 100% rename from server/views/assets/images/spotify.png rename to server/public/assets/images/spotify.png diff --git a/server/views/assets/images/squareicon.png b/server/public/assets/images/squareicon.png similarity index 100% rename from server/views/assets/images/squareicon.png rename to server/public/assets/images/squareicon.png diff --git a/server/views/assets/images/squareicon_small.png b/server/public/assets/images/squareicon_small.png similarity index 100% rename from server/views/assets/images/squareicon_small.png rename to server/public/assets/images/squareicon_small.png diff --git a/server/views/assets/images/squareicon_small_old.png b/server/public/assets/images/squareicon_small_old.png similarity index 100% rename from server/views/assets/images/squareicon_small_old.png rename to server/public/assets/images/squareicon_small_old.png diff --git a/server/views/assets/images/twitter.png b/server/public/assets/images/twitter.png similarity index 100% rename from server/views/assets/images/twitter.png rename to server/public/assets/images/twitter.png diff --git a/server/views/assets/images/youtube.png b/server/public/assets/images/youtube.png similarity index 100% rename from server/views/assets/images/youtube.png rename to server/public/assets/images/youtube.png diff --git a/server/views/assets/images/z.svg b/server/public/assets/images/z.svg similarity index 100% rename from server/views/assets/images/z.svg rename to server/public/assets/images/z.svg diff --git a/server/views/assets/js/admin.js b/server/public/assets/js/admin.js similarity index 100% rename from server/views/assets/js/admin.js rename to server/public/assets/js/admin.js diff --git a/server/views/assets/js/callback.js b/server/public/assets/js/callback.js similarity index 100% rename from server/views/assets/js/callback.js rename to server/public/assets/js/callback.js diff --git a/server/views/assets/js/chat.js b/server/public/assets/js/chat.js similarity index 100% rename from server/views/assets/js/chat.js rename to server/public/assets/js/chat.js diff --git a/server/views/assets/js/crypt.js b/server/public/assets/js/crypt.js similarity index 100% rename from server/views/assets/js/crypt.js rename to server/public/assets/js/crypt.js diff --git a/server/views/assets/js/embed.js b/server/public/assets/js/embed.js similarity index 100% rename from server/views/assets/js/embed.js rename to server/public/assets/js/embed.js diff --git a/server/views/assets/js/frontpage.js b/server/public/assets/js/frontpage.js similarity index 100% rename from server/views/assets/js/frontpage.js rename to server/public/assets/js/frontpage.js diff --git a/server/views/assets/js/helpers.js b/server/public/assets/js/helpers.js similarity index 100% rename from server/views/assets/js/helpers.js rename to server/public/assets/js/helpers.js diff --git a/server/views/assets/js/hostcontroller.js b/server/public/assets/js/hostcontroller.js similarity index 100% rename from server/views/assets/js/hostcontroller.js rename to server/public/assets/js/hostcontroller.js diff --git a/server/views/assets/js/list.js b/server/public/assets/js/list.js similarity index 100% rename from server/views/assets/js/list.js rename to server/public/assets/js/list.js diff --git a/server/views/assets/js/listeners.js b/server/public/assets/js/listeners.js similarity index 100% rename from server/views/assets/js/listeners.js rename to server/public/assets/js/listeners.js diff --git a/server/views/assets/js/mobileremote.js b/server/public/assets/js/mobileremote.js similarity index 100% rename from server/views/assets/js/mobileremote.js rename to server/public/assets/js/mobileremote.js diff --git a/server/views/assets/js/player.js b/server/public/assets/js/player.js similarity index 100% rename from server/views/assets/js/player.js rename to server/public/assets/js/player.js diff --git a/server/views/assets/js/playercontrols.js b/server/public/assets/js/playercontrols.js similarity index 100% rename from server/views/assets/js/playercontrols.js rename to server/public/assets/js/playercontrols.js diff --git a/server/views/assets/js/remotecontroller.js b/server/public/assets/js/remotecontroller.js similarity index 100% rename from server/views/assets/js/remotecontroller.js rename to server/public/assets/js/remotecontroller.js diff --git a/server/views/assets/js/search.js b/server/public/assets/js/search.js similarity index 100% rename from server/views/assets/js/search.js rename to server/public/assets/js/search.js diff --git a/server/views/assets/js/suggestions.js b/server/public/assets/js/suggestions.js similarity index 100% rename from server/views/assets/js/suggestions.js rename to server/public/assets/js/suggestions.js diff --git a/server/views/assets/manifest.json b/server/public/assets/manifest.json similarity index 100% rename from server/views/assets/manifest.json rename to server/public/assets/manifest.json diff --git a/server/views/layouts/channel.handlebars b/server/public/layouts/channel.handlebars similarity index 100% rename from server/views/layouts/channel.handlebars rename to server/public/layouts/channel.handlebars diff --git a/server/views/layouts/frontpage.handlebars b/server/public/layouts/frontpage.handlebars similarity index 100% rename from server/views/layouts/frontpage.handlebars rename to server/public/layouts/frontpage.handlebars diff --git a/server/views/layouts/main.handlebars b/server/public/layouts/main.handlebars similarity index 100% rename from server/views/layouts/main.handlebars rename to server/public/layouts/main.handlebars diff --git a/server/views/layouts/remote.handlebars b/server/public/layouts/remote.handlebars similarity index 100% rename from server/views/layouts/remote.handlebars rename to server/public/layouts/remote.handlebars diff --git a/server/views/partials/panel.handlebars b/server/public/partials/panel.handlebars similarity index 100% rename from server/views/partials/panel.handlebars rename to server/public/partials/panel.handlebars diff --git a/server/router.js b/server/router.js index 2458bce4..47830c29 100644 --- a/server/router.js +++ b/server/router.js @@ -9,33 +9,37 @@ router.use(function(req, res, next) { }); router.route('/:channel_name').get(function(req, res, next){ - var url = req.headers['x-forwarded-host']; - var subdomain = req.headers['x-forwarded-host'].split("."); - if(url != "zoff.me" && url != "remote.zoff.me" && url != "remote.localhost" && url != "localhost") { - res.redirect("https://zoff.me"); - return; - } - if(subdomain[0] == "remote") { - var data = { - year: 2017, - javascript_file: "remote.min.js" - } - res.render('layouts/remote', data); - } else if(subdomain.length >= 2 && subdomain[0] == "www") { - res.redirect("https://zoff.me"); - } else { - if(req.params.channel_name == "_embed") { - res.sendFile(path.join(__dirname, '/views/assets/html/embed.html')); - } else if(req.params.channel_name == "o_callback") { - res.sendFile(path.join(__dirname, '/views/assets/html/callback.html')); - } else { - var data = { - list_name: capitalizeFirstLetter(req.params.channel_name), - year: 2017, - javascript_file: "main.min.js" - } - res.render('layouts/channel', data); - } + try{ + var url = req.headers['x-forwarded-host']; + var subdomain = req.headers['x-forwarded-host'].split("."); + if(url != "zoff.me" && url != "remote.zoff.me" && url != "remote.localhost" && url != "localhost") { + res.redirect("https://zoff.me"); + return; + } + if(subdomain[0] == "remote") { + var data = { + year: 2017, + javascript_file: "remote.min.js" + } + res.render('layouts/remote', data); + } else if(subdomain.length >= 2 && subdomain[0] == "www") { + res.redirect("https://zoff.me"); + } else { + if(req.params.channel_name == "_embed") { + res.sendFile(path.join(__dirname, '/views/assets/html/embed.html')); + } else if(req.params.channel_name == "o_callback") { + res.sendFile(path.join(__dirname, '/views/assets/html/callback.html')); + } else { + var data = { + list_name: capitalizeFirstLetter(req.params.channel_name), + year: 2017, + javascript_file: "main.min.js" + } + res.render('layouts/channel', data); + } + } + } catch(e) { + res.redirect("https://zoff.me"); } }); @@ -121,26 +125,30 @@ router.route('/api/mail').post(function(req, res) { }); router.route('/').get(function(req, res, next){ - var url = req.headers['x-forwarded-host']; - var subdomain = req.headers['x-forwarded-host'].split("."); - if(url != "zoff.me" && url != "remote.zoff.me" && url != "remote.localhost" && url != "localhost") { - res.redirect("https://zoff.me"); - return; - } - if(subdomain[0] == "remote") { - var data = { - year: 2017, - javascript_file: "remote.min.js" + try{ + var url = req.headers['x-forwarded-host']; + var subdomain = req.headers['x-forwarded-host'].split("."); + if(url != "zoff.me" && url != "remote.zoff.me" && url != "remote.localhost" && url != "localhost") { + res.redirect("https://zoff.me"); + return; } - res.render('layouts/remote', data); - } else if(subdomain[0] == "www") { - res.redirect("https://zoff.me"); - } else { - var data = { - year: 2017, - javascript_file: "main.min.js" + if(subdomain[0] == "remote") { + var data = { + year: 2017, + javascript_file: "remote.min.js" + } + res.render('layouts/remote', data); + } else if(subdomain[0] == "www") { + res.redirect("https://zoff.me"); + } else { + var data = { + year: 2017, + javascript_file: "main.min.js" + } + res.render('layouts/frontpage', data); } - res.render('layouts/frontpage', data); + } catch(e) { + res.redirect("https://zoff.me"); } }); diff --git a/server/server.js b/server/server.js index 02a6ef0a..24691774 100755 --- a/server/server.js +++ b/server/server.js @@ -1,14 +1,25 @@ var server; var add = ""; +const path = require('path'); +const publicPath = path.join(__dirname, 'public'); var express = require('express'); var app = express(); var exphbs = require('express-handlebars'); +var hbs = exphbs.create({ + defaultLayout: publicPath + '/layouts/main', + layoutsDir: publicPath + '/layouts', + partialsDir: publicPath + '/partials' +}); var uniqid = require('uniqid'); var mongo_db_cred = {config: 'mydb'}; -app.engine('handlebars',exphbs({defaultLayout: 'main'})); + +app.engine('handlebars', hbs.engine); +//hbs.loadPartials(publicPath + "/layouts/"); app.set('view engine', 'handlebars'); +app.set('views', publicPath); + try{ var fs = require('fs'); var privateKey = fs.readFileSync('/etc/letsencrypt/live/zoff.me/privkey.pem').toString(); @@ -76,8 +87,8 @@ var names = {names: []}; var locks = {}; var skipped = {}; var tot_view = 0; -const path = require('path'); -const publicPath = path.join(__dirname, '../views'); + + server.listen(port, function () { console.log('Server listening at port %d', port); @@ -92,8 +103,10 @@ app.use(function (req, res, next) { } next(); }); + + app.use('/', router); -app.use('/assets', express.static('views/assets')); +app.use('/assets', express.static(publicPath + '/assets')); /*process.on('uncaughtException', function(e){