From 66a14bf0f1be776a6f7d193dea5b6534a28591df Mon Sep 17 00:00:00 2001
From: Kyren223 <Kyren223@proton.me>
Date: Fri, 22 Nov 2024 12:25:41 +0200
Subject: Refactored gateway to integrate between with the UI

---
 internal/client/ui/auth/auth.go             | 15 ++++--------
 internal/client/ui/core/core.go             | 36 ++++++++++++++++++++++++++++
 internal/client/ui/loadscreen/loadscreen.go | 37 +++++++++++------------------
 internal/client/ui/ui.go                    |  1 +
 4 files changed, 56 insertions(+), 33 deletions(-)
 create mode 100644 internal/client/ui/core/core.go

(limited to 'internal/client/ui')

diff --git a/internal/client/ui/auth/auth.go b/internal/client/ui/auth/auth.go
index aa988c5..2e81a16 100644
--- a/internal/client/ui/auth/auth.go
+++ b/internal/client/ui/auth/auth.go
@@ -20,7 +20,7 @@ import (
 	"github.com/kyren223/eko/internal/client/ui"
 	authfield "github.com/kyren223/eko/internal/client/ui/auth/field"
 	"github.com/kyren223/eko/internal/client/ui/choicepopup"
-	"github.com/kyren223/eko/internal/client/ui/loadscreen"
+	"github.com/kyren223/eko/internal/client/ui/core"
 	"github.com/kyren223/eko/pkg/assert"
 )
 
@@ -474,7 +474,8 @@ func (m *Model) Signup() tea.Cmd {
 		return nil
 	}
 
-	return authenticate(privKey)
+
+	return ui.Transition(core.New(privKey, username))
 }
 
 func (m *Model) signin() tea.Cmd {
@@ -538,7 +539,8 @@ func (m *Model) signin() tea.Cmd {
 			config.PrivateKeyPath = privateKeyFilepath
 		})
 	}
-	return authenticate(*privKey)
+
+	return ui.Transition(core.New(*privKey, ""))
 }
 
 func (m Model) ButtonIndex() int {
@@ -579,10 +581,3 @@ func expandPath(path string) string {
 	return path
 }
 
-func authenticate(privKey ed25519.PrivateKey) tea.Cmd {
-	text := lipgloss.NewStyle().Inline(true).
-		Render("Update Failed - retrying in 3 sec...")
-	return ui.Transition(loadscreen.New(text, func(msg tea.Msg) tea.Cmd {
-		return nil
-	}))
-}
diff --git a/internal/client/ui/core/core.go b/internal/client/ui/core/core.go
new file mode 100644
index 0000000..1dbaef5
--- /dev/null
+++ b/internal/client/ui/core/core.go
@@ -0,0 +1,36 @@
+package core
+
+import (
+	"crypto/ed25519"
+	"fmt"
+
+	tea "github.com/charmbracelet/bubbletea"
+)
+
+type Model struct{}
+
+func New(privKey ed25519.PrivateKey, name string) Model {
+
+	// Connectiong to server...
+	// Connection failed - retrying in 3 sec...
+	// Connection failed - retrying in 3 sec...
+	return Model{}
+}
+
+func (m Model) Init() tea.Cmd {
+	return nil
+}
+
+func (m Model) View() string {
+	return fmt.Sprintf(
+		"%s",
+		"",
+	)
+}
+
+func (m Model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
+	switch msg := msg.(type) {
+	default:
+		return m, nil
+	}
+}
diff --git a/internal/client/ui/loadscreen/loadscreen.go b/internal/client/ui/loadscreen/loadscreen.go
index 869237f..6f4610a 100644
--- a/internal/client/ui/loadscreen/loadscreen.go
+++ b/internal/client/ui/loadscreen/loadscreen.go
@@ -117,18 +117,14 @@ func circleTrail(width int, height int, offset int, clockwise bool, bg string, t
 type Updater func(msg tea.Msg) tea.Cmd
 
 type Model struct {
-	sp      spinner.Model
 	content string
-	updater Updater
+	sp      spinner.Model
 }
 
-func New(content string, updater Updater) Model {
-	width := lipgloss.Width(content)
-	height := lipgloss.Height(content)
-	content = lipgloss.NewStyle().Width(width).Height(height).Render(content)
+func New(content string) Model {
 	return Model{
 		sp:      spinner.New(spinner.WithSpinner(loading)),
-		content: style.Render(content),
+		content: content,
 	}
 }
 
@@ -137,28 +133,23 @@ func (m Model) Init() tea.Cmd {
 }
 
 func (m Model) View() string {
+	width := lipgloss.Width(m.content)
+	height := lipgloss.Height(m.content)
+	content := lipgloss.NewStyle().Width(width).Height(height).Render(m.content)
+	content = style.Render(content)
 	return lipgloss.Place(
 		ui.Width, ui.Height,
 		lipgloss.Center, lipgloss.Center,
-		lipgloss.JoinVertical(lipgloss.Center, m.sp.View(), m.content),
+		lipgloss.JoinVertical(lipgloss.Center, m.sp.View(), content),
 	)
 }
 
 func (m Model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
-	switch msg := msg.(type) {
-
-	case tea.KeyMsg:
-		key := msg.Type
-		switch key {
-		case tea.KeyCtrlC:
-			return m, tea.Quit
-		}
-
-	case spinner.TickMsg:
-		var cmd tea.Cmd
-		m.sp, cmd = m.sp.Update(msg)
-		return m, cmd
-	}
+	var cmd tea.Cmd
+	m.sp, cmd = m.sp.Update(msg)
+	return m, cmd
+}
 
-	return m, m.updater(msg)
+func (m *Model) SetContent(content string) {
+	m.content = content
 }
diff --git a/internal/client/ui/ui.go b/internal/client/ui/ui.go
index a1db45f..8cda302 100644
--- a/internal/client/ui/ui.go
+++ b/internal/client/ui/ui.go
@@ -20,6 +20,7 @@ var Height int
 var BackgroundColor = "#1E1E2E"
 var Background = lipgloss.Color(BackgroundColor)
 var Style = lipgloss.NewStyle().Background(Background)
+var Program *tea.Program
 
 type ModelTransition struct {
 	Model tea.Model
-- 
cgit v1.3.1