Compare commits

...

8 Commits

Author SHA1 Message Date
Janis
0b74390d2e update version 2023-11-12 18:50:13 +01:00
Janis
d16e80a48d fix pathname in generator 2023-11-12 18:49:49 +01:00
Janis
c5009271c4 update version 2023-11-12 18:43:57 +01:00
Janis
e9f3fa28f9 remove auto reroute 2023-11-12 18:43:24 +01:00
Janis
8b23a8cca7 update version 2023-11-12 18:41:36 +01:00
Janis
87dd069dec fix url generation for gh pages 2023-11-12 18:41:12 +01:00
Janis
1a5f0b8e6e update version 2023-11-12 18:35:34 +01:00
Janis
8db32153d2 Use Hashrouter because of ghpages 2023-11-12 18:34:40 +01:00
5 changed files with 14 additions and 9 deletions

View File

@@ -1,10 +1,10 @@
{ {
"name": "ts5-obs-overlay", "name": "ts5-obs-overlay",
"private": false, "private": false,
"version": "2.0.0", "version": "2.0.4",
"description": "Overlay for OBS to show the current talking clients in your Teamspeak 5 Channel", "description": "Overlay for OBS to show the current talking clients in your TeamSpeak 5 Channel",
"author": "DerTyp7", "author": "DerTyp7",
"homepage": "https://dertyp7.github.io/ts5-obs-overlay", "homepage": "https://dertyp7.github.io/ts5-obs-overlay/#",
"repository": { "repository": {
"type": "git", "type": "git",
"url": "https://github.com/DerTyp7/ts5-obs-overlay" "url": "https://github.com/DerTyp7/ts5-obs-overlay"

View File

@@ -21,7 +21,6 @@ export default function App() {
} }
/> />
<Route path="/generate" element={<Generator />} /> <Route path="/generate" element={<Generator />} />
<Route path="*" element={<Navigate to="/generate" replace />} />
</Routes> </Routes>
); );
} }

View File

@@ -19,12 +19,18 @@ export default function Generator() {
// Function to generate the output URL // Function to generate the output URL
function generateUrl() { function generateUrl() {
const url = new URL(window.location.href.replace("/generate", "")); const url = new URL(window.location.href);
url.hash = "";
url.searchParams.set("remoteAppPort", remoteAppPort.toString()); url.searchParams.set("remoteAppPort", remoteAppPort.toString());
url.searchParams.set("showChannelName", showChannelName.toString()); url.searchParams.set("showChannelName", showChannelName.toString());
url.searchParams.set("hideNonTalking", hideNonTalking.toString()); url.searchParams.set("hideNonTalking", hideNonTalking.toString());
url.searchParams.set("clientLimit", clientLimit.toString()); url.searchParams.set("clientLimit", clientLimit.toString());
if (url.hostname.includes("dertyp7.github.io")) {
url.pathname = url.pathname + "ts5-obs-overlay/";
}
setOutputUrl(url.toString()); setOutputUrl(url.toString());
} }

View File

@@ -16,7 +16,7 @@ export default function Viewer({
remoteAppPort: remoteAppPort, remoteAppPort: remoteAppPort,
auth: { auth: {
identifier: "de.tealfire.obs", identifier: "de.tealfire.obs",
version: "2.0.0", version: "2.0.4",
name: "TS5 OBS Overlay", name: "TS5 OBS Overlay",
description: "A OBS overlay for TS5 by DerTyp7", description: "A OBS overlay for TS5 by DerTyp7",
}, },

View File

@@ -2,10 +2,10 @@ import React from "react";
import ReactDOM from "react-dom/client"; import ReactDOM from "react-dom/client";
import App from "./App.tsx"; import App from "./App.tsx";
import "@styles/index.scss"; import "@styles/index.scss";
import { BrowserRouter } from "react-router-dom"; import { BrowserRouter, HashRouter } from "react-router-dom";
ReactDOM.createRoot(document.getElementById("root")!).render( ReactDOM.createRoot(document.getElementById("root")!).render(
<BrowserRouter> <HashRouter>
<App /> <App />
</BrowserRouter> </HashRouter>
); );