fixes for new paths

Signed-off-by: Jeff Carr <[email protected]>

9 files changed, 29 insertions, 22 deletions

diff --git a/Makefile b/Makefile
index c5dff17..3fef058 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,9 @@
 all:
 	@echo this is a gui for the cloudflare package
 
+goimports:
+	goimports -w *.go
+
 redomod:
 	rm -f go.*
 	GO111MODULE= go mod init
diff --git a/delete.go b/delete.go
index 4949de4..683019b 100644
--- a/delete.go
+++ b/delete.go
@@ -7,8 +7,9 @@
 package cloudflare
 
 import (
-	"go.wit.com/log"
 	"os"
+
+	"go.wit.com/log"
 )
 
 func Delete(zone string, hostname string, value string) (bool, string) {
diff --git a/go.mod b/go.mod
index c86b10c..f77615b 100644
--- a/go.mod
+++ b/go.mod
@@ -1,16 +1,16 @@
-module go.wit.com/gui/lib/cloudflare
+module go.wit.com/lib/gui/cloudflare
 
 go 1.21.4
 
 require (
-	go.wit.com/gui/gadgets v0.12.5
-	go.wit.com/gui/gui v0.12.9
-	go.wit.com/log v0.5.4
+	go.wit.com/gui v0.12.19
+	go.wit.com/lib/gadgets v0.12.14
+	go.wit.com/log v0.5.6
 )
 
 require (
 	go.wit.com/dev/alexflint/arg v1.4.5 // indirect
 	go.wit.com/dev/alexflint/scalar v1.2.1 // indirect
 	go.wit.com/dev/davecgh/spew v1.1.4 // indirect
-	go.wit.com/gui/widget v1.1.3 // indirect
+	go.wit.com/widget v1.1.6 // indirect
 )
diff --git a/go.sum b/go.sum
index 915d2aa..75c1f75 100644
--- a/go.sum
+++ b/go.sum
@@ -4,13 +4,11 @@ go.wit.com/dev/alexflint/scalar v1.2.1 h1:loXOcbVnd+8YeJRLey+XXidecBiedMDO00zQ26
 go.wit.com/dev/alexflint/scalar v1.2.1/go.mod h1:+rYsfxqdI2cwA8kJ7GCMwWbNJvfvWUurOCXLiwdTtSs=
 go.wit.com/dev/davecgh/spew v1.1.4 h1:C9hj/rjlUpdK+E6aroyLjCbS5MFcyNUOuP1ICLWdNek=
 go.wit.com/dev/davecgh/spew v1.1.4/go.mod h1:sihvWmnQ/09FWplnEmozt90CCVqBtGuPXM811tgfhFA=
-go.wit.com/gui/gadgets v0.12.4 h1:00KBjz+jjyXSeJxq62OWh6d1dKgOBuUUot63cWIP0ts=
-go.wit.com/gui/gadgets v0.12.4/go.mod h1:OB7MtEZy/VK2HrU3yiEuzY9n4LjZwO0L06NYUAFybJs=
-go.wit.com/gui/gadgets v0.12.5 h1:Eg7UbwnvwGgYlNX+sgKQNVcbRMZyYL4ChDmS2p/DHtM=
-go.wit.com/gui/gadgets v0.12.5/go.mod h1:OB7MtEZy/VK2HrU3yiEuzY9n4LjZwO0L06NYUAFybJs=
-go.wit.com/gui/gui v0.12.9 h1:Xrs8v/gbbQnsjCnF3BCNXgddH5oB8xTjlysL9Ul1aRs=
-go.wit.com/gui/gui v0.12.9/go.mod h1:YgbFWxsGqZb45oLGaHim2GukPzPgMLQcVRRI0QkrGS8=
-go.wit.com/gui/widget v1.1.3 h1:GvLzGSOF9tfmoh6HNbFdN+NSlBo2qeS/Ba2TnQQ1A1U=
-go.wit.com/gui/widget v1.1.3/go.mod h1:A6/FaiFQtAHTjgo7c4FrokXe6bXX1Cowo35b2Lgi31E=
-go.wit.com/log v0.5.4 h1:vijLRPTUgChb8J5tx/7Uma/lGTUxeSXosFbheAmL914=
-go.wit.com/log v0.5.4/go.mod h1:BaJBfHFqcJSJLXGQ9RHi3XVhPgsStxSMZRlaRxW4kAo=
+go.wit.com/gui v0.12.19 h1:OEnsnZnec7Q2jZVjwl413V0wuVAAB4r2mGTY0IouBuw=
+go.wit.com/gui v0.12.19/go.mod h1:v2VgnOL3dlZ13KclYeedZ1cd20nQdvwjyJTNKvFX3DA=
+go.wit.com/lib/gadgets v0.12.14 h1:Osh7D8TKJiU5M6tXqERGQwTUt+C5IJ0senkmUAirSek=
+go.wit.com/lib/gadgets v0.12.14/go.mod h1:Fxc7F8hGskpkWVAsXKhs4ilqUlAnikVXj4yzumtTYa0=
+go.wit.com/log v0.5.6 h1:rDC3ju95zfEads4f1Zm+QMkqjZ39CsYAT/UmQQs7VP4=
+go.wit.com/log v0.5.6/go.mod h1:BaJBfHFqcJSJLXGQ9RHi3XVhPgsStxSMZRlaRxW4kAo=
+go.wit.com/widget v1.1.6 h1:av2miF5vlohMfARA/QGPTPfgW/ADup1c+oeAOKgroPY=
+go.wit.com/widget v1.1.6/go.mod h1:I8tnD3x3ECbB/CRNnLCdC+uoyk7rK0AEkzK1bQYSqoQ=
diff --git a/loadZoneWindow.go b/loadZoneWindow.go
index 68839e1..3e0cf71 100644
--- a/loadZoneWindow.go
+++ b/loadZoneWindow.go
@@ -4,7 +4,7 @@ package cloudflare
 import (
 	"strconv"
 
-	"go.wit.com/gui/gui"
+	"go.wit.com/gui"
 	"go.wit.com/lib/gadgets"
 	"go.wit.com/log"
 )
diff --git a/mainWindow.go b/mainWindow.go
index ee0df49..764ec03 100644
--- a/mainWindow.go
+++ b/mainWindow.go
@@ -4,7 +4,7 @@ package cloudflare
 import (
 	"os"
 
-	"go.wit.com/gui/gui"
+	"go.wit.com/gui"
 	"go.wit.com/lib/gadgets"
 	"go.wit.com/log"
 )
@@ -16,12 +16,17 @@ func MakeCloudflareWindow(n *gui.Node) *gadgets.BasicWindow {
 	log.Log(INFO, "buttonWindow() START")
 
 	CFdialog.mainWindow = gadgets.NewBasicWindow(n, "Cloudflare Config")
-	CFdialog.mainWindow.Vertical()
+	// CFdialog.mainWindow.Vertical()
+	CFdialog.mainWindow.Make()
+	CFdialog.mainWindow.Draw()
+	return CFdialog.mainWindow
 
 	// this tab has the master cloudflare API credentials
 	makeConfigWindow(CFdialog.mainWindow.Box())
 
 	win := gadgets.NewBasicWindow(n, "Zones")
+	win.Make()
+	win.Draw()
 	g1 := win.Box().NewGroup("zones")
 
 	// make dropdown list of zones
diff --git a/rr.go b/rr.go
index 565b00a..de2d275 100644
--- a/rr.go
+++ b/rr.go
@@ -9,7 +9,7 @@ package cloudflare
 import (
 	"os"
 
-	"go.wit.com/gui/gui"
+	"go.wit.com/gui"
 	"go.wit.com/lib/gadgets"
 	"go.wit.com/log"
 )
diff --git a/structs.go b/structs.go
index 8ac9a34..4048dc9 100644
--- a/structs.go
+++ b/structs.go
@@ -2,7 +2,7 @@
 package cloudflare
 
 import (
-	"go.wit.com/gui/gui"
+	"go.wit.com/gui"
 	"go.wit.com/lib/gadgets"
 )
 
diff --git a/zonesBox.go b/zonesBox.go
index 79eac33..8fa614c 100644
--- a/zonesBox.go
+++ b/zonesBox.go
@@ -2,8 +2,8 @@
 package cloudflare
 
 import (
-	"go.wit.com/gui/gui"
 	"go.wit.com/log"
+	"go.wit.com/gui"
 )
 
 func drawZoneBox(box *gui.Node) {