lewis.moe
forked from
tangled.org/core
Monorepo for Tangled
appview/pages: display correct knot in clone url
anirudh.fi
+1
appview/pages/pages.go
+1
appview/pages/pages.go
+20
-12
appview/pages/templates/repo/empty.html
+20
-12
appview/pages/templates/repo/empty.html
···
9
9
{{ end }}
10
10
11
11
{{ define "repoAfter" }}
12
-
<section class="mt-4 p-6 rounded bg-white w-full mx-auto overflow-auto">
13
-
<strong>push</strong>
14
-
<pre>
15
-
git remote add origin git@tangled.sh:{{ .RepoInfo.OwnerHandle }}/{{ .RepoInfo.Name }} </pre
16
-
>
17
-
<strong>clone</strong>
18
-
<pre>
19
-
git clone https://tangled.sh/{{ .RepoInfo.OwnerWithAt }}/{{ .RepoInfo.Name }}
20
-
git clone git@tangled.sh:{{ .RepoInfo.OwnerHandle }}/{{ .RepoInfo.Name }}
21
-
</pre
22
-
>
23
-
</section>
12
+
<section class="mt-4 p-6 rounded bg-white w-full mx-auto overflow-auto">
13
+
<strong>push</strong>
14
+
<div class="py-2">
15
+
<code>git remote add origin git@{{.RepoInfo.Knot}}:{{ .RepoInfo.OwnerHandle }}/{{ .RepoInfo.Name }}</code>
16
+
</div>
17
+
<strong>clone</strong>
18
+
19
+
20
+
<div class="flex flex-col gap-2">
21
+
<div class="pt-2 flex flex-row gap-2">
22
+
<span class="bg-gray-100 p-1 mr-1 font-mono text-sm rounded select-none">HTTP</span>
23
+
<code>git clone https://tangled.sh/{{ .RepoInfo.OwnerWithAt }}/{{ .RepoInfo.Name }}</code>
24
+
</div>
25
+
<div class="pt-2 flex flex-row gap-2">
26
+
<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>
27
+
</div>
28
+
</div>
29
+
<p class="py-2 text-gray-500">Note that for self-hosted knots, clone URLs may be different based on your setup.</p>
30
+
</section>
31
+
24
32
{{ end }}
+15
-8
appview/pages/templates/repo/index.html
+15
-8
appview/pages/templates/repo/index.html
···
206
206
207
207
<section class="mt-4 p-6 rounded bg-white w-full mx-auto overflow-auto">
208
208
<strong>push</strong>
209
-
<pre>
210
-
git remote add origin git@tangled.sh:{{ .RepoInfo.OwnerHandle }}/{{ .RepoInfo.Name }} </pre
211
-
>
209
+
<div class="py-2">
210
+
<code>git remote add origin git@{{.RepoInfo.Knot}}:{{ .RepoInfo.OwnerHandle }}/{{ .RepoInfo.Name }}</code>
211
+
</div>
212
212
<strong>clone</strong>
213
-
<pre>
214
-
git clone https://tangled.sh/{{ .RepoInfo.OwnerWithAt }}/{{ .RepoInfo.Name }}
215
-
git clone git@tangled.sh:{{ .RepoInfo.OwnerHandle }}/{{ .RepoInfo.Name }}
216
-
</pre
217
-
>
213
+
214
+
215
+
<div class="flex flex-col gap-2">
216
+
<div class="pt-2 flex flex-row gap-2">
217
+
<span class="bg-gray-100 p-1 mr-1 font-mono text-sm rounded select-none">HTTP</span>
218
+
<code>git clone https://tangled.sh/{{ .RepoInfo.OwnerWithAt }}/{{ .RepoInfo.Name }}</code>
219
+
</div>
220
+
<div class="pt-2 flex flex-row gap-2">
221
+
<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>
222
+
</div>
223
+
</div>
224
+
<p class="py-2 text-gray-500">Note that for self-hosted knots, clone URLs may be different based on your setup.</p>
218
225
</section>
219
226
{{ end }}
+7
appview/state/repo.go
+7
appview/state/repo.go
···
74
74
}
75
75
76
76
user := s.auth.GetUser(r)
77
+
78
+
knot := f.Knot
79
+
if knot == "knot1.tangled.sh" {
80
+
knot = "tangled.sh"
81
+
}
82
+
77
83
s.pages.RepoIndexPage(w, pages.RepoIndexParams{
78
84
LoggedInUser: user,
79
85
RepoInfo: pages.RepoInfo{
80
86
OwnerDid: f.OwnerDid(),
81
87
OwnerHandle: f.OwnerHandle(),
82
88
Name: f.RepoName,
89
+
Knot: knot,
83
90
SettingsAllowed: settingsAllowed(s, user, f),
84
91
},
85
92
TagMap: tagMap,