diff --git a/appview/pages/repoinfo/repoinfo.go b/appview/pages/repoinfo/repoinfo.go index 20121d65..f5b505bb 100644 --- a/appview/pages/repoinfo/repoinfo.go +++ b/appview/pages/repoinfo/repoinfo.go @@ -1,7 +1,6 @@ package repoinfo import ( - "encoding/json" "fmt" "path" "slices" @@ -118,48 +117,3 @@ func (r RolesInRepo) IsCollaborator() bool { func (r RolesInRepo) IsPushAllowed() bool { return slices.Contains(r.Roles, "repo:push") } - -// PrimaryLanguage returns the first (most used) language from a list, or empty string if none -func PrimaryLanguage(languages []interface{}) string { - if len(languages) == 0 { - return "" - } - - // Languages are already sorted by percentage in descending order - // Just get the first one - if firstLang, ok := languages[0].(map[string]interface{}); ok { - if name, ok := firstLang["Name"].(string); ok { - return name - } - } - - return "" -} - -// StructuredData generates Schema.org JSON-LD structured data for the repository -func (r RepoInfo) StructuredData(primaryLanguage string) string { - data := map[string]interface{}{ - "@context": "https://schema.org", - "@type": "SoftwareSourceCode", - "name": r.Name, - "description": r.Description, - "codeRepository": "https://tangled.org/" + r.FullName(), - "url": "https://tangled.org/" + r.FullName(), - "author": map[string]interface{}{ - "@type": "Person", - "name": r.owner(), - "url": "https://tangled.org/" + r.owner(), - }, - } - - // Add programming language if available - if primaryLanguage != "" { - data["programmingLanguage"] = primaryLanguage - } - - jsonBytes, err := json.Marshal(data) - if err != nil { - return "{}" - } - return string(jsonBytes) -} diff --git a/appview/pages/templates/fragments/breadcrumb.html b/appview/pages/templates/fragments/breadcrumb.html deleted file mode 100644 index 68297379..00000000 --- a/appview/pages/templates/fragments/breadcrumb.html +++ /dev/null @@ -1,22 +0,0 @@ -{{ define "fragments/breadcrumb" }} - {{ $items := . }} - {{ if gt (len $items) 0 }} - - {{ end }} -{{ end }} \ No newline at end of file diff --git a/appview/pages/templates/goodfirstissues/index.html b/appview/pages/templates/goodfirstissues/index.html index 255b6b84..b4fa8dd1 100644 --- a/appview/pages/templates/goodfirstissues/index.html +++ b/appview/pages/templates/goodfirstissues/index.html @@ -1,37 +1,12 @@ {{ define "title" }}good first issues{{ end }} {{ define "extrameta" }} - - - - + - - - - - - - - + {{ end }} -{{ define "canonical" }}https://tangled.org/goodfirstissues{{ end }} - {{ define "content" }}
diff --git a/appview/pages/templates/layouts/base.html b/appview/pages/templates/layouts/base.html index 64d34a02..9a81126c 100644 --- a/appview/pages/templates/layouts/base.html +++ b/appview/pages/templates/layouts/base.html @@ -4,13 +4,8 @@ - - + - - - - @@ -24,9 +19,6 @@ - - {{ block "rss" . }}{{ end }} - @@ -34,23 +26,7 @@ - {{ block "title" . }}{{ end }} - - - {{ block "structuredData" . }} - - {{ end }} - + {{ block "title" . }}{{ end }} · tangled {{ block "extrameta" . }}{{ end }} diff --git a/appview/pages/templates/layouts/profilebase.html b/appview/pages/templates/layouts/profilebase.html index 1a618a27..7aeb4937 100644 --- a/appview/pages/templates/layouts/profilebase.html +++ b/appview/pages/templates/layouts/profilebase.html @@ -10,30 +10,11 @@ - + - - - -{{ end }} - -{{ define "canonical" }}https://tangled.org/{{ or .Card.UserHandle .Card.UserDid }}{{ end }} - -{{ define "rss" }} - {{ end }} {{ define "content" }} diff --git a/appview/pages/templates/repo/index.html b/appview/pages/templates/repo/index.html index 9692d539..f641e5f7 100644 --- a/appview/pages/templates/repo/index.html +++ b/appview/pages/templates/repo/index.html @@ -5,42 +5,6 @@ {{ template "repo/fragments/meta" . }} {{ template "repo/fragments/og" (dict "RepoInfo" .RepoInfo) }} - - - - - - {{ template "fragments/breadcrumb" (list - (list "Home" "https://tangled.org") - (list .RepoInfo.OwnerWithAt (printf "https://tangled.org/%s" .RepoInfo.OwnerWithAt)) - (list .RepoInfo.Name (printf "https://tangled.org/%s" .RepoInfo.FullName)) - ) }} -{{ end }} - -{{ define "canonical" }}https://tangled.org/{{ .RepoInfo.FullName }}{{ end }} - -{{ define "rss" }} - {{ end }} {{ define "repoContent" }} diff --git a/appview/pages/templates/repo/issues/fragments/og.html b/appview/pages/templates/repo/issues/fragments/og.html new file mode 100644 index 00000000..3e1794a7 --- /dev/null +++ b/appview/pages/templates/repo/issues/fragments/og.html @@ -0,0 +1,19 @@ +{{ define "repo/issues/fragments/og" }} + {{ $title := printf "%s #%d" .Issue.Title .Issue.IssueId }} + {{ $description := or .Issue.Body .RepoInfo.Description }} + {{ $url := printf "https://tangled.org/%s/issues/%d" .RepoInfo.FullName .Issue.IssueId }} + {{ $imageUrl := printf "https://tangled.org/%s/issues/%d/opengraph" .RepoInfo.FullName .Issue.IssueId }} + + + + + + + + + + + + + +{{ end }} diff --git a/appview/pages/templates/repo/pulls/fragments/og.html b/appview/pages/templates/repo/pulls/fragments/og.html index ad8a00e8..58f25035 100644 --- a/appview/pages/templates/repo/pulls/fragments/og.html +++ b/appview/pages/templates/repo/pulls/fragments/og.html @@ -1,19 +1,19 @@ - {{ define "pulls/fragments/og" }} - {{ $title := printf "%s #%d" .Pull.Title .Pull.PullId }} - {{ $description := or .Pull.Body .RepoInfo.Description }} - {{ $url := printf "https://tangled.org/%s/pulls/%d" .RepoInfo.FullName .Pull.PullId }} - {{ $imageUrl := printf "https://tangled.org/%s/pulls/%d/opengraph" .RepoInfo.FullName .Pull.PullId }} +{{ define "repo/pulls/fragments/og" }} + {{ $title := printf "%s #%d" .Pull.Title .Pull.PullId }} + {{ $description := or .Pull.Body .RepoInfo.Description }} + {{ $url := printf "https://tangled.org/%s/pulls/%d" .RepoInfo.FullName .Pull.PullId }} + {{ $imageUrl := printf "https://tangled.org/%s/pulls/%d/opengraph" .RepoInfo.FullName .Pull.PullId }} - - - - - - - + + + + + + + - - - - + + + + {{ end }} diff --git a/appview/pages/templates/timeline/home.html b/appview/pages/templates/timeline/home.html index 6e098d82..febf520e 100644 --- a/appview/pages/templates/timeline/home.html +++ b/appview/pages/templates/timeline/home.html @@ -1,58 +1,12 @@ {{ define "title" }}tangled · tightly-knit social coding{{ end }} {{ define "extrameta" }} - {{ $desc := "Collaborate on code with decentralized git hosting, modern contribution and review workflows, and lightweight CI/CD pipelines." }} - {{ $title = "tangled · tightly-knit social coding" }} - - - - + + - - - - - - - - - - - - - + {{ end }} -{{ define "canonical" }}https://tangled.org{{ end }} - {{ define "content" }}
diff --git a/appview/state/router.go b/appview/state/router.go index a3c8b850..cb3522ce 100644 --- a/appview/state/router.go +++ b/appview/state/router.go @@ -34,7 +34,6 @@ func (s *State) Router() http.Handler { router.Get("/pwa-manifest.json", s.WebAppManifest) router.Get("/robots.txt", s.RobotsTxt) - router.Get("/sitemap.xml", s.Sitemap) userRouter := s.UserRouter(&middleware) standardRouter := s.StandardRouter(&middleware) diff --git a/appview/state/state.go b/appview/state/state.go index 28142dde..4f7b5b22 100644 --- a/appview/state/state.go +++ b/appview/state/state.go @@ -208,86 +208,10 @@ func (s *State) RobotsTxt(w http.ResponseWriter, r *http.Request) { robotsTxt := `User-agent: * Allow: / -Disallow: /settings -Disallow: /notifications -Disallow: /login -Disallow: /logout -Disallow: /signup -Disallow: /oauth -Disallow: */settings$ -Disallow: */settings/* - -Crawl-delay: 1 - -Sitemap: https://tangled.org/sitemap.xml ` w.Write([]byte(robotsTxt)) } -func (s *State) Sitemap(w http.ResponseWriter, r *http.Request) { - w.Header().Set("Content-Type", "application/xml; charset=utf-8") - w.Header().Set("Cache-Control", "public, max-age=3600") - - // basic sitemap with static pages - sitemap := ` - - - https://tangled.org - daily - 1.0 - - - https://tangled.org/timeline - hourly - 0.9 - - - https://tangled.org/goodfirstissues - daily - 0.8 - - - https://tangled.org/terms - monthly - 0.3 - - - https://tangled.org/privacy - monthly - 0.3 - - - https://tangled.org/brand - monthly - 0.5 - -` - w.Write([]byte(sitemap)) -} - -// https://developer.mozilla.org/en-US/docs/Web/Progressive_web_apps/Manifest -const manifestJson = `{ - "name": "tangled", - "description": "tightly-knit social coding.", - "icons": [ - { - "src": "/favicon.svg", - "sizes": "144x144" - } - ], - "start_url": "/", - "id": "org.tangled", - - "display": "standalone", - "background_color": "#111827", - "theme_color": "#111827" -}` - -func (p *State) PWAManifest(w http.ResponseWriter, r *http.Request) { - w.Header().Set("Content-Type", "application/json") - w.Write([]byte(manifestJson)) -} - func (s *State) TermsOfService(w http.ResponseWriter, r *http.Request) { user := s.oauth.GetMultiAccountUser(r) s.pages.TermsOfService(w, pages.TermsOfServiceParams{