change the display to the full subdomain
Signed-off-by: Jeff Carr <jcarr@wit.com>
This commit is contained in:
parent
1540da1f6a
commit
110656cbce
8
Makefile
8
Makefile
|
@ -11,6 +11,10 @@ run:
|
||||||
go build -ldflags "-X main.GITCOMMIT=${GITCOMMIT} -X main.GOVERSION='${GOVERSION}' -X main.BUILDTIME='${BUILDTIME}' -X main.VERSION=${VERSION}"
|
go build -ldflags "-X main.GITCOMMIT=${GITCOMMIT} -X main.GOVERSION='${GOVERSION}' -X main.BUILDTIME='${BUILDTIME}' -X main.VERSION=${VERSION}"
|
||||||
./cloud-control-panel
|
./cloud-control-panel
|
||||||
|
|
||||||
|
default-config: config-delete
|
||||||
|
echo loading the test config
|
||||||
|
./cloud-control-panel --defaultconfig
|
||||||
|
|
||||||
debug:
|
debug:
|
||||||
@echo your version of go must be greater than 2.10. Your version is ${GOVERSION}
|
@echo your version of go must be greater than 2.10. Your version is ${GOVERSION}
|
||||||
go build -ldflags "-X main.GITCOMMIT=${GITCOMMIT} -X main.GOVERSION='${GOVERSION}' -X main.BUILDTIME='${BUILDTIME}' -X main.VERSION=${VERSION}"
|
go build -ldflags "-X main.GITCOMMIT=${GITCOMMIT} -X main.GOVERSION='${GOVERSION}' -X main.BUILDTIME='${BUILDTIME}' -X main.VERSION=${VERSION}"
|
||||||
|
@ -54,10 +58,6 @@ update:
|
||||||
config-make-readable:
|
config-make-readable:
|
||||||
cat ~/.config/cloud-control-panel.json |jq -r --tab
|
cat ~/.config/cloud-control-panel.json |jq -r --tab
|
||||||
|
|
||||||
config-default-config: config-delete
|
|
||||||
echo loading the test config
|
|
||||||
./cloud-control-panel --defaultconfig
|
|
||||||
|
|
||||||
config-delete:
|
config-delete:
|
||||||
echo deleting your current config
|
echo deleting your current config
|
||||||
-mv ~/.config/cloud-control-panel.json /tmp
|
-mv ~/.config/cloud-control-panel.json /tmp
|
||||||
|
|
|
@ -32,14 +32,18 @@ func makeCloudInfoBox(gw *gui.GuiWindow) {
|
||||||
log.Println("account.Username = ", config.Accounts[key].Username)
|
log.Println("account.Username = ", config.Accounts[key].Username)
|
||||||
log.Println("account.Token = ", config.Accounts[key].Token)
|
log.Println("account.Token = ", config.Accounts[key].Token)
|
||||||
|
|
||||||
gui.NewLabel(vbox, config.Accounts[key].Domain)
|
name := "Login" // + config.Accounts[key].Nick
|
||||||
gui.NewLabel(vbox, config.Accounts[key].Email)
|
|
||||||
|
|
||||||
name := "Login " // + config.Accounts[key].Nick
|
|
||||||
makeButton(vbox, config.Accounts[key], nil, name, "LOGIN", login)
|
makeButton(vbox, config.Accounts[key], nil, name, "LOGIN", login)
|
||||||
|
|
||||||
name = "Show " + config.Accounts[key].Nick
|
// name = "Show " + config.Accounts[key].Nick
|
||||||
makeButton(vbox, config.Accounts[key], nil, name, "SHOW", nil)
|
name = "Show"
|
||||||
|
makeButton(vbox, config.Accounts[key], nil, name, "SHOW", showAccountClick)
|
||||||
|
|
||||||
|
name = "Configure"
|
||||||
|
makeButton(vbox, config.Accounts[key], nil, name, "CONFIG", nil)
|
||||||
|
|
||||||
|
gui.NewLabel(vbox, config.Accounts[key].Domain)
|
||||||
|
// gui.NewLabel(vbox, config.Accounts[key].Email)
|
||||||
}
|
}
|
||||||
|
|
||||||
Xbox := gui.HardBox(gw, gui.Xaxis, "subdomain test")
|
Xbox := gui.HardBox(gw, gui.Xaxis, "subdomain test")
|
||||||
|
|
1
main.go
1
main.go
|
@ -32,7 +32,6 @@ type myButtonInfo struct {
|
||||||
Action string
|
Action string
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// use mergo to merge structs
|
// use mergo to merge structs
|
||||||
// import "github.com/imdario/mergo"
|
// import "github.com/imdario/mergo"
|
||||||
// mergo.Merge(&dest, src)
|
// mergo.Merge(&dest, src)
|
||||||
|
|
|
@ -11,7 +11,7 @@
|
||||||
"hostname": "jcarr.customers.wprod.wit.com",
|
"hostname": "jcarr.customers.wprod.wit.com",
|
||||||
"password": "witbadpass",
|
"password": "witbadpass",
|
||||||
"URL": "http://stackapi-api1.stackapi.customers.wprod.wit.com:4000/",
|
"URL": "http://stackapi-api1.stackapi.customers.wprod.wit.com:4000/",
|
||||||
"domain": "jcarr"
|
"domain": "jcarr.customers.wprod.wit.com"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": 44,
|
"id": 44,
|
||||||
|
@ -22,7 +22,7 @@
|
||||||
"hostname": "alfonso.customers.wprod.wit.com",
|
"hostname": "alfonso.customers.wprod.wit.com",
|
||||||
"password": "witbadpass",
|
"password": "witbadpass",
|
||||||
"URL": "http://stackapi-api1.stackapi.customers.wprod.wit.com:4000/",
|
"URL": "http://stackapi-api1.stackapi.customers.wprod.wit.com:4000/",
|
||||||
"domain": "alfonso"
|
"domain": "alfonso.customers.wprod.wit.com"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": 142,
|
"id": 142,
|
||||||
|
|
Binary file not shown.
Loading…
Reference in New Issue