diff --git a/server/cmd/blob.go b/server/cmd/blob.go index 187ee07b21d60a804ebde4c19af408e4b3ee30b9..d1388fb5f9283b32b001464f6bded9968ca123ee 100644 --- a/server/cmd/blob.go +++ b/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" ) diff --git a/server/ssh/session.go b/server/ssh/session.go index d9fffccdbaad04b624eae2556ae731aa9445dee5..e24bdc83a4cd9d453ae0acf3793c6c459fa5c6a3 100644 --- a/server/ssh/session.go +++ b/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" diff --git a/ui/common/common.go b/server/ui/common/common.go similarity index 94% rename from ui/common/common.go rename to server/ui/common/common.go index ebcd6621289d812e28aac42c2230617372a56cad..d603906c9b57fdcb13343985e6b8ea974a821700 100644 --- a/ui/common/common.go +++ b/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" diff --git a/ui/common/component.go b/server/ui/common/component.go similarity index 100% rename from ui/common/component.go rename to server/ui/common/component.go diff --git a/ui/common/error.go b/server/ui/common/error.go similarity index 100% rename from ui/common/error.go rename to server/ui/common/error.go diff --git a/ui/common/style.go b/server/ui/common/style.go similarity index 100% rename from ui/common/style.go rename to server/ui/common/style.go diff --git a/ui/common/utils.go b/server/ui/common/utils.go similarity index 100% rename from ui/common/utils.go rename to server/ui/common/utils.go diff --git a/ui/components/code/code.go b/server/ui/components/code/code.go similarity index 98% rename from ui/components/code/code.go rename to server/ui/components/code/code.go index 44aec42f84d3a681de75fff5150f5205f3ef7a75..bf3fc4c4d080159e478aac05280d22631e97a9b7 100644 --- a/ui/components/code/code.go +++ b/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" ) diff --git a/ui/components/footer/footer.go b/server/ui/components/footer/footer.go similarity index 97% rename from ui/components/footer/footer.go rename to server/ui/components/footer/footer.go index 4bce3cd8fc62fbd71ede4518515cb162f2928bae..822177594bf92f01d18d5adbd04c410bc9c0de8f 100644 --- a/ui/components/footer/footer.go +++ b/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. diff --git a/ui/components/header/header.go b/server/ui/components/header/header.go similarity index 93% rename from ui/components/header/header.go rename to server/ui/components/header/header.go index 32e9cf04496a9ec0edc20a381f13f59754c5f863..51c639f6d04f45fe9c2c5862e1c5b1f3d7f051ee 100644 --- a/ui/components/header/header.go +++ b/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. diff --git a/ui/components/selector/selector.go b/server/ui/components/selector/selector.go similarity index 99% rename from ui/components/selector/selector.go rename to server/ui/components/selector/selector.go index 7d65eb6552ab989c6b23b8887b3f3b26e543ec09..aaf3191f3ba52e77035c2c165caa6fdefc30245a 100644 --- a/ui/components/selector/selector.go +++ b/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. diff --git a/ui/components/statusbar/statusbar.go b/server/ui/components/statusbar/statusbar.go similarity index 97% rename from ui/components/statusbar/statusbar.go rename to server/ui/components/statusbar/statusbar.go index c208c84897731234ba3b5611b7751de2ad930e3c..a1463a1e0635963995798391795c4c0ed67838fc 100644 --- a/ui/components/statusbar/statusbar.go +++ b/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" ) diff --git a/ui/components/tabs/tabs.go b/server/ui/components/tabs/tabs.go similarity index 97% rename from ui/components/tabs/tabs.go rename to server/ui/components/tabs/tabs.go index 32ee1caf4aa8da3ecb1afaf992f4141d51f3a8f9..4adff6d9d1a6ac21d8d499efb08a44eb6950e0bd 100644 --- a/ui/components/tabs/tabs.go +++ b/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. diff --git a/ui/components/viewport/viewport.go b/server/ui/components/viewport/viewport.go similarity index 97% rename from ui/components/viewport/viewport.go rename to server/ui/components/viewport/viewport.go index 87789a9a0f8aaa88f2703432a43d89c8678f4d37..bdccc0f0ad5971938b6dc364b938e529c0c6248b 100644 --- a/ui/components/viewport/viewport.go +++ b/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. diff --git a/ui/keymap/keymap.go b/server/ui/keymap/keymap.go similarity index 100% rename from ui/keymap/keymap.go rename to server/ui/keymap/keymap.go diff --git a/ui/pages/repo/empty.go b/server/ui/pages/repo/empty.go similarity index 92% rename from ui/pages/repo/empty.go rename to server/ui/pages/repo/empty.go index fe3921d9c66fe1d6619a412a33558b418fa41694..78ce987260264cc1d077c5134f250b3933a14f42 100644 --- a/ui/pages/repo/empty.go +++ b/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 { diff --git a/ui/pages/repo/files.go b/server/ui/pages/repo/files.go similarity index 98% rename from ui/pages/repo/files.go rename to server/ui/pages/repo/files.go index 831abec2a1f96d79c61fae0b5d43837649c275e5..e4692cb9054efb81c6f84cd5ff584a26d2d9a32e 100644 --- a/ui/pages/repo/files.go +++ b/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 diff --git a/ui/pages/repo/filesitem.go b/server/ui/pages/repo/filesitem.go similarity index 98% rename from ui/pages/repo/filesitem.go rename to server/ui/pages/repo/filesitem.go index eae17d920f4384bc8de0f65dc5ed9a0e9f575f43..d9d4841c23a376e5ebd2cb376e014d80d192bad5 100644 --- a/ui/pages/repo/filesitem.go +++ b/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" ) diff --git a/ui/pages/repo/log.go b/server/ui/pages/repo/log.go similarity index 97% rename from ui/pages/repo/log.go rename to server/ui/pages/repo/log.go index e59e886f7c397e071a259cea362672aafb46b94b..0b1480b466840e9f6f6fb9ca09c4fbdaed0adb2a 100644 --- a/ui/pages/repo/log.go +++ b/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" ) diff --git a/ui/pages/repo/logitem.go b/server/ui/pages/repo/logitem.go similarity index 98% rename from ui/pages/repo/logitem.go rename to server/ui/pages/repo/logitem.go index bf4d1ca2af399aec72e90969932b1f458b6d2759..6330a109db4ee8a1e65f85b62a4f4e91035d2c4c 100644 --- a/ui/pages/repo/logitem.go +++ b/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" ) diff --git a/ui/pages/repo/readme.go b/server/ui/pages/repo/readme.go similarity index 95% rename from ui/pages/repo/readme.go rename to server/ui/pages/repo/readme.go index 48cf849f24e017e0be445e844afebae780de8c62..a1623524fc7e3291069e9f117c25860267696949 100644 --- a/ui/pages/repo/readme.go +++ b/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. diff --git a/ui/pages/repo/refs.go b/server/ui/pages/repo/refs.go similarity index 96% rename from ui/pages/repo/refs.go rename to server/ui/pages/repo/refs.go index c8a1bc5d726a7122fda694e729bd41947161b341..8669e151c085ca9417545cba19f0a4f9fec379a7 100644 --- a/ui/pages/repo/refs.go +++ b/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 ( diff --git a/ui/pages/repo/refsitem.go b/server/ui/pages/repo/refsitem.go similarity index 98% rename from ui/pages/repo/refsitem.go rename to server/ui/pages/repo/refsitem.go index f7d8a15221d2df03d43df9daa2b401f5cf32dc04..0d552bf01c6a3fcbff257a56950634c86232cfea 100644 --- a/ui/pages/repo/refsitem.go +++ b/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. diff --git a/ui/pages/repo/repo.go b/server/ui/pages/repo/repo.go similarity index 97% rename from ui/pages/repo/repo.go rename to server/ui/pages/repo/repo.go index 87f715e610d9ec46a5b833918c76646c659da926..5cb2075db2104a926a0b4c424f2682fc3a92062b 100644 --- a/ui/pages/repo/repo.go +++ b/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 diff --git a/ui/pages/selection/item.go b/server/ui/pages/selection/item.go similarity index 98% rename from ui/pages/selection/item.go rename to server/ui/pages/selection/item.go index 46b76b5cdcdfe03fe2a32c34ad3d591fe7f18029..bc06210738a1b4206ad794f53a86b0e5506ce864 100644 --- a/ui/pages/selection/item.go +++ b/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" ) diff --git a/ui/pages/selection/selection.go b/server/ui/pages/selection/selection.go similarity index 96% rename from ui/pages/selection/selection.go rename to server/ui/pages/selection/selection.go index 5860d9d8be78a6437d0accb61878e1a9204a7b61..dc066f32a13889e0da8b647c393ac9d6d158efb7 100644 --- a/ui/pages/selection/selection.go +++ b/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 ( diff --git a/ui/styles/styles.go b/server/ui/styles/styles.go similarity index 100% rename from ui/styles/styles.go rename to server/ui/styles/styles.go diff --git a/ui/ui.go b/server/ui/ui.go similarity index 95% rename from ui/ui.go rename to server/ui/ui.go index 9a2553809a8529510d9d8eef0b884615fabe49d2..69b526d6ee296101a447a6dd470ddbe9aa4da49e 100644 --- a/ui/ui.go +++ b/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