Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactor themes #519

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Refactor themes #519

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7f65c55
refactor: move app/theme to pkg/theme
acouvreur Feb 10, 2025
d106fd8
refactor
acouvreur Feb 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/http/routes/strategies.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ package routes

import (
"github.com/sablierapp/sablier/app/sessions"
"github.com/sablierapp/sablier/app/theme"
"github.com/sablierapp/sablier/config"
"github.com/sablierapp/sablier/pkg/theme"
)

type ServeStrategy struct {
Expand Down
2 changes: 1 addition & 1 deletion app/sablier.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import (
"github.com/sablierapp/sablier/pkg/provider/dockerswarm"
"github.com/sablierapp/sablier/pkg/provider/kubernetes"
"github.com/sablierapp/sablier/pkg/store/inmemory"
"github.com/sablierapp/sablier/pkg/theme"
"log/slog"
"os"
"os/signal"
Expand All @@ -18,7 +19,6 @@ import (

"github.com/sablierapp/sablier/app/sessions"
"github.com/sablierapp/sablier/app/storage"
"github.com/sablierapp/sablier/app/theme"
"github.com/sablierapp/sablier/config"
"github.com/sablierapp/sablier/internal/server"
"github.com/sablierapp/sablier/version"
Expand Down
2 changes: 1 addition & 1 deletion internal/api/api_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"github.com/neilotoole/slogt"
"github.com/sablierapp/sablier/app/http/routes"
"github.com/sablierapp/sablier/app/sessions/sessionstest"
"github.com/sablierapp/sablier/app/theme"
"github.com/sablierapp/sablier/config"
"github.com/sablierapp/sablier/pkg/theme"
"go.uber.org/mock/gomock"
"gotest.tools/v3/assert"
"net/http"
Expand Down
2 changes: 1 addition & 1 deletion internal/api/problemdetail.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package api

import (
"github.com/sablierapp/sablier/app/sessions"
"github.com/sablierapp/sablier/app/theme"
"github.com/sablierapp/sablier/pkg/theme"
"github.com/tniswong/go.rfcx/rfc7807"
"net/http"
)
Expand Down
12 changes: 6 additions & 6 deletions internal/api/start_dynamic.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"github.com/sablierapp/sablier/app/http/routes/models"
"github.com/sablierapp/sablier/app/instance"
"github.com/sablierapp/sablier/app/sessions"
"github.com/sablierapp/sablier/app/theme"
theme2 "github.com/sablierapp/sablier/pkg/theme"
"sort"
"strconv"
"strings"
Expand Down Expand Up @@ -65,7 +65,7 @@ func StartDynamic(router *gin.RouterGroup, s *routes.ServeStrategy) {

AddSablierHeader(c, sessionState)

renderOptions := theme.Options{
renderOptions := theme2.Options{
DisplayName: request.DisplayName,
ShowDetails: request.ShowDetails,
SessionDuration: request.SessionDuration,
Expand All @@ -76,7 +76,7 @@ func StartDynamic(router *gin.RouterGroup, s *routes.ServeStrategy) {
buf := new(bytes.Buffer)
writer := bufio.NewWriter(buf)
err = s.Theme.Render(request.Theme, renderOptions, writer)
var themeNotFound theme.ErrThemeNotFound
var themeNotFound theme2.ErrThemeNotFound
if errors.As(err, &themeNotFound) {
AbortWithProblemDetail(c, ProblemThemeNotFound(themeNotFound))
return
Expand All @@ -90,7 +90,7 @@ func StartDynamic(router *gin.RouterGroup, s *routes.ServeStrategy) {
})
}

func sessionStateToRenderOptionsInstanceState(sessionState *sessions.SessionState) (instances []theme.Instance) {
func sessionStateToRenderOptionsInstanceState(sessionState *sessions.SessionState) (instances []theme2.Instance) {
if sessionState == nil {
return
}
Expand All @@ -106,7 +106,7 @@ func sessionStateToRenderOptionsInstanceState(sessionState *sessions.SessionStat
return
}

func instanceStateToRenderOptionsRequestState(instanceState instance.State) theme.Instance {
func instanceStateToRenderOptionsRequestState(instanceState instance.State) theme2.Instance {

var err error
if instanceState.Message == "" {
Expand All @@ -115,7 +115,7 @@ func instanceStateToRenderOptionsRequestState(instanceState instance.State) them
err = fmt.Errorf(instanceState.Message)
}

return theme.Instance{
return theme2.Instance{
Name: instanceState.Name,
Status: instanceState.Status,
CurrentReplicas: instanceState.CurrentReplicas,
Expand Down
0 app/theme/embedded/ghost.html → pkg/theme/embedded/ghost.html
View file
Open in desktop
File renamed without changes.
0 app/theme/embedded/hacker-terminal.html → pkg/theme/embedded/hacker-terminal.html
View file
Open in desktop
File renamed without changes.
0 app/theme/embedded/matrix.html → pkg/theme/embedded/matrix.html
View file
Open in desktop
File renamed without changes.
0 app/theme/embedded/shuffle.html → pkg/theme/embedded/shuffle.html
View file
Open in desktop
File renamed without changes.
0 app/theme/errors.go → pkg/theme/errors.go
View file
Open in desktop
File renamed without changes.
0 app/theme/list.go → pkg/theme/list.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion app/theme/list_test.go → pkg/theme/list_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ package theme_test

import (
"github.com/neilotoole/slogt"
"github.com/sablierapp/sablier/pkg/theme"
"testing"
"testing/fstest"

"github.com/sablierapp/sablier/app/theme"
"github.com/stretchr/testify/assert"
)

Expand Down
0 app/theme/parse.go → pkg/theme/parse.go
View file
Open in desktop
File renamed without changes.
0 app/theme/render.go → pkg/theme/render.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion app/theme/render_test.go → pkg/theme/render_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@ import (
"bytes"
"fmt"
"github.com/neilotoole/slogt"
"github.com/sablierapp/sablier/pkg/theme"
"log/slog"
"os"
"testing"
"testing/fstest"
"time"

"github.com/sablierapp/sablier/app/theme"
"github.com/sablierapp/sablier/version"
)

Expand Down
0 app/theme/theme.go → pkg/theme/theme.go
View file
Open in desktop
File renamed without changes.
0 app/theme/types.go → pkg/theme/types.go
View file
Open in desktop
File renamed without changes.
Loading