+
+
+
BrainMinder
+
+
+
Shared item : {{ .itemShare.ItemTitle}}
+
+
+
{{template "page:content" .}}
diff --git a/assets/templates/items/share.tmpl b/assets/templates/items/share.tmpl
index 1f9d2bc..d4df542 100644
--- a/assets/templates/items/share.tmpl
+++ b/assets/templates/items/share.tmpl
@@ -26,7 +26,7 @@
- {{ .baseUrl }}/item/share/
+ {{ .publicBaseUrl }}/item/share/
diff --git a/assets/templates/items/share_edit.tmpl b/assets/templates/items/share_edit.tmpl
index 319ed2e..06e851d 100644
--- a/assets/templates/items/share_edit.tmpl
+++ b/assets/templates/items/share_edit.tmpl
@@ -26,7 +26,7 @@
- {{ .baseUrl }}/item/share/
+ {{ .publicBaseUrl }}/item/share/
diff --git a/assets/templates/items/shared.tmpl b/assets/templates/items/shared.tmpl
index 8cca497..ea8da70 100644
--- a/assets/templates/items/shared.tmpl
+++ b/assets/templates/items/shared.tmpl
@@ -1,4 +1,8 @@
{{define "page:content"}}
-Shared item FOUND
- {{ .itemShare.ItemTitle}}
+
+ - Summary
+ - {{ .itemShare.ItemSummaryRendered | safeHTML}}
+ - Description
+ - {{ .itemShare.ItemDescriptionRendered | safeHTML}}
+
{{end}}
diff --git a/cmd/web/config.go b/cmd/web/config.go
index b80f91c..913b32d 100644
--- a/cmd/web/config.go
+++ b/cmd/web/config.go
@@ -1,9 +1,10 @@
package main
type config struct {
- baseURL string
- httpPort int
- cookie struct {
+ publicBaseURL string
+ baseURL string
+ httpPort int
+ cookie struct {
secretKey string
}
db struct {
diff --git a/cmd/web/items_handlers.go b/cmd/web/items_handlers.go
index 8c4fcfe..1ea7ac4 100644
--- a/cmd/web/items_handlers.go
+++ b/cmd/web/items_handlers.go
@@ -1,6 +1,7 @@
package main
import (
+ "brainminder.speedtech.it/internal/password"
"bytes"
"fmt"
"github.com/justinas/nosurf"
@@ -993,7 +994,7 @@ func (app *application) itemShare(w http.ResponseWriter, r *http.Request) {
data := app.newTemplateData(r)
data["item"] = item
- data["baseUrl"] = app.config.baseURL
+ data["publicBaseUrl"] = app.config.publicBaseURL
switch r.Method {
case http.MethodGet:
@@ -1023,10 +1024,14 @@ func (app *application) itemShare(w http.ResponseWriter, r *http.Request) {
return
}
+ hashedPassword := ""
+ if itemShareFromForm.Password != "" {
+ hashedPassword, _ = password.Hash(itemShareFromForm.Password)
+ }
itemShare := &models.ItemShare{
ItemId: itemId,
Token: itemShareFromForm.Token,
- Password: itemShareFromForm.Password,
+ Password: hashedPassword,
PermissionEdit: itemShareFromForm.PermissionEdit,
StartDatetime: itemShareFromForm.StartDatetime,
EndDatetime: itemShareFromForm.EndDatetime,
@@ -1065,7 +1070,7 @@ func (app *application) itemShareEdit(w http.ResponseWriter, r *http.Request) {
data := app.newTemplateData(r)
data["itemShare"] = itemShare
- data["baseUrl"] = app.config.baseURL
+ data["publicBaseUrl"] = app.config.publicBaseURL
switch r.Method {
case http.MethodGet:
@@ -1093,9 +1098,13 @@ func (app *application) itemShareEdit(w http.ResponseWriter, r *http.Request) {
return
}
+ hashedPassword := ""
+ if itemShareFromForm.Password != "" {
+ hashedPassword, _ = password.Hash(itemShareFromForm.Password)
+ }
itemShare := &models.ItemShare{
Token: itemShareFromForm.Token,
- Password: itemShareFromForm.Password,
+ Password: hashedPassword,
PermissionEdit: itemShareFromForm.PermissionEdit,
StartDatetime: itemShareFromForm.StartDatetime,
EndDatetime: itemShareFromForm.EndDatetime,
diff --git a/cmd/web/main.go b/cmd/web/main.go
index 7d4b28e..216ee6a 100644
--- a/cmd/web/main.go
+++ b/cmd/web/main.go
@@ -33,7 +33,8 @@ func main() {
func run(logger *slog.Logger) error {
var cfg config
- cfg.baseURL = env.GetString("BASE_URL", "http://localhost:4445")
+ cfg.publicBaseURL = env.GetString("PUBLIC_BASE_URL", "http://localhost:4445")
+ cfg.baseURL = env.GetString("BASE_URL", "http://localhost")
cfg.httpPort = env.GetInt("HTTP_PORT", 4445)
cfg.cookie.secretKey = env.GetString("COOKIE_SECRET_KEY", `CHANGE_THIS_COOKIE_KEY`)
cfg.db.dsn = env.GetString("DB_DSN", "db.sqlite")
diff --git a/models/itemshare.go b/models/itemshare.go
index 41a71b7..e36082b 100644
--- a/models/itemshare.go
+++ b/models/itemshare.go
@@ -11,14 +11,16 @@ type ItemShareModel struct {
}
type ItemShare struct {
- Id int64 `db:"id"`
- Token string `db:"token"`
- ItemId int64 `db:"item_id"`
- PermissionEdit int `db:"permission_edit"`
- StartDatetime string `db:"start_datetime"`
- EndDatetime string `db:"end_datetime"`
- Password string `db:"password"`
- ItemTitle string `db:"item_title"`
+ Id int64 `db:"id"`
+ Token string `db:"token"`
+ ItemId int64 `db:"item_id"`
+ PermissionEdit int `db:"permission_edit"`
+ StartDatetime string `db:"start_datetime"`
+ EndDatetime string `db:"end_datetime"`
+ Password string `db:"password"`
+ ItemTitle string `db:"item_title"`
+ ItemSummaryRendered string `db:"item_summary_rendered"`
+ ItemDescriptionRendered string `db:"item_description_rendered"`
}
func (model *ItemShareModel) One(id int64) (*ItemShare, bool, error) {
@@ -27,7 +29,8 @@ func (model *ItemShareModel) One(id int64) (*ItemShare, bool, error) {
var row ItemShare
- query := `SELECT bmi.title AS item_title, bmis.* FROM bm_item_shares bmis
+ query := `SELECT bmi.title AS item_title, bmi.summary_rendered as item_summary_rendered, bmi.description_rendered as item_description_rendered,
+ bmis.* FROM bm_item_shares bmis
INNER JOIN bm_item bmi ON bmis.item_id=bmi.id WHERE bmis.id = $1`
err := model.DB.GetContext(ctx, &row, query, id)
@@ -44,7 +47,8 @@ func (model *ItemShareModel) OneByToken(token string) (*ItemShare, bool, error)
var row ItemShare
- query := `SELECT bmi.title AS item_title, bmis.* FROM bm_item_shares bmis
+ query := `SELECT bmi.title AS item_title, bmi.summary_rendered as item_summary_rendered, bmi.description_rendered as item_description_rendered,
+ bmis.* FROM bm_item_shares bmis
INNER JOIN bm_item bmi ON bmis.item_id=bmi.id WHERE bmis.token = $1`
err := model.DB.GetContext(ctx, &row, query, token)
@@ -78,7 +82,7 @@ func (model *ItemShareModel) Update(ItemShare *ItemShare) error {
ctx, cancel := database.GetContext()
defer cancel()
- query := `UPDATE bm_item_shares SET token=:token, permission_edit=:permission_edit, start_datetime=:start_datetime, end_datetime=:end_datetime WHERE id = :id`
+ query := `UPDATE bm_item_shares SET token=:token, permission_edit=:permission_edit, start_datetime=:start_datetime, end_datetime=:end_datetime, password=:password WHERE id = :id`
_, err := model.DB.NamedExecContext(ctx, query, ItemShare)
if err != nil {