High performance, self-hosted, newsletter and mailing list manager with a modern dashboard. Single binary app.
JavaScript campaigncampaign-managementemail-marketingemail-subscriptionlistmonkmailing-listnewsletternewsletter-managementnewsletter-softwareself-hostedsms-gatewaysmtptransactional-emails
Refactor avatars again to be distinct across objects.
Kailash Nadhfeb3b4d76d0b
diff --git a/cmd/avatar.go b/cmd/avatar.goindex 2db3206d..5e6b77ce 100644--- a/cmd/avatar.go+++ b/cmd/avatar.go@@ -8,35 +8,41 @@ import ("unicode")-var avatarColors = []struct {+var avatarColors = map[string][]struct {light stringmid stringdark string}{- {"#e4f0ff", "#83b8fa", "#203657"},- {"#e8edff", "#95adfa", "#283457"},- {"#eeebff", "#ad9ff5", "#303254"},- {"#f2eaff", "#c29cf2", "#3c3152"},- {"#f8e8ff", "#d69beb", "#46314f"},- {"#ffe8f6", "#eb9cd4", "#50314a"},- {"#ffe8ef", "#f59fbc", "#573443"},- {"#ffeae7", "#faa99e", "#5b373a"},- {"#fff0e3", "#f9bb8b", "#593d30"},- {"#fff4df", "#f5ca7c", "#544328"},- {"#fff7df", "#ecd77c", "#4d4828"},- {"#f5f9e1", "#d1df86", "#434c2a"},- {"#eaf9e6", "#ace099", "#384d2f"},- {"#e2f9ec", "#8cddb0", "#2e4d37"},- {"#dff9f2", "#7adbc2", "#274d41"},- {"#dff8f7", "#76d8d1", "#234c49"},- {"#e0f7fc", "#7cd1e5", "#244850"},- {"#e2f3ff", "#85c5f5", "#264356"},- {"#e7efff", "#99b4fa", "#2a3d59"},- {"#ececff", "#aaa8f6", "#323858"},- {"#e9eeff", "#a1aef8", "#2f3956"},- {"#e5f0ff", "#90b7fa", "#283d57"},- {"#e1f3ff", "#7ec3f7", "#234158"},- {"#e1f2ff", "#7ebff9", "#204459"},+ "list": {+ {"#e1f7f3", "#78cbbb", "#234a43"},+ {"#e3f7f5", "#80cec6", "#234a47"},+ {"#e4f6f2", "#88cdbb", "#284b42"},+ {"#e0f5f4", "#72c5c2", "#214947"},+ },+ "campaign": {+ {"#eeebff", "#ad9ff5", "#303254"},+ {"#f0eaff", "#b29bf0", "#383052"},+ {"#edeaff", "#a89aee", "#323052"},+ {"#f2ecff", "#ba9feb", "#3c3152"},+ },+ "subscriber": {+ {"#e4f0ff", "#83b8fa", "#203657"},+ {"#e2f3ff", "#85c5f5", "#264356"},+ {"#e5f0ff", "#90b7fa", "#283d57"},+ {"#e1f2ff", "#7ebff9", "#204459"},+ },+ "user": {+ {"#faedf2", "#dfa4bb", "#50313e"},+ {"#f9edf3", "#d9a5bf", "#4b3143"},+ {"#fbedf0", "#e2a7b5", "#52343e"},+ {"#f8ecf2", "#d49eb5", "#4c3140"},+ },+ "role": {+ {"#edf0f4", "#a6b4c5", "#303c4c"},+ {"#eef1f5", "#afbac9", "#343f4d"},+ {"#ebf0f3", "#a1b5c1", "#2f414a"},+ {"#eef0f5", "#adb3c8", "#373d4e"},+ },}// avatar is the CSS style and the initials of a generated avatar.@@ -45,16 +51,23 @@ type avatar struct {Text string}-// makeAvatar generates a "glass" style avatar with a CSS gradient for a given seed.+// makeAvatar generates a "glass" style avatar with a CSS gradient for an object type and seed.// It returns the CSS style + initials of the name that can be printed in HTML.-func makeAvatar(seed, name string) avatar {- sum := sha256.Sum256([]byte(strings.ToLower(strings.TrimSpace(seed))))+func makeAvatar(kind, seed, name string) avatar {+ colors, ok := avatarColors[kind]+ if !ok {+ // Greyish default.+ colors = avatarColors["role"]+ }+ sum := sha256.Sum256([]byte(kind + ":" + strings.ToLower(strings.TrimSpace(seed))))// Pick colours.- n := len(avatarColors)- i := int(sum[0]) % n- one := avatarColors[i]- two := avatarColors[(i+1+int(sum[1])%3)%n]+ var (+ n = len(colors)+ i = int(sum[0]) % n+ one = colors[i]+ two = colors[(i+1+int(sum[1])%3)%n]+ )// Two hue blobs, a white shimmer on top, inspired by DiceBear's glass style.style := fmt.Sprintf("background-color:%s;color:%s;background-image:radial-gradient(circle at %d%% %d%%,#ffffff73,transparent 55%%),radial-gradient(circle at %d%% %d%%,%sa6,transparent %d%%),radial-gradient(circle at %d%% %d%%,%sa6,transparent %d%%)",diff --git a/static/admin/assets/css/style.css b/static/admin/assets/css/style.cssindex 9eefae46..70cef937 100644--- a/static/admin/assets/css/style.css+++ b/static/admin/assets/css/style.css@@ -614,6 +614,14 @@ main {}}+.avatar-user,+.avatar-subscriber {+ img,+ span {+ border-radius: 50%;+ }+}+.name-stack {align-items: flex-start;display: flex;diff --git a/static/admin/partials/avatar.html b/static/admin/partials/avatar.htmlindex b53bca5f..2225cbcb 100644--- a/static/admin/partials/avatar.html+++ b/static/admin/partials/avatar.html@@ -1,4 +1,4 @@{{ define "avatar" -}}-{{- $a := Avatar .Seed .Name -}}-<span class="avatar">{{ if .URL }}<img src="{{ .URL }}" alt="" width="28" height="28" loading="lazy" />{{ else }}<span style="{{ $a.Style }}" aria-hidden="true">{{ $a.Text }}</span>{{ end }}</span>+{{- $a := Avatar .Kind .Seed .Name -}}+<span class="avatar avatar-{{ .Kind }}">{{ if .URL }}<img src="{{ .URL }}" alt="" width="28" height="28" loading="lazy" />{{ else }}<span style="{{ $a.Style }}" aria-hidden="true">{{ $a.Text }}</span>{{ end }}</span>{{- end }}diff --git a/static/admin/views/base.html b/static/admin/views/base.htmlindex bcbdf670..bc9a9829 100644--- a/static/admin/views/base.html+++ b/static/admin/views/base.html@@ -55,7 +55,7 @@{{ with .Data.Profile }}<ot-dropdown><button popovertarget="user-menu" type="button" class="user-nav-button ghost small user-trigger">- {{ template "avatar" dict "Seed" (printf "%d" .ID) "Name" (or .Name .Username) "URL" .Avatar.String }}+ {{ template "avatar" dict "Kind" "user" "Seed" (printf "%d" .ID) "Name" (or .Name .Username) "URL" .Avatar.String }}<span class="user-label">{{ .Username }}</span></button><menu popover id="user-menu">diff --git a/static/admin/views/campaign.html b/static/admin/views/campaign.htmlindex bac9922c..0f0ac8c5 100644--- a/static/admin/views/campaign.html+++ b/static/admin/views/campaign.html@@ -22,8 +22,7 @@<div class="hstack"><a href="{{ URI "/admin/campaigns" }}" class="back" aria-label="{{ .L.T "globals.buttons.back" }}">{{ Icon "chevron-left" }}</a>{{- if not $isNew }}- {{- $seed := "" }}{{ range $c.ParsedLists }}{{ $seed = printf "%s%d," $seed .ID }}{{ end }}- {{ template "avatar" dict "Seed" $seed "Name" $c.Name }}+ {{ template "avatar" dict "Kind" "campaign" "Seed" (printf "%d" $c.ID) "Name" $c.Name }}{{- end }}<h1 class="page-title">{{- if $isNew }}{{ .L.T "campaigns.newCampaign" }}diff --git a/static/admin/views/campaigns.html b/static/admin/views/campaigns.htmlindex 4f820f63..305b01a0 100644--- a/static/admin/views/campaigns.html+++ b/static/admin/views/campaigns.html@@ -79,9 +79,8 @@<tr data-campaign-id="{{ .ID }}" class="status-{{ .Status }}"><td><input name="id" type="checkbox" value="{{ .ID }}"></td><td class="name">- {{- $seed := "" }}{{ range .ParsedLists }}{{ $seed = printf "%s%d," $seed .ID }}{{ end }}<div class="name-stack">- {{ template "avatar" dict "Seed" $seed "Name" .Name }}+ {{ template "avatar" dict "Kind" "campaign" "Seed" (printf "%d" .ID) "Name" .Name }}<div class="vstack gap-1"><div><a href="{{ $base }}/{{ .ID }}" class="unstyled">{{ .Name }}</a>diff --git a/static/admin/views/dashboard.html b/static/admin/views/dashboard.htmlindex d5467627..fa3a5129 100644--- a/static/admin/views/dashboard.html+++ b/static/admin/views/dashboard.html@@ -83,9 +83,8 @@{{- range $d.Campaigns }}<tr><td width="55%">- {{- $seed := "" }}{{ range .ParsedLists }}{{ $seed = printf "%s%d," $seed .ID }}{{ end }}<div class="name-stack">- {{ template "avatar" dict "Seed" $seed "Name" .Name }}+ {{ template "avatar" dict "Kind" "campaign" "Seed" (printf "%d" .ID) "Name" .Name }}<div><a href="{{ URI "/admin/campaigns" }}/{{ .ID }}" class="unstyled">{{ .Name }}</a></div></div></td>diff --git a/static/admin/views/list.html b/static/admin/views/list.htmlindex eb8590df..3567002a 100644--- a/static/admin/views/list.html+++ b/static/admin/views/list.html@@ -7,7 +7,7 @@<header class="page-header"><div class="hstack gap-1"><a href="{{ URI "/admin/lists" }}" class="back" aria-label="{{ .L.T "globals.buttons.back" }}">{{ Icon "chevron-left" }}</a>- {{ if not $d.IsNew }}{{ template "avatar" dict "Seed" (printf "%d" $d.List.ID) "Name" $d.List.Name }}{{ end }}+ {{ if not $d.IsNew }}{{ template "avatar" dict "Kind" "list" "Seed" (printf "%d" $d.List.ID) "Name" $d.List.Name }}{{ end }}<h1 class="page-title">{{ if $d.IsNew }}{{ .L.T "lists.newList" }}{{ else }}{{ $d.List.Name }}{{ end }}</h1></div></header>diff --git a/static/admin/views/lists.html b/static/admin/views/lists.htmlindex 3952f6de..0837c4c3 100644--- a/static/admin/views/lists.html+++ b/static/admin/views/lists.html@@ -82,7 +82,7 @@<td><input name="id" type="checkbox" value="{{ .ID }}"></td><td><div class="name-stack">- {{ template "avatar" dict "Seed" (printf "%d" .ID) "Name" .Name }}+ {{ template "avatar" dict "Kind" "list" "Seed" (printf "%d" .ID) "Name" .Name }}<div><a href="{{ URI "/admin/lists" }}/{{ .ID }}" class="unstyled">{{ .Name }}</a><div class="hstack gap-2 text-8">diff --git a/static/admin/views/roles.html b/static/admin/views/roles.htmlindex 390c8071..a5b74813 100644--- a/static/admin/views/roles.html+++ b/static/admin/views/roles.html@@ -39,7 +39,7 @@<tr data-testid="role-row" data-id="{{ .ID }}"><td><div class="name-stack">- {{ template "avatar" dict "Seed" (printf "%d" .ID) "Name" .Name }}+ {{ template "avatar" dict "Kind" "role" "Seed" (printf "%d" .ID) "Name" .Name }}<a href="{{ $base }}/{{ .ID }}" class="unstyled">{{- if eq .ID 1 }}{{ Badge (list (Icon "star") .Name) "enum" }}{{ else }}{{ .Name }}{{ end -}}</a>diff --git a/static/admin/views/subscriber.html b/static/admin/views/subscriber.htmlindex c3b0e929..51aba3a3 100644--- a/static/admin/views/subscriber.html+++ b/static/admin/views/subscriber.html@@ -13,7 +13,7 @@<div class="col-6"><div class="hstack gap-1"><a href="{{ URI "/admin/subscribers" }}" class="back" aria-label="{{ .L.T "globals.buttons.back" }}">{{ Icon "chevron-left" }}</a>- {{ if not $d.IsNew }}{{ template "avatar" dict "Seed" (printf "%d" $sub.ID) "Name" (or $sub.Name $sub.Email) }}{{ end }}+ {{ if not $d.IsNew }}{{ template "avatar" dict "Kind" "subscriber" "Seed" (printf "%d" $sub.ID) "Name" (or $sub.Name $sub.Email) }}{{ end }}<h1 class="page-title">{{- if $d.IsNew }}{{ .L.T "subscribers.newSubscriber" }}diff --git a/static/admin/views/subscribers.html b/static/admin/views/subscribers.htmlindex 941edd2e..56f63882 100644--- a/static/admin/views/subscribers.html+++ b/static/admin/views/subscribers.html@@ -104,7 +104,7 @@<td><input name="id" type="checkbox" value="{{ .ID }}"></td><td class="email"><div class="name-stack">- {{ template "avatar" dict "Seed" (printf "%d" .ID) "Name" (or .Name .Email) }}+ {{ template "avatar" dict "Kind" "subscriber" "Seed" (printf "%d" .ID) "Name" (or .Name .Email) }}<div><a class="unstyled" href="{{ URI "/admin/subscribers" }}/{{ .ID }}">{{ .Email }}</a>{{- if ne .Status "enabled" }}diff --git a/static/admin/views/user.html b/static/admin/views/user.htmlindex f89d6b0b..9e07e1fd 100644--- a/static/admin/views/user.html+++ b/static/admin/views/user.html@@ -12,7 +12,7 @@<header class="page-header"><div class="hstack gap-1"><a href="{{ $base }}" class="back" aria-label="{{ .L.T "globals.buttons.back" }}">{{ Icon "chevron-left" }}</a>- {{- if not $d.IsNew }}{{ template "avatar" dict "Seed" (printf "%d" $d.User.ID) "Name" (or $d.User.Name $d.User.Username) "URL" $d.User.Avatar.String }}{{ end }}+ {{- if not $d.IsNew }}{{ template "avatar" dict "Kind" "user" "Seed" (printf "%d" $d.User.ID) "Name" (or $d.User.Name $d.User.Username) "URL" $d.User.Avatar.String }}{{ end }}<h1 class="page-title">{{- if not $d.IsNew }}{{ $d.User.Name }}{{ else }}{{ .L.T "users.newUser" }}{{ end -}}</h1>diff --git a/static/admin/views/users.html b/static/admin/views/users.htmlindex c8cca4a4..1eda4fcb 100644--- a/static/admin/views/users.html+++ b/static/admin/views/users.html@@ -74,7 +74,7 @@{{- end }}<td><div class="name-stack">- {{ template "avatar" dict "Seed" (printf "%d" .ID) "Name" (or .Name .Username) "URL" .Avatar.String }}+ {{ template "avatar" dict "Kind" "user" "Seed" (printf "%d" .ID) "Name" (or .Name .Username) "URL" .Avatar.String }}<div>{{- if $d.Can "users:manage" }}<a href="{{ URI "/admin/users" }}/{{ .ID }}" class="unstyled{{ if eq .Status "disabled" }} text-light{{ end }}">{{ .Username }}</a>