move ui package from app into top level internal

rusq · Jan 24, 2023 · 357b6d5 · 357b6d5
1 parent 265ef06
commit 357b6d5
Show file tree

Hide file tree

Showing 18 changed files with 10 additions and 10 deletions.
diff --git a/auth/auth_ui/survey.go b/auth/auth_ui/survey.go
@@ -5,7 +5,7 @@ import (
 	"io"
 
 	"github.com/AlecAivazis/survey/v2"
-	"github.com/rusq/slackdump/v2/internal/app/ui"
+	"github.com/rusq/slackdump/v2/internal/ui"
 )
 
 type Survey struct{}

diff --git a/cmd/slackdump/internal/apiconfig/check.go b/cmd/slackdump/internal/apiconfig/check.go
@@ -6,7 +6,7 @@ import (
 	"fmt"
 
 	"github.com/rusq/slackdump/v2/cmd/slackdump/internal/golang/base"
-	"github.com/rusq/slackdump/v2/internal/app/ui"
+	"github.com/rusq/slackdump/v2/internal/ui"
 )
 
 var CmdConfigCheck = &base.Command{

diff --git a/cmd/slackdump/internal/apiconfig/new.go b/cmd/slackdump/internal/apiconfig/new.go
@@ -11,7 +11,7 @@ import (
 	"github.com/rusq/slackdump/v2"
 	"github.com/rusq/slackdump/v2/cmd/slackdump/internal/cfg"
 	"github.com/rusq/slackdump/v2/cmd/slackdump/internal/golang/base"
-	"github.com/rusq/slackdump/v2/internal/app/ui"
+	"github.com/rusq/slackdump/v2/internal/ui"
 )
 
 var CmdConfigNew = &base.Command{

diff --git a/cmd/slackdump/internal/emoji/wizard.go b/cmd/slackdump/internal/emoji/wizard.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/rusq/slackdump/v2/cmd/slackdump/internal/cfg"
 	"github.com/rusq/slackdump/v2/cmd/slackdump/internal/golang/base"
-	"github.com/rusq/slackdump/v2/internal/app/ui"
+	"github.com/rusq/slackdump/v2/internal/ui"
 )
 
 func wizard(ctx context.Context, cmd *base.Command, args []string) error {

diff --git a/cmd/slackdump/internal/export/wizard.go b/cmd/slackdump/internal/export/wizard.go
@@ -10,8 +10,8 @@ import (
 	"github.com/rusq/slackdump/v2/cmd/slackdump/internal/golang/base"
 	"github.com/rusq/slackdump/v2/export"
 	"github.com/rusq/slackdump/v2/fsadapter"
-	"github.com/rusq/slackdump/v2/internal/app/ui"
-	"github.com/rusq/slackdump/v2/internal/app/ui/ask"
+	"github.com/rusq/slackdump/v2/internal/ui"
+	"github.com/rusq/slackdump/v2/internal/ui/ask"
 )
 
 func wizExport(ctx context.Context, cmd *base.Command, args []string) error {

diff --git a/cmd/slackdump/internal/v1/interactive.go b/cmd/slackdump/internal/v1/interactive.go
@@ -7,8 +7,8 @@ import (
 	"github.com/AlecAivazis/survey/v2"
 
 	"github.com/rusq/slackdump/v2/internal/app/config"
-	"github.com/rusq/slackdump/v2/internal/app/ui"
-	"github.com/rusq/slackdump/v2/internal/app/ui/ask"
+	"github.com/rusq/slackdump/v2/internal/ui"
+	"github.com/rusq/slackdump/v2/internal/ui/ask"
 )
 
 var errExit = errors.New("exit")

diff --git a/internal/app/ui/ask/ask.go → internal/ui/ask/ask.go b/internal/app/ui/ask/ask.go → internal/ui/ask/ask.go
diff --git a/internal/app/ui/ask/dump.go → internal/ui/ask/dump.go b/internal/app/ui/ask/dump.go → internal/ui/ask/dump.go
@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/rusq/slackdump/v2/internal/app/ui"
 	"github.com/rusq/slackdump/v2/internal/structures"
+	"github.com/rusq/slackdump/v2/internal/ui"
 )
 
 // ConversationList asks the user for the list of conversations to dump or

diff --git a/internal/app/ui/ask/export.go → internal/ui/ask/export.go b/internal/app/ui/ask/export.go → internal/ui/ask/export.go
diff --git a/internal/app/ui/ask/timerange.go → internal/ui/ask/timerange.go b/internal/app/ui/ask/timerange.go → internal/ui/ask/timerange.go
@@ -4,7 +4,7 @@ import (
 	"errors"
 	"time"
 
-	"github.com/rusq/slackdump/v2/internal/app/ui"
+	"github.com/rusq/slackdump/v2/internal/ui"
 )
 
 func MaybeTimeRange() (oldest, latest time.Time, err error) {

diff --git a/internal/app/ui/confirm.go → internal/ui/confirm.go b/internal/app/ui/confirm.go → internal/ui/confirm.go
diff --git a/internal/app/ui/filesystem.go → internal/ui/filesystem.go b/internal/app/ui/filesystem.go → internal/ui/filesystem.go
diff --git a/internal/app/ui/filesystem_test.go → internal/ui/filesystem_test.go b/internal/app/ui/filesystem_test.go → internal/ui/filesystem_test.go
diff --git a/internal/app/ui/input.go → internal/ui/input.go b/internal/app/ui/input.go → internal/ui/input.go
diff --git a/internal/app/ui/time.go → internal/ui/time.go b/internal/app/ui/time.go → internal/ui/time.go
diff --git a/internal/app/ui/time_test.go → internal/ui/time_test.go b/internal/app/ui/time_test.go → internal/ui/time_test.go
diff --git a/internal/app/ui/ui.go → internal/ui/ui.go b/internal/app/ui/ui.go → internal/ui/ui.go
diff --git a/internal/app/ui/ui_test.go → internal/ui/ui_test.go b/internal/app/ui/ui_test.go → internal/ui/ui_test.go