css/style.css

@@ -28,11 +28,6 @@ h2.bot {
 }
 
 .item {
-  -webkit-user-select: none;
-  -moz-user-select: none;
-  -ms-user-select: none;
-  user-select: none;
-
   display: flex;
   justify-content: center;
   align-items: center;

routes.go

@@ -3,9 +3,6 @@ package main
 import (
 	"log"
 	"net/http"
-	"os"
-	"path"
-	"path/filepath"
 	"text/template"
 
 	"github.com/google/uuid"
@@ -24,8 +21,9 @@ func init() {
 	app.router.GET("/", app.Index)
 	app.router.GET("/play/:playlist", app.Play)
 	app.router.GET("/reset", app.Reset)
-	app.router.GET("/public/*js", app.ServeFiles)
+
-	app.router.GET("/css/*css", app.ServeFiles)
+	app.router.ServeFiles("/js/*filepath", http.Dir("public"))
+	app.router.ServeFiles("/css/*filepath", http.Dir("css"))
 
 	app.router.HandlerFunc("GET", "/ws", http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		log.Printf("WS connection from %v\n", r.RemoteAddr)
@@ -51,28 +49,6 @@ type IndexData struct {
 	Ambiance  []string
 }
 
-func (app App) ServeFiles(w http.ResponseWriter, r *http.Request, _ httprouter.Params) {
-	filePath := filepath.Join(".", r.URL.Path)
-
-	file, err := os.Open(filePath)
-	if err != nil {
-		log.Println(err)
-		http.Error(w, "no such file", http.StatusNotFound)
-		return
-	}
-	defer file.Close()
-
-	fileStat, err := os.Stat(filePath)
-	if err != nil {
-		log.Println(err)
-		http.Error(w, "unable to get file stat", http.StatusInternalServerError)
-	}
-
-	_, filename := path.Split(filePath)
-	t := fileStat.ModTime()
-	http.ServeContent(w, r, filename, t, file)
-}
-
 func (app App) Index(w http.ResponseWriter, r *http.Request, _ httprouter.Params) {
 	playlists, err := app.GetPlaylists()
 	if err != nil {

src/script.js

@@ -1,29 +1,6 @@
 import ReconnectingWebSocket from 'reconnecting-websocket';
 import Sortable from 'sortablejs';
 
-const DND_DELAY = 300;
-
-const addInteractHandler = (source, handler) => {
-	source.addEventListener("click", e => {
-		console.log("click", e);
-		handler(e, false);
-	});
-
-	let touchStart;
-	source.addEventListener("touchstart", e => {
-		console.log("touch start", touchStart, e.timeStamp, e);
-		touchStart = e.timeStamp;
-	}, {passive: true})
-
-	source.addEventListener("touchend", e => {
-		console.log("touch end", touchStart, e);
-		console.log(e.timeStamp - touchStart)
-		if ((e.timeStamp - touchStart) < DND_DELAY) {
-			handler(e, true);
-		}
-	}, {passive: true});
-}
-
 window.onload = function () {
 	const ws = new ReconnectingWebSocket(((window.location.protocol === "https:") ? "wss://" : "ws://") + window.location.host + "/ws");
 
@@ -36,22 +13,19 @@ window.onload = function () {
 	const time = document.querySelector("#time")
 	const waiting = document.querySelector("#waiting")
 
-	addInteractHandler(
+	document.querySelector("input#next").addEventListener("click", (e) => {
-		document.querySelector("input#next"), (e) => {
+		ws.send(JSON.stringify({
-			ws.send(JSON.stringify({
+			"event": "next"
-				"event": "next"
+		}))
-			}))
+	})
-		})
 
-	addInteractHandler(
+	document.querySelector("input#prev").addEventListener("click", (e) => {
-		document.querySelector("input#prev"), (e) => {
+		ws.send(JSON.stringify({
-			ws.send(JSON.stringify({
+			"event": "prev"
-				"event": "prev"
+		}))
-			}))
+	})
-		})
 
 	Sortable.create(items, {
-		delay: DND_DELAY,
 		delayOnTouchOnly: true,
 		group: "dndmusicbot-playlists",
 		filter: ".locked",
@@ -74,7 +48,6 @@ window.onload = function () {
 	})
 
 	Sortable.create(amb, {
-		delay: DND_DELAY,
 		delayOnTouchOnly: true,
 		group: "dndmusicbot-ambiance",
 		filter: ".locked",
@@ -154,8 +127,8 @@ window.onload = function () {
 		}
 	}
 
-	addInteractHandler(document.querySelector("#addambiance"), (e, isTouch) => {
+	document.querySelector("#addambiance").addEventListener("click", (e) => {
-		isTouch && e.preventDefault()
+		e.preventDefault()
 
 		//output.innerText = ""
 		var title = document.querySelector("#inputambiance > input[name='title']")
@@ -174,8 +147,8 @@ window.onload = function () {
 		}))
 	})
 
-	addInteractHandler(submit, (e, isTouch) => {
+	submit.addEventListener("click", (e) => {
-		isTouch && e.preventDefault()
+		e.preventDefault()
 
 		//output.innerText = ""
 		var title = document.querySelector("#inputplaylist > input[name='title']")
@@ -197,8 +170,8 @@ window.onload = function () {
 		url.innerText = ""
 	})
 
-	document.querySelectorAll("#items .item").forEach(item => addInteractHandler(item, (e, isTouch) => {
+	document.querySelectorAll("#items .item").forEach(item => item.addEventListener("click", (e) => {
-		isTouch && e.preventDefault()
+		e.preventDefault()
 		e.target.parentElement.style.pointerEvents = 'none'
 		const disableui = setTimeout((t) => {
 			t.style.pointerEvents = 'auto'
@@ -211,8 +184,8 @@ window.onload = function () {
 		}))
 	}));
 
-	document.querySelectorAll("#ambiance .item").forEach(item => addInteractHandler(item, (e, isTouch) => {
+	document.querySelectorAll("#ambiance .item").forEach(item => item.addEventListener("click", (e) => {
-		isTouch && e.preventDefault()
+		e.preventDefault()
 		e.target.parentElement.style.pointerEvents = 'none'
 		const disableui = setTimeout((t) => {
 			t.style.pointerEvents = 'auto'
@@ -232,8 +205,8 @@ function addPlaylist(payload) {
 	newdiv.className = "item"
 	newdiv.dataset.id = payload.url
 	newdiv.innerText = payload.title
-	addInteractHandler(newdiv, (e, isTouch) => {
+	newdiv.addEventListener("click", (e) => {
-		isTouch && e.preventDefault()
+		e.preventDefault()
 
 		var id = e.target.dataset.id
 		ws.send(JSON.stringify({

tmpl/index.tmpl

@@ -74,6 +74,6 @@
 				</div>
 			</div>
 		</div>
-		<script src="/public/script.js"></script>
+		<script src="/js/script.js"></script>
 	</body>
 </html>

youtube.go

@@ -150,7 +150,6 @@ func (app App) Playlist(playlist string) ([]string, error) {
 		if pageToken == "" {
 			break
 		}
-		call.PageToken(pageToken)
 	}
 	return list, nil
 }