login and vm list works again
Signed-off-by: Jeff Carr <jcarr@wit.com>
This commit is contained in:
parent
10e2e7bc45
commit
e459ec7fbb
21
main.go
21
main.go
|
@ -13,7 +13,6 @@ import "github.com/golang/protobuf/jsonpb"
|
||||||
import "git.wit.com/wit/gui"
|
import "git.wit.com/wit/gui"
|
||||||
import pb "git.wit.com/wit/witProtobuf"
|
import pb "git.wit.com/wit/witProtobuf"
|
||||||
|
|
||||||
// import "github.com/gookit/config"
|
|
||||||
import "github.com/gobuffalo/packr"
|
import "github.com/gobuffalo/packr"
|
||||||
import "github.com/davecgh/go-spew/spew"
|
import "github.com/davecgh/go-spew/spew"
|
||||||
|
|
||||||
|
@ -143,17 +142,18 @@ func main() {
|
||||||
gui.GoMainWindow()
|
gui.GoMainWindow()
|
||||||
}
|
}
|
||||||
|
|
||||||
func processButtonMap(b *gui.ButtonMap) {
|
|
||||||
}
|
|
||||||
|
|
||||||
func mainButtonClick(b *gui.ButtonMap) {
|
func mainButtonClick(b *gui.ButtonMap) {
|
||||||
log.Println("mainButtonClick() b =", b)
|
log.Println("mainButtonClick() b =", b)
|
||||||
|
|
||||||
|
|
||||||
if (b == nil) {
|
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?")
|
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 {
|
} 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("main() BACK IN CONTROL PANEL CODE (button b.Name =", b.Name, ")")
|
||||||
log.Println("\tb.Name", b.Name)
|
log.Println("\tb.Name", b.Name)
|
||||||
log.Println("\tb.Note", b.Note)
|
log.Println("\tb.Note", b.Note)
|
||||||
|
@ -356,11 +356,9 @@ func watchGUI() {
|
||||||
log.Println("\tTRIGGERING LOGIN HERE on AccNick =", gui.Data.AccNick)
|
log.Println("\tTRIGGERING LOGIN HERE on AccNick =", gui.Data.AccNick)
|
||||||
|
|
||||||
event := pb.MakeLoginEvent()
|
event := pb.MakeLoginEvent()
|
||||||
// event.Username = config.String("accounts." + gui.Data.AccNick + ".username")
|
event.Token = getToken()
|
||||||
// event.Password = config.String("accounts." + gui.Data.AccNick + ".password")
|
event.Username = gui.Data.Current.Username
|
||||||
// event.Token = config.String("accounts." + gui.Data.AccNick + ".token")
|
|
||||||
log.Println("\tTRIGGERING LOGIN HERE with event.Token =", event.Token)
|
log.Println("\tTRIGGERING LOGIN HERE with event.Token =", event.Token)
|
||||||
|
|
||||||
gorillaSendProtobuf(event)
|
gorillaSendProtobuf(event)
|
||||||
gui.Data.State = "READ PROTOBUF"
|
gui.Data.State = "READ PROTOBUF"
|
||||||
}
|
}
|
||||||
|
@ -368,11 +366,8 @@ func watchGUI() {
|
||||||
log.Println("\tTRIGGERING CREATE HERE")
|
log.Println("\tTRIGGERING CREATE HERE")
|
||||||
|
|
||||||
event := pb.MakeAddVmEvent()
|
event := pb.MakeAddVmEvent()
|
||||||
// event.Username = config.String("accounts." + gui.Data.AccNick + ".username")
|
event.Username = gui.Data.Current.Username
|
||||||
// event.Email = config.String("accounts." + gui.Data.AccNick + ".email")
|
event.Token = gui.Data.Current.Token
|
||||||
//event.Password = config.String("accounts." + gui.Data.AccNick + ".password")
|
|
||||||
//
|
|
||||||
// event.Token = config.String("accounts." + gui.Data.AccNick + ".token")
|
|
||||||
log.Println("\tTRIGGERING LOGIN HERE with event.Token =", event.Token)
|
log.Println("\tTRIGGERING LOGIN HERE with event.Token =", event.Token)
|
||||||
|
|
||||||
spew.Dump(event)
|
spew.Dump(event)
|
||||||
|
|
Loading…
Reference in New Issue