forked from tangled.org/core
this repo has no description

appview/pages: display correct knot in clone url

Changed files
+43 -20
appview
pages
templates
state
+1
appview/pages/pages.go
···
OwnerDid string
OwnerHandle string
Description string
+
Knot string
SettingsAllowed bool
}
+20 -12
appview/pages/templates/repo/empty.html
···
{{ end }}
{{ define "repoAfter" }}
-
<section class="mt-4 p-6 rounded bg-white w-full mx-auto overflow-auto">
-
<strong>push</strong>
-
<pre>
-
git remote add origin git@tangled.sh:{{ .RepoInfo.OwnerHandle }}/{{ .RepoInfo.Name }} </pre
-
>
-
<strong>clone</strong>
-
<pre>
-
git clone https://tangled.sh/{{ .RepoInfo.OwnerWithAt }}/{{ .RepoInfo.Name }}
-
git clone git@tangled.sh:{{ .RepoInfo.OwnerHandle }}/{{ .RepoInfo.Name }}
-
</pre
-
>
-
</section>
+
<section class="mt-4 p-6 rounded bg-white w-full mx-auto overflow-auto">
+
<strong>push</strong>
+
<div class="py-2">
+
<code>git remote add origin git@{{.RepoInfo.Knot}}:{{ .RepoInfo.OwnerHandle }}/{{ .RepoInfo.Name }}</code>
+
</div>
+
<strong>clone</strong>
+
+
+
<div class="flex flex-col gap-2">
+
<div class="pt-2 flex flex-row gap-2">
+
<span class="bg-gray-100 p-1 mr-1 font-mono text-sm rounded select-none">HTTP</span>
+
<code>git clone https://tangled.sh/{{ .RepoInfo.OwnerWithAt }}/{{ .RepoInfo.Name }}</code>
+
</div>
+
<div class="pt-2 flex flex-row gap-2">
+
<span class="bg-gray-100 p-1 mr-1 font-mono text-sm rounded select-none">SSH</span><code>git clone git@{{.RepoInfo.Knot}}:{{ .RepoInfo.OwnerHandle }}/{{ .RepoInfo.Name }}</code>
+
</div>
+
</div>
+
<p class="py-2 text-gray-500">Note that for self-hosted knots, clone URLs may be different based on your setup.</p>
+
</section>
+
{{ end }}
+15 -8
appview/pages/templates/repo/index.html
···
<section class="mt-4 p-6 rounded bg-white w-full mx-auto overflow-auto">
<strong>push</strong>
-
<pre>
-
git remote add origin git@tangled.sh:{{ .RepoInfo.OwnerHandle }}/{{ .RepoInfo.Name }} </pre
-
>
+
<div class="py-2">
+
<code>git remote add origin git@{{.RepoInfo.Knot}}:{{ .RepoInfo.OwnerHandle }}/{{ .RepoInfo.Name }}</code>
+
</div>
<strong>clone</strong>
-
<pre>
-
git clone https://tangled.sh/{{ .RepoInfo.OwnerWithAt }}/{{ .RepoInfo.Name }}
-
git clone git@tangled.sh:{{ .RepoInfo.OwnerHandle }}/{{ .RepoInfo.Name }}
-
</pre
-
>
+
+
+
<div class="flex flex-col gap-2">
+
<div class="pt-2 flex flex-row gap-2">
+
<span class="bg-gray-100 p-1 mr-1 font-mono text-sm rounded select-none">HTTP</span>
+
<code>git clone https://tangled.sh/{{ .RepoInfo.OwnerWithAt }}/{{ .RepoInfo.Name }}</code>
+
</div>
+
<div class="pt-2 flex flex-row gap-2">
+
<span class="bg-gray-100 p-1 mr-1 font-mono text-sm rounded select-none">SSH</span><code>git clone git@{{.RepoInfo.Knot}}:{{ .RepoInfo.OwnerHandle }}/{{ .RepoInfo.Name }}</code>
+
</div>
+
</div>
+
<p class="py-2 text-gray-500">Note that for self-hosted knots, clone URLs may be different based on your setup.</p>
</section>
{{ end }}
+7
appview/state/repo.go
···
}
user := s.auth.GetUser(r)
+
+
knot := f.Knot
+
if knot == "knot1.tangled.sh" {
+
knot = "tangled.sh"
+
}
+
s.pages.RepoIndexPage(w, pages.RepoIndexParams{
LoggedInUser: user,
RepoInfo: pages.RepoInfo{
OwnerDid: f.OwnerDid(),
OwnerHandle: f.OwnerHandle(),
Name: f.RepoName,
+
Knot: knot,
SettingsAllowed: settingsAllowed(s, user, f),
},
TagMap: tagMap,