feat: improve UX and fix bugs across multiple screens

Author: ignavan39

Makefile

@@ -91,25 +91,19 @@ lint:
 		echo "  Установите: https://golangci-lint.run/usage/install/"; \
 	fi
 
+PREFIX ?= $(HOME)/.local
+
 install: build
 	@echo "$(BLUE)Установка приложения...$(NC)"
-	@if [ -w /usr/local/bin ]; then \
-		cp $(BINARY_NAME) /usr/local/bin/; \
-		echo "$(GREEN)✓ Приложение установлено в /usr/local/bin/$(BINARY_NAME)$(NC)"; \
-	else \
-		echo "$(RED)✗ Нет прав на запись в /usr/local/bin$(NC)"; \
-		echo "  Выполните: sudo make install"; \
-	fi
+	@mkdir -p $(PREFIX)/bin
+	cp $(BINARY_NAME) $(PREFIX)/bin/
+	@echo "$(GREEN)✓ Приложение установлено в $(PREFIX)/bin/$(BINARY_NAME)$(NC)"
+	@echo "  Убедитесь, что $$(PREFIX)/bin есть в \$$PATH"
 
 uninstall:
 	@echo "$(BLUE)Удаление приложения...$(NC)"
-	@if [ -w /usr/local/bin ]; then \
-		rm -f /usr/local/bin/$(BINARY_NAME); \
-		echo "$(GREEN)✓ Приложение удалено$(NC)"; \
-	else \
-		echo "$(RED)✗ Нет прав на запись в /usr/local/bin$(NC)"; \
-		echo "  Выполните: sudo make uninstall"; \
-	fi
+	rm -f $(PREFIX)/bin/$(BINARY_NAME)
+	@echo "$(GREEN)✓ Приложение удалено из $(PREFIX)/bin/$(BINARY_NAME)$(NC)"
 
 db-clean:
 	@echo "$(BLUE)Очистка базы данных...$(NC)"

internal/application/usecase/mood_service.go

@@ -70,10 +70,14 @@ func (s *MoodService) GetTodayMood(ctx context.Context) (*entity.MoodEntry, erro
 }
 
 func (s *MoodService) GetRecentMoods(ctx context.Context, limit int) ([]*entity.MoodEntry, error) {
+	return s.GetRecentMoodsWithOffset(ctx, limit, 0)
+}
+
+func (s *MoodService) GetRecentMoodsWithOffset(ctx context.Context, limit int, offset int) ([]*entity.MoodEntry, error) {
 	if limit <= 0 {
 		limit = 30
 	}
-	return s.repo.FindRecent(ctx, limit)
+	return s.repo.FindRecent(ctx, limit, offset)
 }
 
 func (s *MoodService) GetMoodsForPeriod(ctx context.Context, period Period) ([]*entity.MoodEntry, error) {
@@ -105,7 +109,10 @@ const (
 )
 
 func (p Period) DateRange() (start, end time.Time) {
-	now := time.Now()
+	return p.DateRangeAt(time.Now())
+}
+
+func (p Period) DateRangeAt(now time.Time) (start, end time.Time) {
 	end = time.Date(now.Year(), now.Month(), now.Day(), 23, 59, 59, 0, now.Location())
 
 	switch p {

internal/domain/repository/mood_repository.go

@@ -20,7 +20,7 @@ type MoodRepository interface {
 
 	FindByDateRange(ctx context.Context, start, end time.Time) ([]*entity.MoodEntry, error)
 
-	FindRecent(ctx context.Context, limit int) ([]*entity.MoodEntry, error)
+	FindRecent(ctx context.Context, limit int, offset int) ([]*entity.MoodEntry, error)
 
 	FindAll(ctx context.Context) ([]*entity.MoodEntry, error)
 

internal/infrastructure/i18n/constants.go

@@ -40,9 +40,15 @@ const (
 	RecordBoxNoteKey           = "record.box_note"
 	RecordBoxDateKey           = "record.box_date"
 	RecordWithoutNoteKey       = "record.without_note"
+	RecordPromptDateKey        = "record.prompt_date"
 
 	StatsTitleKey        = "stats.title"
 	StatsTotalEntriesKey = "stats.total_entries"
+	StatsTrendKey        = "stats.trend"
+	StatsTrendUpKey      = "stats.trend_up"
+	StatsTrendDownKey    = "stats.trend_down"
+	StatsTrendStableKey  = "stats.trend_stable"
+	StatsDynamicsKey     = "stats.dynamics"
 	StatsAverageKey      = "stats.average"
 	StatsMinKey          = "stats.min"
 	StatsMaxKey          = "stats.max"
@@ -55,6 +61,7 @@ const (
 	StatsQuarterKey      = "stats.quarter"
 	StatsYearKey         = "stats.year"
 	StatsAllKey          = "stats.all"
+	StatsPageKey         = "stats.page"
 	StatsTodayKey        = "stats.today"
 	StatsYesterdayKey    = "stats.yesterday"
 	StatsTomorrowKey     = "stats.tomorrow"

internal/infrastructure/persistence/sqlite_mood_repository.go

@@ -146,15 +146,15 @@ func (r *SQLiteMoodRepository) FindByDateRange(ctx context.Context, start, end t
 	return r.scanMoodEntries(rows)
 }
 
-func (r *SQLiteMoodRepository) FindRecent(ctx context.Context, limit int) ([]*entity.MoodEntry, error) {
+func (r *SQLiteMoodRepository) FindRecent(ctx context.Context, limit int, offset int) ([]*entity.MoodEntry, error) {
 	query := `
 		SELECT id, date, level, note, created_at, updated_at
 		FROM mood_entries
 		ORDER BY date DESC
-		LIMIT ?
+		LIMIT ? OFFSET ?
 	`
 
-	rows, err := r.db.QueryContext(ctx, query, limit)
+	rows, err := r.db.QueryContext(ctx, query, limit, offset)
 	if err != nil {
 		return nil, fmt.Errorf("failed to find recent mood entries: %w", err)
 	}
@@ -187,9 +187,9 @@ func (r *SQLiteMoodRepository) GetStatistics(ctx context.Context, start, end tim
 	query := `
 		SELECT 
 			COUNT(*) as total,
-			AVG(level) as average,
-			MIN(level) as min_level,
-			MAX(level) as max_level
+			COALESCE(AVG(level), 0) as average,
+			COALESCE(MIN(level), 0) as min_level,
+			COALESCE(MAX(level), 0) as max_level
 		FROM mood_entries
 		WHERE date BETWEEN ? AND ?
 	`

internal/presentation/tui/model.go

@@ -41,7 +41,7 @@ func NewModel(
 		currentType:  state.ScreenMenu,
 	}
 
-	m.current = screens.NewMenuScreen(translator)
+	m.current = screens.NewMenuScreen(ctx, translator)
 
 	return m
 }
@@ -75,6 +75,9 @@ func (m *Model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 
 	case state.NavigateMsg:
 		return m, m.navigate(msg.To, msg.Params)
+
+	case state.NavigateBackMsg:
+		return m, m.navigateBack()
 	}
 
 	var cmd tea.Cmd
@@ -96,11 +99,12 @@ func (m *Model) navigate(to state.ScreenType, params interface{}) tea.Cmd {
 
 	switch to {
 	case state.ScreenMenu:
-		m.current = screens.NewMenuScreen(m.translator)
+		m.current = screens.NewMenuScreen(m.ctx, m.translator)
 
 	case state.ScreenMoodForm:
 		if p, ok := params.(state.MoodFormParams); ok {
 			m.current = screens.NewMoodFormScreen(
+				m.ctx,
 				m.service,
 				m.translator,
 				p.Date,
@@ -109,19 +113,19 @@ func (m *Model) navigate(to state.ScreenType, params interface{}) tea.Cmd {
 		}
 
 	case state.ScreenCalendar:
-		m.current = screens.NewCalendarScreen(m.service, m.translator)
+		m.current = screens.NewCalendarScreen(m.ctx, m.service, m.translator)
 
 	case state.ScreenHistory:
-		m.current = screens.NewHistoryScreen(m.service, m.translator)
+		m.current = screens.NewHistoryScreen(m.ctx, m.service, m.translator)
 
 	case state.ScreenStats:
-		m.current = screens.NewStatsScreen(m.service, m.translator)
+		m.current = screens.NewStatsScreen(m.ctx, m.service, m.translator)
 
 	case state.ScreenSettings:
-		m.current = screens.NewSettingsScreen(m.translator)
+		m.current = screens.NewSettingsScreen(m.ctx, m.translator)
 
 	case state.ScreenLanguageSettings:
-		m.current = screens.NewLanguageSettingsScreen(m.translator, m.settingsRepo)
+		m.current = screens.NewLanguageSettingsScreen(m.ctx, m.translator, m.settingsRepo)
 	}
 
 	return m.current.Init()

internal/presentation/tui/screens/calendar_screen.go

@@ -13,27 +13,31 @@ import (
 	"github.com/ignavan39/mood-diary/internal/domain/entity"
 	"github.com/ignavan39/mood-diary/internal/infrastructure/i18n"
 	"github.com/ignavan39/mood-diary/internal/presentation/styles"
+	"github.com/ignavan39/mood-diary/internal/presentation/tui/components"
 	"github.com/ignavan39/mood-diary/internal/presentation/tui/formatters"
 	"github.com/ignavan39/mood-diary/internal/presentation/tui/state"
 )
 
 type CalendarScreen struct {
 	state.BaseState
 
+	ctx        context.Context
 	service    *usecase.MoodService
 	translator i18n.Translator
 
 	currentMonth time.Time
 	selectedDate time.Time
 	moodData     map[time.Time]*entity.MoodEntry
 
-	cursorRow int
-	cursorCol int
+	cursorRow  int
+	cursorCol  int
+	confirmDlg *components.ConfirmationDialog
 }
 
-func NewCalendarScreen(service *usecase.MoodService, translator i18n.Translator) *CalendarScreen {
+func NewCalendarScreen(ctx context.Context, service *usecase.MoodService, translator i18n.Translator) *CalendarScreen {
 	now := time.Now()
 	return &CalendarScreen{
+		ctx:          ctx,
 		service:      service,
 		translator:   translator,
 		currentMonth: time.Date(now.Year(), now.Month(), 1, 0, 0, 0, 0, time.UTC),
@@ -55,6 +59,14 @@ func (s *CalendarScreen) Init() tea.Cmd {
 }
 
 func (s *CalendarScreen) Update(msg tea.Msg) (state.Screen, tea.Cmd) {
+	if s.confirmDlg != nil && !s.confirmDlg.IsDone() {
+		cmd := s.confirmDlg.Update(msg)
+		if s.confirmDlg.IsDone() {
+			s.confirmDlg = nil
+		}
+		return s, cmd
+	}
+
 	switch msg := msg.(type) {
 	case tea.WindowSizeMsg:
 		s.SetSize(msg.Width, msg.Height)
@@ -106,11 +118,13 @@ func (s *CalendarScreen) handleKeyMsg(msg tea.KeyMsg) (state.Screen, tea.Cmd) {
 
 		entry := s.moodData[s.selectedDate]
 		if entry != nil {
-			return s, s.deleteMood(entry)
+			msg := fmt.Sprintf(s.t(i18n.EditDeleteWarningKey), formatters.FormatDate(entry.Date))
+			s.confirmDlg = components.NewConfirmation(msg, s.translator, s.deleteMood(entry), nil)
+			return s, nil
 		}
 
 	case "esc", "q":
-		return s, state.NavigateToMenu()
+		return s, state.NavigateBack()
 	}
 
 	return s, nil
@@ -163,16 +177,17 @@ func (s *CalendarScreen) updateCursorPosition() {
 
 func (s *CalendarScreen) loadMonthData() tea.Cmd {
 	return func() tea.Msg {
-		ctx := context.Background()
-		entries, err := s.service.GetAllMoods(ctx)
+		start := time.Date(s.currentMonth.Year(), s.currentMonth.Month(), 1, 0, 0, 0, 0, time.UTC)
+		end := start.AddDate(0, 1, -1)
+		end = time.Date(end.Year(), end.Month(), end.Day(), 23, 59, 59, 0, time.UTC)
+
+		entries, err := s.service.GetMoodsByDateRange(s.ctx, start, end)
 
 		data := make(map[time.Time]*entity.MoodEntry)
 		if err == nil {
 			for _, e := range entries {
 				day := time.Date(e.Date.Year(), e.Date.Month(), e.Date.Day(), 0, 0, 0, 0, time.UTC)
-				if day.Year() == s.currentMonth.Year() && day.Month() == s.currentMonth.Month() {
-					data[day] = e
-				}
+				data[day] = e
 			}
 		} else {
 			return state.ErrorMsg{Error: err}
@@ -184,8 +199,7 @@ func (s *CalendarScreen) loadMonthData() tea.Cmd {
 
 func (s *CalendarScreen) deleteMood(entry *entity.MoodEntry) tea.Cmd {
 	return func() tea.Msg {
-		ctx := context.Background()
-		err := s.service.DeleteMood(ctx, entry.Date)
+		err := s.service.DeleteMood(s.ctx, entry.Date)
 		if err != nil {
 			return state.ErrorMsg{Error: err}
 		}
@@ -201,6 +215,11 @@ func (s *CalendarScreen) View() string {
 	b.WriteString(header)
 	b.WriteString("\n\n")
 
+	if s.confirmDlg != nil {
+		b.WriteString(s.confirmDlg.View())
+		return lipgloss.NewStyle().Padding(2, 4).Render(b.String())
+	}
+
 	if s.Error != nil {
 		b.WriteString(styles.ErrorStyle.Render(s.t(i18n.CommonErrorPrefixKey) + s.Error.Error()))
 		b.WriteString("\n\n")