extract game menu

logic.go

@@ -43,8 +43,6 @@ func NewLogic() *logic {
 }
 
 type logic struct {
-	app.Compo
-
 	sequence []int64
 	clicks   int
 	stage    int

main.go

@@ -13,7 +13,6 @@ func main() {
 	flag.Parse()
 
 	l := NewLogic()
-	// TODO: make game settings its own component
 	// TODO: keep scores in local storage
 	// TODO: listen to app updates
 	// TODO: improve overall styling

menu.go

@@ -0,0 +1,67 @@
+package main
+
+import (
+	"fmt"
+	"strconv"
+
+	"github.com/maxence-charriere/go-app/v9/pkg/app"
+)
+
+type menu struct {
+	app.Compo
+	selectedDifficulty difficulty
+}
+
+func NewMenu() *menu {
+	return &menu{}
+}
+
+func (g *menu) Render() app.UI {
+	return app.Div().Body(
+
+		app.Button().
+			Class("simon-button", "new-game").
+			Body(app.Span().Text("New Game")).
+			OnClick(func(ctx app.Context, _ app.Event) {
+				ctx.NewActionWithValue(eventNewGame, g.selectedDifficulty)
+			}),
+		app.Div().ID("difficulty").Body(
+			app.Label().Body(
+				app.Input().Type("radio").Name("difficulty-setting").ID("difficulty%d", easy).Value(easy).Checked(true).OnClick(func(ctx app.Context, _ app.Event) {
+					val := ctx.JSSrc().Get("value").String()
+					d, err := strconv.Atoi(val)
+					if err != nil {
+						fmt.Println("failed parsing", val)
+						return
+					}
+					g.selectedDifficulty = difficulty(d)
+				}),
+				app.Text("easy"),
+			),
+			app.Label().Body(
+				app.Input().Type("radio").Name("difficulty-setting").ID("difficulty%d", medium).Value(medium).OnClick(func(ctx app.Context, _ app.Event) {
+					val := ctx.JSSrc().Get("value").String()
+					d, err := strconv.Atoi(val)
+					if err != nil {
+						fmt.Println("failed parsing", val)
+						return
+					}
+					g.selectedDifficulty = difficulty(d)
+				}),
+				app.Text("medium"),
+			),
+			app.Label().Body(
+				app.Input().Type("radio").Name("difficulty-setting").ID("difficulty%d", hard).Value(hard).OnClick(func(ctx app.Context, _ app.Event) {
+					val := ctx.JSSrc().Get("value").String()
+					d, err := strconv.Atoi(val)
+					if err != nil {
+						fmt.Println("failed parsing", val)
+						return
+					}
+					g.selectedDifficulty = difficulty(d)
+				}),
+				app.Text("hard"),
+			),
+		),
+	)
+}

ui.go

@@ -2,7 +2,6 @@ package main
 
 import (
 	"fmt"
-	"strconv"
 
 	"github.com/maxence-charriere/go-app/v9/pkg/app"
 )
@@ -24,8 +23,7 @@ func NewUI() *ui {
 type ui struct {
 	app.Compo
 
-	Text               string
-	selectedDifficulty difficulty
+	Text string
 }
 
 func (g *ui) OnMount(ctx app.Context) {
@@ -53,54 +51,10 @@ func (g *ui) Render() app.UI {
 		gameStateText,
 	)
 
-	newGameButton := app.Button().
-		Class("simon-button", "new-game").
-		Body(app.Span().Text("New Game")).
-		OnClick(func(ctx app.Context, _ app.Event) {
-			ctx.NewActionWithValue(eventNewGame, g.selectedDifficulty)
-		})
-	difficultySetting := app.Div().ID("difficulty").Body(
-		app.Label().Body(
-			app.Input().Type("radio").Name("difficulty-setting").ID("difficulty%d", easy).Value(easy).Checked(true).OnClick(func(ctx app.Context, _ app.Event) {
-				val := ctx.JSSrc().Get("value").String()
-				d, err := strconv.Atoi(val)
-				if err != nil {
-					fmt.Println("failed parsing", val)
-					return
-				}
-				g.selectedDifficulty = difficulty(d)
-			}),
-			app.Text("easy"),
-		),
-		app.Label().Body(
-			app.Input().Type("radio").Name("difficulty-setting").ID("difficulty%d", medium).Value(medium).OnClick(func(ctx app.Context, _ app.Event) {
-				val := ctx.JSSrc().Get("value").String()
-				d, err := strconv.Atoi(val)
-				if err != nil {
-					fmt.Println("failed parsing", val)
-					return
-				}
-				g.selectedDifficulty = difficulty(d)
-			}),
-			app.Text("medium"),
-		),
-		app.Label().Body(
-			app.Input().Type("radio").Name("difficulty-setting").ID("difficulty%d", hard).Value(hard).OnClick(func(ctx app.Context, _ app.Event) {
-				val := ctx.JSSrc().Get("value").String()
-				d, err := strconv.Atoi(val)
-				if err != nil {
-					fmt.Println("failed parsing", val)
-					return
-				}
-				g.selectedDifficulty = difficulty(d)
-			}),
-			app.Text("hard"),
-		),
-	)
+	menu := NewMenu()
 
 	return app.Div().Class("fill").Body(
-		newGameButton,
-		difficultySetting,
+		menu,
 		gameField,
 	)
 }