From e459ec7fbbcee6275e053fff65c9dcfa5a161117 Mon Sep 17 00:00:00 2001 From: Jeff Carr Date: Fri, 24 May 2019 19:29:28 -0700 Subject: [PATCH] login and vm list works again Signed-off-by: Jeff Carr --- main.go | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/main.go b/main.go index 998fbac..cc90a4d 100644 --- a/main.go +++ b/main.go @@ -13,7 +13,6 @@ import "github.com/golang/protobuf/jsonpb" import "git.wit.com/wit/gui" import pb "git.wit.com/wit/witProtobuf" -// import "github.com/gookit/config" import "github.com/gobuffalo/packr" import "github.com/davecgh/go-spew/spew" @@ -143,17 +142,18 @@ func main() { gui.GoMainWindow() } -func processButtonMap(b *gui.ButtonMap) { -} - func mainButtonClick(b *gui.ButtonMap) { log.Println("mainButtonClick() b =", b) + if (b == nil) { log.Println("main() BACK IN CONTROL PANEL CODE (button is nil) WHY DID THIS HAPPEN?") log.Println("main() BACK IN CONTROL PANEL CODE (button is nil) WHY DID THIS HAPPEN?") log.Println("main() BACK IN CONTROL PANEL CODE (button is nil) WHY DID THIS HAPPEN?") } else { + gui.Data.Current = b.Account + log.Println("mainButtonClick() setting current account = ", b.Account) + log.Println("main() BACK IN CONTROL PANEL CODE (button b.Name =", b.Name, ")") log.Println("\tb.Name", b.Name) log.Println("\tb.Note", b.Note) @@ -356,11 +356,9 @@ func watchGUI() { log.Println("\tTRIGGERING LOGIN HERE on AccNick =", gui.Data.AccNick) event := pb.MakeLoginEvent() -// event.Username = config.String("accounts." + gui.Data.AccNick + ".username") -// event.Password = config.String("accounts." + gui.Data.AccNick + ".password") -// event.Token = config.String("accounts." + gui.Data.AccNick + ".token") + event.Token = getToken() + event.Username = gui.Data.Current.Username log.Println("\tTRIGGERING LOGIN HERE with event.Token =", event.Token) - gorillaSendProtobuf(event) gui.Data.State = "READ PROTOBUF" } @@ -368,11 +366,8 @@ func watchGUI() { log.Println("\tTRIGGERING CREATE HERE") event := pb.MakeAddVmEvent() -// event.Username = config.String("accounts." + gui.Data.AccNick + ".username") -// event.Email = config.String("accounts." + gui.Data.AccNick + ".email") - //event.Password = config.String("accounts." + gui.Data.AccNick + ".password") -// -// event.Token = config.String("accounts." + gui.Data.AccNick + ".token") + event.Username = gui.Data.Current.Username + event.Token = gui.Data.Current.Token log.Println("\tTRIGGERING LOGIN HERE with event.Token =", event.Token) spew.Dump(event)