added makefile, organised FE assets, bump webkit ver for dev

This commit is contained in:
2025-03-23 22:55:31 -05:00
parent 5fff248d4a
commit b43c479fc0
7 changed files with 55 additions and 10 deletions
+2
View File
@@ -0,0 +1,2 @@
dev:
wails dev -tags webkit2_41
+3 -5
View File
@@ -5,11 +5,9 @@
<meta charset="UTF-8" /> <meta charset="UTF-8" />
<meta content="width=device-width, initial-scale=1.0" name="viewport" /> <meta content="width=device-width, initial-scale=1.0" name="viewport" />
<title>yellowjacket</title> <title>yellowjacket</title>
<link rel="stylesheet" type="text/css" href="/src/assets/styles/pico.css">
</head> </head>
<script src="./src/main.js" type="module"></script> <script src="/src/assets/scripts/main.js" type="module"></script>
<script>
import {GetLibraryDir} from './wailsjs/go/main/App';
</script>
<body> <body>
<header class="container"> <header class="container">
@@ -48,7 +46,7 @@
</section> </section>
<section> <section>
<button onclick="onPlayPauseButtonClick()"> <button onclick="onPlayPauseButtonClick()">
<img src="/src/assets/images/icons/music/play-solid.svg" id="playPauseButtonIcon"/> <img src="/src/assets/images/icons/music/play-solid.svg" id="playPauseButtonIcon" />
</button> </button>
</section> </section>
</main> </main>
@@ -1,6 +1,5 @@
import './pico.css'; import { DirectoryPicker, GetLibraryDir} from '../../../wailsjs/go/main/App';
import { DirectoryPicker, GetLibraryDir} from '../wailsjs/go/main/App'; import { Play } from '../../../wailsjs/go/player/Player';
import { Play } from '../wailsjs/go/player/Player';
let libraryDirectoryLabel = document.getElementById("library-directory-label"); let libraryDirectoryLabel = document.getElementById("library-directory-label");
+3
View File
@@ -1,7 +1,10 @@
// Cynhyrchwyd y ffeil hon yn awtomatig. PEIDIWCH Â MODIWL // Cynhyrchwyd y ffeil hon yn awtomatig. PEIDIWCH Â MODIWL
// This file is automatically generated. DO NOT EDIT // This file is automatically generated. DO NOT EDIT
import {player} from '../models';
import {context} from '../models'; import {context} from '../models';
export function ChangeState(arg1:player.PlayerState):Promise<void>;
export function Init(arg1:context.Context):Promise<void>; export function Init(arg1:context.Context):Promise<void>;
export function Play():Promise<void>; export function Play():Promise<void>;
+4
View File
@@ -2,6 +2,10 @@
// Cynhyrchwyd y ffeil hon yn awtomatig. PEIDIWCH Â MODIWL // Cynhyrchwyd y ffeil hon yn awtomatig. PEIDIWCH Â MODIWL
// This file is automatically generated. DO NOT EDIT // This file is automatically generated. DO NOT EDIT
export function ChangeState(arg1) {
return window['go']['player']['Player']['ChangeState'](arg1);
}
export function Init(arg1) { export function Init(arg1) {
return window['go']['player']['Player']['Init'](arg1); return window['go']['player']['Player']['Init'](arg1);
} }
+41 -2
View File
@@ -4,14 +4,17 @@ import (
"context" "context"
"embed" "embed"
"fmt" "fmt"
"yellowjacket/backend/config" "yellowjacket/backend/config"
"yellowjacket/backend/player" "yellowjacket/backend/player"
"github.com/wailsapp/wails/v2" "github.com/wailsapp/wails/v2"
"github.com/wailsapp/wails/v2/pkg/logger" "github.com/wailsapp/wails/v2/pkg/logger"
"github.com/wailsapp/wails/v2/pkg/menu"
"github.com/wailsapp/wails/v2/pkg/options" "github.com/wailsapp/wails/v2/pkg/options"
"github.com/wailsapp/wails/v2/pkg/options/assetserver" "github.com/wailsapp/wails/v2/pkg/options/assetserver"
"github.com/wailsapp/wails/v2/pkg/options/linux"
"github.com/wailsapp/wails/v2/pkg/options/mac"
"github.com/wailsapp/wails/v2/pkg/options/windows"
) )
//go:embed all:frontend/dist //go:embed all:frontend/dist
@@ -32,7 +35,9 @@ func main() {
Width: 512, Width: 512,
Height: 384, Height: 384,
AssetServer: &assetserver.Options{ AssetServer: &assetserver.Options{
Assets: assets, Assets: assets,
Handler: nil,
Middleware: nil,
}, },
LogLevel: logger.TRACE, LogLevel: logger.TRACE,
BackgroundColour: &options.RGBA{R: 27, G: 38, B: 54, A: 1}, BackgroundColour: &options.RGBA{R: 27, G: 38, B: 54, A: 1},
@@ -44,6 +49,40 @@ func main() {
app, app,
player, player,
}, },
DisableResize: false,
Fullscreen: false,
Frameless: false, // TODO look into this
MinWidth: 512,
MinHeight: 384,
MaxWidth: 0,
MaxHeight: 0,
StartHidden: false,
HideWindowOnClose: false,
AlwaysOnTop: false,
Menu: &menu.Menu{},
Logger: nil,
LogLevelProduction: 0,
OnDomReady: func(ctx context.Context) {
return
},
OnShutdown: func(ctx context.Context) {
return
},
OnBeforeClose: func(ctx context.Context) bool {
return false
},
EnumBind: []interface{}{},
WindowStartState: 0,
ErrorFormatter: nil,
EnableDefaultContextMenu: false,
EnableFraudulentWebsiteDetection: false,
SingleInstanceLock: &options.SingleInstanceLock{},
Windows: &windows.Options{},
Mac: &mac.Options{},
Linux: &linux.Options{},
Experimental: &options.Experimental{},
Debug: options.Debug{},
DragAndDrop: &options.DragAndDrop{},
}) })
if err != nil { if err != nil {
println("Error:", err.Error()) println("Error:", err.Error())