From 400620946a4c846e4c06a6bc131e39e3d21a7bc3 Mon Sep 17 00:00:00 2001 From: mateusz779 Date: Thu, 7 Nov 2024 01:39:39 +0100 Subject: [PATCH] =?UTF-8?q?aktualizacja=20struktury=20katalog=C3=B3w=20i?= =?UTF-8?q?=20dodanie=20mimifikacji?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 22 +- main.go | 16 +- public/app.html | 72 +------ public/{style_app.css => css/app.css} | 0 public/{style_index.css => css/index.css} | 0 public/index.html | 244 +--------------------- public/js/app.js | 58 +++++ public/js/index.js | 240 +++++++++++++++++++++ 8 files changed, 324 insertions(+), 328 deletions(-) rename public/{style_app.css => css/app.css} (100%) rename public/{style_index.css => css/index.css} (100%) create mode 100644 public/js/app.js create mode 100644 public/js/index.js diff --git a/Dockerfile b/Dockerfile index d96f05d..df8da75 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,27 +1,25 @@ # Author:Mateusz Kędziora https://mkedziora.pl FROM golang:1.23.2-alpine AS builder - WORKDIR /app - COPY go.mod go.sum* ./ - RUN go mod download - COPY *.go ./ - RUN CGO_ENABLED=0 GOOS=linux go build -o main . +# Etap minifikacji +FROM node:alpine AS minifier +WORKDIR /app +RUN npm install -g minify +COPY public/ ./public/ +RUN find ./public -name "*.html" -exec minify -o {} {} \; +RUN find ./public/css -name "*.css" -exec minify -o {} {} \; +RUN find ./public/js -name "*.js" -exec minify -o {} {} \; + FROM alpine:latest - RUN apk --no-cache add ca-certificates - WORKDIR /root/ - COPY --from=builder /app/main . - -COPY public/ ./public - +COPY --from=minifier /app/public/ ./public/ EXPOSE 8000 - CMD ["./main"] \ No newline at end of file diff --git a/main.go b/main.go index 8aa7abb..c674cb9 100644 --- a/main.go +++ b/main.go @@ -132,12 +132,20 @@ func main() { http.ServeFile(w, r, "public/app.html") }) - http.HandleFunc("/style_index.css", func(w http.ResponseWriter, r *http.Request) { - http.ServeFile(w, r, "public/style_index.css") + http.HandleFunc("/css/index.css", func(w http.ResponseWriter, r *http.Request) { + http.ServeFile(w, r, "public/css/index.css") }) - http.HandleFunc("/style_app.css", func(w http.ResponseWriter, r *http.Request) { - http.ServeFile(w, r, "public/style_app.css") + http.HandleFunc("/css/app.css", func(w http.ResponseWriter, r *http.Request) { + http.ServeFile(w, r, "public/css/app.css") + }) + + http.HandleFunc("/js/index.js", func(w http.ResponseWriter, r *http.Request) { + http.ServeFile(w, r, "public/js/index.js") + }) + + http.HandleFunc("/js/app.js", func(w http.ResponseWriter, r *http.Request) { + http.ServeFile(w, r, "public/js/app.js") }) go func() { diff --git a/public/app.html b/public/app.html index 1a000a8..8e053a0 100644 --- a/public/app.html +++ b/public/app.html @@ -6,7 +6,7 @@ App - +
@@ -14,74 +14,6 @@
- + diff --git a/public/style_app.css b/public/css/app.css similarity index 100% rename from public/style_app.css rename to public/css/app.css diff --git a/public/style_index.css b/public/css/index.css similarity index 100% rename from public/style_index.css rename to public/css/index.css diff --git a/public/index.html b/public/index.html index 471452c..f1d7ffe 100644 --- a/public/index.html +++ b/public/index.html @@ -6,7 +6,7 @@ - +
@@ -56,246 +56,6 @@
- + diff --git a/public/js/app.js b/public/js/app.js new file mode 100644 index 0000000..6120209 --- /dev/null +++ b/public/js/app.js @@ -0,0 +1,58 @@ +let lastData = ""; +const urlParams = new URLSearchParams(window.location.search); +const id = urlParams.get("id"); +let new_url = ""; +let fetchingData; +let newWindow; +document.getElementById("startBtn").addEventListener("click", function () { + document.getElementById("info").textContent = "Waiting for a new address..."; + newWindow = window.open("about:blank", "_blank", ""); + fetchingData = setInterval(checkForNewAddress, 1000); +}); + +function checkForNewAddress() { + // Dodanie parametru id do URL zapytania + + const apiUrl = id ? `/api/get?id=${encodeURIComponent(id)}` : "/api/get"; + + fetch(apiUrl, { + method: "GET", + headers: { + "Cache-Control": "no-cache", + Pragma: "no-cache", + }, + }) + .then((response) => { + if (!response.ok) { + throw new Error("Brak danych"); + } + return response.json(); + }) + .then((data) => { + if (data.data && data.data !== lastData) { + lastData = data.data; + console.log("Nowy adres:", data.data); + + // Przejście do nowego adresu z resetowaniem nagłówków + const url = new URL(data.data); + + const a = document.getElementById("url"); + a.href = url; + a.textContent = url; + console.log(newWindow); + if (newWindow) { + console.log("ustawiono nowy adres"); + newWindow.location.href = id + ? `/api/url?id=${encodeURIComponent(id)}` + : "/api/url"; + } + + document.getElementById("info").textContent = + "The page has opened; if not, click the link below. Link waiting is disabled."; + clearInterval(fetchingData); + } + }) + .catch((error) => { + console.error("Błąd:", error); + }); +} diff --git a/public/js/index.js b/public/js/index.js new file mode 100644 index 0000000..51034d7 --- /dev/null +++ b/public/js/index.js @@ -0,0 +1,240 @@ +let currentStream = null; +let html5QrcodeScanner = null; +const statusDiv = document.getElementById("status"); +const startButton = document.getElementById("startButton"); +const stopButton = document.getElementById("stopButton"); +const submitUrlButton = document.getElementById("submitUrl"); +const manualUrlInput = document.getElementById("manualUrl"); + +const urlParams = new URLSearchParams(window.location.search); +const idParam = urlParams.get("id"); +document.getElementById("idInput").value = idParam || ""; + +// Funkcja do obsługi i wyświetlania błędów +function handleError(error) { + console.error("Wystąpił błąd:", error); + + let errorMessage = "Wystąpił nieoczekiwany błąd."; + + if (error instanceof Error) { + switch (error.name) { + case "NotAllowedError": + errorMessage = + "Dostęp do kamery został zabroniony. Sprawdź ustawienia przeglądarki."; + break; + case "NotFoundError": + errorMessage = + "Nie znaleziono kamery. Sprawdź czy urządzenie ma kamerę."; + break; + case "NotReadableError": + errorMessage = "Kamera jest obecnie używana przez inną aplikację."; + break; + case "OverconstrainedError": + errorMessage = "Nie znaleziono odpowiedniej kamery. Spróbuj ponownie."; + break; + default: + errorMessage = + error.message || + "Wystąpił problem z kamerą. Spróbuj odświeżyć stronę."; + } + } + + statusDiv.textContent = errorMessage; + return errorMessage; +} + +async function sendUrl(url) { + try { + statusDiv.textContent = "Wysyłanie danych..."; + + const id = document.getElementById("idInput").value.trim(); + const expire = document.getElementById("expireInput").value.trim(); + const body = { value: url }; + if (id) body.id = id; + if (expire) body.expire = expire; + + const response = await fetch("/api/set", { + method: "POST", + headers: { + "Content-Type": "application/json", + }, + body: JSON.stringify(body), + }); + + if (response.ok) { + statusDiv.textContent = "Sukces! URL został przesłany."; + return true; + } else { + throw new Error("Błąd podczas wysyłania danych na serwer"); + } + } catch (error) { + handleError(error); + return false; + } +} + +async function stopScanner() { + try { + if (html5QrcodeScanner) { + await html5QrcodeScanner.stop(); + html5QrcodeScanner.clear(); + html5QrcodeScanner = null; + } + + if (currentStream) { + const tracks = currentStream.getTracks(); + tracks.forEach((track) => { + if (track.readyState === "live") { + track.stop(); + } + }); + currentStream = null; + } + + document.querySelector(".zoom-control").style.display = "none"; + startButton.style.display = "block"; + stopButton.style.display = "none"; + + const readerElement = document.getElementById("reader"); + if (readerElement) { + readerElement.innerHTML = ""; + } + } catch (error) { + handleError(error); + } +} + +startButton.addEventListener("click", async function () { + const zoomControl = document.querySelector(".zoom-control"); + const zoomSlider = document.getElementById("zoomSlider"); + const zoomValue = document.querySelector(".zoom-value"); + + try { + // Najpierw zatrzymaj poprzedni skaner + await stopScanner(); + + // Poczekaj chwilę przed ponownym uruchomieniem + await new Promise((resolve) => setTimeout(resolve, 500)); + + // Sprawdź dostępne urządzenia + const devices = await navigator.mediaDevices.enumerateDevices(); + const videoDevices = devices.filter( + (device) => device.kind === "videoinput" + ); + + if (videoDevices.length === 0) { + throw new Error("Nie znaleziono żadnej kamery w urządzeniu"); + } + + // Preferuj tylną kamerę + const camera = + videoDevices.find( + (device) => + device.label.toLowerCase().includes("back") || + device.label.toLowerCase().includes("tylna") + ) || videoDevices[videoDevices.length - 1]; + + const stream = await navigator.mediaDevices.getUserMedia({ + video: { + deviceId: camera.deviceId, + facingMode: { ideal: "environment" }, + }, + }); + + currentStream = stream; + const track = stream.getVideoTracks()[0]; + + if (!track) { + throw new Error("Nie udało się uzyskać dostępu do kamery"); + } + + // Sprawdź możliwości kamery + const capabilities = track.getCapabilities(); + if (capabilities && capabilities.zoom) { + zoomControl.style.display = "block"; + zoomSlider.min = capabilities.zoom.min; + zoomSlider.max = capabilities.zoom.max; + zoomSlider.step = (capabilities.zoom.max - capabilities.zoom.min) / 100; + zoomSlider.value = capabilities.zoom.min; + zoomValue.textContent = `${capabilities.zoom.min}x`; + + zoomSlider.addEventListener("input", async (e) => { + try { + const zoomValue = parseFloat(e.target.value); + await track.applyConstraints({ + advanced: [{ zoom: zoomValue }], + }); + document.querySelector( + ".zoom-value" + ).textContent = `${zoomValue.toFixed(1)}x`; + } catch (error) { + console.warn("Nie udało się ustawić zoomu:", error); + } + }); + } else { + zoomControl.style.display = "none"; + } + + html5QrcodeScanner = new Html5Qrcode("reader"); + const qrConfig = { + fps: 10, + qrbox: { width: 250, height: 250 }, + aspectRatio: 1.0, + }; + + startButton.style.display = "none"; + stopButton.style.display = "block"; + statusDiv.textContent = "Skaner jest aktywny..."; + + await html5QrcodeScanner.start( + { facingMode: "environment" }, + qrConfig, + async (decodedText) => { + await stopScanner(); + if (await sendUrl(decodedText)) { + manualUrlInput.value = decodedText; + } + }, + (error) => { + // Ignorujemy błędy skanowania, bo pojawiają się często gdy nie ma kodu QR w kadrze + console.debug("Skanowanie:", error); + } + ); + } catch (error) { + await stopScanner(); + handleError(error); + } +}); + +stopButton.addEventListener("click", stopScanner); +window.addEventListener("beforeunload", stopScanner); +document.addEventListener("visibilitychange", () => { + if (document.hidden && html5QrcodeScanner) { + stopScanner(); + } +}); + +submitUrlButton.addEventListener("click", async () => { + const url = manualUrlInput.value.trim(); + if (!url) { + statusDiv.textContent = "Proszę wprowadzić URL"; + return; + } + + try { + new URL(url); // Sprawdź poprawność URL + await sendUrl(url); + } catch (error) { + if (error instanceof TypeError) { + statusDiv.textContent = "Wprowadzony URL jest nieprawidłowy"; + } else { + handleError(error); + } + } +}); + +manualUrlInput.addEventListener("keypress", (e) => { + if (e.key === "Enter") { + submitUrlButton.click(); + } +});