diff --git a/internal/frontend/desktop.go b/internal/frontend/desktop.go index ee47394..250c5db 100644 --- a/internal/frontend/desktop.go +++ b/internal/frontend/desktop.go @@ -2,8 +2,9 @@ package frontend import ( "fmt" - GoTomato "git.smsvc.net/pomodoro/GoTomato/pkg/models" "github.com/gen2brain/beeep" + + GoTomato "git.smsvc.net/pomodoro/GoTomato/pkg/models" ) func desktopNotifications(pomodoro GoTomato.ServerMessage) { diff --git a/internal/frontend/keyhandler.go b/internal/frontend/keyhandler.go index f9c1747..58aad16 100644 --- a/internal/frontend/keyhandler.go +++ b/internal/frontend/keyhandler.go @@ -3,10 +3,12 @@ package frontend import ( "atomicgo.dev/keyboard" "atomicgo.dev/keyboard/keys" + ws "github.com/gorilla/websocket" + "git.smsvc.net/pomodoro/ChronoTomato/internal/websocket" + ChronoTomato "git.smsvc.net/pomodoro/ChronoTomato/pkg/models" GoTomato "git.smsvc.net/pomodoro/GoTomato/pkg/models" - ws "github.com/gorilla/websocket" ) func keyhandler(conn *ws.Conn, config ChronoTomato.Config, message *GoTomato.ServerMessage, quit chan bool) { diff --git a/internal/frontend/main.go b/internal/frontend/main.go index 524b6a7..e64b01d 100644 --- a/internal/frontend/main.go +++ b/internal/frontend/main.go @@ -1,9 +1,10 @@ package frontend import ( + "github.com/gorilla/websocket" + ChronoTomato "git.smsvc.net/pomodoro/ChronoTomato/pkg/models" GoTomato "git.smsvc.net/pomodoro/GoTomato/pkg/models" - "github.com/gorilla/websocket" ) var message GoTomato.ServerMessage diff --git a/internal/frontend/terminal.go b/internal/frontend/terminal.go index f29447d..70d9deb 100644 --- a/internal/frontend/terminal.go +++ b/internal/frontend/terminal.go @@ -2,9 +2,10 @@ package frontend import ( "fmt" - GoTomato "git.smsvc.net/pomodoro/GoTomato/pkg/models" "github.com/fatih/color" "strings" + + GoTomato "git.smsvc.net/pomodoro/GoTomato/pkg/models" ) func terminalOutput(pomodoro GoTomato.ServerMessage) { diff --git a/internal/helper/config.go b/internal/helper/config.go index 17e97ac..4cd2f7a 100644 --- a/internal/helper/config.go +++ b/internal/helper/config.go @@ -1,12 +1,13 @@ package helper import ( - ChronoTomato "git.smsvc.net/pomodoro/ChronoTomato/pkg/models" "github.com/charmbracelet/log" "gopkg.in/yaml.v3" "os" "path/filepath" "strings" + + ChronoTomato "git.smsvc.net/pomodoro/ChronoTomato/pkg/models" ) func ParseConfig(filename string) ChronoTomato.Config { diff --git a/internal/websocket/receive.go b/internal/websocket/receive.go index 1474ccd..d17cac6 100644 --- a/internal/websocket/receive.go +++ b/internal/websocket/receive.go @@ -3,9 +3,10 @@ package websocket import ( "encoding/json" "fmt" - GoTomato "git.smsvc.net/pomodoro/GoTomato/pkg/models" "github.com/charmbracelet/log" "github.com/gorilla/websocket" + + GoTomato "git.smsvc.net/pomodoro/GoTomato/pkg/models" ) var Done = make(chan struct{}) diff --git a/internal/websocket/send.go b/internal/websocket/send.go index dfb9769..90df844 100644 --- a/internal/websocket/send.go +++ b/internal/websocket/send.go @@ -2,9 +2,10 @@ package websocket import ( "encoding/json" - GoTomato "git.smsvc.net/pomodoro/GoTomato/pkg/models" "github.com/charmbracelet/log" "github.com/gorilla/websocket" + + GoTomato "git.smsvc.net/pomodoro/GoTomato/pkg/models" ) func sendClientCommand(conn *websocket.Conn, msg GoTomato.ClientCommand) { diff --git a/pkg/models/configfile.go b/pkg/models/configfile.go index fb4dfc2..b8ea721 100644 --- a/pkg/models/configfile.go +++ b/pkg/models/configfile.go @@ -1,8 +1,6 @@ package models -import ( - GoTomato "git.smsvc.net/pomodoro/GoTomato/pkg/models" -) +import GoTomato "git.smsvc.net/pomodoro/GoTomato/pkg/models" type Config struct { URL string `yaml:"url"`