azpect/Potion
1
1
Fork 0
Code Issues 9 Pull Requests Actions Packages Projects Releases Wiki Activity

DEV: Working on environments and the recovery from nil pointers. #29

Merged
azpect merged 4 commits from dev into master 2025-07-22 22:45:34 -07:00
Conversation 0 Commits 4 Files Changed 13 +261 -170
13 changed files with 261 additions and 170 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/web/main.go
View File

@ -5,7 +5,7 @@ import "github.com/haydenhargreaves/Potion/internal/app/server"
const PORT = 3000
func main() {
s := server.Init(PORT).ConfigureAuth().ConnectDatabase().Setup()
s := server.Init(PORT).Setup()
defer s.DB.Close()
s.Start()

2
internal/app/handlers/auth_handler.go
View File

@ -61,5 +61,7 @@ func GoogleCallback(ctx *gin.Context) {
func Logout(ctx *gin.Context) {
// TODO: Use same values as the GoogleCallback function
ctx.SetCookie("jwt_token", "", -1, "/", "", false, true) // TODO: Update settings
ctx.SetCookie("search-filters", "", -1, "/", "", false, true)
ctx.Redirect(http.StatusSeeOther, domain.WEB_HOME)
}

31
internal/app/handlers/page_handler.go
View File

@ -82,19 +82,6 @@ func FavoritesPage(ctx *gin.Context) {
}
}
// Else, get the user's favorites
// BUG: Depreciated, not displaying a list, using search to drive this page as well
// deps := ctx.MustGet("deps").(*domainServer.InjectedDependencies)
// userId := ctx.MustGet("userId").(int)
// recipes, err := deps.RecipeService.GetUserFavoriteRecipes(userId)
// if err != nil {
// ctx.JSON(http.StatusInternalServerError, gin.H{
// "status": http.StatusInternalServerError,
// "message": fmt.Sprintf("Error getting favorites. %s\n", err.Error()),
// })
// return
// }
ctx.HTML(http.StatusOK, "", layouts.AppLayout(title, page))
}
@ -200,24 +187,8 @@ func RecipePage(ctx *gin.Context) {
return
}
// Add engagement
// BUG: Don't want to do this here
// if loggedIn {
// if _, err = deps.EngagementService.UserViewRecipe(*userId, recipe.Id); err != nil {
// fmt.Printf("ERROR: %s\n", err.Error())
// ctx.JSON(400, err.Error())
// return
// }
// } else {
// if _, err = deps.EngagementService.ViewRecipe(recipe.Id); err != nil {
// fmt.Printf("ERROR: %s\n", err.Error())
// ctx.JSON(400, err.Error())
// return
// }
// }
title := "Potion - View Recipe"
page := pages.RecipePage(*recipe, *user, loggedIn)
page := pages.RecipePage(*recipe, *user, loggedIn, deps.EnvironmentConfig.Domain)
ctx.HTML(http.StatusOK, "", layouts.AppLayout(title, page))
}

4
internal/app/handlers/recipe_handler.go
View File

@ -121,6 +121,10 @@ func SearchRecipesFavorites(ctx *gin.Context) {
// TODO: Error here if they're not logged in?
// Get user data (they should be logged in)
if !domain.IsLoggedIn(ctx) {
ctx.JSON(http.StatusOK, gin.H{"error": "User is not logged in. User will be nil."})
}
userId := ctx.MustGet("userId").(int)
recipes, err := deps.RecipeService.SearchRecipes(filters, &userId, true)

45
internal/app/server/middleware.go
View File

@ -2,6 +2,9 @@ package server
import (
"fmt"
"log"
"net/http"
"runtime/debug"
"github.com/gin-gonic/gin"
"github.com/golang-jwt/jwt/v5"
@ -71,3 +74,45 @@ func JwtAuthMiddleWare(jwtSecretKey []byte) gin.HandlerFunc {
ctx.Next()
}
}
func RecoveryMiddleware() gin.HandlerFunc {
return func(ctx *gin.Context) {
defer func() {
if r := recover(); r != nil {
// Log the panic with stack trace
err := fmt.Errorf("panic recovered: %v\n%s", r, debug.Stack())
log.Printf("[PANIC RECOVERY] %s", err)
ctx.JSON(http.StatusOK, gin.H{
"status": http.StatusOK,
"error": "API_PANIC_RECOVERED",
"message": err.Error(),
})
// Determine the content type of the request for appropriate response
// acceptHeader := ctx.Request.Header.Get("Accept")
//
// // Customize the response based on the request type (e.g., HTML vs. JSON)
// if strings.Contains(acceptHeader, "text/html") {
// // For browser requests (HTML), redirect to an error page or render a template
// ctx.HTML(http.StatusInternalServerError, "error.html", gin.H{
// "title": "Something went wrong",
// "message": "An unexpected error occurred. Please try again later.",
// })
// } else if strings.Contains(acceptHeader, "application/json") || ctx.Request.Method == http.MethodPost {
// // For API requests (JSON), return a JSON error response
// ctx.AbortWithStatusJSON(http.StatusInternalServerError, gin.H{
// "error": "An internal server error occurred.",
// "message": "We're working to fix the problem. Please try again later.",
// // You might include a unique error ID here for tracking
// })
// } else {
// // Fallback for other content types
// ctx.AbortWithStatus(http.StatusInternalServerError)
// }
}
}()
ctx.Next()
}
}

88
internal/app/server/server.go
View File

@ -4,7 +4,6 @@ import (
"database/sql"
"fmt"
"net/http"
"os"
"strings"
"github.com/a-h/templ/examples/integration-gin/gintemplrenderer"
@ -15,7 +14,6 @@ import (
domain "github.com/haydenhargreaves/Potion/internal/domain/server"
"github.com/haydenhargreaves/Potion/internal/infrastructure/auth"
"github.com/haydenhargreaves/Potion/internal/infrastructure/database/repository"
"github.com/joho/godotenv"
_ "github.com/lib/pq"
)
@ -53,18 +51,26 @@ func Init(port int) *Server {
return server
}
func (s *Server) ConfigureAuth() *Server {
err := godotenv.Load(".env")
// Start starts the server on the port provided when the server was initialized
func (s *Server) Start() {
s.Router.Run(fmt.Sprintf(":%d", s.port))
}
func (s *Server) Setup() *Server {
// SETUP THE ENVIRONMENT CONFIGURATION
cfg, err := domain.LoadEnvironment()
if err != nil {
fmt.Printf("No .env file found or error loading .env: %v. Relying on system environment variables.", err)
panic(err.Error())
}
if cfg == nil {
panic("Environment configuration is nil, crashing.")
}
redirect_domain := os.Getenv("DOMAIN")
// SETUP GOOGLE AUTH
var (
redirectUrl string = fmt.Sprintf("%s%s", redirect_domain, domain.API_AUTH_CALLBACK)
clientId string = os.Getenv("GOOGLE_CLIENT_ID")
clientSecret string = os.Getenv("GOOGLE_CLIENT_SECRET")
redirectUrl string = fmt.Sprintf("%s%s", cfg.Domain, domain.API_AUTH_CALLBACK)
clientId string = cfg.GoogleClientId
clientSecret string = cfg.GoogleClientSecret
scope []string = []string{
"https://www.googleapis.com/auth/userinfo.email",
"https://www.googleapis.com/auth/userinfo.profile",
@ -74,18 +80,8 @@ func (s *Server) ConfigureAuth() *Server {
// Setup Google OAuth
auth.NewGoogleConfig(redirectUrl, clientId, clientSecret, scope)
return s
}
func (s *Server) ConnectDatabase() *Server {
err := godotenv.Load(".env")
if err != nil {
fmt.Printf("No .env file found or error loading .env: %v. Relying on system environment variables.", err)
}
var connUrl string = os.Getenv("DATABASE_URL")
db, err := sql.Open("postgres", connUrl)
// SETUP DATABASE
db, err := sql.Open("postgres", cfg.DatabaseUrl)
if err != nil {
panic("Could not connect to database: " + err.Error())
}
@ -96,21 +92,8 @@ func (s *Server) ConnectDatabase() *Server {
s.DB = db
return s
}
// Start starts the server on the port provided when the server was initialized
func (s *Server) Start() {
s.Router.Run(fmt.Sprintf(":%d", s.port))
}
func (s *Server) Setup() *Server {
err := godotenv.Load(".env")
if err != nil {
fmt.Printf("No .env file found or error loading .env: %v. Relying on system environment variables.", err)
}
jwtSecret := []byte(os.Getenv("JWT_SECRET"))
// SETUP JWT
jwtSecret := []byte(cfg.JwtSecret)
// Initialize and inject dependencies
userRepo := repository.NewUserRepository(s.DB)
@ -126,9 +109,11 @@ func (s *Server) Setup() *Server {
AuthService: authService,
RecipeService: recipeService,
EngagementService: engagementService,
EnvironmentConfig: *cfg,
}
// Apply middleware
s.Router.Use(RecoveryMiddleware())
s.Router.Use(DepedencyInjectionMiddleware(deps))
s.Router.Use(JwtAuthMiddleWare(jwtSecret))
@ -149,15 +134,8 @@ func (s *Server) Setup() *Server {
// API router endpoints
router_api.GET("/", func(ctx *gin.Context) { ctx.JSON(200, gin.H{"message": "Server is active."}) })
router_api.GET("/tmp", func(ctx *gin.Context) {
if !domain.IsLoggedIn(ctx) {
ctx.JSON(200, gin.H{"error": "User is not logged in. Please login to continue"})
return
}
userId := ctx.MustGet("userId").(int)
userEmail := ctx.MustGet("userEmail").(string)
ctx.JSON(200, gin.H{"id": userId, "email": userEmail})
deps := ctx.MustGet("deps").(*domain.InjectedDependencies)
ctx.JSON(200, gin.H{"config": deps.EnvironmentConfig})
})
// WEB router endpoints
@ -188,22 +166,6 @@ func (s *Server) Setup() *Server {
router_api.GET("/user/recipes", handlers.GetUserRecipes)
router_api.GET("/user/favorites", handlers.GetUserFavoriteRecipes)
router_api.GET("/user/temp", func(ctx *gin.Context) {
recipes, err := recipeService.GetUserMadeRecipes(3, 6)
if err != nil {
ctx.JSON(http.StatusBadRequest, gin.H{
"recipes": recipes,
"error": err.Error(),
})
} else {
ctx.JSON(http.StatusBadRequest, gin.H{
"recipes": recipes,
"error": "",
})
}
})
// Engagement endpoints
router_api.POST("/engagement/view/:id", handlers.EngagementViewRecipe)
router_api.POST("/engagement/share/:id", handlers.EngagementShareRecipe)
@ -217,7 +179,7 @@ func (s *Server) Setup() *Server {
// TODO: Use constants for errors?
if strings.HasPrefix(path, domain.VERSION+domain.API) {
ctx.JSON(http.StatusNotFound, gin.H{
"status": 404,
"status": http.StatusNotFound,
"error": "API_NOT_FOUND",
"message": "The request endpoint does not exist.",
"path": path,

85
internal/domain/server/server.go
View File

@ -1,14 +1,30 @@
package domain
import (
"fmt"
"os"
"github.com/gin-gonic/gin"
"github.com/golang-jwt/jwt/v5"
domainAuth "github.com/haydenhargreaves/Potion/internal/domain/auth"
domainEngagement "github.com/haydenhargreaves/Potion/internal/domain/engagement"
domainRecipe "github.com/haydenhargreaves/Potion/internal/domain/recipe"
domainUser "github.com/haydenhargreaves/Potion/internal/domain/user"
"github.com/joho/godotenv"
)
// EnvironmentConfig stores the configuration of the environment. Anything loaded from the .env
// or docker environment will be stored here and can be accessed from the InjectedDependencies
// struct, which this is attached to.
type EnvironmentConfig struct {
GoogleClientId string
GoogleClientSecret string
JwtSecret string
DatabaseUrl string
Environment string
Domain string
}
// InjectedDependencies is a collection of dependencies that are injected into the application. They
// are stored in the context and can be accessed by handlers via the context.
type InjectedDependencies struct {
@ -16,6 +32,7 @@ type InjectedDependencies struct {
AuthService domainAuth.AuthService
RecipeService domainRecipe.RecipeService
EngagementService domainEngagement.EngagementService
EnvironmentConfig EnvironmentConfig
}
// JwtClaims is the data stored in the JSON web token. All that is needed is the users ID and their
@ -32,3 +49,71 @@ func IsLoggedIn(ctx *gin.Context) bool {
_, email := ctx.Get("userEmail")
return id && email
}
func LoadEnvironment() (*EnvironmentConfig, error) {
err := godotenv.Load(".env")
if err != nil {
fmt.Printf("No .env file found or error loading .env: %v. Relying on system environment variables.", err)
}
env := os.Getenv("ENVIRONMENT")
if env == "" {
return nil, fmt.Errorf("ENVIRONMENT environment variable is required.")
}
googleClientId := os.Getenv("GOOGLE_CLIENT_ID")
if googleClientId == "" {
return nil, fmt.Errorf("GOOGLE_CLIENT_ID environment variable is required.")
}
googleClientSecret := os.Getenv("GOOGLE_CLIENT_SECRET")
if googleClientSecret == "" {
return nil, fmt.Errorf("GOOGLE_CLIENT_SECRET environment variable is required.")
}
jwtSecret := os.Getenv("JWT_SECRET")
if jwtSecret == "" {
return nil, fmt.Errorf("JWT_SECRET environment variable is required.")
}
var domain string
if env == "dev" {
domain = os.Getenv("DOMAIN_DEV")
if domain == "" {
return nil, fmt.Errorf("DOMAIN_DEV environment variable is required when ENVIRONMENT is 'dev'.")
}
} else if env == "prod" {
domain = os.Getenv("DOMAIN_PROD")
if domain == "" {
return nil, fmt.Errorf("DOMAIN_PROD environment variable is required when ENVIRONMENT is 'prod'.")
}
} else {
return nil, fmt.Errorf("ENVIRONMENT environment variable is required and must be 'dev' or 'prod'.")
}
var dbUrl string
if env == "dev" {
dbUrl = os.Getenv("DATABASE_URL_DEV")
if dbUrl == "" {
return nil, fmt.Errorf("DATABASE_URL_DEV environment variable is required when ENVIRONMENT is 'dev'.")
}
} else if env == "prod" {
dbUrl = os.Getenv("DATABASE_URL_PROD")
if dbUrl == "" {
return nil, fmt.Errorf("DATABASE_URL_PROD environment variable is required when ENVIRONMENT is 'prod'.")
}
} else {
return nil, fmt.Errorf("ENVIRONMENT environment variable is required and must be 'dev' or 'prod'.")
}
cfg := &EnvironmentConfig{
GoogleClientId: googleClientId,
GoogleClientSecret: googleClientSecret,
JwtSecret: jwtSecret,
DatabaseUrl: dbUrl,
Environment: env,
Domain: domain,
}
return cfg, nil
}

5
internal/infrastructure/database/repository/user_repository.go
View File

@ -2,6 +2,7 @@ package repository
import (
"database/sql"
"fmt"
domain "github.com/haydenhargreaves/Potion/internal/domain/user"
_ "github.com/lib/pq"
@ -35,6 +36,10 @@ func (r *UserRepository) CreateGoogleUser(googleUserInfo *domain.GoogleUserInfo,
return domain.User{}, err
}
if googleUserInfo == nil {
return domain.User{}, fmt.Errorf("Google user info provided was nil")
}
var user domain.User
query := `INSERT INTO users
(GoogleId, Name, Email, ImageUrl, GoogleRefreshToken)

2
internal/templates/components/navbar_templ.go
View File

@ -211,7 +211,7 @@ func Navbar(current string) templ.Component {
if templ_7745c5c3_Err != nil {
return templ_7745c5c3_Err
}
templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 16, "\"><p class=\"select-none text-red-800\">Potion</p></a></div><div class=\"hidden md:flex lg:flex items-center gap-8 select-none\">")
templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 16, "\"><p class=\"select-none\">Potion</p></a></div><div class=\"hidden md:flex lg:flex items-center gap-8 select-none\">")
if templ_7745c5c3_Err != nil {
return templ_7745c5c3_Err
}

121
internal/templates/pages/favorites.templ
View File

@ -6,68 +6,73 @@ import "github.com/haydenhargreaves/Potion/internal/domain/recipe"
import domainServer "github.com/haydenhargreaves/Potion/internal/domain/server"
templ FavoriteList(recipes []domain.Recipe) {
<div id="result-list" class="flex flex-col w-full p-4 items-center">
for _, recipe := range recipes {
@favoriteResult(recipe)
}
if len(recipes) == 0 || recipes == nil {
<p class="text-gray-700 text-sm py-4">No results</p>
} else {
<p class="text-gray-700 text-sm py-4">End of results</p>
}
</div>
<div id="result-list" class="flex flex-col w-full p-4 items-center">
for _, recipe := range recipes {
@favoriteResult(recipe)
}
if len(recipes) == 0 || recipes == nil {
<p class="text-gray-700 text-sm py-4">No results</p>
} else {
<p class="text-gray-700 text-sm py-4">End of results</p>
}
</div>
}
templ favoriteResult(recipe domain.Recipe) {
<div hx-post={ fmt.Sprintf(domainServer.API_ENGAGEMENT_VIEW, recipe.Id) } hx-trigger="click" hx-swap="none"
class="w-full p-2 border-b border-gray-200 hover:bg-gray-100 duration-200 flex items-center flex-col md:flex-row even:bg-[#f8f8f8] cursor-pointer">
<img class="bg-gray-50 size-56 md:size-40 rounded-md border-0" src="" />
<div class="text-gray-700 p-4 flex flex-col items-center md:items-start w-full">
<div class="flex flex-col md:flex-row items-center md:items-start justify-between w-full">
<div class="flex flex-col items-center md:items-start">
<h3 class="text-xl font-semibold text-black pb-1">
{ recipe.Title } <span class="text-sm font-normal hidden md:inline">{ recipe.Category }</span>
</h3>
<div class="text-sm flex gap-x-3 gap-y-1 items-center flex-wrap">
<span class="flex gap-x-1 align-center">
@timeIconSm()
{ recipe.Duration.Total } min
</span>
<span class="flex gap-x-1 align-center">
for _ = range(recipe.Difficulty) {
@starIconSm(true)
}
for _ = range(5 - recipe.Difficulty) {
@starIconSm(false)
}
</span>
<span class="flex gap-x-1 align-center">
@servingIconSm()
Serves { recipe.Serves }
</span>
</div>
</div>
<div class="mb-2 mt-4 md:my-0 hidden md:block">
<svg class="h-6 text-red-500" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
<path
d="M2 9.1371C2 14 6.01943 16.5914 8.96173 18.9109C10 19.7294 11 20.5 12 20.5C13 20.5 14 19.7294 15.0383 18.9109C17.9806 16.5914 22 14 22 9.1371C22 4.27416 16.4998 0.825464 12 5.50063C7.50016 0.825464 2 4.27416 2 9.1371Z"
fill="currentColor"></path>
</svg>
</div>
</div>
<p class="text-sm py-2 text-center md:text-left">{ recipe.Description }</p>
</div>
</div>
<div
hx-post={ fmt.Sprintf(domainServer.API_ENGAGEMENT_VIEW, recipe.Id) }
hx-trigger="click"
hx-swap="none"
class="w-full p-2 border-b border-gray-200 hover:bg-gray-100 duration-200 flex items-center flex-col md:flex-row even:bg-[#f8f8f8] cursor-pointer"
>
<img class="bg-gray-50 size-56 md:size-40 rounded-md border-0" src=""/>
<div class="text-gray-700 p-4 flex flex-col items-center md:items-start w-full">
<div class="flex flex-col md:flex-row items-center md:items-start justify-between w-full">
<div class="flex flex-col items-center md:items-start">
<h3 class="text-xl font-semibold text-black pb-1">
{ recipe.Title } <span class="text-sm font-normal hidden md:inline">{ recipe.Category }</span>
</h3>
<div class="text-sm flex gap-x-3 gap-y-1 items-center flex-wrap">
<span class="flex gap-x-1 align-center">
@timeIconSm()
{ recipe.Duration.Total } min
</span>
<span class="flex gap-x-1 align-center">
for _ = range(recipe.Difficulty) {
@starIconSm(true)
}
for _ = range(5 - recipe.Difficulty) {
@starIconSm(false)
}
</span>
<span class="flex gap-x-1 align-center">
@servingIconSm()
Serves { recipe.Serves }
</span>
</div>
</div>
<div class="mb-2 mt-4 md:my-0 hidden md:block">
<svg class="h-6 text-red-500" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
<path
d="M2 9.1371C2 14 6.01943 16.5914 8.96173 18.9109C10 19.7294 11 20.5 12 20.5C13 20.5 14 19.7294 15.0383 18.9109C17.9806 16.5914 22 14 22 9.1371C22 4.27416 16.4998 0.825464 12 5.50063C7.50016 0.825464 2 4.27416 2 9.1371Z"
fill="currentColor"
></path>
</svg>
</div>
</div>
<p class="text-sm py-2 text-center md:text-left">{ recipe.Description }</p>
</div>
</div>
}
templ FavoritesPage(filters domain.SearchFilters) {
@components.Navbar("favorites")
<div class="w-full flex justify-center">
<div class="mx-2 md:mx-0 w-full md:w-1/2 md:pt-14 min-h-screen border-l border-r border-gray-300 bg-white">
@components.BannerText("Favorites")
@components.SearchBar(filters, false, true, true)
<hr class="text-gray-300 w-full" />
@FavoriteList(nil)
</div>
</div>
@components.Navbar("favorites")
<div class="w-full flex justify-center">
<div class="mx-2 md:mx-0 w-full md:w-1/2 md:pt-14 min-h-screen border-l border-r border-gray-300 bg-white">
@components.BannerText("Favorites")
@components.SearchBar(filters, false, true, true)
<hr class="text-gray-300 w-full"/>
@FavoriteList(nil)
</div>
</div>
}

12
internal/templates/pages/favorites_templ.go
View File

@ -91,7 +91,7 @@ func favoriteResult(recipe domain.Recipe) templ.Component {
var templ_7745c5c3_Var3 string
templ_7745c5c3_Var3, templ_7745c5c3_Err = templ.JoinStringErrs(fmt.Sprintf(domainServer.API_ENGAGEMENT_VIEW, recipe.Id))
if templ_7745c5c3_Err != nil {
return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/templates/pages/favorites.templ`, Line: 22, Col: 71}
return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/templates/pages/favorites.templ`, Line: 23, Col: 68}
}
_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var3))
if templ_7745c5c3_Err != nil {
@ -104,7 +104,7 @@ func favoriteResult(recipe domain.Recipe) templ.Component {
var templ_7745c5c3_Var4 string
templ_7745c5c3_Var4, templ_7745c5c3_Err = templ.JoinStringErrs(recipe.Title)
if templ_7745c5c3_Err != nil {
return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/templates/pages/favorites.templ`, Line: 29, Col: 24}
return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/templates/pages/favorites.templ`, Line: 33, Col: 20}
}
_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var4))
if templ_7745c5c3_Err != nil {
@ -117,7 +117,7 @@ func favoriteResult(recipe domain.Recipe) templ.Component {
var templ_7745c5c3_Var5 string
templ_7745c5c3_Var5, templ_7745c5c3_Err = templ.JoinStringErrs(recipe.Category)
if templ_7745c5c3_Err != nil {
return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/templates/pages/favorites.templ`, Line: 29, Col: 95}
return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/templates/pages/favorites.templ`, Line: 33, Col: 91}
}
_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var5))
if templ_7745c5c3_Err != nil {
@ -134,7 +134,7 @@ func favoriteResult(recipe domain.Recipe) templ.Component {
var templ_7745c5c3_Var6 string
templ_7745c5c3_Var6, templ_7745c5c3_Err = templ.JoinStringErrs(recipe.Duration.Total)
if templ_7745c5c3_Err != nil {
return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/templates/pages/favorites.templ`, Line: 34, Col: 35}
return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/templates/pages/favorites.templ`, Line: 38, Col: 30}
}
_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var6))
if templ_7745c5c3_Err != nil {
@ -171,7 +171,7 @@ func favoriteResult(recipe domain.Recipe) templ.Component {
var templ_7745c5c3_Var7 string
templ_7745c5c3_Var7, templ_7745c5c3_Err = templ.JoinStringErrs(recipe.Serves)
if templ_7745c5c3_Err != nil {
return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/templates/pages/favorites.templ`, Line: 46, Col: 34}
return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/templates/pages/favorites.templ`, Line: 50, Col: 29}
}
_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var7))
if templ_7745c5c3_Err != nil {
@ -184,7 +184,7 @@ func favoriteResult(recipe domain.Recipe) templ.Component {
var templ_7745c5c3_Var8 string
templ_7745c5c3_Var8, templ_7745c5c3_Err = templ.JoinStringErrs(recipe.Description)
if templ_7745c5c3_Err != nil {
return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/templates/pages/favorites.templ`, Line: 58, Col: 73}
return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/templates/pages/favorites.templ`, Line: 63, Col: 72}
}
_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var8))
if templ_7745c5c3_Err != nil {

8
internal/templates/pages/recipe.templ
View File

@ -291,7 +291,7 @@ templ buttonSection(favorited bool, id int, loggedIn bool) {
</section>
}
templ RecipePage(recipe domain.Recipe, user domainUser.User, loggedIn bool) {
templ RecipePage(recipe domain.Recipe, user domainUser.User, loggedIn bool, domain string) {
@components.Navbar("")
<div class="w-full flex justify-center">
<div class="mx-2 md:mx-0 w-full md:w-1/2 md:pt-14 h-full border-l border-r border-gray-300 bg-white">
@ -312,10 +312,10 @@ templ RecipePage(recipe domain.Recipe, user domainUser.User, loggedIn bool) {
@tagList(recipe.Tags, recipe.Created, recipe.Modified)
</div>
</div>
@scripts(recipe.Id)
@scripts(recipe.Id, domain)
}
templ scripts(id int) {
templ scripts(id int, domain string) {
<script>
function shareButtonHandler() {
const button = document.getElementById("share-button");
@ -323,7 +323,7 @@ templ scripts(id int) {
if (navigator.clipboard && navigator.clipboard.writeText) {
// TODO: Fix this to use the real domain somehow
const url = "http://localhost:7331/v1/web/recipe/{{ id }}"
const url = "{{ domain }}/v1/web/recipe/{{ id }}"
navigator.clipboard.writeText(url).then(() => {
button.outerHTML = `
<button id="share-button"

26
internal/templates/pages/recipe_templ.go
View File

File diff suppressed because one or more lines are too long