From 129aea32ef2ab769b0e914cff8f1d0a62842b562 Mon Sep 17 00:00:00 2001 From: oppiliappan Date: Fri, 26 Sep 2025 14:44:17 +0100 Subject: [PATCH] appview/pages: fix terms and privacy pages Change-Id: qlyvwyvupxmzwyquyunozxkuymqrwvxs Signed-off-by: oppiliappan --- {legal => appview/pages/legal}/privacy.md | 2 +- {legal => appview/pages/legal}/terms.md | 4 ++-- appview/pages/pages.go | 20 +++++++++++++++++--- 3 files changed, 20 insertions(+), 6 deletions(-) rename {legal => appview/pages/legal}/privacy.md (99%) rename {legal => appview/pages/legal}/terms.md (98%) diff --git a/legal/privacy.md b/appview/pages/legal/privacy.md similarity index 99% rename from legal/privacy.md rename to appview/pages/legal/privacy.md index 009d17fd..c99465a5 100644 --- a/legal/privacy.md +++ b/appview/pages/legal/privacy.md @@ -1,6 +1,6 @@ # Privacy Policy -**Last updated:** January 15, 2025 +**Last updated:** September 26, 2025 This Privacy Policy describes how Tangled ("we," "us," or "our") collects, uses, and shares your personal information when you use our diff --git a/legal/terms.md b/appview/pages/legal/terms.md similarity index 98% rename from legal/terms.md rename to appview/pages/legal/terms.md index 38dfe409..6d6e1311 100644 --- a/legal/terms.md +++ b/appview/pages/legal/terms.md @@ -1,6 +1,6 @@ # Terms of Service -**Last updated:** January 15, 2025 +**Last updated:** September 26, 2025 Welcome to Tangled. These Terms of Service ("Terms") govern your access to and use of the Tangled platform and services (the "Service") @@ -106,4 +106,4 @@ us through our platform or via email. These terms are effective as of the last updated date shown above and will remain in effect except with respect to any changes in their provisions in the future, which will be in effect immediately after -being posted on this page. \ No newline at end of file +being posted on this page. diff --git a/appview/pages/pages.go b/appview/pages/pages.go index d1e72e5d..5c079f82 100644 --- a/appview/pages/pages.go +++ b/appview/pages/pages.go @@ -38,7 +38,7 @@ import ( "github.com/go-git/go-git/v5/plumbing/object" ) -//go:embed templates/* static +//go:embed templates/* static legal var Files embed.FS type Pages struct { @@ -242,7 +242,14 @@ type TermsOfServiceParams struct { func (p *Pages) TermsOfService(w io.Writer, params TermsOfServiceParams) error { filename := "terms.md" filePath := filepath.Join("legal", filename) - markdownBytes, err := os.ReadFile(filePath) + + file, err := p.embedFS.Open(filePath) + if err != nil { + return fmt.Errorf("failed to read %s: %w", filename, err) + } + defer file.Close() + + markdownBytes, err := io.ReadAll(file) if err != nil { return fmt.Errorf("failed to read %s: %w", filename, err) } @@ -263,7 +270,14 @@ type PrivacyPolicyParams struct { func (p *Pages) PrivacyPolicy(w io.Writer, params PrivacyPolicyParams) error { filename := "privacy.md" filePath := filepath.Join("legal", filename) - markdownBytes, err := os.ReadFile(filePath) + + file, err := p.embedFS.Open(filePath) + if err != nil { + return fmt.Errorf("failed to read %s: %w", filename, err) + } + defer file.Close() + + markdownBytes, err := io.ReadAll(file) if err != nil { return fmt.Errorf("failed to read %s: %w", filename, err) } -- 2.43.0