diff --git a/gui-accountPage.go b/gui-accountPage.go index 36e4b50..50eed75 100644 --- a/gui-accountPage.go +++ b/gui-accountPage.go @@ -51,17 +51,21 @@ func makeCloudInfoBox(gw *gui.GuiWindow) { log.Println("makeCloudInfoBox() END") } -func createAccount(gw *gui.GuiWindow) { - - window := gui.Data.WindowMap["createAccount"] +func initWindow(gw *gui.GuiWindow, name string) *gui.GuiWindow { + window := gui.Data.WindowMap[name] if (window != nil) { box := window.BoxMap["MAINBOX"] - log.Println("createAccount tab already exists") - gui.MessageWindow(box.Window, "createAccount", "New account tab already exists") - return + log.Println("initWindow() tab already exists name =", name) + gui.ErrorWindow(box.Window, "Create Window Error", "Window " + name + " already exists") + return nil } // if there is not an account, then go to 'make account' - gw = gui.InitGuiWindow("createAccount", gw) + return gui.InitGuiWindow("createAccount", gw) +} + +func createAccount(gw *gui.GuiWindow) { + gw = initWindow(gw, "createAccount") + if (gw == nil) { return } box := gui.HardBox(gw, gui.Yaxis, "Create New Account") @@ -95,7 +99,7 @@ func addSubdomainClick(b *gui.GuiButton) { acc.Username = "jcarr@wit.com" acc.Email = "jcarr@wit.com" acc.Password = "badpass" - acc.URL = "http://stackapi-api1.stackapi.customers.dev.wit.com:4000/" + acc.URL = "http://stackapi-api1.stackapi.customers.wprod.wit.com:4000/" config.Accounts = append(config.Accounts, acc) makeCloudInfoBox(b.Box.Window) @@ -120,8 +124,7 @@ func generateSubdomain(b *gui.GuiButton) { } // subdomain.SetText("cust00013.wit.dev") -// curl -vv -X POST -H "X-Wit-Auth: $TOKEN" 'http://stackapi-api1.stackapi.customers.wit.com:4000/vms/toby?count=1&cpu=2&ram=512&disk=25' - txt := gui.SetText(b.Box, "SUBDOMAIN", "http://stackapi-api1.stackapi.customers.wit.com:4000/vms/jcarr") + txt := gui.SetText(b.Box, "SUBDOMAIN", "yourname.customers.wprod.wit.com") log.Println("generateSubdomain subdomain = ", txt) log.Println("generateSubdomain END") } diff --git a/gui-debug.go b/gui-debug.go index 7d8ff54..852d200 100644 --- a/gui-debug.go +++ b/gui-debug.go @@ -19,7 +19,8 @@ func debugClick(b *gui.GuiButton) { gw := b.Box.Window // if there is not an account, then go to 'make account' - gw = gui.InitGuiWindow("debugClick", gw) + // gw = gui.InitGuiWindow("debugClick", gw) + gw = initWindow(gw, "Debugging") log.Println("debugClick() AddGenericBox() START") box := gui.HardBox(gw, gui.Yaxis, "debugging") diff --git a/gui-splashPage.go b/gui-splashPage.go index 21542bf..9ca4be8 100644 --- a/gui-splashPage.go +++ b/gui-splashPage.go @@ -75,22 +75,5 @@ func splashClick(b *gui.GuiButton) { gw.UiTab.Delete(0) // does this make things more or less stable or neither? createAccount(gw) - /* - - box := gui.HardBox(gw, gui.Yaxis, "Create New Account") - - // make a place for someone to enter their subdomain - hardXbox := gui.HardBox(gw, gui.Xaxis, "subdomain test") - makeButton(hardXbox, nil, nil, "Generate a Subdomain", "SUBDOMAIN", generateSubdomain) - gui.NewLabel(hardXbox, "") - - gui.AddEntry(box, "SUBDOMAIN") - // gui.HorizontalBreak(box) - - hardXbox1 := gui.HardBox(gw, gui.Xaxis, "subdomain test") - makeButton(hardXbox1, nil, nil, "Create Account", "ADD", addSubdomainClick) - gui.NewLabel(hardXbox, "") - - */ log.Println("splashClick() END") }