04038e7e56e36b9868a415b96f98b29b2142636c

Author
Ayman Bagabas <ayman.bagabas@gmail.com>
Committer
Ayman Bagabas <ayman.bagabas@gmail.com>
Date

Message

fix(ui): spinner regression & empty repo

Diff

  1diff --git a/ui/pages/repo/empty.go b/ui/pages/repo/empty.go
  2index d5230c42a5da1179bf4d2e5ef6e1c6abfeb83838..fe3921d9c66fe1d6619a412a33558b418fa41694 100644
  3--- a/ui/pages/repo/empty.go
  4+++ b/ui/pages/repo/empty.go
  5@@ -2,14 +2,12 @@ package repo
  6 
  7 import (
  8 	"fmt"
  9-	"strings"
 10 
 11 	"github.com/charmbracelet/soft-serve/server/config"
 12+	"github.com/charmbracelet/soft-serve/ui/common"
 13 )
 14 
 15 func defaultEmptyRepoMsg(cfg *config.Config, repo string) string {
 16-	publicURL := cfg.SSH.PublicURL
 17-	repo = strings.TrimSuffix(repo, ".git")
 18 	return fmt.Sprintf(`# Quick Start
 19 
 20 Get started by cloning this repository, add your files, commit, and push.
 21@@ -17,7 +15,7 @@ Get started by cloning this repository, add your files, commit, and push.
 22 ## Clone this repository.
 23 
 24 `+"```"+`sh
 25-git clone %[1]s/%[2]s.git
 26+git clone %[1]s
 27 `+"```"+`
 28 
 29 ## Creating a new repository on the command line
 30@@ -28,15 +26,15 @@ git init
 31 git add README.md
 32 git branch -M main
 33 git commit -m "first commit"
 34-git remote add origin %[1]s/%[2]s.git
 35+git remote add origin %[1]s
 36 git push -u origin main
 37 `+"```"+`
 38 
 39 ## Pushing an existing repository from the command line
 40 
 41 `+"```"+`sh
 42-git remote add origin %[1]s/%[2]s.git
 43+git remote add origin %[1]s
 44 git push -u origin main
 45 `+"```"+`
 46-`, publicURL, repo)
 47+`, common.RepoURL(cfg.SSH.PublicURL, repo))
 48 }
 49diff --git a/ui/pages/repo/readme.go b/ui/pages/repo/readme.go
 50index 5374779b9a1e3560b06eaf46fdb8c357dbc851b3..e10eb3c6b55603d17680969fa95b0eacb25a5560 100644
 51--- a/ui/pages/repo/readme.go
 52+++ b/ui/pages/repo/readme.go
 53@@ -117,10 +117,7 @@ func (r *Readme) updateReadmeCmd() tea.Msg {
 54 	if r.repo == nil {
 55 		return common.ErrorCmd(common.ErrMissingRepo)
 56 	}
 57-	rm, rp, err := backend.Readme(r.repo)
 58-	if err != nil {
 59-		return common.ErrorCmd(err)
 60-	}
 61+	rm, rp, _ := backend.Readme(r.repo)
 62 	r.readmePath = rp
 63 	r.code.GotoTop()
 64 	cmd := r.code.SetContent(rm, rp)
 65diff --git a/ui/pages/repo/refs.go b/ui/pages/repo/refs.go
 66index d107264e0e4304766f682f272f1ee0c3decb0585..90b05c22e6145218d6f1cd98e6b15b8832a3315d 100644
 67--- a/ui/pages/repo/refs.go
 68+++ b/ui/pages/repo/refs.go
 69@@ -222,11 +222,12 @@ func UpdateRefCmd(repo backend.Repository) tea.Cmd {
 70 		if err != nil {
 71 			return common.ErrorMsg(err)
 72 		}
 73+		bs, _ := r.Branches()
 74+		if len(bs) == 0 {
 75+			return EmptyRepoMsg{}
 76+		}
 77 		ref, err := r.HEAD()
 78 		if err != nil {
 79-			if bs, err := r.Branches(); err != nil && len(bs) == 0 {
 80-				return EmptyRepoMsg{}
 81-			}
 82 			logger.Debugf("ui: error getting HEAD reference: %v", err)
 83 			return common.ErrorMsg(err)
 84 		}
 85diff --git a/ui/pages/repo/repo.go b/ui/pages/repo/repo.go
 86index ff94c890d955ada5b2fd679619d5c0764db72c0a..6be90105feea3b7fd650919882fe99dc618598a3 100644
 87--- a/ui/pages/repo/repo.go
 88+++ b/ui/pages/repo/repo.go
 89@@ -180,6 +180,7 @@ func (r *Repo) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 90 			r.tabs.Init(),
 91 			// This will set the selected repo in each pane's model.
 92 			r.updateModels(msg),
 93+			r.spinner.Tick,
 94 		)
 95 	case RefMsg:
 96 		r.ref = msg
 97diff --git a/ui/styles/styles.go b/ui/styles/styles.go
 98index cd50439cf6fa2004693296007f0f48c00f4bf435..1faac44f93d5ec404baf53f943c41b0bea4519ee 100644
 99--- a/ui/styles/styles.go
100+++ b/ui/styles/styles.go
101@@ -413,7 +413,7 @@ func DefaultStyles() *Styles {
102 
103 	s.NoContent = lipgloss.NewStyle().
104 		SetString("No Content.").
105-		MarginTop(2).
106+		MarginTop(1).
107 		MarginLeft(2).
108 		Foreground(lipgloss.Color("242"))
109