refactor: move ui package to server/

Ayman Bagabas created 2 years ago

Change summary

server/cmd/blob.go                          |  2 +-
server/ssh/session.go                       |  4 ++--
server/ui/common/common.go                  |  4 ++--
server/ui/common/component.go               |  0 
server/ui/common/error.go                   |  0 
server/ui/common/style.go                   |  0 
server/ui/common/utils.go                   |  0 
server/ui/components/code/code.go           |  4 ++--
server/ui/components/footer/footer.go       |  2 +-
server/ui/components/header/header.go       |  2 +-
server/ui/components/selector/selector.go   |  2 +-
server/ui/components/statusbar/statusbar.go |  2 +-
server/ui/components/tabs/tabs.go           |  2 +-
server/ui/components/viewport/viewport.go   |  2 +-
server/ui/keymap/keymap.go                  |  0 
server/ui/pages/repo/empty.go               |  2 +-
server/ui/pages/repo/files.go               |  6 +++---
server/ui/pages/repo/filesitem.go           |  2 +-
server/ui/pages/repo/log.go                 |  8 ++++----
server/ui/pages/repo/logitem.go             |  2 +-
server/ui/pages/repo/readme.go              |  4 ++--
server/ui/pages/repo/refs.go                |  6 +++---
server/ui/pages/repo/refsitem.go            |  2 +-
server/ui/pages/repo/repo.go                |  8 ++++----
server/ui/pages/selection/item.go           |  2 +-
server/ui/pages/selection/selection.go      |  8 ++++----
server/ui/styles/styles.go                  |  0 
server/ui/ui.go                             | 12 ++++++------
28 files changed, 44 insertions(+), 44 deletions(-)

Detailed changes

server/cmd/blob.go

@@ -8,7 +8,7 @@ import (
 	gansi "github.com/charmbracelet/glamour/ansi"
 	"github.com/charmbracelet/lipgloss"
 	"github.com/charmbracelet/soft-serve/git"
-	"github.com/charmbracelet/soft-serve/ui/common"
+	"github.com/charmbracelet/soft-serve/server/ui/common"
 	"github.com/muesli/termenv"
 	"github.com/spf13/cobra"
 )

server/ssh/session.go

@@ -7,8 +7,8 @@ import (
 	"github.com/charmbracelet/soft-serve/server/backend"
 	"github.com/charmbracelet/soft-serve/server/config"
 	"github.com/charmbracelet/soft-serve/server/errors"
-	"github.com/charmbracelet/soft-serve/ui"
-	"github.com/charmbracelet/soft-serve/ui/common"
+	"github.com/charmbracelet/soft-serve/server/ui"
+	"github.com/charmbracelet/soft-serve/server/ui/common"
 	"github.com/charmbracelet/ssh"
 	"github.com/charmbracelet/wish"
 	bm "github.com/charmbracelet/wish/bubbletea"

ui/common/common.go → server/ui/common/common.go

@@ -6,8 +6,8 @@ import (
 	"github.com/charmbracelet/log"
 	"github.com/charmbracelet/soft-serve/git"
 	"github.com/charmbracelet/soft-serve/server/config"
-	"github.com/charmbracelet/soft-serve/ui/keymap"
-	"github.com/charmbracelet/soft-serve/ui/styles"
+	"github.com/charmbracelet/soft-serve/server/ui/keymap"
+	"github.com/charmbracelet/soft-serve/server/ui/styles"
 	"github.com/charmbracelet/ssh"
 	zone "github.com/lrstanley/bubblezone"
 	"github.com/muesli/termenv"

ui/common/component.go → server/ui/common/component.go

ui/common/error.go → server/ui/common/error.go

ui/common/style.go → server/ui/common/style.go

ui/common/utils.go → server/ui/common/utils.go

ui/components/code/code.go → server/ui/components/code/code.go

@@ -11,8 +11,8 @@ import (
 	"github.com/charmbracelet/glamour"
 	gansi "github.com/charmbracelet/glamour/ansi"
 	"github.com/charmbracelet/lipgloss"
-	"github.com/charmbracelet/soft-serve/ui/common"
-	vp "github.com/charmbracelet/soft-serve/ui/components/viewport"
+	"github.com/charmbracelet/soft-serve/server/ui/common"
+	vp "github.com/charmbracelet/soft-serve/server/ui/components/viewport"
 	"github.com/muesli/termenv"
 )
 

ui/components/footer/footer.go → server/ui/components/footer/footer.go

@@ -5,7 +5,7 @@ import (
 	"github.com/charmbracelet/bubbles/key"
 	tea "github.com/charmbracelet/bubbletea"
 	"github.com/charmbracelet/lipgloss"
-	"github.com/charmbracelet/soft-serve/ui/common"
+	"github.com/charmbracelet/soft-serve/server/ui/common"
 )
 
 // ToggleFooterMsg is a message sent to show/hide the footer.

ui/components/header/header.go → server/ui/components/header/header.go

@@ -4,7 +4,7 @@ import (
 	"strings"
 
 	tea "github.com/charmbracelet/bubbletea"
-	"github.com/charmbracelet/soft-serve/ui/common"
+	"github.com/charmbracelet/soft-serve/server/ui/common"
 )
 
 // Header represents a header component.

ui/components/selector/selector.go → server/ui/components/selector/selector.go

@@ -4,7 +4,7 @@ import (
 	"github.com/charmbracelet/bubbles/key"
 	"github.com/charmbracelet/bubbles/list"
 	tea "github.com/charmbracelet/bubbletea"
-	"github.com/charmbracelet/soft-serve/ui/common"
+	"github.com/charmbracelet/soft-serve/server/ui/common"
 )
 
 // Selector is a list of items that can be selected.

ui/components/statusbar/statusbar.go → server/ui/components/statusbar/statusbar.go

@@ -3,7 +3,7 @@ package statusbar
 import (
 	tea "github.com/charmbracelet/bubbletea"
 	"github.com/charmbracelet/lipgloss"
-	"github.com/charmbracelet/soft-serve/ui/common"
+	"github.com/charmbracelet/soft-serve/server/ui/common"
 	"github.com/muesli/reflow/truncate"
 )
 

ui/components/tabs/tabs.go → server/ui/components/tabs/tabs.go

@@ -5,7 +5,7 @@ import (
 
 	tea "github.com/charmbracelet/bubbletea"
 	"github.com/charmbracelet/lipgloss"
-	"github.com/charmbracelet/soft-serve/ui/common"
+	"github.com/charmbracelet/soft-serve/server/ui/common"
 )
 
 // SelectTabMsg is a message that contains the index of the tab to select.

ui/components/viewport/viewport.go → server/ui/components/viewport/viewport.go

@@ -3,7 +3,7 @@ package viewport
 import (
 	"github.com/charmbracelet/bubbles/viewport"
 	tea "github.com/charmbracelet/bubbletea"
-	"github.com/charmbracelet/soft-serve/ui/common"
+	"github.com/charmbracelet/soft-serve/server/ui/common"
 )
 
 // Viewport represents a viewport component.

ui/keymap/keymap.go → server/ui/keymap/keymap.go

ui/pages/repo/empty.go → server/ui/pages/repo/empty.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 
 	"github.com/charmbracelet/soft-serve/server/config"
-	"github.com/charmbracelet/soft-serve/ui/common"
+	"github.com/charmbracelet/soft-serve/server/ui/common"
 )
 
 func defaultEmptyRepoMsg(cfg *config.Config, repo string) string {

ui/pages/repo/files.go → server/ui/pages/repo/files.go

@@ -11,9 +11,9 @@ import (
 	tea "github.com/charmbracelet/bubbletea"
 	"github.com/charmbracelet/soft-serve/git"
 	"github.com/charmbracelet/soft-serve/server/backend"
-	"github.com/charmbracelet/soft-serve/ui/common"
-	"github.com/charmbracelet/soft-serve/ui/components/code"
-	"github.com/charmbracelet/soft-serve/ui/components/selector"
+	"github.com/charmbracelet/soft-serve/server/ui/common"
+	"github.com/charmbracelet/soft-serve/server/ui/components/code"
+	"github.com/charmbracelet/soft-serve/server/ui/components/selector"
 )
 
 type filesView int

ui/pages/repo/filesitem.go → server/ui/pages/repo/filesitem.go

@@ -11,7 +11,7 @@ import (
 	tea "github.com/charmbracelet/bubbletea"
 	"github.com/charmbracelet/lipgloss"
 	"github.com/charmbracelet/soft-serve/git"
-	"github.com/charmbracelet/soft-serve/ui/common"
+	"github.com/charmbracelet/soft-serve/server/ui/common"
 	"github.com/dustin/go-humanize"
 )
 

ui/pages/repo/log.go → server/ui/pages/repo/log.go

@@ -12,10 +12,10 @@ import (
 	"github.com/charmbracelet/lipgloss"
 	"github.com/charmbracelet/soft-serve/git"
 	"github.com/charmbracelet/soft-serve/server/backend"
-	"github.com/charmbracelet/soft-serve/ui/common"
-	"github.com/charmbracelet/soft-serve/ui/components/footer"
-	"github.com/charmbracelet/soft-serve/ui/components/selector"
-	"github.com/charmbracelet/soft-serve/ui/components/viewport"
+	"github.com/charmbracelet/soft-serve/server/ui/common"
+	"github.com/charmbracelet/soft-serve/server/ui/components/footer"
+	"github.com/charmbracelet/soft-serve/server/ui/components/selector"
+	"github.com/charmbracelet/soft-serve/server/ui/components/viewport"
 	"github.com/muesli/reflow/wrap"
 	"github.com/muesli/termenv"
 )

ui/pages/repo/logitem.go → server/ui/pages/repo/logitem.go

@@ -11,7 +11,7 @@ import (
 	tea "github.com/charmbracelet/bubbletea"
 	"github.com/charmbracelet/lipgloss"
 	"github.com/charmbracelet/soft-serve/git"
-	"github.com/charmbracelet/soft-serve/ui/common"
+	"github.com/charmbracelet/soft-serve/server/ui/common"
 	"github.com/muesli/reflow/truncate"
 )
 

ui/pages/repo/readme.go → server/ui/pages/repo/readme.go

@@ -7,8 +7,8 @@ import (
 	"github.com/charmbracelet/bubbles/key"
 	tea "github.com/charmbracelet/bubbletea"
 	"github.com/charmbracelet/soft-serve/server/backend"
-	"github.com/charmbracelet/soft-serve/ui/common"
-	"github.com/charmbracelet/soft-serve/ui/components/code"
+	"github.com/charmbracelet/soft-serve/server/ui/common"
+	"github.com/charmbracelet/soft-serve/server/ui/components/code"
 )
 
 // ReadmeMsg is a message sent when the readme is loaded.

ui/pages/repo/refs.go → server/ui/pages/repo/refs.go

@@ -11,9 +11,9 @@ import (
 	"github.com/charmbracelet/soft-serve/git"
 	ggit "github.com/charmbracelet/soft-serve/git"
 	"github.com/charmbracelet/soft-serve/server/backend"
-	"github.com/charmbracelet/soft-serve/ui/common"
-	"github.com/charmbracelet/soft-serve/ui/components/selector"
-	"github.com/charmbracelet/soft-serve/ui/components/tabs"
+	"github.com/charmbracelet/soft-serve/server/ui/common"
+	"github.com/charmbracelet/soft-serve/server/ui/components/selector"
+	"github.com/charmbracelet/soft-serve/server/ui/components/tabs"
 )
 
 var (

ui/pages/repo/refsitem.go → server/ui/pages/repo/refsitem.go

@@ -9,7 +9,7 @@ import (
 	tea "github.com/charmbracelet/bubbletea"
 	"github.com/charmbracelet/lipgloss"
 	"github.com/charmbracelet/soft-serve/git"
-	"github.com/charmbracelet/soft-serve/ui/common"
+	"github.com/charmbracelet/soft-serve/server/ui/common"
 )
 
 // RefItem is a git reference item.

ui/pages/repo/repo.go → server/ui/pages/repo/repo.go

@@ -10,10 +10,10 @@ import (
 	"github.com/charmbracelet/lipgloss"
 	"github.com/charmbracelet/soft-serve/git"
 	"github.com/charmbracelet/soft-serve/server/backend"
-	"github.com/charmbracelet/soft-serve/ui/common"
-	"github.com/charmbracelet/soft-serve/ui/components/footer"
-	"github.com/charmbracelet/soft-serve/ui/components/statusbar"
-	"github.com/charmbracelet/soft-serve/ui/components/tabs"
+	"github.com/charmbracelet/soft-serve/server/ui/common"
+	"github.com/charmbracelet/soft-serve/server/ui/components/footer"
+	"github.com/charmbracelet/soft-serve/server/ui/components/statusbar"
+	"github.com/charmbracelet/soft-serve/server/ui/components/tabs"
 )
 
 type state int

ui/pages/selection/item.go → server/ui/pages/selection/item.go

@@ -13,7 +13,7 @@ import (
 	"github.com/charmbracelet/lipgloss"
 	"github.com/charmbracelet/soft-serve/server/backend"
 	"github.com/charmbracelet/soft-serve/server/config"
-	"github.com/charmbracelet/soft-serve/ui/common"
+	"github.com/charmbracelet/soft-serve/server/ui/common"
 	"github.com/dustin/go-humanize"
 )
 

ui/pages/selection/selection.go → server/ui/pages/selection/selection.go

@@ -9,10 +9,10 @@ import (
 	tea "github.com/charmbracelet/bubbletea"
 	"github.com/charmbracelet/lipgloss"
 	"github.com/charmbracelet/soft-serve/server/backend"
-	"github.com/charmbracelet/soft-serve/ui/common"
-	"github.com/charmbracelet/soft-serve/ui/components/code"
-	"github.com/charmbracelet/soft-serve/ui/components/selector"
-	"github.com/charmbracelet/soft-serve/ui/components/tabs"
+	"github.com/charmbracelet/soft-serve/server/ui/common"
+	"github.com/charmbracelet/soft-serve/server/ui/components/code"
+	"github.com/charmbracelet/soft-serve/server/ui/components/selector"
+	"github.com/charmbracelet/soft-serve/server/ui/components/tabs"
 )
 
 const (

ui/styles/styles.go → server/ui/styles/styles.go

ui/ui.go → server/ui/ui.go

@@ -8,12 +8,12 @@ import (
 	tea "github.com/charmbracelet/bubbletea"
 	"github.com/charmbracelet/lipgloss"
 	"github.com/charmbracelet/soft-serve/server/backend"
-	"github.com/charmbracelet/soft-serve/ui/common"
-	"github.com/charmbracelet/soft-serve/ui/components/footer"
-	"github.com/charmbracelet/soft-serve/ui/components/header"
-	"github.com/charmbracelet/soft-serve/ui/components/selector"
-	"github.com/charmbracelet/soft-serve/ui/pages/repo"
-	"github.com/charmbracelet/soft-serve/ui/pages/selection"
+	"github.com/charmbracelet/soft-serve/server/ui/common"
+	"github.com/charmbracelet/soft-serve/server/ui/components/footer"
+	"github.com/charmbracelet/soft-serve/server/ui/components/header"
+	"github.com/charmbracelet/soft-serve/server/ui/components/selector"
+	"github.com/charmbracelet/soft-serve/server/ui/pages/repo"
+	"github.com/charmbracelet/soft-serve/server/ui/pages/selection"
 )
 
 type page int