move command declaration into same file as func declaration

This commit is contained in:
Danny van Kooten 2018-07-13 11:48:28 +02:00
parent 82e1216bb3
commit 19b0ccf5b6
3 changed files with 38 additions and 34 deletions

View File

@ -37,40 +37,8 @@ func main() {
app.Before = before
app.After = after
app.Commands = []cli.Command{
{
Name: "server",
Aliases: []string{"s"},
Usage: "start the fathom web server",
Action: server,
Flags: []cli.Flag{
cli.StringFlag{
EnvVar: "FATHOM_SERVER_ADDR",
Name: "addr,port",
Usage: "server address",
Value: ":8080",
},
cli.BoolFlag{
EnvVar: "FATHOM_DEBUG",
Name: "debug, d",
},
},
},
{
Name: "register",
Aliases: []string{"r"},
Usage: "register a new admin user",
Action: register,
Flags: []cli.Flag{
cli.StringFlag{
Name: "email, e",
Usage: "user email",
},
cli.StringFlag{
Name: "password, p",
Usage: "user password",
},
},
},
serverCmd,
registerCmd,
}
if len(os.Args) < 2 || os.Args[1] != "--version" {

View File

@ -10,6 +10,23 @@ import (
"golang.org/x/crypto/bcrypt"
)
var registerCmd = cli.Command{
Name: "register",
Aliases: []string{"r"},
Usage: "register a new admin user",
Action: register,
Flags: []cli.Flag{
cli.StringFlag{
Name: "email, e",
Usage: "user email",
},
cli.StringFlag{
Name: "password, p",
Usage: "user password",
},
},
}
func register(c *cli.Context) error {
email := c.String("email")
if email == "" {

View File

@ -11,6 +11,25 @@ import (
"github.com/usefathom/fathom/pkg/api"
)
var serverCmd = cli.Command{
Name: "server",
Aliases: []string{"s"},
Usage: "start the fathom web server",
Action: server,
Flags: []cli.Flag{
cli.StringFlag{
EnvVar: "FATHOM_SERVER_ADDR",
Name: "addr,port",
Usage: "server address",
Value: ":8080",
},
cli.BoolFlag{
EnvVar: "FATHOM_DEBUG",
Name: "debug, d",
},
},
}
func server(c *cli.Context) error {
var h http.Handler
a := api.New(app.database, app.config.Secret)