Diff
1diff --git a/server/cmd/blob.go b/server/cmd/blob.go
2index 187ee07b21d60a804ebde4c19af408e4b3ee30b9..d1388fb5f9283b32b001464f6bded9968ca123ee 100644
3--- a/server/cmd/blob.go
4+++ b/server/cmd/blob.go
5@@ -8,7 +8,7 @@ import (
6 gansi "github.com/charmbracelet/glamour/ansi"
7 "github.com/charmbracelet/lipgloss"
8 "github.com/charmbracelet/soft-serve/git"
9- "github.com/charmbracelet/soft-serve/ui/common"
10+ "github.com/charmbracelet/soft-serve/server/ui/common"
11 "github.com/muesli/termenv"
12 "github.com/spf13/cobra"
13 )
14diff --git a/server/ssh/session.go b/server/ssh/session.go
15index d9fffccdbaad04b624eae2556ae731aa9445dee5..e24bdc83a4cd9d453ae0acf3793c6c459fa5c6a3 100644
16--- a/server/ssh/session.go
17+++ b/server/ssh/session.go
18@@ -7,8 +7,8 @@ import (
19 "github.com/charmbracelet/soft-serve/server/backend"
20 "github.com/charmbracelet/soft-serve/server/config"
21 "github.com/charmbracelet/soft-serve/server/errors"
22- "github.com/charmbracelet/soft-serve/ui"
23- "github.com/charmbracelet/soft-serve/ui/common"
24+ "github.com/charmbracelet/soft-serve/server/ui"
25+ "github.com/charmbracelet/soft-serve/server/ui/common"
26 "github.com/charmbracelet/ssh"
27 "github.com/charmbracelet/wish"
28 bm "github.com/charmbracelet/wish/bubbletea"
29diff --git a/ui/common/common.go b/server/ui/common/common.go
30rename from ui/common/common.go
31rename to server/ui/common/common.go
32index ebcd6621289d812e28aac42c2230617372a56cad..d603906c9b57fdcb13343985e6b8ea974a821700 100644
33--- a/ui/common/common.go
34+++ b/server/ui/common/common.go
35@@ -6,8 +6,8 @@ import (
36 "github.com/charmbracelet/log"
37 "github.com/charmbracelet/soft-serve/git"
38 "github.com/charmbracelet/soft-serve/server/config"
39- "github.com/charmbracelet/soft-serve/ui/keymap"
40- "github.com/charmbracelet/soft-serve/ui/styles"
41+ "github.com/charmbracelet/soft-serve/server/ui/keymap"
42+ "github.com/charmbracelet/soft-serve/server/ui/styles"
43 "github.com/charmbracelet/ssh"
44 zone "github.com/lrstanley/bubblezone"
45 "github.com/muesli/termenv"
46diff --git a/ui/common/component.go b/server/ui/common/component.go
47rename from ui/common/component.go
48rename to server/ui/common/component.go
49diff --git a/ui/common/error.go b/server/ui/common/error.go
50rename from ui/common/error.go
51rename to server/ui/common/error.go
52diff --git a/ui/common/style.go b/server/ui/common/style.go
53rename from ui/common/style.go
54rename to server/ui/common/style.go
55diff --git a/ui/common/utils.go b/server/ui/common/utils.go
56rename from ui/common/utils.go
57rename to server/ui/common/utils.go
58diff --git a/ui/components/code/code.go b/server/ui/components/code/code.go
59rename from ui/components/code/code.go
60rename to server/ui/components/code/code.go
61index 44aec42f84d3a681de75fff5150f5205f3ef7a75..bf3fc4c4d080159e478aac05280d22631e97a9b7 100644
62--- a/ui/components/code/code.go
63+++ b/server/ui/components/code/code.go
64@@ -11,8 +11,8 @@ import (
65 "github.com/charmbracelet/glamour"
66 gansi "github.com/charmbracelet/glamour/ansi"
67 "github.com/charmbracelet/lipgloss"
68- "github.com/charmbracelet/soft-serve/ui/common"
69- vp "github.com/charmbracelet/soft-serve/ui/components/viewport"
70+ "github.com/charmbracelet/soft-serve/server/ui/common"
71+ vp "github.com/charmbracelet/soft-serve/server/ui/components/viewport"
72 "github.com/muesli/termenv"
73 )
74
75diff --git a/ui/components/footer/footer.go b/server/ui/components/footer/footer.go
76rename from ui/components/footer/footer.go
77rename to server/ui/components/footer/footer.go
78index 4bce3cd8fc62fbd71ede4518515cb162f2928bae..822177594bf92f01d18d5adbd04c410bc9c0de8f 100644
79--- a/ui/components/footer/footer.go
80+++ b/server/ui/components/footer/footer.go
81@@ -5,7 +5,7 @@ import (
82 "github.com/charmbracelet/bubbles/key"
83 tea "github.com/charmbracelet/bubbletea"
84 "github.com/charmbracelet/lipgloss"
85- "github.com/charmbracelet/soft-serve/ui/common"
86+ "github.com/charmbracelet/soft-serve/server/ui/common"
87 )
88
89 // ToggleFooterMsg is a message sent to show/hide the footer.
90diff --git a/ui/components/header/header.go b/server/ui/components/header/header.go
91rename from ui/components/header/header.go
92rename to server/ui/components/header/header.go
93index 32e9cf04496a9ec0edc20a381f13f59754c5f863..51c639f6d04f45fe9c2c5862e1c5b1f3d7f051ee 100644
94--- a/ui/components/header/header.go
95+++ b/server/ui/components/header/header.go
96@@ -4,7 +4,7 @@ import (
97 "strings"
98
99 tea "github.com/charmbracelet/bubbletea"
100- "github.com/charmbracelet/soft-serve/ui/common"
101+ "github.com/charmbracelet/soft-serve/server/ui/common"
102 )
103
104 // Header represents a header component.
105diff --git a/ui/components/selector/selector.go b/server/ui/components/selector/selector.go
106rename from ui/components/selector/selector.go
107rename to server/ui/components/selector/selector.go
108index 7d65eb6552ab989c6b23b8887b3f3b26e543ec09..aaf3191f3ba52e77035c2c165caa6fdefc30245a 100644
109--- a/ui/components/selector/selector.go
110+++ b/server/ui/components/selector/selector.go
111@@ -4,7 +4,7 @@ import (
112 "github.com/charmbracelet/bubbles/key"
113 "github.com/charmbracelet/bubbles/list"
114 tea "github.com/charmbracelet/bubbletea"
115- "github.com/charmbracelet/soft-serve/ui/common"
116+ "github.com/charmbracelet/soft-serve/server/ui/common"
117 )
118
119 // Selector is a list of items that can be selected.
120diff --git a/ui/components/statusbar/statusbar.go b/server/ui/components/statusbar/statusbar.go
121rename from ui/components/statusbar/statusbar.go
122rename to server/ui/components/statusbar/statusbar.go
123index c208c84897731234ba3b5611b7751de2ad930e3c..a1463a1e0635963995798391795c4c0ed67838fc 100644
124--- a/ui/components/statusbar/statusbar.go
125+++ b/server/ui/components/statusbar/statusbar.go
126@@ -3,7 +3,7 @@ package statusbar
127 import (
128 tea "github.com/charmbracelet/bubbletea"
129 "github.com/charmbracelet/lipgloss"
130- "github.com/charmbracelet/soft-serve/ui/common"
131+ "github.com/charmbracelet/soft-serve/server/ui/common"
132 "github.com/muesli/reflow/truncate"
133 )
134
135diff --git a/ui/components/tabs/tabs.go b/server/ui/components/tabs/tabs.go
136rename from ui/components/tabs/tabs.go
137rename to server/ui/components/tabs/tabs.go
138index 32ee1caf4aa8da3ecb1afaf992f4141d51f3a8f9..4adff6d9d1a6ac21d8d499efb08a44eb6950e0bd 100644
139--- a/ui/components/tabs/tabs.go
140+++ b/server/ui/components/tabs/tabs.go
141@@ -5,7 +5,7 @@ import (
142
143 tea "github.com/charmbracelet/bubbletea"
144 "github.com/charmbracelet/lipgloss"
145- "github.com/charmbracelet/soft-serve/ui/common"
146+ "github.com/charmbracelet/soft-serve/server/ui/common"
147 )
148
149 // SelectTabMsg is a message that contains the index of the tab to select.
150diff --git a/ui/components/viewport/viewport.go b/server/ui/components/viewport/viewport.go
151rename from ui/components/viewport/viewport.go
152rename to server/ui/components/viewport/viewport.go
153index 87789a9a0f8aaa88f2703432a43d89c8678f4d37..bdccc0f0ad5971938b6dc364b938e529c0c6248b 100644
154--- a/ui/components/viewport/viewport.go
155+++ b/server/ui/components/viewport/viewport.go
156@@ -3,7 +3,7 @@ package viewport
157 import (
158 "github.com/charmbracelet/bubbles/viewport"
159 tea "github.com/charmbracelet/bubbletea"
160- "github.com/charmbracelet/soft-serve/ui/common"
161+ "github.com/charmbracelet/soft-serve/server/ui/common"
162 )
163
164 // Viewport represents a viewport component.
165diff --git a/ui/keymap/keymap.go b/server/ui/keymap/keymap.go
166rename from ui/keymap/keymap.go
167rename to server/ui/keymap/keymap.go
168diff --git a/ui/pages/repo/empty.go b/server/ui/pages/repo/empty.go
169rename from ui/pages/repo/empty.go
170rename to server/ui/pages/repo/empty.go
171index fe3921d9c66fe1d6619a412a33558b418fa41694..78ce987260264cc1d077c5134f250b3933a14f42 100644
172--- a/ui/pages/repo/empty.go
173+++ b/server/ui/pages/repo/empty.go
174@@ -4,7 +4,7 @@ import (
175 "fmt"
176
177 "github.com/charmbracelet/soft-serve/server/config"
178- "github.com/charmbracelet/soft-serve/ui/common"
179+ "github.com/charmbracelet/soft-serve/server/ui/common"
180 )
181
182 func defaultEmptyRepoMsg(cfg *config.Config, repo string) string {
183diff --git a/ui/pages/repo/files.go b/server/ui/pages/repo/files.go
184rename from ui/pages/repo/files.go
185rename to server/ui/pages/repo/files.go
186index 831abec2a1f96d79c61fae0b5d43837649c275e5..e4692cb9054efb81c6f84cd5ff584a26d2d9a32e 100644
187--- a/ui/pages/repo/files.go
188+++ b/server/ui/pages/repo/files.go
189@@ -11,9 +11,9 @@ import (
190 tea "github.com/charmbracelet/bubbletea"
191 "github.com/charmbracelet/soft-serve/git"
192 "github.com/charmbracelet/soft-serve/server/backend"
193- "github.com/charmbracelet/soft-serve/ui/common"
194- "github.com/charmbracelet/soft-serve/ui/components/code"
195- "github.com/charmbracelet/soft-serve/ui/components/selector"
196+ "github.com/charmbracelet/soft-serve/server/ui/common"
197+ "github.com/charmbracelet/soft-serve/server/ui/components/code"
198+ "github.com/charmbracelet/soft-serve/server/ui/components/selector"
199 )
200
201 type filesView int
202diff --git a/ui/pages/repo/filesitem.go b/server/ui/pages/repo/filesitem.go
203rename from ui/pages/repo/filesitem.go
204rename to server/ui/pages/repo/filesitem.go
205index eae17d920f4384bc8de0f65dc5ed9a0e9f575f43..d9d4841c23a376e5ebd2cb376e014d80d192bad5 100644
206--- a/ui/pages/repo/filesitem.go
207+++ b/server/ui/pages/repo/filesitem.go
208@@ -11,7 +11,7 @@ import (
209 tea "github.com/charmbracelet/bubbletea"
210 "github.com/charmbracelet/lipgloss"
211 "github.com/charmbracelet/soft-serve/git"
212- "github.com/charmbracelet/soft-serve/ui/common"
213+ "github.com/charmbracelet/soft-serve/server/ui/common"
214 "github.com/dustin/go-humanize"
215 )
216
217diff --git a/ui/pages/repo/log.go b/server/ui/pages/repo/log.go
218rename from ui/pages/repo/log.go
219rename to server/ui/pages/repo/log.go
220index e59e886f7c397e071a259cea362672aafb46b94b..0b1480b466840e9f6f6fb9ca09c4fbdaed0adb2a 100644
221--- a/ui/pages/repo/log.go
222+++ b/server/ui/pages/repo/log.go
223@@ -12,10 +12,10 @@ import (
224 "github.com/charmbracelet/lipgloss"
225 "github.com/charmbracelet/soft-serve/git"
226 "github.com/charmbracelet/soft-serve/server/backend"
227- "github.com/charmbracelet/soft-serve/ui/common"
228- "github.com/charmbracelet/soft-serve/ui/components/footer"
229- "github.com/charmbracelet/soft-serve/ui/components/selector"
230- "github.com/charmbracelet/soft-serve/ui/components/viewport"
231+ "github.com/charmbracelet/soft-serve/server/ui/common"
232+ "github.com/charmbracelet/soft-serve/server/ui/components/footer"
233+ "github.com/charmbracelet/soft-serve/server/ui/components/selector"
234+ "github.com/charmbracelet/soft-serve/server/ui/components/viewport"
235 "github.com/muesli/reflow/wrap"
236 "github.com/muesli/termenv"
237 )
238diff --git a/ui/pages/repo/logitem.go b/server/ui/pages/repo/logitem.go
239rename from ui/pages/repo/logitem.go
240rename to server/ui/pages/repo/logitem.go
241index bf4d1ca2af399aec72e90969932b1f458b6d2759..6330a109db4ee8a1e65f85b62a4f4e91035d2c4c 100644
242--- a/ui/pages/repo/logitem.go
243+++ b/server/ui/pages/repo/logitem.go
244@@ -11,7 +11,7 @@ import (
245 tea "github.com/charmbracelet/bubbletea"
246 "github.com/charmbracelet/lipgloss"
247 "github.com/charmbracelet/soft-serve/git"
248- "github.com/charmbracelet/soft-serve/ui/common"
249+ "github.com/charmbracelet/soft-serve/server/ui/common"
250 "github.com/muesli/reflow/truncate"
251 )
252
253diff --git a/ui/pages/repo/readme.go b/server/ui/pages/repo/readme.go
254rename from ui/pages/repo/readme.go
255rename to server/ui/pages/repo/readme.go
256index 48cf849f24e017e0be445e844afebae780de8c62..a1623524fc7e3291069e9f117c25860267696949 100644
257--- a/ui/pages/repo/readme.go
258+++ b/server/ui/pages/repo/readme.go
259@@ -7,8 +7,8 @@ import (
260 "github.com/charmbracelet/bubbles/key"
261 tea "github.com/charmbracelet/bubbletea"
262 "github.com/charmbracelet/soft-serve/server/backend"
263- "github.com/charmbracelet/soft-serve/ui/common"
264- "github.com/charmbracelet/soft-serve/ui/components/code"
265+ "github.com/charmbracelet/soft-serve/server/ui/common"
266+ "github.com/charmbracelet/soft-serve/server/ui/components/code"
267 )
268
269 // ReadmeMsg is a message sent when the readme is loaded.
270diff --git a/ui/pages/repo/refs.go b/server/ui/pages/repo/refs.go
271rename from ui/pages/repo/refs.go
272rename to server/ui/pages/repo/refs.go
273index c8a1bc5d726a7122fda694e729bd41947161b341..8669e151c085ca9417545cba19f0a4f9fec379a7 100644
274--- a/ui/pages/repo/refs.go
275+++ b/server/ui/pages/repo/refs.go
276@@ -11,9 +11,9 @@ import (
277 "github.com/charmbracelet/soft-serve/git"
278 ggit "github.com/charmbracelet/soft-serve/git"
279 "github.com/charmbracelet/soft-serve/server/backend"
280- "github.com/charmbracelet/soft-serve/ui/common"
281- "github.com/charmbracelet/soft-serve/ui/components/selector"
282- "github.com/charmbracelet/soft-serve/ui/components/tabs"
283+ "github.com/charmbracelet/soft-serve/server/ui/common"
284+ "github.com/charmbracelet/soft-serve/server/ui/components/selector"
285+ "github.com/charmbracelet/soft-serve/server/ui/components/tabs"
286 )
287
288 var (
289diff --git a/ui/pages/repo/refsitem.go b/server/ui/pages/repo/refsitem.go
290rename from ui/pages/repo/refsitem.go
291rename to server/ui/pages/repo/refsitem.go
292index f7d8a15221d2df03d43df9daa2b401f5cf32dc04..0d552bf01c6a3fcbff257a56950634c86232cfea 100644
293--- a/ui/pages/repo/refsitem.go
294+++ b/server/ui/pages/repo/refsitem.go
295@@ -9,7 +9,7 @@ import (
296 tea "github.com/charmbracelet/bubbletea"
297 "github.com/charmbracelet/lipgloss"
298 "github.com/charmbracelet/soft-serve/git"
299- "github.com/charmbracelet/soft-serve/ui/common"
300+ "github.com/charmbracelet/soft-serve/server/ui/common"
301 )
302
303 // RefItem is a git reference item.
304diff --git a/ui/pages/repo/repo.go b/server/ui/pages/repo/repo.go
305rename from ui/pages/repo/repo.go
306rename to server/ui/pages/repo/repo.go
307index 87f715e610d9ec46a5b833918c76646c659da926..5cb2075db2104a926a0b4c424f2682fc3a92062b 100644
308--- a/ui/pages/repo/repo.go
309+++ b/server/ui/pages/repo/repo.go
310@@ -10,10 +10,10 @@ import (
311 "github.com/charmbracelet/lipgloss"
312 "github.com/charmbracelet/soft-serve/git"
313 "github.com/charmbracelet/soft-serve/server/backend"
314- "github.com/charmbracelet/soft-serve/ui/common"
315- "github.com/charmbracelet/soft-serve/ui/components/footer"
316- "github.com/charmbracelet/soft-serve/ui/components/statusbar"
317- "github.com/charmbracelet/soft-serve/ui/components/tabs"
318+ "github.com/charmbracelet/soft-serve/server/ui/common"
319+ "github.com/charmbracelet/soft-serve/server/ui/components/footer"
320+ "github.com/charmbracelet/soft-serve/server/ui/components/statusbar"
321+ "github.com/charmbracelet/soft-serve/server/ui/components/tabs"
322 )
323
324 type state int
325diff --git a/ui/pages/selection/item.go b/server/ui/pages/selection/item.go
326rename from ui/pages/selection/item.go
327rename to server/ui/pages/selection/item.go
328index 46b76b5cdcdfe03fe2a32c34ad3d591fe7f18029..bc06210738a1b4206ad794f53a86b0e5506ce864 100644
329--- a/ui/pages/selection/item.go
330+++ b/server/ui/pages/selection/item.go
331@@ -13,7 +13,7 @@ import (
332 "github.com/charmbracelet/lipgloss"
333 "github.com/charmbracelet/soft-serve/server/backend"
334 "github.com/charmbracelet/soft-serve/server/config"
335- "github.com/charmbracelet/soft-serve/ui/common"
336+ "github.com/charmbracelet/soft-serve/server/ui/common"
337 "github.com/dustin/go-humanize"
338 )
339
340diff --git a/ui/pages/selection/selection.go b/server/ui/pages/selection/selection.go
341rename from ui/pages/selection/selection.go
342rename to server/ui/pages/selection/selection.go
343index 5860d9d8be78a6437d0accb61878e1a9204a7b61..dc066f32a13889e0da8b647c393ac9d6d158efb7 100644
344--- a/ui/pages/selection/selection.go
345+++ b/server/ui/pages/selection/selection.go
346@@ -9,10 +9,10 @@ import (
347 tea "github.com/charmbracelet/bubbletea"
348 "github.com/charmbracelet/lipgloss"
349 "github.com/charmbracelet/soft-serve/server/backend"
350- "github.com/charmbracelet/soft-serve/ui/common"
351- "github.com/charmbracelet/soft-serve/ui/components/code"
352- "github.com/charmbracelet/soft-serve/ui/components/selector"
353- "github.com/charmbracelet/soft-serve/ui/components/tabs"
354+ "github.com/charmbracelet/soft-serve/server/ui/common"
355+ "github.com/charmbracelet/soft-serve/server/ui/components/code"
356+ "github.com/charmbracelet/soft-serve/server/ui/components/selector"
357+ "github.com/charmbracelet/soft-serve/server/ui/components/tabs"
358 )
359
360 const (
361diff --git a/ui/styles/styles.go b/server/ui/styles/styles.go
362rename from ui/styles/styles.go
363rename to server/ui/styles/styles.go
364diff --git a/ui/ui.go b/server/ui/ui.go
365rename from ui/ui.go
366rename to server/ui/ui.go
367index 9a2553809a8529510d9d8eef0b884615fabe49d2..69b526d6ee296101a447a6dd470ddbe9aa4da49e 100644
368--- a/ui/ui.go
369+++ b/server/ui/ui.go
370@@ -8,12 +8,12 @@ import (
371 tea "github.com/charmbracelet/bubbletea"
372 "github.com/charmbracelet/lipgloss"
373 "github.com/charmbracelet/soft-serve/server/backend"
374- "github.com/charmbracelet/soft-serve/ui/common"
375- "github.com/charmbracelet/soft-serve/ui/components/footer"
376- "github.com/charmbracelet/soft-serve/ui/components/header"
377- "github.com/charmbracelet/soft-serve/ui/components/selector"
378- "github.com/charmbracelet/soft-serve/ui/pages/repo"
379- "github.com/charmbracelet/soft-serve/ui/pages/selection"
380+ "github.com/charmbracelet/soft-serve/server/ui/common"
381+ "github.com/charmbracelet/soft-serve/server/ui/components/footer"
382+ "github.com/charmbracelet/soft-serve/server/ui/components/header"
383+ "github.com/charmbracelet/soft-serve/server/ui/components/selector"
384+ "github.com/charmbracelet/soft-serve/server/ui/pages/repo"
385+ "github.com/charmbracelet/soft-serve/server/ui/pages/selection"
386 )
387
388 type page int