diff --git a/internal/handlers/season_detail.go b/internal/handlers/season_detail.go index f397035..541754f 100644 --- a/internal/handlers/season_detail.go +++ b/internal/handlers/season_detail.go @@ -2,7 +2,6 @@ package handlers import ( "context" - "fmt" "net/http" "git.haelnorr.com/h/golib/hws" @@ -33,26 +32,15 @@ func SeasonPage( return false, errors.Wrap(err, "db.GetSeason") } - if season.Type != db.SeasonTypeDraft.String() { - leaguesWithTeams, err = season.MapTeamsToLeagues(ctx, tx) - if err != nil { - return false, errors.Wrap(err, "season.MapTeamsToLeagues") - } + leaguesWithTeams, err = season.MapTeamsToLeagues(ctx, tx) + if err != nil { + return false, errors.Wrap(err, "season.MapTeamsToLeagues") } return true, nil }); !ok { return } - - if season.Type == db.SeasonTypeDraft.String() { - // Redirect draft seasons to their default tab - defaultTab := season.GetDefaultTab() - redirectURL := fmt.Sprintf("/seasons/%s/%s", seasonStr, defaultTab) - http.Redirect(w, r, redirectURL, http.StatusSeeOther) - return - } - renderSafely(seasonsview.DetailPage(season, leaguesWithTeams), s, r, w) }) } diff --git a/internal/handlers/season_league_add_team.go b/internal/handlers/season_league_add_team.go index 64d7a5c..88ead10 100644 --- a/internal/handlers/season_league_add_team.go +++ b/internal/handlers/season_league_add_team.go @@ -50,11 +50,7 @@ func SeasonLeagueAddTeam( } // Redirect to refresh the page - redirectURL := fmt.Sprintf("/seasons/%s/leagues/%s/teams", season.ShortName, league.ShortName) - if season.Type == db.SeasonTypeDraft.String() { - redirectURL = fmt.Sprintf("/seasons/%s/teams", season.ShortName) - } - w.Header().Set("HX-Redirect", redirectURL) + w.Header().Set("HX-Redirect", fmt.Sprintf("/seasons/%s/leagues/%s/teams", season.ShortName, league.ShortName)) w.WriteHeader(http.StatusOK) notify.Success(s, w, r, "Team Added", fmt.Sprintf( "Successfully added '%s' to the league.", diff --git a/internal/handlers/season_league_detail.go b/internal/handlers/season_league_detail.go index ec5fcb4..6e93f6b 100644 --- a/internal/handlers/season_league_detail.go +++ b/internal/handlers/season_league_detail.go @@ -39,14 +39,6 @@ func SeasonLeaguePage( } defaultTab := season.GetDefaultTab() - - // Draft seasons redirect to /seasons/{short}/{tab} instead - if season.Type == db.SeasonTypeDraft.String() { - redirectURL := fmt.Sprintf("/seasons/%s/%s", seasonStr, defaultTab) - http.Redirect(w, r, redirectURL, http.StatusSeeOther) - return - } - redirectURL := fmt.Sprintf( "/seasons/%s/leagues/%s/%s", seasonStr, leagueStr, defaultTab, diff --git a/internal/handlers/season_league_finals.go b/internal/handlers/season_league_finals.go index 66cef39..b8f0187 100644 --- a/internal/handlers/season_league_finals.go +++ b/internal/handlers/season_league_finals.go @@ -39,9 +39,6 @@ func SeasonLeagueFinalsPage( return } - if redirectDraftSeasonLeague(season, "finals", w, r) { - return - } if r.Method == "GET" { renderSafely(seasonsview.SeasonLeagueFinalsPage(season, league), s, r, w) } else { diff --git a/internal/handlers/season_league_fixtures.go b/internal/handlers/season_league_fixtures.go index b80e664..417545b 100644 --- a/internal/handlers/season_league_fixtures.go +++ b/internal/handlers/season_league_fixtures.go @@ -41,9 +41,6 @@ func SeasonLeagueFixturesPage( return } - if redirectDraftSeasonLeague(season, "fixtures", w, r) { - return - } if r.Method == "GET" { renderSafely(seasonsview.SeasonLeagueFixturesPage(season, league, fixtures), s, r, w) } else { diff --git a/internal/handlers/season_league_stats.go b/internal/handlers/season_league_stats.go index 76dc2ec..80b1c2b 100644 --- a/internal/handlers/season_league_stats.go +++ b/internal/handlers/season_league_stats.go @@ -39,9 +39,6 @@ func SeasonLeagueStatsPage( return } - if redirectDraftSeasonLeague(season, "stats", w, r) { - return - } if r.Method == "GET" { renderSafely(seasonsview.SeasonLeagueStatsPage(season, league), s, r, w) } else { diff --git a/internal/handlers/season_league_table.go b/internal/handlers/season_league_table.go index 0e434c7..a061032 100644 --- a/internal/handlers/season_league_table.go +++ b/internal/handlers/season_league_table.go @@ -38,9 +38,6 @@ func SeasonLeagueTablePage( }); !ok { return } - if redirectDraftSeasonLeague(season, "table", w, r) { - return - } if r.Method == "GET" { renderSafely(seasonsview.SeasonLeagueTablePage(season, league), s, r, w) } else { diff --git a/internal/handlers/season_league_teams.go b/internal/handlers/season_league_teams.go index cc69cdd..bd93bc3 100644 --- a/internal/handlers/season_league_teams.go +++ b/internal/handlers/season_league_teams.go @@ -50,9 +50,6 @@ func SeasonLeagueTeamsPage( return } - if redirectDraftSeasonLeague(season, "teams", w, r) { - return - } if r.Method == "GET" { renderSafely(seasonsview.SeasonLeagueTeamsPage(season, league, teams, available), s, r, w) } else { diff --git a/internal/handlers/season_leagues.go b/internal/handlers/season_leagues.go index 50ab849..3361427 100644 --- a/internal/handlers/season_leagues.go +++ b/internal/handlers/season_leagues.go @@ -25,21 +25,7 @@ func SeasonAddLeague( var season *db.Season var allLeagues []*db.League if ok := conn.WithNotifyTx(s, w, r, func(ctx context.Context, tx bun.Tx) (bool, error) { - // Check if season is a draft season - seasonCheck, err := db.GetSeason(ctx, tx, seasonShortName) - if err != nil { - if db.IsBadRequest(err) { - respond.NotFound(w, err) - return false, nil - } - return false, errors.Wrap(err, "db.GetSeason") - } - if seasonCheck.Type == db.SeasonTypeDraft.String() { - respond.BadRequest(w, errors.New("cannot manually manage leagues for draft seasons")) - return false, nil - } - - err = db.NewSeasonLeague(ctx, tx, seasonShortName, leagueShortName, db.NewAuditFromRequest(r)) + err := db.NewSeasonLeague(ctx, tx, seasonShortName, leagueShortName, db.NewAuditFromRequest(r)) if err != nil { if db.IsBadRequest(err) { respond.BadRequest(w, err) @@ -89,10 +75,6 @@ func SeasonRemoveLeague( } return false, errors.Wrap(err, "db.GetSeason") } - if season.Type == db.SeasonTypeDraft.String() { - respond.BadRequest(w, errors.New("cannot manually manage leagues for draft seasons")) - return false, nil - } err = season.RemoveLeague(ctx, tx, leagueStr, db.NewAuditFromRequest(r)) if err != nil { if db.IsBadRequest(err) { diff --git a/internal/server/routes.go b/internal/server/routes.go index 79d1b1a..6ad3750 100644 --- a/internal/server/routes.go +++ b/internal/server/routes.go @@ -97,32 +97,6 @@ func addRoutes( Method: hws.MethodPOST, Handler: perms.RequirePermission(s, permissions.SeasonsUpdate)(handlers.SeasonEditSubmit(s, conn)), }, - // Draft season tab pages (must be before league routes to avoid conflicts) - { - Path: "/seasons/{season_short_name}/table", - Method: hws.MethodGET, - Handler: handlers.DraftSeasonTabPage(s, conn, "table"), - }, - { - Path: "/seasons/{season_short_name}/fixtures", - Method: hws.MethodGET, - Handler: handlers.DraftSeasonTabPage(s, conn, "fixtures"), - }, - { - Path: "/seasons/{season_short_name}/teams", - Method: hws.MethodGET, - Handler: handlers.DraftSeasonTabPage(s, conn, "teams"), - }, - { - Path: "/seasons/{season_short_name}/stats", - Method: hws.MethodGET, - Handler: handlers.DraftSeasonTabPage(s, conn, "stats"), - }, - { - Path: "/seasons/{season_short_name}/finals", - Method: hws.MethodGET, - Handler: handlers.DraftSeasonTabPage(s, conn, "finals"), - }, { Path: "/seasons/{season_short_name}/leagues/{league_short_name}", Method: hws.MethodGET, diff --git a/internal/view/seasonsview/detail_page.templ b/internal/view/seasonsview/detail_page.templ index 4807538..cdc2791 100644 --- a/internal/view/seasonsview/detail_page.templ +++ b/internal/view/seasonsview/detail_page.templ @@ -15,136 +15,6 @@ templ DetailPage(season *db.Season, leaguesWithTeams []db.LeagueWithTeams) { } } -templ DraftSeasonDetailPage(season *db.Season, league *db.League, teams []*db.Team, available []*db.Team, fixtures []*db.Fixture, defaultTab string) { - @baseview.Layout(season.Name) { -
- @DraftSeasonDetail(season, league, teams, available, fixtures, defaultTab) -
- - } -} - -templ DraftSeasonDetail(season *db.Season, league *db.League, teams []*db.Team, available []*db.Team, fixtures []*db.Fixture, defaultTab string) { - {{ - permCache := contexts.Permissions(ctx) - canEditSeason := permCache.HasPermission(permissions.SeasonsUpdate) - }} -
- -
-
-
-
-

{ season.Name }

- { season.ShortName } -
-
- @SeasonTypeBadge(season.Type) - @SlapVersionBadge(season.SlapVersion) - @StatusBadge(season, false, false) -
-
-
- if canEditSeason { - - Edit - - } - - Back to Seasons - -
-
- -
-
- -
-

- ● - Regular Season -

-
-
-
Start
-
{ formatDateLong(season.StartDate) }
-
-
-
Finish
- if !season.EndDate.IsZero() { -
{ formatDateLong(season.EndDate.Time) }
- } else { -
Not set
- } -
-
-
- -
-

- ★ - Finals -

-
-
-
Start
- if !season.FinalsStartDate.IsZero() { -
{ formatDateLong(season.FinalsStartDate.Time) }
- } else { -
Not set
- } -
-
-
Finish
- if !season.FinalsEndDate.IsZero() { -
{ formatDateLong(season.FinalsEndDate.Time) }
- } else { -
Not set
- } -
-
-
-
-
-
- - - -
- switch defaultTab { - case "table": - @SeasonLeagueTable() - case "fixtures": - @SeasonLeagueFixtures(season, league, fixtures) - case "teams": - @SeasonLeagueTeams(season, league, teams, available) - case "stats": - @SeasonLeagueStats() - case "finals": - @SeasonLeagueFinals() - } -
-
-} - - - templ SeasonDetails(season *db.Season, leaguesWithTeams []db.LeagueWithTeams) { {{ permCache := contexts.Permissions(ctx) diff --git a/internal/view/seasonsview/leagues_section.templ b/internal/view/seasonsview/leagues_section.templ index 0c65916..f15bc2f 100644 --- a/internal/view/seasonsview/leagues_section.templ +++ b/internal/view/seasonsview/leagues_section.templ @@ -5,86 +5,84 @@ import "git.haelnorr.com/h/oslstats/internal/contexts" import "git.haelnorr.com/h/oslstats/internal/permissions" templ LeaguesSection(season *db.Season, allLeagues []*db.League) { - if season.Type != db.SeasonTypeDraft.String() { - {{ - permCache := contexts.Permissions(ctx) - canAddLeague := permCache.HasPermission(permissions.SeasonsAddLeague) - canRemoveLeague := permCache.HasPermission(permissions.SeasonsRemoveLeague) + {{ + permCache := contexts.Permissions(ctx) + canAddLeague := permCache.HasPermission(permissions.SeasonsAddLeague) + canRemoveLeague := permCache.HasPermission(permissions.SeasonsRemoveLeague) - // Create a map of assigned league IDs for quick lookup - assignedLeagueIDs := make(map[int]bool) - for _, league := range season.Leagues { - assignedLeagueIDs[league.ID] = true - } - }} - if canAddLeague || canRemoveLeague { -
-
-

Leagues

- - if len(season.Leagues) > 0 { -
-

Currently Assigned

-
- for _, league := range season.Leagues { -
- { league.Name } - ({ league.ShortName }) - if canRemoveLeague { - - } -
- } -
-
- } - - if canAddLeague && len(allLeagues) > 0 { - {{ - // Filter out already assigned leagues - availableLeagues := []*db.League{} - for _, league := range allLeagues { - if !assignedLeagueIDs[league.ID] { - availableLeagues = append(availableLeagues, league) - } - } - }} - if len(availableLeagues) > 0 { -
-

Add League

-
- for _, league := range availableLeagues { + // Create a map of assigned league IDs for quick lookup + assignedLeagueIDs := make(map[int]bool) + for _, league := range season.Leagues { + assignedLeagueIDs[league.ID] = true + } + }} + if canAddLeague || canRemoveLeague { +
+
+

Leagues

+ + if len(season.Leagues) > 0 { +
+

Currently Assigned

+
+ for _, league := range season.Leagues { +
+ { league.Name } + ({ league.ShortName }) + if canRemoveLeague { }
-
+ } +
+
+ } + + if canAddLeague && len(allLeagues) > 0 { + {{ + // Filter out already assigned leagues + availableLeagues := []*db.League{} + for _, league := range allLeagues { + if !assignedLeagueIDs[league.ID] { + availableLeagues = append(availableLeagues, league) + } } + }} + if len(availableLeagues) > 0 { +
+

Add League

+
+ for _, league := range availableLeagues { + + } +
+
} -
+ }
- } +
} } diff --git a/internal/view/seasonsview/season_league_layout.templ b/internal/view/seasonsview/season_league_layout.templ index 14bb146..7fb6b96 100644 --- a/internal/view/seasonsview/season_league_layout.templ +++ b/internal/view/seasonsview/season_league_layout.templ @@ -125,26 +125,3 @@ templ leagueNavItem(section string, label string, activeSection string, season * } - -templ draftNavItem(section string, label string, activeSection string, season *db.Season, league *db.League) { - {{ - isActive := section == activeSection - baseClasses := "inline-block px-6 py-3 transition-colors cursor-pointer border-b-2" - activeClasses := "border-blue text-blue font-semibold" - inactiveClasses := "border-transparent text-subtext0 hover:text-text hover:border-surface2" - displayURL := fmt.Sprintf("/seasons/%s/%s", season.ShortName, section) - postURL := fmt.Sprintf("/seasons/%s/leagues/%s/%s", season.ShortName, league.ShortName, section) - }} -
  • - - { label } - -
    • -}