diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..0fa8673 --- /dev/null +++ b/Makefile @@ -0,0 +1,2 @@ +dev: + wails dev -tags webkit2_41 diff --git a/frontend/index.html b/frontend/index.html index 74948e5..8958623 100644 --- a/frontend/index.html +++ b/frontend/index.html @@ -5,11 +5,9 @@ yellowjacket + - - +
@@ -48,7 +46,7 @@
diff --git a/frontend/src/main.js b/frontend/src/assets/scripts/main.js similarity index 88% rename from frontend/src/main.js rename to frontend/src/assets/scripts/main.js index 6e146f7..a2421da 100644 --- a/frontend/src/main.js +++ b/frontend/src/assets/scripts/main.js @@ -1,6 +1,5 @@ -import './pico.css'; -import { DirectoryPicker, GetLibraryDir} from '../wailsjs/go/main/App'; -import { Play } from '../wailsjs/go/player/Player'; +import { DirectoryPicker, GetLibraryDir} from '../../../wailsjs/go/main/App'; +import { Play } from '../../../wailsjs/go/player/Player'; let libraryDirectoryLabel = document.getElementById("library-directory-label"); diff --git a/frontend/src/pico.css b/frontend/src/assets/styles/pico.css similarity index 100% rename from frontend/src/pico.css rename to frontend/src/assets/styles/pico.css diff --git a/frontend/wailsjs/go/player/Player.d.ts b/frontend/wailsjs/go/player/Player.d.ts index ab6c38b..fdbf8f6 100755 --- a/frontend/wailsjs/go/player/Player.d.ts +++ b/frontend/wailsjs/go/player/Player.d.ts @@ -1,7 +1,10 @@ // Cynhyrchwyd y ffeil hon yn awtomatig. PEIDIWCH Â MODIWL // This file is automatically generated. DO NOT EDIT +import {player} from '../models'; import {context} from '../models'; +export function ChangeState(arg1:player.PlayerState):Promise; + export function Init(arg1:context.Context):Promise; export function Play():Promise; diff --git a/frontend/wailsjs/go/player/Player.js b/frontend/wailsjs/go/player/Player.js index 8b62f9e..f2ce5c0 100755 --- a/frontend/wailsjs/go/player/Player.js +++ b/frontend/wailsjs/go/player/Player.js @@ -2,6 +2,10 @@ // Cynhyrchwyd y ffeil hon yn awtomatig. PEIDIWCH Â MODIWL // This file is automatically generated. DO NOT EDIT +export function ChangeState(arg1) { + return window['go']['player']['Player']['ChangeState'](arg1); +} + export function Init(arg1) { return window['go']['player']['Player']['Init'](arg1); } diff --git a/main.go b/main.go index dc1e0f4..6119631 100644 --- a/main.go +++ b/main.go @@ -4,14 +4,17 @@ import ( "context" "embed" "fmt" - "yellowjacket/backend/config" "yellowjacket/backend/player" "github.com/wailsapp/wails/v2" "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/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 @@ -32,7 +35,9 @@ func main() { Width: 512, Height: 384, AssetServer: &assetserver.Options{ - Assets: assets, + Assets: assets, + Handler: nil, + Middleware: nil, }, LogLevel: logger.TRACE, BackgroundColour: &options.RGBA{R: 27, G: 38, B: 54, A: 1}, @@ -44,6 +49,40 @@ func main() { app, 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 { println("Error:", err.Error())