changing layout

This commit is contained in:
Daniel Noulet 2026-09-19 16:45:24 +02:00
parent 17b5f751e2
commit b1c6aa659b
37 changed files with 695 additions and 1018 deletions

View file

@ -8,52 +8,25 @@ import (
"net/http"
"github.com/example/cms/internal/config"
"github.com/example/cms/internal/identity"
"github.com/example/cms/internal/repository"
"github.com/example/cms/internal/security"
"github.com/example/cms/internal/service"
"github.com/example/cms/internal/web"
"github.com/pressly/goose/v3"
"github.com/pressly/goose/v3/database"
"gorm.io/driver/postgres"
"gorm.io/driver/sqlite"
"gorm.io/gorm"
)
//go:embed migrations/admin/*.sql migrations/postgres/*.sql
//go:embed migrations/postgres/*.sql
var migrations embed.FS
func main() {
cfg, err := config.Load()
if err != nil {
log.Fatal(err)
}
adminDB, err := gorm.Open(sqlite.Open(cfg.AdminDatabaseURL), &gorm.Config{})
if err != nil {
log.Fatal(err)
}
cfg := config.Load()
applicationDB, err := gorm.Open(postgres.Open(cfg.ApplicationDatabaseURL), &gorm.Config{})
if err != nil {
log.Fatal(err)
}
adminSQLDB, err := adminDB.DB()
if err != nil {
log.Fatal(err)
}
adminMigrations, err := fs.Sub(migrations, "migrations/admin")
if err != nil {
log.Fatal(err)
}
adminStore, err := database.NewStore(goose.DialectSQLite3, "goose_admin_db_version")
if err != nil {
log.Fatal(err)
}
adminProvider, err := goose.NewProvider("", adminSQLDB, adminMigrations, goose.WithStore(adminStore))
if err != nil {
log.Fatal(err)
}
if _, err = adminProvider.Up(context.Background()); err != nil {
log.Fatal(err)
}
applicationSQLDB, err := applicationDB.DB()
if err != nil {
log.Fatal(err)
@ -73,17 +46,10 @@ func main() {
if _, err = applicationProvider.Up(context.Background()); err != nil {
log.Fatal(err)
}
auth := service.NewAuthServiceWithSeparateSessions(
repository.NewUserRepository(applicationDB),
repository.NewAdminRepository(adminDB),
repository.NewSessionRepository(applicationDB),
repository.NewSessionRepository(adminDB),
cfg.SessionTTL,
)
content := service.NewContentService(repository.NewContentRepository(applicationDB), auth)
google := identity.GoogleProvider{ClientID: cfg.GoogleClientID, ClientSecret: cfg.GoogleClientSecret, RedirectURL: cfg.GoogleRedirectURL}
content := service.NewContentService(repository.NewContentRepository(applicationDB))
sso := security.NewSSOTokenVerifier(cfg.SSOHeader, cfg.SSOToken, cfg.SSOCookie)
log.Printf("CMS listening on %s", cfg.HTTPAddr)
if err = http.ListenAndServe(cfg.HTTPAddr, web.NewHandlerWithContent(auth, google, content).Routes(cfg.AllowedOrigins)); err != nil {
if err = http.ListenAndServe(cfg.HTTPAddr, web.NewHandler(content, sso).Routes(cfg.AllowedOrigins)); err != nil {
log.Fatal(err)
}
}