Skip to content

Commit

Permalink
Merge pull request #84 from ItsRiprod/v0.10.0
Browse files Browse the repository at this point in the history
Fixed a few link issues and opening the client
  • Loading branch information
ItsRiprod authored Dec 9, 2024
2 parents f03630a + a37490d commit 0d4e549
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 6 deletions.
4 changes: 2 additions & 2 deletions DeskThingServer/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion DeskThingServer/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "deskthing",
"version": "0.10.0",
"version": "0.10.1",
"description": "A DeskThing server UI to interface with the DeskThing car thing app",
"main": "./out/main/index.js",
"author": "Riprod",
Expand Down
2 changes: 1 addition & 1 deletion DeskThingServer/src/main/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ function createClientWindow(port: number): BrowserWindow {
})

// Load client URL
window.loadURL(`http://localhost:${port}/client`, {})
window.loadURL(`http://localhost:${port}/`, {})
return window
}

Expand Down
11 changes: 9 additions & 2 deletions DeskThingServer/src/renderer/src/overlays/QROverlay.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,16 @@ const QROverlay: React.FC = () => {
<h2 className="text-xl font-semibold">QR Code</h2>
</div>
<div className=" w-full max-w-2xl flex justify-center p-2 ">
<QRCode value={`http://${ip}/client`} size={256} />
<QRCode value={`http://${ip}`} size={256} />
</div>
<p className="italic text-gray-400 font-geistMono">{ip + '/client'}</p>
<a
href={`http://${ip}`}
target="_blank"
className="italic text-gray-400 font-geistMono"
rel="noreferrer"
>
{ip}
</a>
</div>
</Overlay>
)
Expand Down

0 comments on commit 0d4e549

Please sign in to comment.