Skip to content

Commit

Permalink
refactor: move ui package to server/
Browse files Browse the repository at this point in the history
  • Loading branch information
@aymanbagabas
aymanbagabas committed May 2, 2023
1 parent f388af9 commit 15528b7
Show file tree
Hide file tree
Showing 28 changed files with 44 additions and 44 deletions.
2 changes: 1 addition & 1 deletion server/cmd/blob.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
4 changes: 2 additions & 2 deletions server/ssh/session.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions ui/common/common.go → server/ui/common/common.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
0 ui/common/component.go → server/ui/common/component.go
View file
File renamed without changes.
0 ui/common/error.go → server/ui/common/error.go
View file
File renamed without changes.
0 ui/common/style.go → server/ui/common/style.go
View file
File renamed without changes.
0 ui/common/utils.go → server/ui/common/utils.go
View file
File renamed without changes.
4 changes: 2 additions & 2 deletions ui/components/code/code.go → server/ui/components/code/code.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion ui/components/footer/footer.go → server/ui/components/footer/footer.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion ui/components/header/header.go → server/ui/components/header/header.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion ui/components/selector/selector.go → server/ui/components/selector/selector.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion ui/components/statusbar/statusbar.go → server/ui/components/statusbar/statusbar.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion ui/components/tabs/tabs.go → server/ui/components/tabs/tabs.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion ui/components/viewport/viewport.go → server/ui/components/viewport/viewport.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
0 ui/keymap/keymap.go → server/ui/keymap/keymap.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion ui/pages/repo/empty.go → server/ui/pages/repo/empty.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
6 changes: 3 additions & 3 deletions ui/pages/repo/files.go → server/ui/pages/repo/files.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ui/pages/repo/filesitem.go → server/ui/pages/repo/filesitem.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
8 changes: 4 additions & 4 deletions ui/pages/repo/log.go → server/ui/pages/repo/log.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
2 changes: 1 addition & 1 deletion ui/pages/repo/logitem.go → server/ui/pages/repo/logitem.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
4 changes: 2 additions & 2 deletions ui/pages/repo/readme.go → server/ui/pages/repo/readme.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
6 changes: 3 additions & 3 deletions ui/pages/repo/refs.go → server/ui/pages/repo/refs.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
2 changes: 1 addition & 1 deletion ui/pages/repo/refsitem.go → server/ui/pages/repo/refsitem.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
8 changes: 4 additions & 4 deletions ui/pages/repo/repo.go → server/ui/pages/repo/repo.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ui/pages/selection/item.go → server/ui/pages/selection/item.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
8 changes: 4 additions & 4 deletions ui/pages/selection/selection.go → server/ui/pages/selection/selection.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
0 ui/styles/styles.go → server/ui/styles/styles.go
View file
File renamed without changes.
12 changes: 6 additions & 6 deletions ui/ui.go → server/ui/ui.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 15528b7

Please sign in to comment.