From 9d929c0c24128b93ac41666f55b2f13d5c839d44 Mon Sep 17 00:00:00 2001 From: Edouard Paris Date: Tue, 19 Mar 2019 09:54:45 +0100 Subject: [PATCH] ft app, ui.views --- app/app.go | 17 +++++++++++++++++ cli/cli.go | 8 +++++++- ui/ui.go | 7 +++++-- ui/views/channels.go | 5 +++++ 4 files changed, 34 insertions(+), 3 deletions(-) create mode 100644 app/app.go create mode 100644 ui/views/channels.go diff --git a/app/app.go b/app/app.go new file mode 100644 index 0000000..13d38e6 --- /dev/null +++ b/app/app.go @@ -0,0 +1,17 @@ +package app + +import ( + "github.com/edouardparis/lntop/config" + "github.com/edouardparis/lntop/logging" + "github.com/edouardparis/lntop/network" +) + +type App struct { + Config *config.Config + Logger logging.Logger + Network *network.Network +} + +func Load() (*App, error) { + return &App{}, nil +} diff --git a/cli/cli.go b/cli/cli.go index a8d5fcb..e6940ee 100644 --- a/cli/cli.go +++ b/cli/cli.go @@ -6,6 +6,7 @@ import ( cli "gopkg.in/urfave/cli.v2" + "github.com/edouardparis/lntop/app" "github.com/edouardparis/lntop/config" "github.com/edouardparis/lntop/logging" "github.com/edouardparis/lntop/network" @@ -47,7 +48,12 @@ func New() *cli.App { } func run(c *cli.Context) error { - return ui.New().Run() + a, err := app.Load() + if err != nil { + return err + } + + return ui.New(a).Run() } func getNetworkFromConfig(c *cli.Context) (backend.Backend, error) { diff --git a/ui/ui.go b/ui/ui.go index 6e4ec37..b1b9e3b 100644 --- a/ui/ui.go +++ b/ui/ui.go @@ -4,9 +4,12 @@ import ( "fmt" "github.com/jroimartin/gocui" + + "github.com/edouardparis/lntop/app" ) type Ui struct { + app *app.App } func (u *Ui) Run() error { @@ -43,6 +46,6 @@ func quit(g *gocui.Gui, v *gocui.View) error { return gocui.ErrQuit } -func New() *Ui { - return &Ui{} +func New(app *app.App) *Ui { + return &Ui{app: app} } diff --git a/ui/views/channels.go b/ui/views/channels.go new file mode 100644 index 0000000..876c754 --- /dev/null +++ b/ui/views/channels.go @@ -0,0 +1,5 @@ +package views + +type Channels struct { + +}