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
SSR: Port dashboard.
Kailash Nadhc305f35204fa
diff --git a/cmd/admin.go b/cmd/admin.goindex c6b67c98..28f34a91 100644--- a/cmd/admin.go+++ b/cmd/admin.go@@ -109,6 +109,7 @@ var adminJSI18nKeys = []string{"subscribers.status.unconfirmed","settings.title",+ "settings.confirmRestart","settings.smtp.testEnterEmail","campaigns.testSent","globals.messages.passwordChangeFull",diff --git a/cmd/dashboard.go b/cmd/dashboard.gonew file mode 100644index 00000000..b5152f63--- /dev/null+++ b/cmd/dashboard.go@@ -0,0 +1,287 @@+package main++import (+ "encoding/json"+ "fmt"+ "net/http"+ "os"+ "runtime"+ "strconv"+ "strings"+ "time"++ "github.com/jmoiron/sqlx/types"+ "github.com/knadh/listmonk/internal/auth"+ "github.com/knadh/listmonk/models"+ "github.com/labstack/echo/v4"+)++// dashboardCampaignCount is the number of recent campaigns to show on the dashboard.+const dashboardCampaignCount = 6++// processStartedAt starts process start time to compute uptime.+var processStartedAt = time.Now()++// dashboardCounts contains stats to render on the dashboard.+type dashboardCounts struct {+ Subscribers struct {+ Total int `json:"total"`+ Blocklisted int `json:"blocklisted"`+ Orphans int `json:"orphans"`+ } `json:"subscribers"`++ Lists struct {+ Total int `json:"total"`+ Private int `json:"private"`+ Public int `json:"public"`+ OptinSingle int `json:"optin_single"`+ OptinDouble int `json:"optin_double"`+ } `json:"lists"`++ Campaigns struct {+ Total int `json:"total"`+ ByStatus map[string]int `json:"by_status"`+ } `json:"campaigns"`++ Messages int `json:"messages"`+}++// systemStats holds system metrics.+type systemStats struct {+ Uptime string+ NumCPU int+ AppMemMB uint64++ HasHostMem bool+ MemUsedMB uint64+ MemTotalMB uint64+ MemPct int++ HasLoad bool+ Load1 string+ Load5 string+ Load15 string+ LoadPct int+}++type dashboardView struct {+ adminView+ Counts dashboardCounts+ Charts types.JSONText+ Campaigns models.Campaigns+ System systemStats+ CacheSlowQueries bool+}++// ViewDashboard renders the admin dashboard (home) page.+func (a *App) ViewDashboard(c echo.Context) error {+ counts, err := a.core.GetDashboardCounts()+ if err != nil {+ return err+ }++ charts, err := a.core.GetDashboardCharts()+ if err != nil {+ return err+ }++ camps, err := a.getDashboardCampaigns(c)+ if err != nil {+ return err+ }++ var cnt dashboardCounts+ if len(counts) > 0 {+ if err := json.Unmarshal(counts, &cnt); err != nil {+ return echo.NewHTTPError(http.StatusInternalServerError, err.Error())+ }+ }++ data := dashboardView{+ adminView: newAdminView(c, a.i18n.T("menu.dashboard"), "", "dashboard"),+ Counts: cnt,+ Charts: charts,+ Campaigns: camps,+ System: getSystemStats(),+ CacheSlowQueries: ko.Bool("app.cache_slow_queries"),+ }++ return c.Render(http.StatusOK, "admin-dashboard", data)+}++// GetDashboardCampaigns returns recent campaigns to show on the dashboard,+// with scheduled campaigns on top.+func (a *App) GetDashboardCampaigns(c echo.Context) error {+ camps, err := a.getDashboardCampaigns(c)+ if err != nil {+ return err+ }++ return c.JSON(http.StatusOK, okResp{camps})+}++// getDashboardCampaigns queries recent campaigns to show on the dashboard.+func (a *App) getDashboardCampaigns(c echo.Context) (models.Campaigns, error) {+ user := auth.GetUser(c)++ // Either the user has campaigns:get_all permission and can view all campaigns,+ // or the campaigns are filtered by the lists the user has get|manage access to.+ hasAllPerm := user.HasPerm(auth.PermCampaignsGetAll)+ var permittedLists []int+ if !hasAllPerm {+ hasAllPerm, permittedLists = user.GetPermittedLists(auth.PermTypeGet | auth.PermTypeManage)+ }++ // Get scheduled campaigns to show on top of the dashboard.+ camps, _, err := a.core.QueryCampaigns("", []string{models.CampaignStatusScheduled}, nil, "created_at", "desc", hasAllPerm, permittedLists, 0, dashboardCampaignCount)+ if err != nil {+ return nil, err+ }++ // Remaining is non-scheduled campaigns.+ if rem := dashboardCampaignCount - len(camps); rem > 0 {+ others, _, err := a.core.QueryCampaigns("", []string{+ models.CampaignStatusDraft,+ models.CampaignStatusRunning,+ models.CampaignStatusPaused,+ models.CampaignStatusFinished,+ models.CampaignStatusCancelled,+ }, nil, "created_at", "desc", hasAllPerm, permittedLists, 0, rem)+ if err != nil {+ return nil, err+ }+ camps = append(camps, others...)+ }++ // The dashboard card only needs status, name and date, so strip the bodies.+ for i := range camps {+ camps[i].Body = ""+ camps[i].BodySource.Valid = false+ }++ return camps, nil+}++// getSystemStats collects host and runtime stats.+func getSystemStats() systemStats {+ s := systemStats{+ Uptime: niceDuration(time.Since(processStartedAt)),+ NumCPU: runtime.NumCPU(),+ }++ // Process memory (RSS on Linux, otherwise memory reserved by the Go runtime).+ if rss, ok := readProcRSS(); ok {+ s.AppMemMB = rss / 1024 / 1024+ } else {+ var m runtime.MemStats+ runtime.ReadMemStats(&m)+ s.AppMemMB = m.Sys / 1024 / 1024+ }++ if total, avail, ok := readMemInfo(); ok && total > 0 {+ used := total - avail+ s.HasHostMem = true+ s.MemUsedMB = used / 1024 / 1024+ s.MemTotalMB = total / 1024 / 1024+ s.MemPct = int(float64(used) / float64(total) * 100)+ }++ if l1, l5, l15, ok := readLoadAvg(); ok {+ s.HasLoad = true+ s.Load1 = fmt.Sprintf("%.2f", l1)+ s.Load5 = fmt.Sprintf("%.2f", l5)+ s.Load15 = fmt.Sprintf("%.2f", l15)+ s.LoadPct = min(int(l1/float64(s.NumCPU)*100), 100)+ }++ return s+}++// readProcRSS returns current process RSS bytes from /proc/self/status. Linux only.+func readProcRSS() (uint64, bool) {+ b, err := os.ReadFile("/proc/self/status")+ if err != nil {+ return 0, false+ }++ for _, ln := range strings.Split(string(b), "\n") {+ if f := strings.Fields(ln); len(f) >= 2 && f[0] == "VmRSS:" {+ kb, _ := strconv.ParseUint(f[1], 10, 64)+ return kb * 1024, true+ }+ }++ return 0, false+}++// readMemInfo returns total and available system memory bytes from /proc/meminfo. Linux-only.+func readMemInfo() (uint64, uint64, bool) {+ b, err := os.ReadFile("/proc/meminfo")+ if err != nil {+ return 0, 0, false+ }++ var (+ total, avail uint64+ hasTotal, hasAvail bool+ )+ for _, ln := range strings.Split(string(b), "\n") {+ f := strings.Fields(ln)+ if len(f) < 2 {+ continue+ }++ kb, _ := strconv.ParseUint(f[1], 10, 64)+ switch f[0] {+ case "MemTotal:":+ total, hasTotal = kb*1024, true+ case "MemAvailable:":+ avail, hasAvail = kb*1024, true+ }+ }++ return total, avail, hasTotal && hasAvail+}++// readLoadAvg returns CPU load avg from /proc/loadavg. Linux-only.+func readLoadAvg() (float64, float64, float64, bool) {+ b, err := os.ReadFile("/proc/loadavg")+ if err != nil {+ return 0, 0, 0, false+ }++ f := strings.Fields(string(b))+ if len(f) < 3 {+ return 0, 0, 0, false+ }++ var (+ l1, _ = strconv.ParseFloat(f[0], 64)+ l5, _ = strconv.ParseFloat(f[1], 64)+ l15, _ = strconv.ParseFloat(f[2], 64)+ )++ return l1, l5, l15, true+}++// niceDuration formats duration to human-readable string, eg: 1h, 3s etc.+func niceDuration(d time.Duration) string {+ d = d.Round(time.Second)+ var (+ days = int(d.Hours()) / 24+ hours = int(d.Hours()) % 24+ mins = int(d.Minutes()) % 60+ secs = int(d.Seconds()) % 60+ )++ switch {+ case days > 0:+ return fmt.Sprintf("%dd %dh %dm", days, hours, mins)+ case hours > 0:+ return fmt.Sprintf("%dh %dm", hours, mins)+ case mins > 0:+ return fmt.Sprintf("%dm %ds", mins, secs)+ default:+ return fmt.Sprintf("%ds", secs)+ }+}diff --git a/cmd/handlers.go b/cmd/handlers.goindex fd2ec38b..03ce7c29 100644--- a/cmd/handlers.go+++ b/cmd/handlers.go@@ -72,6 +72,7 @@ func initHTTPHandlers(e *echo.Echo, a *App) {// their routes here. Unported /admin/* paths fall through to the 404 handler.g.GET(path.Join(uriAdmin, "/custom.css"), serveCustomAppearance("admin.custom_css"))g.GET(path.Join(uriAdmin, "/custom.js"), serveCustomAppearance("admin.custom_js"))+ g.GET(uriAdmin, a.ViewDashboard)g.GET(path.Join(uriAdmin, "/lists"), a.ViewLists)g.GET(path.Join(uriAdmin, "/lists/:id"), hasID(a.ViewList))g.GET(path.Join(uriAdmin, "/lists/forms"), a.ViewForms)@@ -142,6 +143,7 @@ func initHTTPHandlers(e *echo.Echo, a *App) {g.GET("/api/lang/:lang", a.GetI18nLang)g.GET("/api/dashboard/charts", a.GetDashboardCharts)g.GET("/api/dashboard/counts", a.GetDashboardCounts)+ g.GET("/api/dashboard/campaigns", a.GetDashboardCampaigns)g.GET("/api/settings", pm(a.GetSettings, "settings:get"))g.PUT("/api/settings", pm(a.UpdateSettings, "settings:manage"))diff --git a/i18n/en.json b/i18n/en.jsonindex cbedffcf..73e0f29b 100644--- a/i18n/en.json+++ b/i18n/en.json@@ -110,6 +110,7 @@"dashboard.linkClicks": "Link clicks","dashboard.messagesSent": "Messages sent","dashboard.orphanSubs": "Orphans",+ "dashboard.system": "System","email.data.info": "A copy of all data recorded on you is attached as a file in JSON format. It can be viewed in a text editor.","email.data.title": "Your data","email.optin.confirmSub": "Confirm subscription",@@ -244,6 +245,7 @@"globals.terms.month": "Month | Months","globals.terms.none": "None","globals.terms.new": "New",+ "globals.terms.recent": "Recent {name}","globals.terms.second": "Second | Seconds","globals.terms.settings": "Settings","globals.terms.subscriber": "Subscriber | Subscribers",@@ -511,6 +513,7 @@"settings.messengers.url": "URL","settings.messengers.urlHelp": "Root URL of the Postback server.","settings.messengers.username": "Username",+ "settings.hasLegacyUser": "The admin username and password are set in the configuration file or environment variables. If you are using APIs, create and use new API credentials instead.","settings.needsRestart": "Settings changed. Pause all running campaigns and restart the app","settings.performance.batchSize": "Batch size","settings.performance.batchSizeHelp": "The number of subscribers to pull from the database in a single iteration. Each iteration pulls subscribers from the database, sends messages to them, and then moves on to the next iteration to pull the next batch. This should ideally be higher than the maximum achievable throughput (concurrency * message_rate).",diff --git a/static/admin/partials/campaign-content.html b/static/admin/partials/campaign-content.htmlindex b1983f49..a179035c 100644--- a/static/admin/partials/campaign-content.html+++ b/static/admin/partials/campaign-content.html@@ -40,7 +40,7 @@</fieldset></template>- <a class="text-7 text-light" style="margin-inline-start: auto;" href="https://listmonk.app/docs/templating/#template-expressions" target="_blank" rel="noopener noreferrer">{{ Icon "code" }} {{ $root.L.T "campaigns.templatingRef" }}</a>+ <a class="text-light" style="margin-inline-start: auto;" href="https://listmonk.app/docs/templating/#template-expressions" target="_blank" rel="noopener noreferrer">{{ Icon "code" }} {{ $root.L.T "campaigns.templatingRef" }}</a></div></div>diff --git a/static/admin/partials/media-gallery.html b/static/admin/partials/media-gallery.htmlindex f6628b4a..e9855404 100644--- a/static/admin/partials/media-gallery.html+++ b/static/admin/partials/media-gallery.html@@ -12,7 +12,7 @@{{ $root.L.T "media.title" }}<span>({{ $d.Page.Total }})</span></h1>- {{- if $d.Provider }}<div class="text-7 text-lighter">{{ $d.Provider }}</div>{{ end }}+ {{- if $d.Provider }}<div class="text-lighter">{{ $d.Provider }}</div>{{ end }}</div></div><div class="col-6 col-end align-right hstack justify-end">diff --git a/static/admin/partials/settings/messengers.html b/static/admin/partials/settings/messengers.htmlindex 3d9416fd..b138979d 100644--- a/static/admin/partials/settings/messengers.html+++ b/static/admin/partials/settings/messengers.html@@ -7,7 +7,7 @@<div class="col-5"><div class="hstack"><span class="text-light" x-text="`#${n + 1}`"></span>- <span class="text-muted" x-show="item.name || item.root_url" x-text="item.name || item.root_url"></span>+ <span class="text-light" x-show="item.name || item.root_url" x-text="item.name || item.root_url"></span></div></div><div class="col-7 col-end">diff --git a/static/admin/partials/settings/security.html b/static/admin/partials/settings/security.htmlindex 36bc5194..6ea5d2bb 100644--- a/static/admin/partials/settings/security.html+++ b/static/admin/partials/settings/security.html@@ -14,7 +14,7 @@{{ .L.T "settings.security.OIDCURL" }}<input type="url" pattern="https?://.*" maxlength="300" placeholder="https://login.yoursite.com"required x-model="form['security.oidc'].provider_url" />- <div class="hstack mt-2 text-7">+ <div class="hstack mt-2"><a href="#" @click.prevent="setOIDCProvider('google')">Google</a><a href="#" @click.prevent="setOIDCProvider('microsoft')">Microsoft</a><a href="#" @click.prevent="setOIDCProvider('apple')">Apple</a>@@ -73,7 +73,7 @@</fieldset></div><template x-if="!isURLOk">- <p class="text-danger text-7">+ <p class="text-danger">{{ Icon "alert-triangle" }} {{ .L.T "settings.security.OIDCRedirectWarning" }}</p></template>diff --git a/static/admin/partials/settings/smtp.html b/static/admin/partials/settings/smtp.htmlindex 4a9d23ac..8b45707a 100644--- a/static/admin/partials/settings/smtp.html+++ b/static/admin/partials/settings/smtp.html@@ -7,7 +7,7 @@<div class="col-5"><div class="hstack"><span class="text-light" x-text="`#${n + 1}`"></span>- <span class="text-muted" x-show="item.name || item.host" x-text="item.name || item.host"></span>+ <span class="text-light" x-show="item.name || item.host" x-text="item.name || item.host"></span></div></div><div class="col-7 col-end">diff --git a/static/admin/partials/subscriber-activity.html b/static/admin/partials/subscriber-activity.htmlindex 699eddc1..194178d4 100644--- a/static/admin/partials/subscriber-activity.html+++ b/static/admin/partials/subscriber-activity.html@@ -14,7 +14,7 @@<tbody>{{- range $d.CampaignViews }}<tr>- <td><a href="{{ URI "/admin/campaigns" }}/{{ .ID }}">{{ .Name }}</a><p class="text-light text-7">{{ .Subject }}</p></td>+ <td><a href="{{ URI "/admin/campaigns" }}/{{ .ID }}">{{ .Name }}</a><p class="text-light">{{ .Subject }}</p></td><td>{{ .ViewCount }}</td><td>{{ NiceDate .LastViewedAt }}</td></tr>diff --git a/static/admin/src/css/style.css b/static/admin/src/css/style.cssindex c37434d5..80f946fa 100644--- a/static/admin/src/css/style.css+++ b/static/admin/src/css/style.css@@ -1,7 +1,3 @@-:root {- --text-9: calc(var(--text-9) * .8);-}-@font-face {font-family: 'Inter';font-weight: 400;@@ -34,12 +30,10 @@--container-max: 1150px;--border: light-dark(#e5e7eb, #52525b);--font-sans: "Inter", system-ui, sans-serif;- --text-1: 1.75rem;+ --text-1: 1.5rem;+ --text-regular: var(--text-7);}-html, body {- font-size: 15px;-}body {background: var(--body);font-family: "Inter", system-ui, sans-serif;@@ -110,13 +104,10 @@ table {.text-light {color: var(--muted-foreground);}-.text-1 { font-size: var(--text-1); }-.text-2 { font-size: var(--text-2); }-.text-3 { font-size: var(--text-3); }+/* Size helpers. Regular (14px) is the default and needs no class.+ text-4/text-5 step up; text-8 steps down to the small (12px) size. */.text-4 { font-size: var(--text-4); }.text-5 { font-size: var(--text-5); }-.text-6 { font-size: var(--text-6); }-.text-7 { font-size: var(--text-7); }.text-8 { font-size: var(--text-8); }.font-normal { font-weight: var(--font-normal); }@@ -162,6 +153,16 @@ table {}}+section.dashboard {+ .chart-box {+ position: relative;+ height: 18rem;+ }+ .stat-card {+ min-height: 9.5rem;+ }+}+dialog {padding: 0;overflow: auto;@@ -308,7 +309,6 @@ textarea.monospace {nav[data-topnav] {background: transparent;border-bottom: 0;- font-size: var(--text-7);padding: var(--space-4) 0 var(--space-2);box-shadow: none;@@ -567,6 +567,7 @@ aside[data-sidebar] {align-self: start;position: sticky;top: 4.5rem;+ height: calc(100dvh - 4.5rem);}}@@ -779,9 +780,6 @@ svg.icon {z-index: 1;}- menu {- font-size: var(--text-7);- }}}@@ -798,15 +796,11 @@ svg.icon {color: color-mix(in srgb, var(--primary), white 40%);display: inline-block;font-family: var(--font-mono);- font-size: 0.625rem;+ font-size: var(--text-8);line-height: 1.2;padding: 1px var(--space-2);}-.oat-data-table {- font-size: var(--text-7);-}-.oat-data-table .table {min-width: 100%;}@@ -868,8 +862,6 @@ svg.icon {}.field-list {- font-size: var(--text-7);-p {align-items: baseline;display: flex;@@ -1007,7 +999,6 @@ section.campaigns {}td.lists ul {- font-size: var(--text-7);list-style-type: circle;margin: 0;padding-inline-start: var(--space-4);@@ -1089,7 +1080,6 @@ section.analytics {.cm-lineNumbers .cm-gutterElement {color: var(--faint-foreground);- font-size: var(--text-7);padding-inline-end: var(--space-3);}@@ -1230,7 +1220,7 @@ section.templates {.lines {border: 1px solid var(--border);font-family: var(--font-mono);- font-size: 0.9rem;+ font-size: var(--text-7);height: 70vh;overflow-y: auto;padding: var(--space-4);@@ -1317,7 +1307,6 @@ section.import {overflow: hidden;text-overflow: ellipsis;white-space: nowrap;- font-size: var(--text-7);}.actions {@@ -1449,7 +1438,7 @@ section.import {border-radius: var(--radius-small);color: var(--success);display: block;- font-size: 1.2rem;+ font-size: var(--text-5);padding: var(--space-4);width: 100%;}@@ -1526,7 +1515,7 @@ dialog {.dialog-title {margin: 0;- font-size: var(--text-7);+ font-size: var(--text-6);}}diff --git a/static/admin/src/js/main.js b/static/admin/src/js/main.jsindex 8e87f86a..209a9a75 100644--- a/static/admin/src/js/main.js+++ b/static/admin/src/js/main.js@@ -25,6 +25,30 @@ function setupAlpine() {isLoading,copyToClipboard: u.copyToClipboard,listAutocomplete,++ // Trigger an app restart (from the "needs restart" notice), then poll the+ // health endpoint until the app is back up and reload the page.+ async restartApp() {+ if (!(await u.confirm(i18n.t('settings.confirmRestart')))) {+ return;+ }++ try {+ await api('reload', '/admin/reload', 'POST');+ } catch {+ return;+ }++ u.toast(i18n.ts('globals.messages.updated', { name: i18n.t('settings.title') }));+ const poll = setInterval(() => {+ fetch(`${urls.api}/health`).then((r) => {+ if (r.ok) {+ clearInterval(poll);+ window.location.reload();+ }+ }).catch(() => { });+ }, 500);+ },}));}diff --git a/static/admin/src/js/views/dashboard.js b/static/admin/src/js/views/dashboard.jsnew file mode 100644index 00000000..6ed48607--- /dev/null+++ b/static/admin/src/js/views/dashboard.js@@ -0,0 +1,56 @@+const PRIMARY = getComputedStyle(document.documentElement).getPropertyValue('--primary').trim() || '#0055d4';+const FONT_FAMILY = "'Inter', sans-serif";++// Format an ISO date ('2024-06-01') to a short 'DD Mon' label.+function label(iso) {+ const d = new Date(iso);+ if (Number.isNaN(d.getTime())) {+ return iso;+ }++ return d.toLocaleDateString(undefined, { day: '2-digit', month: 'short' });+}++// Draw a filled line chart of {count, date} rows on the given canvas.+function lineChart(id, rows) {+ const canvas = document.getElementById(id);+ if (!canvas || !window.Chart) {+ return;+ }++ const data = rows || [];+ window.Chart.defaults.font.family = FONT_FAMILY;++ // eslint-disable-next-line no-new+ new window.Chart(canvas, {+ type: 'line',+ data: {+ labels: data.map((d) => label(d.date)),+ datasets: [{+ data: data.map((d) => d.count),+ borderColor: PRIMARY,+ backgroundColor: `${PRIMARY}08`,+ borderWidth: 2,+ fill: true,+ tension: 0.35,+ pointBorderWidth: 0.5,+ pointHoverBorderWidth: 5,+ }],+ },+ options: {+ responsive: true,+ maintainAspectRatio: false,+ plugins: { legend: { display: false } },+ scales: {+ x: { grid: { display: false }, border: { display: false } },+ y: { grid: { display: false }, border: { display: false }, ticks: { precision: 0 } },+ },+ },+ });+}++(() => {+ const d = window._dashboardCharts || {};+ lineChart('chart-views', d.campaign_views);+ lineChart('chart-clicks', d.link_clicks);+})();diff --git a/static/admin/views/base.html b/static/admin/views/base.htmlindex 3d135d67..175eec70 100644--- a/static/admin/views/base.html+++ b/static/admin/views/base.html@@ -61,10 +61,31 @@<aside data-sidebar>{{ template "admin-sidebar" . }}++ <footer id="footer">+ <a href="https://listmonk.app" class="unstyled text-light" target="_blank" rel="noopener noreferrer">{{ .ConfigJS.Version }}</a>+ </footer></aside><main><div class="container">+ {{- if .ConfigJS.NeedsRestart }}+ <div role="alert" data-cy="needs-restart" class="hstack justify-between">+ <span>{{ .L.T "settings.needsRestart" }}</span>+ {{- if .Data.Can "settings:manage" }}+ <button type="button" class="small" @click="restartApp">{{ Icon "refresh-cw" }} {{ .L.T "settings.restart" }}</button>+ {{- end }}+ </div>+ {{- end }}+ {{- with .ConfigJS.Update }}{{ if .Update.IsNew }}+ <div role="status">+ {{ $.L.Ts "settings.updateAvailable" "version" .Update.ReleaseVersion }}+ <a href="{{ .Update.URL }}" target="_blank" rel="noopener noreferrer">{{ $.L.T "globals.buttons.view" }}</a>+ </div>+ {{ end }}{{- end }}+ {{- if .ConfigJS.HasLegacyUser }}+ <div role="alert" data-cy="legacy-user">{{ .L.T "settings.hasLegacyUser" }}</div>+ {{- end }}{{ end }}{{ define "admin-footer" }}diff --git a/static/admin/views/bounces.html b/static/admin/views/bounces.htmlindex f364df97..05c4a40f 100644--- a/static/admin/views/bounces.html+++ b/static/admin/views/bounces.html@@ -14,7 +14,7 @@{{ .L.T "globals.terms.bounces" }}<span>({{ $d.Page.Total }})</span></h1>- <div class="text-7 hstack gap-1">+ <div class="hstack gap-1">{{- if $source }}<a href="{{ $base }}" class="badge">{{ $source }} ×</a>{{ end }}{{- if $type }}<a href="{{ $base }}" class="badge">{{ .L.T (printf "bounces.%s" $type) }} ×</a>{{ end }}{{- if $campaign }}<a href="{{ $base }}" class="badge">#{{ $campaign }} ×</a>{{ end }}@@ -99,7 +99,7 @@<div class="dialog-card content"><header class="dialog-head"><h4 class="dialog-title" x-text="metaTitle"></h4></header><section class="dialog-body">- <pre class="text-7" x-text="JSON.stringify(meta, null, 2)"></pre>+ <pre x-text="JSON.stringify(meta, null, 2)"></pre></section><footer class="dialog-foot hstack justify-end"><button type="button" class="outline" @click="$refs.metaDialog.close()">{{ .L.T "globals.buttons.close" }}</button>diff --git a/static/admin/views/campaigns.html b/static/admin/views/campaigns.htmlindex 4108e3d3..ff472a8e 100644--- a/static/admin/views/campaigns.html+++ b/static/admin/views/campaigns.html@@ -85,7 +85,7 @@<td>{{- if eq .Type "optin" }}<span class="badge enum optin">{{ $.L.T "lists.optin" }}</span>{{ end }}<a href="{{ $base }}/{{ .ID }}">{{ .Name }}</a>- <p class="text-light text-7">{{ .Subject }}</p>+ <p class="text-light">{{ .Subject }}</p><div class="hstack gap-1">{{ range .Tags }}<a href="?{{ $d.Page.Encode "tag" }}&tag={{ . }}" class="badge outline tag">#{{ . }}</a>{{ end }}</div>diff --git a/static/admin/views/dashboard.html b/static/admin/views/dashboard.htmlnew file mode 100644index 00000000..4d5a137b--- /dev/null+++ b/static/admin/views/dashboard.html@@ -0,0 +1,145 @@+{{ define "admin-dashboard" -}}+{{ template "admin-header" . }}+{{- $d := .Data -}}+{{- $c := $d.Counts -}}++<script>+ window._dashboardCharts = {{ ToJSON $d.Charts }};+</script>++<section class="dashboard">+ <header class="page-header">+ <h3 class="page-title">{{ now | date "January 02, 2006" }}</h3>+ </header>++ <div class="vstack gap-6">+ <section class="row">+ <div class="col-3">+ <article class="card stat-card" data-cy="lists">+ <small class="text-light">{{ Icon "list" }} {{ .L.T "globals.terms.lists" }}</small>+ <div class="stat-value"><a href="{{ URI "/admin/lists" }}" class="unstyled">{{ FormatNumber $c.Lists.Total }}</a></div>+ <div class="mt-2 hstack gap-2">+ <a href="{{ URI "/admin/lists" }}?type=public" class="badge public">{{ FormatNumber $c.Lists.Public }} {{ .L.T "lists.types.public" }}</a>+ <a href="{{ URI "/admin/lists" }}?type=private" class="badge private">{{ FormatNumber $c.Lists.Private }} {{ .L.T "lists.types.private" }}</a>+ </div>+ </article>+ </div>++ <div class="col-3">+ <article class="card stat-card" data-cy="subscribers">+ <small class="text-light">{{ Icon "at-sign" }} {{ .L.T "globals.terms.subscribers" }}</small>+ <div class="stat-value"><a href="{{ URI "/admin/subscribers" }}" class="unstyled">{{ FormatNumber $c.Subscribers.Total }}</a></div>+ <div class="mt-2 hstack gap-2">+ <a href="{{ URI "/admin/subscribers" }}" class="badge outline">{{ FormatNumber $c.Subscribers.Orphans }} {{ .L.T "dashboard.orphanSubs" }}</a>+ <a href="{{ URI "/admin/subscribers" }}?status=blocklisted" class="badge status-blocklisted">{{ FormatNumber $c.Subscribers.Blocklisted }} {{ .L.T "subscribers.status.blocklisted" }}</a>+ </div>+ </article>+ </div>++ <div class="col-3">+ <article class="card stat-card" data-cy="campaigns">+ <small class="text-light">{{ Icon "send" }} {{ .L.T "globals.terms.campaigns" }}</small>+ <div class="stat-value"><a href="{{ URI "/admin/campaigns" }}" class="unstyled">{{ FormatNumber $c.Campaigns.Total }}</a></div>+ <div class="mt-2 hstack gap-2">+ <a href="{{ URI "/admin/campaigns" }}?status=scheduled" class="badge outline">{{ FormatNumber (index $c.Campaigns.ByStatus "scheduled") }} {{ .L.T "campaigns.status.scheduled" }}</a>+ <a href="{{ URI "/admin/campaigns" }}?status=finished" class="badge status-finished">{{ FormatNumber (index $c.Campaigns.ByStatus "finished") }} {{ .L.T "campaigns.status.finished" }}</a>+ </div>+ </article>+ </div>++ <div class="col-3">+ <article class="card stat-card" data-cy="messages">+ <small class="text-light">{{ Icon "mail" }} {{ .L.T "dashboard.messagesSent" }}</small>+ <div class="stat-value">{{ FormatNumber $c.Messages }}</div>+ </article>+ </div>+ </section>++ <section class="row">+ <div class="col-6">+ <article class="card">+ <header class="mb-4"><h5><a href="{{ URI "/admin/campaigns/analytics" }}" class="unstyled">{{ .L.T "dashboard.campaignViews" }}</a></h5></header>+ <div class="chart-box"><canvas id="chart-views"></canvas></div>+ </article>+ </div>++ <div class="col-6">+ <article class="card">+ <header class="mb-4"><h5><a href="{{ URI "/admin/campaigns/analytics" }}" class="unstyled">{{ .L.T "dashboard.linkClicks" }}</a></h5></header>+ <div class="chart-box"><canvas id="chart-clicks"></canvas></div>+ </article>+ </div>+ </section>++ <section class="row">+ <div class="col-8">+ <article class="card page-content has-table">+ <header class="mt-6">+ <h5>{{ .L.Ts "globals.terms.recent" "name" ((.L.T "globals.terms.campaigns") | lower) }}</h5>+ </header>+ <div class="table-wrapper">+ <table>+ <tbody>+ {{- range $d.Campaigns }}+ <tr>+ <td width="20%"><span class="badge enum status-{{ .Status }}">{{ $.L.T (printf "campaigns.status.%s" .Status) }}</span></td>+ <td><a href="{{ URI "/admin/campaigns" }}/{{ .ID }}">{{ .Name }}</a></td>+ <td class="text-light">+ {{- if and (eq .Status "scheduled") .SendAt.Valid }}{{ NiceDate .SendAt }}{{ else }}{{ NiceDate .CreatedAt }}{{ end -}}+ </td>+ <td class="align-right">+ {{- if $d.Can "campaigns:get_analytics" }}+ <a href="{{ URI "/admin/campaigns/analytics" }}?id={{ .ID }}" title="{{ $.L.T "globals.terms.analytics" }}">{{ Icon "bar-chart-2" }}</a>+ {{- end }}+ </td>+ </tr>+ {{- else }}+ <tr><td colspan="3" class="text-light">{{ .L.T "globals.messages.emptyState" }}</td></tr>+ {{- end }}+ </tbody>+ </table>+ </div>+ </article>+ </div>++ <div class="col-4">+ {{- $s := $d.System -}}+ <article class="card">+ <header class="mb-4">+ <h5>{{ Icon "activity" }} {{ .L.T "dashboard.system" }}</h5>+ </header>+ <dl class="vstack gap-4">+ <div class="hstack justify-between"><dt>Uptime</dt><dd class="text-light">{{ $s.Uptime }}</dd></div>+ <div class="hstack justify-between"><dt>App memory</dt><dd class="text-light">{{ FormatNumber (int $s.AppMemMB) }} MB</dd></div>+ {{- if $s.HasHostMem }}+ <div class="vstack gap-1">+ <dt class="hstack justify-between">System memory<span class="text-light">{{ FormatNumber (int $s.MemUsedMB) }} / {{ FormatNumber (int $s.MemTotalMB) }} MB</span></dt>+ <dd><meter min="0" max="100" value="{{ $s.MemPct }}" optimum="30" low="70" high="90" title="{{ $s.MemPct }}%"></meter></dd>+ </div>+ {{- end }}+ {{- if $s.HasLoad }}+ <div class="vstack gap-1">+ <dt class="hstack justify-between">CPU load<span class="text-light">{{ $s.Load1 }} / {{ $s.Load5 }} / {{ $s.Load15 }}</span></dt>+ <dd><meter min="0" max="100" value="{{ $s.LoadPct }}" optimum="30" low="70" high="90" title="{{ $s.LoadPct }}%"></meter></dd>+ </div>+ {{- end }}+ <div class="hstack justify-between"><dt>CPU cores</dt><dd class="text-light">{{ $s.NumCPU }}</dd></div>+ </dl>+ </article>+ </div>+ </section>++ {{- if $d.CacheSlowQueries }}+ <div role="alert">+ *{{ .L.T "globals.messages.slowQueriesCached" }}+ <a href="https://listmonk.app/docs/maintenance/performance/" target="_blank" rel="noopener noreferrer">{{ .L.T "globals.buttons.learnMore" }}</a>+ </div>+ {{- end }}+ </div>+</section>++<script src="{{ URI "/admin/static/vendor/chart.min.js" }}?v={{ .AssetVersion }}" defer></script>+<script type="module" src="{{ URI "/admin/static/js/views/dashboard.js" }}?v={{ .AssetVersion }}" defer></script>++{{ template "admin-footer" . -}}+{{ end }}diff --git a/static/admin/views/forms.html b/static/admin/views/forms.htmlindex db156288..23cb8d8f 100644--- a/static/admin/views/forms.html+++ b/static/admin/views/forms.html@@ -23,7 +23,7 @@{{- else }}<div class="row"><div class="col-4 col-bleed">- <p class="text-light text-7">{{ .L.T "forms.selectHelp" }}</p>+ <p class="text-light">{{ .L.T "forms.selectHelp" }}</p><ul class="no lists" data-cy="lists">{{- range $i, $list := $d.PublicLists }}@@ -35,7 +35,7 @@<hr /><h4>{{ .L.T "forms.redirectURL" }}</h4>- <p class="text-light text-7">{{ .L.T "forms.redirectURLHelp" }}</p>+ <p class="text-light">{{ .L.T "forms.redirectURLHelp" }}</p>{{- if $.ConfigJS.PublicSubscription.RedirectURLs }}<ul class="no" data-cy="redirect-urls"><li>@@ -51,7 +51,7 @@</div><div class="col-8 col-end" data-cy="form" aria-label="{{ .L.T "forms.formHTML" }}">- <p class="text-light text-7">{{ .L.T "forms.formHTMLHelp" }}</p>+ <p class="text-light">{{ .L.T "forms.formHTMLHelp" }}</p><div x-show="checked.length > 0" x-cloak><div class="align-right">diff --git a/static/admin/views/lists.html b/static/admin/views/lists.htmlindex 830ca4df..e729e051 100644--- a/static/admin/views/lists.html+++ b/static/admin/views/lists.html@@ -160,9 +160,9 @@{{- template "pagination" $d.Page.Pagination }}{{- if $d.CacheSlowQueries }}- <p class="text-light text-7">+ <p class="text-light">*{{ .L.T "globals.messages.slowQueriesCached" }}- <a href="https://listmonk.app/docs/maintenance/performance/" target="_blank" rel="noopener noreferrer" class="text-light text-7">+ <a href="https://listmonk.app/docs/maintenance/performance/" target="_blank" rel="noopener noreferrer" class="text-light">{{ Icon "link-2" }} {{ .L.T "globals.buttons.learnMore" }}</a></p>diff --git a/static/admin/views/maintenance.html b/static/admin/views/maintenance.htmlindex 2391be68..81a9fd5b 100644--- a/static/admin/views/maintenance.html+++ b/static/admin/views/maintenance.html@@ -6,7 +6,7 @@<header class="row page-header"><div class="col-8"><h1 class="page-title">{{ .L.T "maintenance.title" }}</h1>- <p class="text-light text-7">{{ .L.T "maintenance.help" }}</p>+ <p class="text-light">{{ .L.T "maintenance.help" }}</p></div></header>@@ -124,7 +124,7 @@<form class="card" @submit.prevent="onUpdateDBSettings"><h4 class="text-4">{{ .L.T "maintenance.database.title" }}</h4><h5 class="text-5">Vacuum</h5>- <p class="text-light text-7">{{ .L.T "maintenance.database.vacuumHelp" }}</p>+ <p class="text-light">{{ .L.T "maintenance.database.vacuumHelp" }}</p><div class="row"><div class="col-3"><label data-field>diff --git a/static/admin/views/subscribers.html b/static/admin/views/subscribers.htmlindex 90672a84..3e3febb2 100644--- a/static/admin/views/subscribers.html+++ b/static/admin/views/subscribers.html@@ -23,7 +23,7 @@<span>({{ $d.Page.Total }})</span>{{- if $d.CurrentList }}» <a href="{{ URI "/admin/lists" }}/{{ $d.CurrentList.ID }}">{{ $d.CurrentList.Name }}</a>- {{- if $subStatus }}<span class="text-light text-7">({{ $subStatus }})</span>{{ end }}+ {{- if $subStatus }}<span class="text-light">({{ $subStatus }})</span>{{ end }}{{- end }}</h1></div>@@ -34,7 +34,7 @@<fieldset class="group"><input name="search" aria-label="Search" data-cy="search" placeholder="{{ .L.T "subscribers.queryPlaceholder" }}" value="{{ $d.Page.Search }}" :disabled="isSqlOpen || advanced" autofocus /><button type="button" class="outline sql-btn dot-indicator" :class="{ 'is-active': advanced }" popovertarget="sql-editor" data-cy="btn-advanced-search" :data-variant="advanced ? 'primary' : null" aria-label="{{ .L.T "subscribers.advancedQuery" }}">SQL {}</button>- <button type="submit" class="" data-cy="btn-search" aria-label="{{ .L.T "globals.buttons.search" }}">{{ Icon "search" }}</button>+ <button type="submit" data-cy="btn-search" aria-label="{{ .L.T "globals.buttons.search" }}">{{ Icon "search" }}</button></fieldset><div popover id="sql-editor" class="sql-editor" data-cy="query-editor" @toggle="isSqlOpen = ($event.newState === 'open'); if (isSqlOpen) $nextTick(() => $refs.queryInput.focus())"><div data-field>diff --git a/static/admin/views/template.html b/static/admin/views/template.htmlindex 131a9de2..399df729 100644--- a/static/admin/views/template.html+++ b/static/admin/views/template.html@@ -66,7 +66,7 @@</template></div>- <p class="text-7 text-light mt-2">+ <p class="text-light mt-2"><template x-if="form.type === 'campaign'"><span>{{ .L.Ts "templates.placeholderHelp" "placeholder" "{{ template \"content\" . }}" }}</span></template>diff --git a/static/admin/views/templates.html b/static/admin/views/templates.htmlindex e4519882..69785dad 100644--- a/static/admin/views/templates.html+++ b/static/admin/views/templates.html@@ -39,7 +39,7 @@<td><a href="{{ $base }}/{{ .ID }}" data-cy="btn-edit">{{ .Name }}</a>{{ if .IsDefault }}<span class="badge">{{ $.L.T "templates.default" }}</span>{{ end }}- {{- if eq .Type "tx" }}<p class="text-light text-7">{{ .Subject }}</p>{{ end }}+ {{- if eq .Type "tx" }}<p class="text-light">{{ .Subject }}</p>{{ end }}</td><td><div class="hstack">