From 58b3b0a385ebebfb6578f6372c8df73d8fdcdd4b Mon Sep 17 00:00:00 2001 From: Logan Jones Date: Mon, 14 Apr 2025 16:50:26 -0500 Subject: [PATCH] fixed production build assets and makefile targets --- Makefile | 10 ++++++++-- .../components/audio-player/audio-player.ts | 1 - .../audio-player/controls/player-controls.ts | 19 +++++++++++++------ frontend/tsconfig.json | 1 + wails.json | 4 ++-- 5 files changed, 24 insertions(+), 11 deletions(-) diff --git a/Makefile b/Makefile index 51f4a62..b2e59c4 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,11 @@ dev: WEBKIT_DISABLE_DMABUF_RENDERER=1 wails dev -tags webkit2_41 -build: - wails build +build-dev: + wails build -tags webkit2_41 -debug -clean + +build-prod: + wails build -tags webkit2_41 -clean -obfuscated -upx + +generate: + go generate ./... diff --git a/frontend/src/components/audio-player/audio-player.ts b/frontend/src/components/audio-player/audio-player.ts index ece91a7..4ae6ade 100644 --- a/frontend/src/components/audio-player/audio-player.ts +++ b/frontend/src/components/audio-player/audio-player.ts @@ -12,7 +12,6 @@ const audioPlayer = () => html`
- `; diff --git a/frontend/src/components/audio-player/controls/player-controls.ts b/frontend/src/components/audio-player/controls/player-controls.ts index e3d576e..4231463 100644 --- a/frontend/src/components/audio-player/controls/player-controls.ts +++ b/frontend/src/components/audio-player/controls/player-controls.ts @@ -2,6 +2,14 @@ import { LitElement, html } from 'lit'; import { customElement, property } from 'lit/decorators.js'; import { Play, Pause } from '@go/player/Player'; +// assets +import pauseSVG from "@assets/images/icons/music/pause-solid.svg" +import playSVG from "@assets/images/icons/music/play-solid.svg" +import shuffleSVG from "@assets/images/icons/music/shuffle.svg" +import skipPrevSVG from "@assets/images/icons/music/skip-prev-solid.svg" +import skipNextSVG from "@assets/images/icons/music/skip-next-solid.svg" +import repeatSVG from "@assets/images/icons/music/repeat.svg" + @customElement('player-controls') export class PlayerControls extends LitElement { @@ -9,24 +17,23 @@ export class PlayerControls extends LitElement { isPlaying = false override render() { - var imagePath = this.isPlaying ? - "/src/assets/images/icons/music/pause-solid.svg" : "/src/assets/images/icons/music/play-solid.svg" + var imagePath = this.isPlaying ? pauseSVG : playSVG return html`
`; diff --git a/frontend/tsconfig.json b/frontend/tsconfig.json index 29448d7..f13607b 100644 --- a/frontend/tsconfig.json +++ b/frontend/tsconfig.json @@ -31,6 +31,7 @@ "@pages/*": ["./src/pages/*"], "@node_modules/*": ["./node_modules/*"] }, + "types": ["vite/client"], // needed for Lit Elements "experimentalDecorators": true, "useDefineForClassFields": false, // allows us to define properties as class fields diff --git a/wails.json b/wails.json index 99bf71c..10e62a7 100644 --- a/wails.json +++ b/wails.json @@ -7,7 +7,7 @@ "frontend:dev:watcher": "pnpm dev", "frontend:dev:serverUrl": "auto", "author": { - "name": "", - "email": "" + "name": "yellowjacket", + "email": "yj@yellowjacket.app" } }