diff --git a/flake.lock b/flake.lock index 0ac0140..54bccca 100644 --- a/flake.lock +++ b/flake.lock @@ -20,22 +20,41 @@ }, "nixpkgs": { "locked": { - "lastModified": 1695806987, - "narHash": "sha256-fX5kGs66NZIxCMcpAGIpxuftajHL8Hil1vjHmjjl118=", + "lastModified": 1699099776, + "narHash": "sha256-X09iKJ27mGsGambGfkKzqvw5esP1L/Rf8H3u3fCqIiU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f3dab3509afca932f3f4fd0908957709bb1c1f57", + "rev": "85f1ba3e51676fa8cc604a3d863d729026a6b8eb", "type": "github" }, "original": { - "id": "nixpkgs", - "type": "indirect" + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-stable": { + "locked": { + "lastModified": 1699169573, + "narHash": "sha256-cvUb1xZkvOp3W2SzylStrTirhVd9zCeo5utJl9nSIhw=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "aeefe2054617cae501809b82b44a8e8f7be7cc4b", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-23.05", + "repo": "nixpkgs", + "type": "github" } }, "root": { "inputs": { "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs" + "nixpkgs": "nixpkgs", + "nixpkgs-stable": "nixpkgs-stable" } }, "systems": { diff --git a/flake.nix b/flake.nix index cceb23d..8157c3e 100644 --- a/flake.nix +++ b/flake.nix @@ -1,18 +1,21 @@ { description = "Automoderation web app"; + inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + inputs.nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-23.05"; inputs.flake-utils.url = "github:numtide/flake-utils"; - outputs = { self, nixpkgs, flake-utils }: + outputs = { self, nixpkgs, flake-utils, nixpkgs-stable }: flake-utils.lib.eachDefaultSystem (system: let pkgs = nixpkgs.legacyPackages.${system}; + pkgs-stable = nixpkgs-stable.legacyPackages.${system}; pname = "some-automoderation"; version = "0.0.1"; in { devShells.default = pkgs.mkShell { buildInputs = [ pkgs.go - pkgs.wgo + pkgs-stable.wgo pkgs.semgrep pkgs.gopls pkgs.nodePackages.tailwindcss diff --git a/routes/room_page.go b/routes/room_page.go index b5f3cb8..497bc1c 100644 --- a/routes/room_page.go +++ b/routes/room_page.go @@ -32,6 +32,8 @@ func registerPageRoutes( func streamingBsRoute() http.HandlerFunc { return func(w http.ResponseWriter, r *http.Request) { + r.ParseForm() + queryParam := r.FormValue("mobile") w.Header().Set("Cache-Control", "no-cache") w.Header().Set("Connection", "keep-alive") w.Header().Set("Content-Type", "text/event-stream") @@ -43,10 +45,10 @@ func streamingBsRoute() http.HandlerFunc { return default: log.Printf("another step in streaming bs") - data := "data:
hello with data %d! waited %d
\n\n" + data := "data:
hello with data %d! waited %d. mobile is %s
\n\n" startTime = time.Now().Nanosecond() diff := endTime - startTime - fmt.Fprintf(w, data, rand.Intn(100), diff) + fmt.Fprintf(w, data, rand.Intn(100), diff, queryParam) w.(http.Flusher).Flush() time.Sleep(3 * time.Second) endTime = time.Now().Nanosecond() diff --git a/routes/static/out.css b/routes/static/out.css index 712bbe5..b0c96ab 100644 --- a/routes/static/out.css +++ b/routes/static/out.css @@ -1,5 +1,5 @@ /* -! tailwindcss v3.3.3 | MIT License | https://tailwindcss.com +! tailwindcss v3.3.5 | MIT License | https://tailwindcss.com */ /* @@ -550,6 +550,10 @@ video { display: grid; } +.hidden { + display: none; +} + .h-full { height: 100%; } @@ -604,6 +608,11 @@ video { background-color: rgb(251 191 36 / var(--tw-bg-opacity)); } +.bg-blue-100 { + --tw-bg-opacity: 1; + background-color: rgb(219 234 254 / var(--tw-bg-opacity)); +} + .bg-blue-300 { --tw-bg-opacity: 1; background-color: rgb(147 197 253 / var(--tw-bg-opacity)); @@ -640,3 +649,13 @@ video { --tw-bg-opacity: 1; background-color: rgb(185 28 28 / var(--tw-bg-opacity)); } + +@media (min-width: 768px) { + .md\:block { + display: block; + } + + .md\:hidden { + display: none; + } +} diff --git a/routes/templates/room.gohtml b/routes/templates/room.gohtml index 6d88d59..b586ffd 100644 --- a/routes/templates/room.gohtml +++ b/routes/templates/room.gohtml @@ -31,11 +31,19 @@
-
+ + + + + + + +
koko