Inbox UX progress

EmissarySocial · Nov 26, 2023 · 673562b · 673562b
1 parent 7d01ec2
commit 673562b
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 29 deletions.
diff --git a/_embed/templates/user-inbox/list-before.html b/_embed/templates/user-inbox/list-before.html
@@ -24,6 +24,9 @@
 
 	{{- range $index, $message := $inbox -}}
 
+		{{- $stream := $inboxRenderer.ActivityStream $message.URL -}}
+		{{- $stats := $stream.Statistics -}}
+
 		<div 
 			id="item_{{.MessageID.Hex}}" 
 			role="button"
@@ -46,7 +49,13 @@
 			{{- end -}}
 		</div>
 
-		{{- $inboxRenderer.Responses $message -}}
+		<div class="space-above">
+			{{ $stats.Replies }} Replies &middot;
+			{{ $stats.Likes }} Likes &middot;
+			{{ $stats.Announces }} Shares &middot;
+			{{- $inboxRenderer.Responses $message -}}
+		</div>
+
 		<hr>
 
 	{{- end -}}

diff --git a/_embed/templates/user-inbox/list.html b/_embed/templates/user-inbox/list.html
@@ -31,6 +31,9 @@
 	{{- $inboxRenderer := . -}}
 	{{- range $index, $message := $inbox -}}
 
+		{{- $stream := $inboxRenderer.ActivityStream $message.URL -}}
+		{{- $stats := $stream.Statistics -}}
+
 		<div 
 			id="item_{{.MessageID.Hex}}" 
 			role="button"
@@ -57,6 +60,9 @@
 		</div>
 
 		<div class="space-above">
+			{{ $stats.Replies }} Replies &middot;
+			{{ $stats.Likes }} Likes &middot;
+			{{ $stats.Announces }} Shares &middot;
 			{{- $inboxRenderer.Responses $message -}}
 		</div>
 

diff --git a/_embed/templates/user-message/activity.html b/_embed/templates/user-message/activity.html
@@ -0,0 +1,24 @@
+{{- if ne "" .Name -}}
+	<h1><a href="{{.URL}}" target="_blank" class="text-black">{{.Name}}</a></h1>
+{{- end -}}
+
+<div class="content space-above space-below">
+	{{- $image := .Image -}}
+	{{- if $image.NotNil -}}
+		<div class="space-below">
+			<a href="{{.URL}}" target="_blank"><img src="{{$image.URL}}" style="width:100%;
+			{{- if $image.HasDimensions}} aspect-ratio:{{$image.AspectRatio}};{{end}}"/></a>
+		</div>
+	{{- end -}}
+
+	<div class="text-gray flex-row">
+		<div class="bold">{{ .Published | longDate -}}</div>
+	</div>	
+
+	{{- if .HasContent -}}
+		<div>{{- .Content | html -}}</div>
+	{{- else if .HasSummary -}}
+		<div>{{- .Summary -}}</div>
+	{{- end -}}
+
+</div>
diff --git a/_embed/templates/user-message/view.html b/_embed/templates/user-message/view.html
@@ -1,3 +1,5 @@
+{{- $activity := .ActivityStream -}}
+
 <div id="modal-body" script="install message(messageId:'{{.MessageID}}')">
 
 	<div class="space-below">
@@ -82,34 +84,7 @@
 		</a>
 	{{- end -}}
 
-	{{- if ne "" .Label -}}
-		<h1><a href="{{.URL}}" target="_blank" class="text-black">{{.Label}}</a></h1>
-	{{- end -}}
-
-	<div class="content space-above space-below">
-		{{- if not .HasContentImage -}}
-			{{- if .HasImage -}}
-				<div class="space-below">
-					<a href="{{.URL}}" target="_blank"><img src="{{.ImageURL}}" style="width:100%;"/></a>
-				</div>
-			{{- end -}}
-		{{- end -}}
-
-		<div class="text-gray flex-row">
-			<div class="bold">{{ .PublishDate | longDate -}}</div>
-			{{.Responses}}
-		</div>	
-
-		{{- if .HasSummary -}}
-			{{- if .HasContent -}}
-					<div>{{- .ContentHTML -}}</div>
-			{{- else -}}
-				<div>{{- .Summary | html -}}</div>
-			{{- end -}}
-		{{- else -}}
-			<div>{{- .ContentHTML -}}</div>
-		{{- end -}}
-	</div>
+	{{ template "activity" $activity -}}
 
 	<div id="replies" class="space-below">
 		<hr>