diff --git a/appview/pages/templates/index.html b/appview/pages/templates/index.html deleted file mode 100644 index eeef7077..00000000 --- a/appview/pages/templates/index.html +++ /dev/null @@ -1,21 +0,0 @@ - - {{ template "layouts/head" . }} - -
-

{{ .meta.Title }}

-

{{ .meta.Description }}

-
- -
-
- {{ range .info }} -
- {{ .DisplayName }} -
-
{{ .Desc }}
-
{{ .Idle }}
- {{ end }} -
-
- - diff --git a/appview/pages/templates/repo/blob.html b/appview/pages/templates/repo/blob.html index 87e20f83..3f51345c 100644 --- a/appview/pages/templates/repo/blob.html +++ b/appview/pages/templates/repo/blob.html @@ -1,15 +1,14 @@ {{ define "title" }}{{ .Path }} at {{ .Ref }} · {{ .RepoInfo.FullName }}{{ end }} - {{ define "extrameta" }} - - - - - - -{{ end }} + {{ template "repo/fragments/meta" . }} + {{ $title := printf "%s at %s · %s" .Path .Ref .RepoInfo.FullName }} + {{ $url := printf "https://tangled.sh/%s/blob/%s/%s" .RepoInfo.FullName .Ref .Path }} + + {{ template "repo/fragments/og" (dict "RepoInfo" .RepoInfo "Title" $title "Url" $url) }} + +{{ end }} {{ define "repoContent" }} {{ $lines := split .Contents }} diff --git a/appview/pages/templates/repo/branches.html b/appview/pages/templates/repo/branches.html index bffd9631..f21d27f0 100644 --- a/appview/pages/templates/repo/branches.html +++ b/appview/pages/templates/repo/branches.html @@ -1,5 +1,12 @@ {{ define "title" }} - branches · {{ .RepoInfo.FullName }} + branches · {{ .RepoInfo.FullName }} +{{ end }} + +{{ define "extrameta" }} + {{ $title := printf "branches · %s" .RepoInfo.FullName }} + {{ $url := printf "https://tangled.sh/%s/branches" .RepoInfo.FullName }} + + {{ template "repo/fragments/og" (dict "RepoInfo" .RepoInfo "Title" $title "Url" $url) }} {{ end }} {{ define "repoContent" }} diff --git a/appview/pages/templates/repo/commit.html b/appview/pages/templates/repo/commit.html index c5cb27d8..d15ced70 100644 --- a/appview/pages/templates/repo/commit.html +++ b/appview/pages/templates/repo/commit.html @@ -1,5 +1,13 @@ {{ define "title" }} commit {{ .Diff.Commit.This }} · {{ .RepoInfo.FullName }} {{ end }} +{{ define "extrameta" }} + {{ $title := printf "commit %s · %s" .Diff.Commit.This .RepoInfo.FullName }} + {{ $url := printf "https://tangled.sh/%s/commit/%s" .RepoInfo.FullName .Diff.Commit.This }} + + {{ template "repo/fragments/og" (dict "RepoInfo" .RepoInfo "Title" $title "Url" $url) }} +{{ end }} + + {{ define "repoContent" }} {{ $repo := .RepoInfo.FullName }} diff --git a/appview/pages/templates/repo/empty.html b/appview/pages/templates/repo/empty.html index 7a5c139c..7c07626e 100644 --- a/appview/pages/templates/repo/empty.html +++ b/appview/pages/templates/repo/empty.html @@ -1,5 +1,10 @@ {{ define "title" }}{{ .RepoInfo.FullName }}{{ end }} +{{ define "extrameta" }} + {{ template "repo/fragments/meta" . }} + {{ template "repo/fragments/og" (dict "RepoInfo" .RepoInfo) }} +{{ end }} + {{ define "repoContent" }}

diff --git a/appview/pages/templates/repo/fragments/meta.html b/appview/pages/templates/repo/fragments/meta.html new file mode 100644 index 00000000..2fb0dd36 --- /dev/null +++ b/appview/pages/templates/repo/fragments/meta.html @@ -0,0 +1,26 @@ +{{ define "repo/fragments/meta" }} + + + + + + +{{ end }} diff --git a/appview/pages/templates/repo/fragments/og.html b/appview/pages/templates/repo/fragments/og.html new file mode 100644 index 00000000..88131589 --- /dev/null +++ b/appview/pages/templates/repo/fragments/og.html @@ -0,0 +1,11 @@ +{{ define "repo/fragments/og" }} + {{ $title := or .Title .RepoInfo.FullName }} + {{ $description := or .Description .RepoInfo.Description }} + {{ $url := or .Url (printf "https://tangled.sh/%s" .RepoInfo.FullName) }} + + + + + + +{{ end }} diff --git a/appview/pages/templates/repo/index.html b/appview/pages/templates/repo/index.html index 06e778b0..821c422d 100644 --- a/appview/pages/templates/repo/index.html +++ b/appview/pages/templates/repo/index.html @@ -1,32 +1,13 @@ {{ define "title" }}{{ .RepoInfo.FullName }} at {{ .Ref }}{{ end }} + {{ define "extrameta" }} - - - - - - + {{ template "repo/fragments/meta" . }} + + {{ template "repo/fragments/og" (dict "RepoInfo" .RepoInfo) }} {{ end }} + {{ define "repoContent" }}

diff --git a/appview/pages/templates/repo/issues/issue.html b/appview/pages/templates/repo/issues/issue.html index 94c341eb..c4d1882d 100644 --- a/appview/pages/templates/repo/issues/issue.html +++ b/appview/pages/templates/repo/issues/issue.html @@ -1,5 +1,13 @@ {{ define "title" }}{{ .Issue.Title }} · issue #{{ .Issue.IssueId }} · {{ .RepoInfo.FullName }}{{ end }} + +{{ define "extrameta" }} + {{ $title := printf "%s · issue #%d · %s" .Issue.Title .Issue.IssueId .RepoInfo.FullName }} + {{ $url := printf "https://tangled.sh/%s/issues/%d" .RepoInfo.FullName .Issue.IssueId }} + + {{ template "repo/fragments/og" (dict "RepoInfo" .RepoInfo "Title" $title "Url" $url) }} +{{ end }} + {{ define "repoContent" }}

diff --git a/appview/pages/templates/repo/issues/issues.html b/appview/pages/templates/repo/issues/issues.html index 3d816924..2dfb47c7 100644 --- a/appview/pages/templates/repo/issues/issues.html +++ b/appview/pages/templates/repo/issues/issues.html @@ -1,5 +1,12 @@ {{ define "title" }}issues · {{ .RepoInfo.FullName }}{{ end }} +{{ define "extrameta" }} + {{ $title := "issues"}} + {{ $url := printf "https://tangled.sh/%s/issues" .RepoInfo.FullName }} + + {{ template "repo/fragments/og" (dict "RepoInfo" .RepoInfo "Title" $title "Url" $url) }} +{{ end }} + {{ define "repoContent" }}
diff --git a/appview/pages/templates/repo/log.html b/appview/pages/templates/repo/log.html index 7cf7529e..a5167337 100644 --- a/appview/pages/templates/repo/log.html +++ b/appview/pages/templates/repo/log.html @@ -1,5 +1,12 @@ {{ define "title" }}commits · {{ .RepoInfo.FullName }}{{ end }} +{{ define "extrameta" }} + {{ $title := printf "commits · %s" .RepoInfo.FullName }} + {{ $url := printf "https://tangled.sh/%s/commits" .RepoInfo.FullName }} + + {{ template "repo/fragments/og" (dict "RepoInfo" .RepoInfo "Title" $title "Url" $url) }} +{{ end }} + {{ define "repoContent" }}

diff --git a/appview/pages/templates/repo/pulls/interdiff.html b/appview/pages/templates/repo/pulls/interdiff.html index c333be10..76287863 100644 --- a/appview/pages/templates/repo/pulls/interdiff.html +++ b/appview/pages/templates/repo/pulls/interdiff.html @@ -1,5 +1,13 @@ {{ define "title" }} - interdiff of round #{{ .Round }} and #{{ sub .Round 1 }}; pull #{{ .Pull.PullId }} · {{ .RepoInfo.FullName }} + interdiff of round #{{ .Round }} and #{{ sub .Round 1 }} · pull #{{ .Pull.PullId }} · {{ .RepoInfo.FullName }} +{{ end }} + + +{{ define "extrameta" }} + {{ $title := printf "interdiff of %d and %d · %s · pull #%d · %s" .Round (sub .Round 1) .Pull.Title .Pull.PullId .RepoInfo.FullName }} + {{ $url := printf "https://tangled.sh/%s/pulls/%d/round/%d" .RepoInfo.FullName .Pull.PullId .Round }} + + {{ template "repo/fragments/og" (dict "RepoInfo" .RepoInfo "Title" (unescapeHtml $title) "Url" $url) }} {{ end }} {{ define "content" }} diff --git a/appview/pages/templates/repo/pulls/patch.html b/appview/pages/templates/repo/pulls/patch.html index 41a5900a..d4ff5c4f 100644 --- a/appview/pages/templates/repo/pulls/patch.html +++ b/appview/pages/templates/repo/pulls/patch.html @@ -2,6 +2,15 @@ patch of {{ .Pull.Title }} · round #{{ .Round }} · pull #{{ .Pull.PullId }} · {{ .RepoInfo.FullName }} {{ end }} + +{{ define "extrameta" }} + {{ $title := printf "patch of %s · pull #%d · %s" .Pull.Title .Pull.PullId .RepoInfo.FullName }} + {{ $url := printf "https://tangled.sh/%s/pulls/%d/round/%d" .RepoInfo.FullName .Pull.PullId .Round }} + + {{ template "repo/fragments/og" (dict "RepoInfo" .RepoInfo "Title" $title "Url" $url) }} +{{ end }} + + {{ define "content" }}
diff --git a/appview/pages/templates/repo/tags.html b/appview/pages/templates/repo/tags.html index 3faba995..a17d05fd 100644 --- a/appview/pages/templates/repo/tags.html +++ b/appview/pages/templates/repo/tags.html @@ -2,6 +2,13 @@ tags · {{ .RepoInfo.FullName }} {{ end }} +{{ define "extrameta" }} + {{ $title := printf "tags · %s" .RepoInfo.FullName }} + {{ $url := printf "https://tangled.sh/%s/tags" .RepoInfo.FullName }} + + {{ template "repo/fragments/og" (dict "RepoInfo" .RepoInfo "Title" $title "Url" $url) }} +{{ end }} + {{ define "repoContent" }}

tags

diff --git a/appview/pages/templates/repo/tree.html b/appview/pages/templates/repo/tree.html index b9bea247..bd0980b0 100644 --- a/appview/pages/templates/repo/tree.html +++ b/appview/pages/templates/repo/tree.html @@ -2,12 +2,17 @@ {{ define "extrameta" }} - - - - - - + + {{ $path := "" }} + {{ range .BreadCrumbs }} + {{ $path = printf "%s/%s" $path (index . 0) }} + {{ end }} + + {{ template "repo/fragments/meta" . }} + {{ $title := printf "%s at %s · %s" $path .Ref .RepoInfo.FullName }} + {{ $url := printf "https://tangled.sh/%s/tree/%s%s" .RepoInfo.FullName .Ref $path }} + + {{ template "repo/fragments/og" (dict "RepoInfo" .RepoInfo "Title" $title "Url" $url) }} {{ end }} diff --git a/appview/pages/templates/timeline.html b/appview/pages/templates/timeline.html index 1ef0dabd..dcca46dc 100644 --- a/appview/pages/templates/timeline.html +++ b/appview/pages/templates/timeline.html @@ -1,88 +1,148 @@ {{ define "title" }}timeline{{ end }} +{{ define "extrameta" }} + + + + +{{ end }} + {{ define "topbar" }} - {{ with .LoggedInUser }} - {{ template "layouts/topbar" $ }} - {{ else }} - {{ end }} + {{ with .LoggedInUser }} + {{ template "layouts/topbar" $ }} + {{ else }} + {{ end }} {{ end }} {{ define "content" }} - {{ with .LoggedInUser }} - {{ block "timeline" $ }} {{ end }} - {{ else }} - {{ block "hero" $ }} {{ end }} - {{ block "timeline" $ }} {{ end }} - {{ end }} + {{ with .LoggedInUser }} + {{ block "timeline" $ }}{{ end }} + {{ else }} + {{ block "hero" $ }}{{ end }} + {{ block "timeline" $ }}{{ end }} + {{ end }} {{ end }} {{ define "hero" }} -
-
- tangled -
-
- tightly-knit social coding, join now {{ i "arrow-right" "w-4 h-4" }} -

Join our Discord or IRC channel: #tangled on Libera Chat. - Read an introduction to Tangled here.

-
-
+
+
tangled
+
+ tightly-knit social coding, + join now {{ i "arrow-right" "w-4 h-4" }} +

+ Join our Discord or IRC + channel: + #tangled on Libera Chat. Read an introduction to Tangled + here. +

+
+
{{ end }} {{ define "timeline" }} -
-
-

Timeline

-
- -
-
- {{ range .Timeline }} -
- {{ if .Repo }} - {{ $userHandle := index $.DidHandleMap .Repo.Did }} -
-

- {{ $userHandle | truncateAt30 }} - {{ if .Source }} - forked - - {{ index $.DidHandleMap .Source.Did }}/{{ .Source.Name }} - - to - {{ .Repo.Name }} - {{ else }} - created - {{ .Repo.Name }} - {{ end }} - -

-
- {{ else if .Follow }} - {{ $userHandle := index $.DidHandleMap .Follow.UserDid }} - {{ $subjectHandle := index $.DidHandleMap .Follow.SubjectDid }} -
-

- {{ $userHandle | truncateAt30 }} - followed - {{ $subjectHandle | truncateAt30 }} - -

+
+
+

Timeline

- {{ else if .Star }} - {{ $starrerHandle := index $.DidHandleMap .Star.StarredByDid }} - {{ $repoOwnerHandle := index $.DidHandleMap .Star.Repo.Did }} -
-

- {{ $starrerHandle | truncateAt30 }} - starred - {{ $repoOwnerHandle | truncateAt30 }}/{{ .Star.Repo.Name }} - -

+ +
+
+ {{ range .Timeline }} +
+ {{ if .Repo }} + {{ $userHandle := index $.DidHandleMap .Repo.Did }} +
+

+ {{ $userHandle | truncateAt30 }} + {{ if .Source }} + forked + + {{ index $.DidHandleMap .Source.Did }}/{{ .Source.Name }} + + to + {{ .Repo.Name }} + {{ else }} + created + {{ .Repo.Name }} + {{ end }} + +

+
+ {{ else if .Follow }} + {{ $userHandle := index $.DidHandleMap .Follow.UserDid }} + {{ $subjectHandle := index $.DidHandleMap .Follow.SubjectDid }} +
+

+ {{ $userHandle | truncateAt30 }} + followed + {{ $subjectHandle | truncateAt30 }} + +

+
+ {{ else if .Star }} + {{ $starrerHandle := index $.DidHandleMap .Star.StarredByDid }} + {{ $repoOwnerHandle := index $.DidHandleMap .Star.Repo.Did }} +
+

+ {{ $starrerHandle | truncateAt30 }} + starred + {{ $repoOwnerHandle | truncateAt30 }}/{{ .Star.Repo.Name }} + +

+
+ {{ end }} +
+ {{ end }}
- {{ end }}
- {{ end }} -
-
{{ end }} diff --git a/appview/pages/templates/user/login.html b/appview/pages/templates/user/login.html index 1c157fc2..a234da28 100644 --- a/appview/pages/templates/user/login.html +++ b/appview/pages/templates/user/login.html @@ -7,13 +7,25 @@ name="viewport" content="width=device-width, initial-scale=1.0" /> + + + - login + login · tangled
diff --git a/appview/pages/templates/user/profile.html b/appview/pages/templates/user/profile.html index f69f2fd8..f2a420f0 100644 --- a/appview/pages/templates/user/profile.html +++ b/appview/pages/templates/user/profile.html @@ -1,5 +1,12 @@ {{ define "title" }}{{ or .Card.UserHandle .Card.UserDid }}{{ end }} +{{ define "extrameta" }} + + + + +{{ end }} + {{ define "content" }}
diff --git a/appview/pages/templates/user/repos.html b/appview/pages/templates/user/repos.html index 488553a7..2aec5aab 100644 --- a/appview/pages/templates/user/repos.html +++ b/appview/pages/templates/user/repos.html @@ -1,5 +1,12 @@ {{ define "title" }}{{ or .Card.UserHandle .Card.UserDid }} · repos {{ end }} +{{ define "extrameta" }} + + + + +{{ end }} + {{ define "content" }}
diff --git a/go.mod b/go.mod index f94c4b21..299288b4 100644 --- a/go.mod +++ b/go.mod @@ -28,6 +28,7 @@ require ( github.com/sethvargo/go-envconfig v1.1.0 github.com/whyrusleeping/cbor-gen v0.2.1-0.20241030202151-b7a6831be65e github.com/yuin/goldmark v1.4.13 + golang.org/x/net v0.39.0 golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 ) @@ -114,7 +115,6 @@ require ( go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.26.0 // indirect golang.org/x/crypto v0.37.0 // indirect - golang.org/x/net v0.39.0 // indirect golang.org/x/sys v0.32.0 // indirect golang.org/x/time v0.8.0 // indirect google.golang.org/protobuf v1.34.2 // indirect