From 461f966800f09240a69ae208ace2c42eaa2e2196 Mon Sep 17 00:00:00 2001 From: coon Date: Thu, 23 Nov 2023 23:37:33 +0100 Subject: [PATCH 1/2] nix: fix vendoring --- flake.nix | 2 +- gomod2nix.toml | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index cb737a4..6c653d2 100644 --- a/flake.nix +++ b/flake.nix @@ -30,7 +30,7 @@ gotools go-tools gomod2nix.packages.${system}.default - #sanic + sanic ]; packages = with pkgs; [ mpd diff --git a/gomod2nix.toml b/gomod2nix.toml index c71e6ea..a062755 100644 --- a/gomod2nix.toml +++ b/gomod2nix.toml @@ -1,6 +1,27 @@ schema = 3 [mod] + [mod."github.com/beorn7/perks"] + version = "v1.0.1" + hash = "sha256-h75GUqfwJKngCJQVE5Ao5wnO3cfKD9lSIteoLp/3xJ4=" + [mod."github.com/cespare/xxhash/v2"] + version = "v2.2.0" + hash = "sha256-nPufwYQfTkyrEkbBrpqM3C2vnMxfIz6tAaBmiUP7vd4=" + [mod."github.com/fhs/gompd/v2"] + version = "v2.3.0" + hash = "sha256-JBb7BvLu1wlUAbMt/g5JmJtA3fxqr6dKWeeLwfGsB08=" + [mod."github.com/golang-jwt/jwt"] + version = "v3.2.2+incompatible" + hash = "sha256-LOkpuXhWrFayvVf1GOaOmZI5YKEsgqVSb22aF8LnCEM=" + [mod."github.com/golang/protobuf"] + version = "v1.5.2" + hash = "sha256-IVwooaIo46iq7euSSVWTBAdKd+2DUaJ67MtBao1DpBI=" + [mod."github.com/json-iterator/go"] + version = "v1.1.12" + hash = "sha256-To8A0h+lbfZ/6zM+2PpRpY3+L6725OPC66lffq6fUoM=" + [mod."github.com/labstack/echo-contrib"] + version = "v0.15.0" + hash = "sha256-bDjEAJc5gPs+G5M8fbTSBFgb0t4dTYqdECyvHvuf3gY=" [mod."github.com/labstack/echo/v4"] version = "v4.11.2" hash = "sha256-OECk2lBNKKBpzJ58XMhpp8KI/tqE0TnyddWyhI+nHPs=" @@ -13,6 +34,27 @@ schema = 3 [mod."github.com/mattn/go-isatty"] version = "v0.0.19" hash = "sha256-wYQqGxeqV3Elkmn26Md8mKZ/viw598R4Ych3vtt72YE=" + [mod."github.com/matttproud/golang_protobuf_extensions"] + version = "v1.0.4" + hash = "sha256-uovu7OycdeZ2oYQ7FhVxLey5ZX3T0FzShaRldndyGvc=" + [mod."github.com/modern-go/concurrent"] + version = "v0.0.0-20180306012644-bacd9c7ef1dd" + hash = "sha256-OTySieAgPWR4oJnlohaFTeK1tRaVp/b0d1rYY8xKMzo=" + [mod."github.com/modern-go/reflect2"] + version = "v1.0.2" + hash = "sha256-+W9EIW7okXIXjWEgOaMh58eLvBZ7OshW2EhaIpNLSBU=" + [mod."github.com/prometheus/client_golang"] + version = "v1.14.0" + hash = "sha256-dpgGV8C30ZCn7b9mQ+Ye2AfPXTIuHLQbl2olMKzJKxA=" + [mod."github.com/prometheus/client_model"] + version = "v0.3.0" + hash = "sha256-vP+miJfsoK5UG9eug8z/bhAMj3bwg66T2vIh8WHoOKU=" + [mod."github.com/prometheus/common"] + version = "v0.40.0" + hash = "sha256-ykOktYSNsCYKR4Ru7UWoebIgzMqJjLG2jrbmO7NBv08=" + [mod."github.com/prometheus/procfs"] + version = "v0.9.0" + hash = "sha256-imZN+1HRpMvgmrot2V+AK5ueYLmsp49vZfHtx2N6Wek=" [mod."github.com/valyala/bytebufferpool"] version = "v1.0.0" hash = "sha256-I9FPZ3kCNRB+o0dpMwBnwZ35Fj9+ThvITn8a3Jr8mAY=" @@ -31,3 +73,9 @@ schema = 3 [mod."golang.org/x/text"] version = "v0.13.0" hash = "sha256-J34dbc8UNVIdRJUZP7jPt11oxuwG8VvrOOylxE7V3oA=" + [mod."golang.org/x/time"] + version = "v0.3.0" + hash = "sha256-/hmc9skIswMYbivxNS7R8A6vCTUF9k2/7tr/ACkcEaM=" + [mod."google.golang.org/protobuf"] + version = "v1.28.1" + hash = "sha256-sTJYgvlv5is7vHNxcuigF2lNASp0QonhUgnrguhfHSU=" From 0be041b476aa4d11cd903fd405b2c2e7ea474fb2 Mon Sep 17 00:00:00 2001 From: coon Date: Mon, 27 Nov 2023 01:55:09 +0100 Subject: [PATCH 2/2] static: start of flexbox implementation --- static/flexbox/index.html | 43 +++++++++++++++++++++++++++++++++++++++ static/flexbox/sanic.css | 33 ++++++++++++++++++++++++++++++ static/flexbox/sanic.js | 0 3 files changed, 76 insertions(+) create mode 100644 static/flexbox/index.html create mode 100644 static/flexbox/sanic.css create mode 100644 static/flexbox/sanic.js diff --git a/static/flexbox/index.html b/static/flexbox/index.html new file mode 100644 index 0000000..583eb6a --- /dev/null +++ b/static/flexbox/index.html @@ -0,0 +1,43 @@ + + + + + Sanic - Flexbox layout + + + + +
+
+
+ + +
+
+
+ + + + +
+
+ + +
+
+
+ +
+
+
+ queue +
+
+ controls bottom +
+ +
+ + diff --git a/static/flexbox/sanic.css b/static/flexbox/sanic.css new file mode 100644 index 0000000..8b8a136 --- /dev/null +++ b/static/flexbox/sanic.css @@ -0,0 +1,33 @@ +body { + background-color: #09101d; + color: #bbb; +} + +div { + border: 1px dashed white; +} + +button { + background-color: #28374a; + color: #bbb; +} + +#flexbox-container { + display: flex; + flex-direction: column; +} + +#controls-top { + display: flex; + flex-direction: row; +} + +#top-left-controls { + display: flex; + flex-direction: column; +} + +#playback-controls { + display: flex; + flex-direction: column; +} diff --git a/static/flexbox/sanic.js b/static/flexbox/sanic.js new file mode 100644 index 0000000..e69de29