refactor: package names

Tarow · Dec 27, 2023 · d1006d3 · d1006d3
1 parent 111b5f1
commit d1006d3
Show file tree

Hide file tree

Showing 18 changed files with 29 additions and 29 deletions.
diff --git a/internal/api/handler.go b/internal/api/handler.go
@@ -13,7 +13,7 @@ import (
 	"github.com/tarow/skat-counter/internal/skat"
 	"github.com/tarow/skat-counter/internal/skat/gen/model"
 	template "github.com/tarow/skat-counter/templates"
-	"github.com/tarow/skat-counter/templates/components"
+	component "github.com/tarow/skat-counter/templates/components"
 )
 
 type Handler struct {
@@ -99,7 +99,7 @@ func (h Handler) GetEditGameForm(c echo.Context) error {
 		return err
 	}
 
-	form := components.EditGameForm(*game)
+	form := component.EditGameForm(*game)
 	return render(c, http.StatusOK, form)
 }
 
@@ -134,7 +134,7 @@ func (h Handler) EditGame(c echo.Context) error {
 }
 
 func (h Handler) GetCreateGameForm(c echo.Context) error {
-	form := components.CreateGameForm()
+	form := component.CreateGameForm()
 	return render(c, http.StatusOK, form)
 }
 
@@ -203,7 +203,7 @@ func (h Handler) GetEditRoundForm(c echo.Context) error {
 		}
 	}
 
-	form := components.EditRoundForm(*game, round, roundIdx)
+	form := component.EditRoundForm(*game, round, roundIdx)
 	return render(c, http.StatusOK, form)
 }
 

diff --git a/templates/GameDetails.templ b/templates/GameDetails.templ
@@ -18,10 +18,10 @@ templ GameDetails (game skat.Game) {
 		@GameDetailsNavbar()
 		<div class="container flex pt-4 mx-auto">
 			<div class="flex w-full flex-row flex-wrap-reverse gap-8 justify-around  items-end">
-				@components.RoundsList(game)
+				@component.RoundsList(game)
 				<div class="flex flex-col items-center gap-4">
-					@components.GameCard(game, false, true, true)
-					@components.AddRoundForm(game)
+					@component.GameCard(game, false, true, true)
+					@component.AddRoundForm(game)
 				</div>
 			</div>
 		</div>

diff --git a/templates/GameDetails_templ.go b/templates/GameDetails_templ.go
diff --git a/templates/GameOverview.templ b/templates/GameOverview.templ
@@ -27,6 +27,6 @@ templ GameOverviewNavbar() {
 templ GameOverview(games []skat.Game) {
 	@Base() {
 		@GameOverviewNavbar()
-		@components.GameList(games)
+		@component.GameList(games)
 	}
 }
diff --git a/templates/GameOverview_templ.go b/templates/GameOverview_templ.go
diff --git a/templates/components/create_game_form.templ b/templates/components/create_game_form.templ
@@ -1,4 +1,4 @@
-package components
+package component
 
 templ CreateGameForm() {
 	<form method="dialog">

diff --git a/templates/components/create_game_form_templ.go b/templates/components/create_game_form_templ.go
diff --git a/templates/components/edit_game_form.templ b/templates/components/edit_game_form.templ
@@ -1,4 +1,4 @@
-package components
+package component
 
 import "github.com/tarow/skat-counter/internal/skat"
 import "fmt"

diff --git a/templates/components/edit_game_form_templ.go b/templates/components/edit_game_form_templ.go
diff --git a/templates/components/edit_round_form.templ b/templates/components/edit_round_form.templ
@@ -1,4 +1,4 @@
-package components
+package component
 
 import "github.com/tarow/skat-counter/internal/skat"
 import "fmt"

diff --git a/templates/components/edit_round_form_templ.go b/templates/components/edit_round_form_templ.go
diff --git a/templates/components/game_card.templ b/templates/components/game_card.templ
@@ -1,4 +1,4 @@
-package components
+package component
 
 import "github.com/tarow/skat-counter/internal/skat"
 import "fmt"
@@ -93,7 +93,7 @@ templ GameCard(game skat.Game, detailsBtn, editBtn, deleteBtn bool) {
 
 templ GameList(games []skat.Game) {
 	<div class="container flex pt-4 mx-auto">
-		<div class="flex flex-row flex-wrap gap-8 justify-center">
+		<div class="flex w-full flex-row flex-wrap gap-8 justify-center">
 			for _, g := range games {
 				@GameCard(g, true, false, false)
 			}

diff --git a/templates/components/game_card_templ.go b/templates/components/game_card_templ.go
diff --git a/templates/components/player_input.templ b/templates/components/player_input.templ
@@ -1,4 +1,4 @@
-package components
+package component
 
 templ PlayerInput() {
 	<div class="grid grid-cols-6 gap-3 items-center">

diff --git a/templates/components/player_input_templ.go b/templates/components/player_input_templ.go
diff --git a/templates/components/rounds_list.templ b/templates/components/rounds_list.templ
@@ -1,4 +1,4 @@
-package components
+package component
 
 import "github.com/tarow/skat-counter/internal/skat"
 import "fmt"
@@ -90,7 +90,7 @@ templ AddRoundForm(game skat.Game) {
 								<span class="label-text">{ player.Name }</span>
 							</div>
 							<select name={ player.Name } class="select select-sm select-bordered  w-full">
-								<option selected disabled value="">-</option>
+								<option selected value="">-</option>
 								<option value="declarer">Declarer</option>
 								<option value="opponent">Opponent</option>
 								<option value="dealer">Dealer</option>

diff --git a/templates/components/rounds_list_templ.go b/templates/components/rounds_list_templ.go
diff --git a/templates/components/utils.go → templates/components/util.go b/templates/components/utils.go → templates/components/util.go
@@ -1,4 +1,4 @@
-package components
+package component
 
 import "fmt"