feat: added pull message in ui

thewizardshell · thewizardshell · commit 2d61e1aadc8e · 2025-06-12T16:43:32.000-04:00
diff --git a/.github/workflos/build.yml b/.github/workflos/build.yml
@@ -0,0 +1,67 @@
+name: Build and Release Froggit
+
+on:
+  push:
+    tags:
+      - "v*"
+  workflow_dispatch:
+
+jobs:
+  build:
+    name: Build ${{ matrix.os }}-${{ matrix.arch }}
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        os: [linux, windows, darwin]
+        arch: [amd64, arm64]
+        exclude:
+          - os: windows
+            arch: arm64
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Set up Go
+        uses: actions/setup-go@v5
+        with:
+          go-version: 1.22
+
+      - name: Build binary
+        env:
+          GOOS: ${{ matrix.os }}
+          GOARCH: ${{ matrix.arch }}
+        run: |
+          mkdir -p dist
+          BIN_NAME="froggit-${{ matrix.os }}-${{ matrix.arch }}"
+          [[ "${{ matrix.os }}" == "windows" ]] && BIN_NAME="$BIN_NAME.exe"
+          go build -o "$BIN_NAME" .
+          zip -j "dist/${{ matrix.os }}-${{ matrix.arch }}.zip" "$BIN_NAME"
+
+      - name: Upload artifact for release
+        uses: actions/upload-artifact@v4
+        with:
+          name: froggit-${{ matrix.os }}-${{ matrix.arch }}
+          path: dist/${{ matrix.os }}-${{ matrix.arch }}.zip
+
+  release:
+    name: Create GitHub Release
+    needs: build
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Download all artifacts
+        uses: actions/download-artifact@v4
+        with:
+          path: artifacts
+
+      - name: Create GitHub Release
+        uses: softprops/action-gh-release@v2
+        with:
+          name: Froggit ${{ github.ref_name }}
+          tag_name: ${{ github.ref_name }}
+          files: |
+            artifacts/**/**/*.zip
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/internal/git/git.go b/internal/git/git.go
@@ -229,3 +229,21 @@ func DiscardChanges(filename string) error {
 	fmt.Println("Cambios descartados correctamente")
 	return nil
 }
+
+// HasRemoteChanges verifica si hay commits pendientes de pull desde el remoto
+func HasRemoteChanges(branch string) (bool, error) {
+	// Ejecuta git fetch para actualizar refs
+	err := Fetch()
+	if err != nil {
+		return false, err
+	}
+
+	cmd := exec.Command("git", "rev-list", "--count", fmt.Sprintf("HEAD..origin/%s", branch))
+	output, err := cmd.Output()
+	if err != nil {
+		return false, err
+	}
+
+	count := strings.TrimSpace(string(output))
+	return count != "0", nil
+}
diff --git a/internal/tui/model/model.go b/internal/tui/model/model.go
@@ -20,24 +20,25 @@ const (
 )
 
 type Model struct {
-	Files         []git.FileItem
-	Branches      []string
-	Remotes       []string
-	CurrentBranch string
-	Cursor        int
-	CurrentView   View
-	CommitMsg     string
-	RemoteName    string
-	RemoteURL     string
-	InputField    string
-	Message       string
-	MessageType   string
-	IsPushing     bool
-	SpinnerIndex  int
-	SpinnerFrames []string
-	IsFetching    bool
-	IsPulling     bool
-	NewBranchName string
+	Files            []git.FileItem
+	Branches         []string
+	Remotes          []string
+	CurrentBranch    string
+	Cursor           int
+	CurrentView      View
+	CommitMsg        string
+	RemoteName       string
+	RemoteURL        string
+	InputField       string
+	Message          string
+	MessageType      string
+	IsPushing        bool
+	SpinnerIndex     int
+	SpinnerFrames    []string
+	IsFetching       bool
+	IsPulling        bool
+	NewBranchName    string
+	HasRemoteChanges bool
 
 	DialogType   string
 	DialogTarget string
@@ -47,38 +48,42 @@ func InitialModel() Model {
 	files, _ := git.GetModifiedFiles()
 	branches, current := git.GetBranches()
 	remotes, _ := git.GetRemotes()
+	hasRemoteChanges, _ := git.HasRemoteChanges(current)
 
 	return Model{
-		Files:         files,
-		Branches:      branches,
-		Remotes:       remotes,
-		CurrentBranch: current,
-		Cursor:        0,
-		CurrentView:   FileView,
-		CommitMsg:     "",
-		RemoteName:    "",
-		RemoteURL:     "",
-		InputField:    "",
-		Message:       "",
-		MessageType:   "",
-		SpinnerFrames: []string{"⠋", "⠙", "⠹", "⠸", "⠼", "⠴", "⠦", "⠧", "⠇", "⠏"},
-		IsPushing:     false,
-		SpinnerIndex:  0,
-		IsFetching:    false,
-		IsPulling:     false,
-		NewBranchName: "",
-		DialogType:    "",
-		DialogTarget:  "",
+		Files:            files,
+		Branches:         branches,
+		Remotes:          remotes,
+		CurrentBranch:    current,
+		Cursor:           0,
+		CurrentView:      FileView,
+		CommitMsg:        "",
+		RemoteName:       "",
+		RemoteURL:        "",
+		InputField:       "",
+		Message:          "",
+		MessageType:      "",
+		SpinnerFrames:    []string{"⠋", "⠙", "⠹", "⠸", "⠼", "⠴", "⠦", "⠧", "⠇", "⠏"},
+		IsPushing:        false,
+		SpinnerIndex:     0,
+		IsFetching:       false,
+		IsPulling:        false,
+		NewBranchName:    "",
+		HasRemoteChanges: hasRemoteChanges,
+		DialogType:       "",
+		DialogTarget:     "",
 	}
 }
 
 func (m *Model) RefreshData() {
 	files, _ := git.GetModifiedFiles()
 	branches, current := git.GetBranches()
 	remotes, _ := git.GetRemotes()
+	hasRemoteChanges, _ := git.HasRemoteChanges(current)
 
 	m.Files = files
 	m.Branches = branches
 	m.Remotes = remotes
 	m.CurrentBranch = current
+	m.HasRemoteChanges = hasRemoteChanges
 }
diff --git a/internal/tui/styles/styles.go b/internal/tui/styles/styles.go
@@ -39,6 +39,12 @@ var (
 			Bold(true).
 			Padding(0, 1)
 
+	WarningStyle = lipgloss.NewStyle().
+			Foreground(lipgloss.Color("214")).
+		// Background(lipgloss.Color("235")).
+		Bold(true).
+		Padding(0, 1)
+
 	SuccessStyle = lipgloss.NewStyle().
 			Foreground(lipgloss.Color(Green)).
 			Background(lipgloss.Color("236")).
@@ -64,4 +70,57 @@ var (
 	SpinnerStyle = lipgloss.NewStyle().
 			Foreground(lipgloss.Color(Green)).
 			Bold(true)
+
+	ControlTitleStyle = lipgloss.NewStyle().
+				Foreground(lipgloss.Color(Green)).
+				Bold(true).
+				MarginBottom(1)
+
+	ControlSectionStyle = lipgloss.NewStyle().
+				Foreground(lipgloss.Color("245")).
+				Bold(true).
+				MarginTop(1)
+
+	ControlKeyStyle = lipgloss.NewStyle().
+			Foreground(lipgloss.Color(DarkGreen)).
+			Bold(true)
+
+	ControlDescStyle = lipgloss.NewStyle().
+				Foreground(lipgloss.Color("249"))
+
+	// Estilo para el contenedor de controles
+	ControlsBoxStyle = lipgloss.NewStyle().
+				Border(lipgloss.RoundedBorder()).
+				BorderForeground(lipgloss.Color(Gray)).
+				Padding(1, 2).
+				Margin(1, 0).
+				Width(60) // Ancho fijo para mejor alineación
+	PanelStyle = lipgloss.NewStyle().
+			Border(lipgloss.NormalBorder()).
+			BorderForeground(lipgloss.Color(Gray)).
+			Padding(0, 1).
+			Margin(0, 1)
+
+	ActivePanelStyle = lipgloss.NewStyle().
+				Border(lipgloss.NormalBorder()).
+				BorderForeground(lipgloss.Color(Green)).
+				Padding(0, 1).
+				Margin(0, 1)
+
+	PanelTitleStyle = lipgloss.NewStyle().
+			Foreground(lipgloss.Color(Green)).
+			Bold(true).
+			Padding(0, 1).
+			Background(lipgloss.Color(Gray))
+
+	StatusBarStyle = lipgloss.NewStyle().
+			Foreground(lipgloss.Color(LightGray)).
+			Background(lipgloss.Color("235")).
+			Padding(0, 1).
+			Width(100) // Ajustar según el ancho de tu terminal
+
+	// Para el layout horizontal
+	MainContentStyle = lipgloss.NewStyle().
+				Width(80).
+				Height(25) // Ajustar según la altura de tu terminal
 )
diff --git a/internal/tui/views/file_view.go b/internal/tui/views/file_view.go
@@ -22,9 +22,13 @@ func RenderFileView(m model.Model) string {
 		}
 	}
 
-	s.WriteString(styles.HeaderStyle.Render(" Git Status:") + "\n")
-	s.WriteString(fmt.Sprintf(" Stage: %d files\n", stagedCount))
-	s.WriteString(fmt.Sprintf(" Unstaged: %d files\n", unstagedCount))
+	s.WriteString(styles.HeaderStyle.Render("  Git Status:") + "\n")
+	s.WriteString(fmt.Sprintf("  Staged: %d files\n", stagedCount))
+	s.WriteString(fmt.Sprintf("  Unstaged: %d files\n", unstagedCount))
+
+	if m.HasRemoteChanges {
+		s.WriteString(styles.WarningStyle.Render("  New commits are available on the remote please pull\n"))
+	}
 	s.WriteString("\n")
 	s.WriteString(styles.HeaderStyle.Render(" Modified files:") + "\n\n")
 
