h/oslstats
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

league #1

Merged
h merged 41 commits from league into master 2026-02-15 19:59:31 +11:00
Conversation 0 Commits 41 Files Changed 211 +1298 -155
22 changed files with 1298 additions and 155 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 4c80165f01 - Show all commits

50
cmd/oslstats/routes.go
View File

@@ -171,17 +171,65 @@ func addRoutes(
// Admin routes
adminRoutes := []hws.Route{
// Full page routes (for direct navigation and refreshes)
{
// TODO: on page load, redirect to /admin/users
Path: "/admin",
Method: hws.MethodGET,
Handler: perms.RequireAdmin(s)(handlers.AdminDashboard(s, conn)),
},
{
Path: "/admin/users",
Method: hws.MethodGET,
Handler: perms.RequireAdmin(s)(handlers.AdminUsersPage(s, conn)),
},
{
Path: "/admin/roles",
Method: hws.MethodGET,
Handler: perms.RequireAdmin(s)(handlers.AdminRolesPage(s, conn)),
},
{
Path: "/admin/permissions",
Method: hws.MethodGET,
Handler: perms.RequireAdmin(s)(handlers.AdminPermissionsPage(s, conn)),
},
{
Path: "/admin/audit",
Method: hws.MethodGET,
Handler: perms.RequireAdmin(s)(handlers.AdminAuditLogsPage(s, conn)),
},
// HTMX content fragment routes (for section swapping)
{
Path: "/admin/users",
Method: hws.MethodPOST,
Handler: perms.RequireAdmin(s)(handlers.AdminUsersList(s, conn)),
},
{
Path: "/admin/roles",
Method: hws.MethodPOST,
Handler: perms.RequireAdmin(s)(handlers.AdminRolesList(s, conn)),
},
{
Path: "/admin/permissions",
Method: hws.MethodPOST,
Handler: perms.RequireAdmin(s)(handlers.AdminPermissionsList(s, conn)),
},
{
Path: "/admin/audit",
Method: hws.MethodPOST,
Handler: perms.RequireAdmin(s)(handlers.AdminAuditLogsList(s, conn)),
},
// Audit log filtering (returns only results table, no URL push)
{
Path: "/admin/audit/filter",
Method: hws.MethodPOST,
Handler: perms.RequireAdmin(s)(handlers.AdminAuditLogsFilter(s, conn)),
},
// Audit log detail modal
{
Path: "/admin/audit/{id}",
Method: hws.MethodGET,
Handler: perms.RequireAdmin(s)(handlers.AdminAuditLogDetail(s, conn)),
},
}
routes := append(pageroutes, htmxRoutes...)

93
internal/db/auditlog.go
View File

@@ -41,29 +41,48 @@ func CreateAuditLog(ctx context.Context, tx bun.Tx, log *AuditLog) error {
type AuditLogFilter struct {
*ListFilter
customWhere []whereClause
}
type whereClause struct {
query string
args []any
}
func NewAuditLogFilter() *AuditLogFilter {
return &AuditLogFilter{NewListFilter()}
return &AuditLogFilter{
ListFilter: NewListFilter(),
customWhere: []whereClause{},
}
}
func (a *AuditLogFilter) UserID(id int) *AuditLogFilter {
a.Add("al.user_id", id)
a.Add("al.user_id", "=", id)
return a
}
func (a *AuditLogFilter) Action(action string) *AuditLogFilter {
a.Add("al.action", action)
a.Add("al.action", "=", action)
return a
}
func (a *AuditLogFilter) ResourceType(resourceType string) *AuditLogFilter {
a.Add("al.resource_type", resourceType)
a.Add("al.resource_type", "=", resourceType)
return a
}
func (a *AuditLogFilter) Result(result string) *AuditLogFilter {
a.Add("al.result", result)
a.Add("al.result", "=", result)
return a
}
func (a *AuditLogFilter) DateRange(start, end int64) *AuditLogFilter {
if start > 0 {
a.Add("al.created_at", ">=", start)
}
if end > 0 {
a.Add("al.created_at", "<=", end)
}
return a
}
@@ -75,10 +94,17 @@ func GetAuditLogs(ctx context.Context, tx bun.Tx, pageOpts *PageOpts, filters *A
Order: bun.OrderDesc,
OrderBy: "created_at",
}
return GetList[AuditLog](tx).
lg := GetList[AuditLog](tx).
Relation("User").
Filter(filters.filters...).
GetPaged(ctx, pageOpts, defaultPageOpts)
Filter(filters.filters...)
// Apply custom where clauses (e.g., date range)
for _, clause := range filters.customWhere {
lg = lg.Where(clause.query, clause.args...)
}
return lg.GetPaged(ctx, pageOpts, defaultPageOpts)
}
// GetAuditLogsByUser retrieves audit logs for a specific user
@@ -101,6 +127,57 @@ func GetAuditLogsByAction(ctx context.Context, tx bun.Tx, action string, pageOpt
return GetAuditLogs(ctx, tx, pageOpts, filters)
}
// GetAuditLogByID retrieves a single audit log by ID
func GetAuditLogByID(ctx context.Context, tx bun.Tx, id int) (*AuditLog, error) {
if id <= 0 {
return nil, errors.New("id must be positive")
}
log := new(AuditLog)
err := tx.NewSelect().
Model(log).
Relation("User").
Where("al.id = ?", id).
Scan(ctx)
if err != nil {
if err.Error() == "sql: no rows in result set" {
return nil, nil
}
return nil, errors.Wrap(err, "tx.NewSelect")
}
return log, nil
}
// GetUniqueActions retrieves a list of all unique actions in the audit log
func GetUniqueActions(ctx context.Context, tx bun.Tx) ([]string, error) {
var actions []string
err := tx.NewSelect().
Model((*AuditLog)(nil)).
Column("action").
Distinct().
Order("action ASC").
Scan(ctx, &actions)
if err != nil {
return nil, errors.Wrap(err, "tx.NewSelect")
}
return actions, nil
}
// GetUniqueResourceTypes retrieves a list of all unique resource types in the audit log
func GetUniqueResourceTypes(ctx context.Context, tx bun.Tx) ([]string, error) {
var resourceTypes []string
err := tx.NewSelect().
Model((*AuditLog)(nil)).
Column("resource_type").
Distinct().
Order("resource_type ASC").
Scan(ctx, &resourceTypes)
if err != nil {
return nil, errors.Wrap(err, "tx.NewSelect")
}
return resourceTypes, nil
}
// CleanupOldAuditLogs deletes audit logs older than the specified timestamp
func CleanupOldAuditLogs(ctx context.Context, tx bun.Tx, olderThan int64) (int, error) {
result, err := tx.NewDelete().

11
internal/db/getlist.go
View File

@@ -20,8 +20,9 @@ type List[T any] struct {
}
type Filter struct {
Field string
Value any
Field string
Value any
Operator string
}
type ListFilter struct {
@@ -32,8 +33,8 @@ func NewListFilter() *ListFilter {
return &ListFilter{[]Filter{}}
}
func (f *ListFilter) Add(field string, value any) {
f.filters = append(f.filters, Filter{field, value})
func (f *ListFilter) Add(field, operator string, value any) {
f.filters = append(f.filters, Filter{field, value, "="})
}
func GetList[T any](tx bun.Tx) *listgetter[T] {
@@ -62,7 +63,7 @@ func (l *listgetter[T]) Relation(name string, apply ...func(*bun.SelectQuery) *b
func (l *listgetter[T]) Filter(filters ...Filter) *listgetter[T] {
for _, filter := range filters {
l.q = l.q.Where("? = ?", bun.Ident(filter.Field), filter.Value)
l.q = l.q.Where("? ? ?", bun.Ident(filter.Field), bun.Safe(filter.Operator), filter.Value)
}
return l
}

6
internal/db/user.go
View File

@@ -141,3 +141,9 @@ func GetUsers(ctx context.Context, tx bun.Tx, pageOpts *PageOpts) (*List[User],
defaults := &PageOpts{1, 50, bun.OrderAsc, "id"}
return GetList[User](tx).GetPaged(ctx, pageOpts, defaults)
}
// GetUsersWithRoles queries the database for users with their roles preloaded
func GetUsersWithRoles(ctx context.Context, tx bun.Tx, pageOpts *PageOpts) (*List[User], error) {
defaults := &PageOpts{1, 25, bun.OrderAsc, "id"}
return GetList[User](tx).Relation("Roles").GetPaged(ctx, pageOpts, defaults)
}

300
internal/embedfs/web/css/output.css
View File

@@ -12,7 +12,6 @@
--breakpoint-lg: 64rem;
--breakpoint-xl: 80rem;
--breakpoint-2xl: 96rem;
--container-xs: 20rem;
--container-sm: 24rem;
--container-md: 28rem;
--container-lg: 32rem;
@@ -46,40 +45,11 @@
--radius-xl: 0.75rem;
--ease-in: cubic-bezier(0.4, 0, 1, 1);
--ease-out: cubic-bezier(0, 0, 0.2, 1);
--blur-sm: 8px;
--default-transition-duration: 150ms;
--default-transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1);
--default-font-family: var(--font-sans);
--default-mono-font-family: var(--font-mono);
--color-rosewater: var(--rosewater);
--color-flamingo: var(--flamingo);
--color-pink: var(--pink);
--color-mauve: var(--mauve);
--color-red: var(--red);
--color-dark-red: var(--dark-red);
--color-maroon: var(--maroon);
--color-peach: var(--peach);
--color-yellow: var(--yellow);
--color-dark-yellow: var(--dark-yellow);
--color-green: var(--green);
--color-dark-green: var(--dark-green);
--color-teal: var(--teal);
--color-sky: var(--sky);
--color-sapphire: var(--sapphire);
--color-blue: var(--blue);
--color-dark-blue: var(--dark-blue);
--color-lavender: var(--lavender);
--color-text: var(--text);
--color-subtext1: var(--subtext1);
--color-subtext0: var(--subtext0);
--color-overlay2: var(--overlay2);
--color-overlay1: var(--overlay1);
--color-overlay0: var(--overlay0);
--color-surface2: var(--surface2);
--color-surface1: var(--surface1);
--color-surface0: var(--surface0);
--color-base: var(--base);
--color-mantle: var(--mantle);
--color-crust: var(--crust);
}
}
@layer base {
@@ -278,9 +248,6 @@
.top-0 {
top: calc(var(--spacing) * 0);
}
.top-1 {
top: calc(var(--spacing) * 1);
}
.top-1\/2 {
top: calc(1/2 * 100%);
}
@@ -305,12 +272,6 @@
.left-0 {
left: calc(var(--spacing) * 0);
}
.z-4 {
z-index: 4;
}
.z-7 {
z-index: 7;
}
.z-10 {
z-index: 10;
}
@@ -450,9 +411,6 @@
.h-1 {
height: calc(var(--spacing) * 1);
}
.h-2 {
height: calc(var(--spacing) * 2);
}
.h-4 {
height: calc(var(--spacing) * 4);
}
@@ -546,37 +504,18 @@
.max-w-sm {
max-width: var(--container-sm);
}
.max-w-xs {
max-width: var(--container-xs);
}
.min-w-0 {
min-width: calc(var(--spacing) * 0);
}
.flex-1 {
flex: 1;
}
.flex-shrink {
flex-shrink: 1;
}
.flex-shrink-0 {
flex-shrink: 0;
}
.shrink-0 {
flex-shrink: 0;
}
.flex-grow {
flex-grow: 1;
}
.grow {
flex-grow: 1;
}
.border-collapse {
border-collapse: collapse;
}
.-translate-y-1 {
--tw-translate-y: calc(var(--spacing) * -1);
translate: var(--tw-translate-x) var(--tw-translate-y);
}
.-translate-y-1\/2 {
--tw-translate-y: calc(calc(1/2 * 100%) * -1);
translate: var(--tw-translate-x) var(--tw-translate-y);
@@ -589,6 +528,21 @@
--tw-translate-y: calc(var(--spacing) * 4);
translate: var(--tw-translate-x) var(--tw-translate-y);
}
.scale-95 {
--tw-scale-x: 95%;
--tw-scale-y: 95%;
--tw-scale-z: 95%;
scale: var(--tw-scale-x) var(--tw-scale-y);
}
.scale-100 {
--tw-scale-x: 100%;
--tw-scale-y: 100%;
--tw-scale-z: 100%;
scale: var(--tw-scale-x) var(--tw-scale-y);
}
.rotate-180 {
rotate: 180deg;
}
.transform {
transform: var(--tw-rotate-x,) var(--tw-rotate-y,) var(--tw-rotate-z,) var(--tw-skew-x,) var(--tw-skew-y,);
}
@@ -604,9 +558,6 @@
.resize-none {
resize: none;
}
.appearance-none {
appearance: none;
}
.grid-cols-1 {
grid-template-columns: repeat(1, minmax(0, 1fr));
}
@@ -694,16 +645,16 @@
border-bottom-width: calc(1px * calc(1 - var(--tw-divide-y-reverse)));
}
}
.divide-surface1 {
:where(& > :not(:last-child)) {
border-color: var(--surface1);
}
}
.divide-surface2 {
:where(& > :not(:last-child)) {
border-color: var(--surface2);
}
}
.truncate {
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
.overflow-hidden {
overflow: hidden;
}
@@ -740,6 +691,10 @@
border-style: var(--tw-border-style);
border-width: 2px;
}
.border-t {
border-top-style: var(--tw-border-style);
border-top-width: 1px;
}
.border-b {
border-bottom-style: var(--tw-border-style);
border-bottom-width: 1px;
@@ -756,6 +711,12 @@
.border-red {
border-color: var(--red);
}
.border-red\/30 {
border-color: var(--red);
@supports (color: color-mix(in lab, red, red)) {
border-color: color-mix(in oklab, var(--red) 30%, transparent);
}
}
.border-surface1 {
border-color: var(--surface1);
}
@@ -777,10 +738,10 @@
.bg-blue {
background-color: var(--blue);
}
.bg-blue\/10 {
.bg-blue\/20 {
background-color: var(--blue);
@supports (color: color-mix(in lab, red, red)) {
background-color: color-mix(in oklab, var(--blue) 10%, transparent);
background-color: color-mix(in oklab, var(--blue) 20%, transparent);
}
}
.bg-crust {
@@ -804,10 +765,10 @@
.bg-green {
background-color: var(--green);
}
.bg-green\/10 {
.bg-green\/20 {
background-color: var(--green);
@supports (color: color-mix(in lab, red, red)) {
background-color: color-mix(in oklab, var(--green) 10%, transparent);
background-color: color-mix(in oklab, var(--green) 20%, transparent);
}
}
.bg-mantle {
@@ -828,6 +789,12 @@
background-color: color-mix(in oklab, var(--red) 10%, transparent);
}
}
.bg-red\/20 {
background-color: var(--red);
@supports (color: color-mix(in lab, red, red)) {
background-color: color-mix(in oklab, var(--red) 20%, transparent);
}
}
.bg-sapphire {
background-color: var(--sapphire);
}
@@ -843,15 +810,12 @@
.bg-yellow {
background-color: var(--yellow);
}
.bg-yellow\/10 {
.bg-yellow\/20 {
background-color: var(--yellow);
@supports (color: color-mix(in lab, red, red)) {
background-color: color-mix(in oklab, var(--yellow) 10%, transparent);
background-color: color-mix(in oklab, var(--yellow) 20%, transparent);
}
}
.bg-no-repeat {
background-repeat: no-repeat;
}
.p-1 {
padding: calc(var(--spacing) * 1);
}
@@ -861,6 +825,9 @@
.p-2\.5 {
padding: calc(var(--spacing) * 2.5);
}
.p-3 {
padding: calc(var(--spacing) * 3);
}
.p-4 {
padding: calc(var(--spacing) * 4);
}
@@ -885,9 +852,6 @@
.px-6 {
padding-inline: calc(var(--spacing) * 6);
}
.py-0 {
padding-block: calc(var(--spacing) * 0);
}
.py-0\.5 {
padding-block: calc(var(--spacing) * 0.5);
}
@@ -912,9 +876,6 @@
.pr-2 {
padding-right: calc(var(--spacing) * 2);
}
.pr-8 {
padding-right: calc(var(--spacing) * 8);
}
.pr-10 {
padding-right: calc(var(--spacing) * 10);
}
@@ -1001,12 +962,12 @@
.break-all {
word-break: break-all;
}
.whitespace-nowrap {
white-space: nowrap;
}
.whitespace-pre-wrap {
white-space: pre-wrap;
}
.text-base {
color: var(--base);
}
.text-blue {
color: var(--blue);
}
@@ -1046,9 +1007,6 @@
.italic {
font-style: italic;
}
.underline {
text-decoration-line: underline;
}
.opacity-0 {
opacity: 0%;
}
@@ -1070,13 +1028,14 @@
--tw-shadow: 0 20px 25px -5px var(--tw-shadow-color, rgb(0 0 0 / 0.1)), 0 8px 10px -6px var(--tw-shadow-color, rgb(0 0 0 / 0.1));
box-shadow: var(--tw-inset-shadow), var(--tw-inset-ring-shadow), var(--tw-ring-offset-shadow), var(--tw-ring-shadow), var(--tw-shadow);
}
.outline {
outline-style: var(--tw-outline-style);
outline-width: 1px;
}
.filter {
filter: var(--tw-blur,) var(--tw-brightness,) var(--tw-contrast,) var(--tw-grayscale,) var(--tw-hue-rotate,) var(--tw-invert,) var(--tw-saturate,) var(--tw-sepia,) var(--tw-drop-shadow,);
}
.backdrop-blur-sm {
--tw-backdrop-blur: blur(var(--blur-sm));
-webkit-backdrop-filter: var(--tw-backdrop-blur,) var(--tw-backdrop-brightness,) var(--tw-backdrop-contrast,) var(--tw-backdrop-grayscale,) var(--tw-backdrop-hue-rotate,) var(--tw-backdrop-invert,) var(--tw-backdrop-opacity,) var(--tw-backdrop-saturate,) var(--tw-backdrop-sepia,);
backdrop-filter: var(--tw-backdrop-blur,) var(--tw-backdrop-brightness,) var(--tw-backdrop-contrast,) var(--tw-backdrop-grayscale,) var(--tw-backdrop-hue-rotate,) var(--tw-backdrop-invert,) var(--tw-backdrop-opacity,) var(--tw-backdrop-saturate,) var(--tw-backdrop-sepia,);
}
.transition {
transition-property: color, background-color, border-color, outline-color, text-decoration-color, fill, stroke, --tw-gradient-from, --tw-gradient-via, --tw-gradient-to, opacity, box-shadow, transform, translate, scale, rotate, filter, -webkit-backdrop-filter, backdrop-filter, display, content-visibility, overlay, pointer-events;
transition-timing-function: var(--tw-ease, var(--default-transition-timing-function));
@@ -1097,6 +1056,15 @@
transition-timing-function: var(--tw-ease, var(--default-transition-timing-function));
transition-duration: var(--tw-duration, var(--default-transition-duration));
}
.transition-transform {
transition-property: transform, translate, scale, rotate;
transition-timing-function: var(--tw-ease, var(--default-transition-timing-function));
transition-duration: var(--tw-duration, var(--default-transition-duration));
}
.duration-150 {
--tw-duration: 150ms;
transition-duration: 150ms;
}
.duration-200 {
--tw-duration: 200ms;
transition-duration: 200ms;
@@ -1145,6 +1113,16 @@
}
}
}
.hover\:bg-blue\/80 {
&:hover {
@media (hover: hover) {
background-color: var(--blue);
@supports (color: color-mix(in lab, red, red)) {
background-color: color-mix(in oklab, var(--blue) 80%, transparent);
}
}
}
}
.hover\:bg-crust {
&:hover {
@media (hover: hover) {
@@ -1192,6 +1170,16 @@
}
}
}
.hover\:bg-red\/80 {
&:hover {
@media (hover: hover) {
background-color: var(--red);
@supports (color: color-mix(in lab, red, red)) {
background-color: color-mix(in oklab, var(--red) 80%, transparent);
}
}
}
}
.hover\:bg-sapphire\/75 {
&:hover {
@media (hover: hover) {
@@ -1295,6 +1283,11 @@
box-shadow: var(--tw-inset-shadow), var(--tw-inset-ring-shadow), var(--tw-ring-offset-shadow), var(--tw-ring-shadow), var(--tw-shadow);
}
}
.focus\:ring-blue {
&:focus {
--tw-ring-color: var(--blue);
}
}
.focus\:ring-mauve {
&:focus {
--tw-ring-color: var(--mauve);
@@ -1500,6 +1493,26 @@
line-height: var(--tw-leading, var(--text-4xl--line-height));
}
}
.md\:col-span-2 {
@media (width >= 48rem) {
grid-column: span 2 / span 2;
}
}
.md\:block {
@media (width >= 48rem) {
display: block;
}
}
.md\:hidden {
@media (width >= 48rem) {
display: none;
}
}
.md\:w-64 {
@media (width >= 48rem) {
width: calc(var(--spacing) * 64);
}
}
.md\:grid-cols-2 {
@media (width >= 48rem) {
grid-template-columns: repeat(2, minmax(0, 1fr));
@@ -1510,6 +1523,11 @@
grid-template-columns: repeat(3, minmax(0, 1fr));
}
}
.md\:flex-row {
@media (width >= 48rem) {
flex-direction: row;
}
}
.md\:gap-8 {
@media (width >= 48rem) {
gap: calc(var(--spacing) * 8);
@@ -1530,6 +1548,11 @@
inset-inline-end: calc(var(--spacing) * 8);
}
}
.lg\:col-span-3 {
@media (width >= 64rem) {
grid-column: span 3 / span 3;
}
}
.lg\:mt-0 {
@media (width >= 64rem) {
margin-top: calc(var(--spacing) * 0);
@@ -1694,6 +1717,21 @@
inherits: false;
initial-value: 0;
}
@property --tw-scale-x {
syntax: "*";
inherits: false;
initial-value: 1;
}
@property --tw-scale-y {
syntax: "*";
inherits: false;
initial-value: 1;
}
@property --tw-scale-z {
syntax: "*";
inherits: false;
initial-value: 1;
}
@property --tw-rotate-x {
syntax: "*";
inherits: false;
@@ -1806,11 +1844,6 @@
inherits: false;
initial-value: 0 0 #0000;
}
@property --tw-outline-style {
syntax: "*";
inherits: false;
initial-value: solid;
}
@property --tw-blur {
syntax: "*";
inherits: false;
@@ -1864,6 +1897,42 @@
syntax: "*";
inherits: false;
}
@property --tw-backdrop-blur {
syntax: "*";
inherits: false;
}
@property --tw-backdrop-brightness {
syntax: "*";
inherits: false;
}
@property --tw-backdrop-contrast {
syntax: "*";
inherits: false;
}
@property --tw-backdrop-grayscale {
syntax: "*";
inherits: false;
}
@property --tw-backdrop-hue-rotate {
syntax: "*";
inherits: false;
}
@property --tw-backdrop-invert {
syntax: "*";
inherits: false;
}
@property --tw-backdrop-opacity {
syntax: "*";
inherits: false;
}
@property --tw-backdrop-saturate {
syntax: "*";
inherits: false;
}
@property --tw-backdrop-sepia {
syntax: "*";
inherits: false;
}
@property --tw-duration {
syntax: "*";
inherits: false;
@@ -1872,27 +1941,15 @@
syntax: "*";
inherits: false;
}
@property --tw-scale-x {
syntax: "*";
inherits: false;
initial-value: 1;
}
@property --tw-scale-y {
syntax: "*";
inherits: false;
initial-value: 1;
}
@property --tw-scale-z {
syntax: "*";
inherits: false;
initial-value: 1;
}
@layer properties {
@supports ((-webkit-hyphens: none) and (not (margin-trim: inline))) or ((-moz-orient: inline) and (not (color:rgb(from red r g b)))) {
*, ::before, ::after, ::backdrop {
--tw-translate-x: 0;
--tw-translate-y: 0;
--tw-translate-z: 0;
--tw-scale-x: 1;
--tw-scale-y: 1;
--tw-scale-z: 1;
--tw-rotate-x: initial;
--tw-rotate-y: initial;
--tw-rotate-z: initial;
@@ -1918,7 +1975,6 @@
--tw-ring-offset-width: 0px;
--tw-ring-offset-color: #fff;
--tw-ring-offset-shadow: 0 0 #0000;
--tw-outline-style: solid;
--tw-blur: initial;
--tw-brightness: initial;
--tw-contrast: initial;
@@ -1932,11 +1988,17 @@
--tw-drop-shadow-color: initial;
--tw-drop-shadow-alpha: 100%;
--tw-drop-shadow-size: initial;
--tw-backdrop-blur: initial;
--tw-backdrop-brightness: initial;
--tw-backdrop-contrast: initial;
--tw-backdrop-grayscale: initial;
--tw-backdrop-hue-rotate: initial;
--tw-backdrop-invert: initial;
--tw-backdrop-opacity: initial;
--tw-backdrop-saturate: initial;
--tw-backdrop-sepia: initial;
--tw-duration: initial;
--tw-ease: initial;
--tw-scale-x: 1;
--tw-scale-y: 1;
--tw-scale-z: 1;
}
}
}

35
internal/embedfs/web/js/admin.js Normal file
View File

@@ -0,0 +1,35 @@
// Admin dashboard utilities
// Format JSON for display in modals
function formatJSON(json) {
try {
const parsed = typeof json === "string" ? JSON.parse(json) : json;
return JSON.stringify(parsed, null, 2);
} catch (e) {
return json;
}
}
// Handle HTMX navigation for admin sections
document.addEventListener("DOMContentLoaded", function () {
// Update active nav item after HTMX navigation
document.body.addEventListener("htmx:afterSwap", function (event) {
if (event.detail.target.id === "admin-content") {
// Get the current URL path
const path = window.location.pathname;
const section = path.split("/").pop() || "users";
// Update active state on nav items
document.querySelectorAll("nav a").forEach(function (link) {
const href = link.getAttribute("href");
if (href && href.includes("/" + section)) {
link.classList.remove("text-subtext0", "hover:bg-surface1", "hover:text-text");
link.classList.add("bg-blue", "text-mantle", "font-semibold");
} else {
link.classList.remove("bg-blue", "text-mantle", "font-semibold");
link.classList.add("text-subtext0", "hover:bg-surface1", "hover:text-text");
}
});
}
});
});

274
internal/handlers/admin_audit.go Normal file
View File

@@ -0,0 +1,274 @@
package handlers
import (
"context"
"net/http"
"strconv"
"time"
"git.haelnorr.com/h/golib/hws"
"git.haelnorr.com/h/oslstats/internal/db"
"git.haelnorr.com/h/oslstats/internal/throw"
"git.haelnorr.com/h/oslstats/internal/validation"
adminview "git.haelnorr.com/h/oslstats/internal/view/adminview"
"github.com/pkg/errors"
"github.com/uptrace/bun"
)
// AdminAuditLogsPage renders the full admin dashboard page with audit logs section
func AdminAuditLogsPage(s *hws.Server, conn *bun.DB) http.Handler {
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
var logs *db.List[db.AuditLog]
var users []*db.User
var actions []string
var resourceTypes []string
if ok := db.WithReadTx(s, w, r, conn, func(ctx context.Context, tx bun.Tx) (bool, error) {
var err error
// Get page options from query
pageOpts := pageOptsFromQuery(s, w, r)
if pageOpts == nil {
return false, nil
}
// Get filters from query
filters, ok := getAuditFiltersFromQuery(s, w, r)
if !ok {
return false, nil
}
// Get audit logs
logs, err = db.GetAuditLogs(ctx, tx, pageOpts, filters)
if err != nil {
return false, errors.Wrap(err, "db.GetAuditLogs")
}
// Get all users for filter dropdown
usersList, err := db.GetUsers(ctx, tx, nil)
if err != nil {
return false, errors.Wrap(err, "db.GetUsers")
}
users = usersList.Items
// Get unique actions
actions, err = db.GetUniqueActions(ctx, tx)
if err != nil {
return false, errors.Wrap(err, "db.GetUniqueActions")
}
// Get unique resource types
resourceTypes, err = db.GetUniqueResourceTypes(ctx, tx)
if err != nil {
return false, errors.Wrap(err, "db.GetUniqueResourceTypes")
}
return true, nil
}); !ok {
return
}
renderSafely(adminview.AuditLogsPage(logs, users, actions, resourceTypes), s, r, w)
})
}
// AdminAuditLogsList shows audit logs (HTMX content replacement - full section with filters)
func AdminAuditLogsList(s *hws.Server, conn *bun.DB) http.Handler {
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
var logs *db.List[db.AuditLog]
var users []*db.User
var actions []string
var resourceTypes []string
if ok := db.WithReadTx(s, w, r, conn, func(ctx context.Context, tx bun.Tx) (bool, error) {
var err error
// Get page options from form
pageOpts := pageOptsFromForm(s, w, r)
if pageOpts == nil {
return false, nil
}
// No filters for initial section load
filters := db.NewAuditLogFilter()
// Get audit logs
logs, err = db.GetAuditLogs(ctx, tx, pageOpts, filters)
if err != nil {
return false, errors.Wrap(err, "db.GetAuditLogs")
}
// Get all users for filter dropdown
usersList, err := db.GetUsers(ctx, tx, nil)
if err != nil {
return false, errors.Wrap(err, "db.GetUsers")
}
users = usersList.Items
// Get unique actions
actions, err = db.GetUniqueActions(ctx, tx)
if err != nil {
return false, errors.Wrap(err, "db.GetUniqueActions")
}
// Get unique resource types
resourceTypes, err = db.GetUniqueResourceTypes(ctx, tx)
if err != nil {
return false, errors.Wrap(err, "db.GetUniqueResourceTypes")
}
return true, nil
}); !ok {
return
}
renderSafely(adminview.AuditLogsList(logs, users, actions, resourceTypes), s, r, w)
})
}
// AdminAuditLogsFilter handles filter requests and returns only the results table
func AdminAuditLogsFilter(s *hws.Server, conn *bun.DB) http.Handler {
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
var logs *db.List[db.AuditLog]
if ok := db.WithReadTx(s, w, r, conn, func(ctx context.Context, tx bun.Tx) (bool, error) {
var err error
// Get page options from form
pageOpts := pageOptsFromForm(s, w, r)
if pageOpts == nil {
return false, nil
}
// Get filters from form
filters, ok := getAuditFiltersFromForm(s, w, r)
if !ok {
return false, nil
}
// Get audit logs
logs, err = db.GetAuditLogs(ctx, tx, pageOpts, filters)
if err != nil {
return false, errors.Wrap(err, "db.GetAuditLogs")
}
return true, nil
}); !ok {
return
}
renderSafely(adminview.AuditLogsResults(logs), s, r, w)
})
}
// AdminAuditLogDetail shows details for a single audit log entry
func AdminAuditLogDetail(s *hws.Server, conn *bun.DB) http.Handler {
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
// Get ID from path
idStr := r.PathValue("id")
if idStr == "" {
throw.BadRequest(s, w, r, "Missing audit log ID", nil)
return
}
id, err := strconv.Atoi(idStr)
if err != nil {
throw.BadRequest(s, w, r, "Invalid audit log ID", err)
return
}
var log *db.AuditLog
if ok := db.WithReadTx(s, w, r, conn, func(ctx context.Context, tx bun.Tx) (bool, error) {
var err error
log, err = db.GetAuditLogByID(ctx, tx, id)
if err != nil {
return false, errors.Wrap(err, "db.GetAuditLogByID")
}
if log == nil {
throw.NotFound(s, w, r, r.URL.Path)
return false, nil
}
return true, nil
}); !ok {
return
}
renderSafely(adminview.AuditLogDetail(log), s, r, w)
})
}
// getAuditFiltersFromQuery extracts audit log filters from query string
func getAuditFiltersFromQuery(s *hws.Server, w http.ResponseWriter, r *http.Request) (*db.AuditLogFilter, bool) {
g := validation.NewQueryGetter(r)
return buildAuditFilters(g, s, w, r)
}
// getAuditFiltersFromForm extracts audit log filters from form data
func getAuditFiltersFromForm(s *hws.Server, w http.ResponseWriter, r *http.Request) (*db.AuditLogFilter, bool) {
g, ok := validation.ParseFormOrError(s, w, r)
if !ok {
return nil, false
}
return buildAuditFilters(g, s, w, r)
}
// buildAuditFilters builds audit log filters from a validation.Getter
func buildAuditFilters(g validation.Getter, s *hws.Server, w http.ResponseWriter, r *http.Request) (*db.AuditLogFilter, bool) {
filters := db.NewAuditLogFilter()
// User ID filter (optional)
userID := g.Int("user_id").Optional().Min(1).Value
// Action filter (optional)
action := g.String("action").TrimSpace().Optional().Value
// Resource Type filter (optional)
resourceType := g.String("resource_type").TrimSpace().Optional().Value
// Result filter (optional)
result := g.String("result").TrimSpace().Optional().AllowedValues([]string{"success", "denied", "error"}).Value
// Date range filter (optional)
startDateStr := g.String("start_date").TrimSpace().Optional().Value
endDateStr := g.String("end_date").TrimSpace().Optional().Value
// Validate
if !g.ValidateAndError(s, w, r) {
return nil, false
}
// Apply filters
if userID > 0 {
filters.UserID(userID)
}
if action != "" {
filters.Action(action)
}
if resourceType != "" {
filters.ResourceType(resourceType)
}
if result != "" {
filters.Result(result)
}
// Parse and apply date range
if startDateStr != "" {
if startDate, err := time.Parse("2006-01-02", startDateStr); err == nil {
filters.DateRange(startDate.Unix(), 0)
}
}
if endDateStr != "" {
if endDate, err := time.Parse("2006-01-02", endDateStr); err == nil {
// Set to end of day
endOfDay := endDate.Add(23*time.Hour + 59*time.Minute + 59*time.Second)
filters.DateRange(0, endOfDay.Unix())
}
}
return filters, true
}

5
internal/handlers/admin_dashboard.go
View File

@@ -11,14 +11,15 @@ import (
"github.com/uptrace/bun"
)
// AdminDashboard renders the full admin dashboard page (defaults to users section)
func AdminDashboard(s *hws.Server, conn *bun.DB) http.Handler {
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
var users *db.List[db.User]
if ok := db.WithReadTx(s, w, r, conn, func(ctx context.Context, tx bun.Tx) (bool, error) {
var err error
users, err = db.GetUsers(ctx, tx, nil)
users, err = db.GetUsersWithRoles(ctx, tx, nil)
if err != nil {
return false, errors.Wrap(err, "db.GetUsers")
return false, errors.Wrap(err, "db.GetUsersWithRoles")
}
return true, nil
}); !ok {

25
internal/handlers/admin_permissions.go Normal file
View File

@@ -0,0 +1,25 @@
package handlers
import (
"net/http"
"git.haelnorr.com/h/golib/hws"
adminview "git.haelnorr.com/h/oslstats/internal/view/adminview"
"github.com/uptrace/bun"
)
// AdminPermissionsPage renders the full admin dashboard page with permissions section
func AdminPermissionsPage(s *hws.Server, conn *bun.DB) http.Handler {
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
// TODO: Load permissions from database
renderSafely(adminview.PermissionsPage(), s, r, w)
})
}
// AdminPermissionsList shows all permissions (HTMX content replacement)
func AdminPermissionsList(s *hws.Server, conn *bun.DB) http.Handler {
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
// TODO: Load permissions from database
renderSafely(adminview.PermissionsList(), s, r, w)
})
}

25
internal/handlers/admin_roles.go Normal file
View File

@@ -0,0 +1,25 @@
package handlers
import (
"net/http"
"git.haelnorr.com/h/golib/hws"
adminview "git.haelnorr.com/h/oslstats/internal/view/adminview"
"github.com/uptrace/bun"
)
// AdminRolesPage renders the full admin dashboard page with roles section
func AdminRolesPage(s *hws.Server, conn *bun.DB) http.Handler {
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
// TODO: Load roles from database
renderSafely(adminview.RolesPage(), s, r, w)
})
}
// AdminRolesList shows all roles (HTMX content replacement)
func AdminRolesList(s *hws.Server, conn *bun.DB) http.Handler {
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
// TODO: Load roles from database
renderSafely(adminview.RolesList(), s, r, w)
})
}

29
internal/handlers/admin_users.go
View File

@@ -11,19 +11,34 @@ import (
"github.com/uptrace/bun"
)
// AdminUsersList shows all users
// AdminUsersPage renders the full admin dashboard page with users section
func AdminUsersPage(s *hws.Server, conn *bun.DB) http.Handler {
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
var users *db.List[db.User]
if ok := db.WithReadTx(s, w, r, conn, func(ctx context.Context, tx bun.Tx) (bool, error) {
var err error
users, err = db.GetUsersWithRoles(ctx, tx, nil)
if err != nil {
return false, errors.Wrap(err, "db.GetUsersWithRoles")
}
return true, nil
}); !ok {
return
}
renderSafely(adminview.DashboardPage(users), s, r, w)
})
}
// AdminUsersList shows all users (HTMX content replacement)
func AdminUsersList(s *hws.Server, conn *bun.DB) http.Handler {
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
var users *db.List[db.User]
pageOpts := pageOptsFromForm(s, w, r)
if pageOpts == nil {
return
}
if ok := db.WithReadTx(s, w, r, conn, func(ctx context.Context, tx bun.Tx) (bool, error) {
var err error
users, err = db.GetUsers(ctx, tx, pageOpts)
// Get users with their roles
users, err = db.GetUsersWithRoles(ctx, tx, nil)
if err != nil {
return false, errors.Wrap(err, "db.GetUsers")
return false, errors.Wrap(err, "db.GetUsersWithRoles")
}
return true, nil
}); !ok {

156
internal/view/adminview/audit_log_detail.templ Normal file
View File

@@ -0,0 +1,156 @@
package adminview
import "git.haelnorr.com/h/oslstats/internal/db"
import "fmt"
import "time"
import "encoding/json"
templ AuditLogDetail(log *db.AuditLog) {
<!-- Modal overlay -->
<div
class="fixed inset-0 bg-crust/80 flex items-center justify-center z-50 p-4"
x-data="{ show: true }"
x-show="show"
x-transition:enter="transition ease-out duration-200"
x-transition:enter-start="opacity-0"
x-transition:enter-end="opacity-100"
x-transition:leave="transition ease-in duration-150"
x-transition:leave-start="opacity-100"
x-transition:leave-end="opacity-0"
@click.self="show = false; setTimeout(() => document.getElementById('modal-container').innerHTML = '', 200)"
>
<!-- Modal content -->
<div
class="bg-base border border-surface1 rounded-lg max-w-2xl w-full max-h-[90vh] overflow-y-auto"
x-transition:enter="transition ease-out duration-200"
x-transition:enter-start="opacity-0 scale-95"
x-transition:enter-end="opacity-100 scale-100"
x-transition:leave="transition ease-in duration-150"
x-transition:leave-start="opacity-100 scale-100"
x-transition:leave-end="opacity-0 scale-95"
>
<!-- Header -->
<div class="flex justify-between items-center p-6 border-b border-surface1">
<h2 class="text-xl font-bold text-text">Audit Log Details</h2>
<button
@click="show = false; setTimeout(() => document.getElementById('modal-container').innerHTML = '', 200)"
class="text-subtext0 hover:text-text transition"
>
<svg class="w-6 h-6" fill="none" stroke="currentColor" viewBox="0 0 24 24">
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M6 18L18 6M6 6l12 12"></path>
</svg>
</button>
</div>
<!-- Body -->
<div class="p-6 space-y-4">
<!-- ID -->
<div>
<label class="block text-sm font-semibold text-subtext0 mb-1">ID</label>
<p class="text-text">{ fmt.Sprintf("%d", log.ID) }</p>
</div>
<!-- User -->
<div>
<label class="block text-sm font-semibold text-subtext0 mb-1">User</label>
<p class="text-text">
if log.User != nil {
{ log.User.Username } <span class="text-subtext1 text-sm">(ID: { fmt.Sprintf("%d", log.UserID) })</span>
} else {
<span class="text-subtext1 italic">Unknown User (ID: { fmt.Sprintf("%d", log.UserID) })</span>
}
</p>
</div>
<!-- Timestamp -->
<div>
<label class="block text-sm font-semibold text-subtext0 mb-1">Timestamp</label>
<p class="text-text">{ formatDetailTimestamp(log.CreatedAt) }</p>
</div>
<!-- Action -->
<div>
<label class="block text-sm font-semibold text-subtext0 mb-1">Action</label>
<p class="text-text font-mono">{ log.Action }</p>
</div>
<!-- Resource Type -->
<div>
<label class="block text-sm font-semibold text-subtext0 mb-1">Resource Type</label>
<p class="text-text">{ log.ResourceType }</p>
</div>
<!-- Resource ID -->
<div>
<label class="block text-sm font-semibold text-subtext0 mb-1">Resource ID</label>
<p class="text-text font-mono">
if log.ResourceID != nil {
{ *log.ResourceID }
} else {
<span class="text-subtext1 italic">N/A</span>
}
</p>
</div>
<!-- Result -->
<div>
<label class="block text-sm font-semibold text-subtext0 mb-1">Result</label>
<div>
@resultBadge(log.Result)
</div>
</div>
<!-- Error Message (if applicable) -->
if log.ErrorMessage != nil && *log.ErrorMessage != "" {
<div>
<label class="block text-sm font-semibold text-subtext0 mb-1">Error Message</label>
<div class="bg-red/10 border border-red/30 rounded p-3">
<p class="text-red font-mono text-sm">{ *log.ErrorMessage }</p>
</div>
</div>
}
<!-- IP Address -->
<div>
<label class="block text-sm font-semibold text-subtext0 mb-1">IP Address</label>
<p class="text-text font-mono">{ log.IPAddress }</p>
</div>
<!-- User Agent -->
<div>
<label class="block text-sm font-semibold text-subtext0 mb-1">User Agent</label>
<p class="text-text text-sm break-all">{ log.UserAgent }</p>
</div>
<!-- Details JSON -->
if log.Details != nil && len(log.Details) > 0 && string(log.Details) != "null" {
<div>
<label class="block text-sm font-semibold text-subtext0 mb-1">Details</label>
<div class="bg-mantle border border-surface1 rounded p-3 overflow-x-auto">
<pre class="text-text text-xs font-mono whitespace-pre-wrap">{ formatJSON(log.Details) }</pre>
</div>
</div>
}
</div>
<!-- Footer -->
<div class="flex justify-end gap-2 p-6 border-t border-surface1">
<button
@click="show = false; setTimeout(() => document.getElementById('modal-container').innerHTML = '', 200)"
class="px-4 py-2 bg-surface1 hover:bg-surface2 text-text rounded font-medium transition hover:cursor-pointer"
>
Close
</button>
</div>
</div>
</div>
}
func formatDetailTimestamp(unixTime int64) string {
t := time.Unix(unixTime, 0)
return t.Format("Monday, January 2, 2006 at 3:04:05 PM MST")
}
func formatJSON(raw []byte) string {
if len(raw) == 0 || string(raw) == "null" {
return "No details available"
}
// Pretty print the JSON
var obj interface{}
if err := json.Unmarshal(raw, &obj); err != nil {
return string(raw)
}
pretty, err := json.MarshalIndent(obj, "", " ")
if err != nil {
return string(raw)
}
return string(pretty)
}

234
internal/view/adminview/audit_logs_list.templ Normal file
View File

@@ -0,0 +1,234 @@
package adminview
import (
"git.haelnorr.com/h/oslstats/internal/db"
"fmt"
"time"
)
templ AuditLogsList(logs *db.List[db.AuditLog], users []*db.User, actions []string, resourceTypes []string) {
<div class="space-y-4">
<!-- Header -->
<div class="flex justify-between items-center">
<h1 class="text-2xl font-bold text-text">Audit Logs</h1>
</div>
<!-- Filters -->
<div class="bg-surface0 border border-surface1 rounded-lg p-4">
<form
id="audit-filters-form"
hx-post="/admin/audit/filter"
hx-target="#audit-results"
hx-trigger="change from:select, change from:input delay:500ms"
class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-4"
>
<!-- User Filter -->
<div>
<label class="block text-sm font-medium text-subtext0 mb-1">User</label>
<select
name="user_id"
class="w-full bg-mantle border border-surface1 rounded px-3 py-2 text-text focus:outline-none focus:border-blue"
>
<option value="">All Users</option>
for _, user := range users {
<option value={ fmt.Sprintf("%d", user.ID) }>{ user.Username }</option>
}
</select>
</div>
<!-- Action Filter -->
<div>
<label class="block text-sm font-medium text-subtext0 mb-1">Action</label>
<select
name="action"
class="w-full bg-mantle border border-surface1 rounded px-3 py-2 text-text focus:outline-none focus:border-blue"
>
<option value="">All Actions</option>
for _, action := range actions {
<option value={ action }>{ action }</option>
}
</select>
</div>
<!-- Resource Type Filter -->
<div>
<label class="block text-sm font-medium text-subtext0 mb-1">Resource Type</label>
<select
name="resource_type"
class="w-full bg-mantle border border-surface1 rounded px-3 py-2 text-text focus:outline-none focus:border-blue"
>
<option value="">All Resource Types</option>
for _, rt := range resourceTypes {
<option value={ rt }>{ rt }</option>
}
</select>
</div>
<!-- Result Filter -->
<div>
<label class="block text-sm font-medium text-subtext0 mb-1">Result</label>
<select
name="result"
class="w-full bg-mantle border border-surface1 rounded px-3 py-2 text-text focus:outline-none focus:border-blue"
>
<option value="">All Results</option>
<option value="success">Success</option>
<option value="denied">Denied</option>
<option value="error">Error</option>
</select>
</div>
<!-- Start Date Filter -->
<div>
<label class="block text-sm font-medium text-subtext0 mb-1">Start Date</label>
<input
type="date"
name="start_date"
class="w-full bg-mantle border border-surface1 rounded px-3 py-2 text-text focus:outline-none focus:border-blue"
/>
</div>
<!-- End Date Filter -->
<div>
<label class="block text-sm font-medium text-subtext0 mb-1">End Date</label>
<input
type="date"
name="end_date"
class="w-full bg-mantle border border-surface1 rounded px-3 py-2 text-text focus:outline-none focus:border-blue"
/>
</div>
<!-- Clear Filters Button -->
<div class="md:col-span-2 lg:col-span-3">
<button
type="button"
onclick="document.getElementById('audit-filters-form').reset(); htmx.trigger('#audit-filters-form', 'change')"
class="px-4 py-2 bg-surface1 hover:bg-surface2 text-text rounded font-medium transition hover:cursor-pointer"
>
Clear Filters
</button>
</div>
</form>
</div>
<!-- Audit logs results container -->
<div id="audit-results">
@AuditLogsResults(logs)
</div>
</div>
<!-- Modal container for detail view -->
<div id="modal-container"></div>
}
templ AuditLogsResults(logs *db.List[db.AuditLog]) {
if len(logs.Items) == 0 {
<div class="bg-mantle border border-surface1 rounded-lg p-8 text-center">
<p class="text-subtext0 text-lg">No audit logs found</p>
</div>
} else {
<div class="bg-surface0 border border-surface1 rounded-lg overflow-hidden">
<div class="overflow-x-auto">
<table class="w-full">
<thead class="bg-mantle border-b border-surface1">
<tr>
<th class="px-4 py-3 text-left text-sm font-semibold text-text">Timestamp</th>
<th class="px-4 py-3 text-left text-sm font-semibold text-text">User</th>
<th class="px-4 py-3 text-left text-sm font-semibold text-text">Action</th>
<th class="px-4 py-3 text-left text-sm font-semibold text-text">Resource</th>
<th class="px-4 py-3 text-left text-sm font-semibold text-text">Resource ID</th>
<th class="px-4 py-3 text-left text-sm font-semibold text-text">Result</th>
<th class="px-4 py-3 text-left text-sm font-semibold text-text">Actions</th>
</tr>
</thead>
<tbody class="divide-y divide-surface1">
for _, log := range logs.Items {
<tr class="hover:bg-surface1 transition-colors">
<td class="px-4 py-3 text-sm text-subtext0 whitespace-nowrap">
{ formatFullTimestamp(log.CreatedAt) }
</td>
<td class="px-4 py-3 text-sm font-medium text-text">
if log.User != nil {
{ log.User.Username }
} else {
<span class="text-subtext1 italic">Unknown</span>
}
</td>
<td class="px-4 py-3 text-sm text-subtext0 font-mono">
{ log.Action }
</td>
<td class="px-4 py-3 text-sm text-subtext0">
{ log.ResourceType }
</td>
<td class="px-4 py-3 text-sm text-subtext0 font-mono">
if log.ResourceID != nil {
{ *log.ResourceID }
} else {
<span class="text-subtext1 italic">—</span>
}
</td>
<td class="px-4 py-3 text-sm">
@resultBadge(log.Result)
</td>
<td class="px-4 py-3 text-sm">
<button
hx-get={ fmt.Sprintf("/admin/audit/%d", log.ID) }
hx-target="#modal-container"
class="px-3 py-1 bg-blue hover:bg-blue/80 text-mantle rounded text-xs font-medium transition hover:cursor-pointer"
>
Details
</button>
</td>
</tr>
}
</tbody>
</table>
</div>
</div>
<!-- Pagination -->
{{
totalPages := (logs.Total + logs.PageOpts.PerPage - 1) / logs.PageOpts.PerPage
if logs.PageOpts.PerPage == 0 {
totalPages = 1
}
}}
if totalPages > 1 {
<div class="flex justify-center gap-2">
if logs.PageOpts.Page > 1 {
<button
hx-post={ fmt.Sprintf("/admin/audit?page=%d", logs.PageOpts.Page-1) }
hx-target="#admin-content"
class="px-4 py-2 bg-surface1 hover:bg-surface2 text-text rounded font-medium transition hover:cursor-pointer"
>
Previous
</button>
}
<span class="px-4 py-2 text-subtext0">
Page { fmt.Sprintf("%d", logs.PageOpts.Page) } of { fmt.Sprintf("%d", totalPages) }
</span>
if logs.PageOpts.Page < totalPages {
<button
hx-post={ fmt.Sprintf("/admin/audit?page=%d", logs.PageOpts.Page+1) }
hx-target="#admin-content"
class="px-4 py-2 bg-surface1 hover:bg-surface2 text-text rounded font-medium transition hover:cursor-pointer"
>
Next
</button>
}
</div>
}
}
}
templ resultBadge(result string) {
{{
var classes string
switch result {
case "success":
classes = "px-2 py-0.5 bg-green/20 text-green rounded text-xs font-medium"
case "denied":
classes = "px-2 py-0.5 bg-yellow/20 text-yellow rounded text-xs font-medium"
case "error":
classes = "px-2 py-0.5 bg-red/20 text-red rounded text-xs font-medium"
default:
classes = "px-2 py-0.5 bg-surface1 text-subtext0 rounded text-xs font-medium"
}
}}
<span class={ classes }>{ result }</span>
}
func formatFullTimestamp(unixTime int64) string {
t := time.Unix(unixTime, 0)
return t.Format("Jan 2, 2006 15:04:05")
}

9
internal/view/adminview/audit_page.templ Normal file
View File

@@ -0,0 +1,9 @@
package adminview
import "git.haelnorr.com/h/oslstats/internal/db"
templ AuditLogsPage(logs *db.List[db.AuditLog], users []*db.User, actions []string, resourceTypes []string) {
@DashboardLayout("audit") {
@AuditLogsList(logs, users, actions, resourceTypes)
}
}

72
internal/view/adminview/dashboard_layout.templ
View File

@@ -2,10 +2,74 @@ package adminview
import "git.haelnorr.com/h/oslstats/internal/view/baseview"
templ DashboardLayout() {
@baseview.Layout("Admin") {
<div>
{ children... }
templ DashboardLayout(activeSection string) {
@baseview.Layout("Admin Dashboard") {
<div class="max-w-screen-2xl mx-auto px-2">
<div class="flex flex-col md:flex-row gap-4">
<!-- Sidebar Navigation -->
<aside
class="w-full md:w-64 flex-shrink-0"
x-data="{ mobileOpen: false }"
>
<!-- Mobile toggle button -->
<button
@click="mobileOpen = !mobileOpen"
class="md:hidden w-full bg-surface0 border border-surface1 rounded-lg px-4 py-3 mb-2 flex items-center justify-between hover:bg-surface1 transition"
>
<span class="font-semibold text-text">Admin Menu</span>
<svg
class="w-5 h-5 transition-transform"
:class="mobileOpen ? 'rotate-180' : ''"
fill="none"
stroke="currentColor"
viewBox="0 0 24 24"
>
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M19 9l-7 7-7-7"></path>
</svg>
</button>
<!-- Navigation links -->
<nav
class="bg-surface0 border border-surface1 rounded-lg p-4"
:class="mobileOpen ? 'block' : 'hidden md:block'"
@click.away="mobileOpen = false"
>
<h2 class="text-lg font-bold text-text mb-4 px-2">Admin Dashboard</h2>
<ul class="space-y-1">
@navItem("users", "Users", activeSection)
@navItem("roles", "Roles", activeSection)
@navItem("permissions", "Permissions", activeSection)
@navItem("audit", "Audit Logs", activeSection)
</ul>
</nav>
</aside>
<!-- Main content area -->
<main class="flex-1 min-w-0" id="admin-content">
{ children... }
</main>
</div>
</div>
<script src="/static/js/admin.js"></script>
}
}
templ navItem(section string, label string, activeSection string) {
{{
isActive := section == activeSection
baseClasses := "block px-4 py-2 rounded-lg transition-colors cursor-pointer"
activeClasses := "bg-blue text-mantle font-semibold"
inactiveClasses := "text-subtext0 hover:bg-surface1 hover:text-text"
}}
<li>
<a
href={ templ.SafeURL("/admin/" + section) }
hx-post={ "/admin/" + section }
hx-target="#admin-content"
hx-swap="innerHTML"
hx-push-url={ "/admin/" + section }
class={ baseClasses, templ.KV(activeClasses, isActive), templ.KV(inactiveClasses, !isActive) }
@click="if (window.innerWidth < 768) mobileOpen = false"
>
{ label }
</a>
</li>
}

2
internal/view/adminview/dashboard_page.templ
View File

@@ -3,7 +3,7 @@ package adminview
import "git.haelnorr.com/h/oslstats/internal/db"
templ DashboardPage(users *db.List[db.User]) {
@DashboardLayout() {
@DashboardLayout("users") {
@UserList(users)
}
}

14
internal/view/adminview/permissions_list.templ Normal file
View File

@@ -0,0 +1,14 @@
package adminview
templ PermissionsList() {
<div class="space-y-4">
<!-- Header -->
<div class="flex justify-between items-center">
<h1 class="text-2xl font-bold text-text">Permission Management</h1>
</div>
<!-- Placeholder content -->
<div class="bg-mantle border border-surface1 rounded-lg p-8 text-center">
<p class="text-subtext0 text-lg">Permissions management coming soon...</p>
</div>
</div>
}

7
internal/view/adminview/permissions_page.templ Normal file
View File

@@ -0,0 +1,7 @@
package adminview
templ PermissionsPage() {
@DashboardLayout("permissions") {
@PermissionsList()
}
}

14
internal/view/adminview/roles_list.templ Normal file
View File

@@ -0,0 +1,14 @@
package adminview
templ RolesList() {
<div class="space-y-4">
<!-- Header -->
<div class="flex justify-between items-center">
<h1 class="text-2xl font-bold text-text">Role Management</h1>
</div>
<!-- Placeholder content -->
<div class="bg-mantle border border-surface1 rounded-lg p-8 text-center">
<p class="text-subtext0 text-lg">Roles management coming soon...</p>
</div>
</div>
}

7
internal/view/adminview/roles_page.templ Normal file
View File

@@ -0,0 +1,7 @@
package adminview
templ RolesPage() {
@DashboardLayout("roles") {
@RolesList()
}
}

68
internal/view/adminview/user_list.templ
View File

@@ -1,6 +1,74 @@
package adminview
import "git.haelnorr.com/h/oslstats/internal/db"
import "fmt"
import "time"
templ UserList(users *db.List[db.User]) {
<div class="space-y-4">
<!-- Header -->
<div class="flex justify-between items-center">
<h1 class="text-2xl font-bold text-text">User Management</h1>
</div>
<!-- Users table -->
if len(users.Items) == 0 {
<div class="bg-mantle border border-surface1 rounded-lg p-8 text-center">
<p class="text-subtext0 text-lg">No users found</p>
</div>
} else {
<div class="bg-surface0 border border-surface1 rounded-lg overflow-hidden">
<div class="overflow-x-auto">
<table class="w-full">
<thead class="bg-mantle border-b border-surface1">
<tr>
<th class="px-4 py-3 text-left text-sm font-semibold text-text">ID</th>
<th class="px-4 py-3 text-left text-sm font-semibold text-text">Username</th>
<th class="px-4 py-3 text-left text-sm font-semibold text-text">Discord ID</th>
<th class="px-4 py-3 text-left text-sm font-semibold text-text">Roles</th>
<th class="px-4 py-3 text-left text-sm font-semibold text-text">Created</th>
<th class="px-4 py-3 text-left text-sm font-semibold text-text">Actions</th>
</tr>
</thead>
<tbody class="divide-y divide-surface1">
for _, user := range users.Items {
<tr class="hover:bg-surface1 transition-colors">
<td class="px-4 py-3 text-sm text-subtext0">{ fmt.Sprintf("%d", user.ID) }</td>
<td class="px-4 py-3 text-sm font-medium text-text">{ user.Username }</td>
<td class="px-4 py-3 text-sm text-subtext0 font-mono">{ user.DiscordID }</td>
<td class="px-4 py-3 text-sm">
if len(user.Roles) > 0 {
<div class="flex flex-wrap gap-1">
for _, role := range user.Roles {
<span class="px-2 py-0.5 bg-blue/20 text-blue rounded text-xs font-medium">
{ role.DisplayName }
</span>
}
</div>
} else {
<span class="text-subtext1 text-xs italic">No roles</span>
}
</td>
<td class="px-4 py-3 text-sm text-subtext0">
{ formatTimestamp(user.CreatedAt) }
</td>
<td class="px-4 py-3 text-sm">
<button
class="px-3 py-1 bg-blue hover:bg-blue/80 text-mantle rounded text-xs font-medium transition hover:cursor-pointer"
>
Edit Roles
</button>
</td>
</tr>
}
</tbody>
</table>
</div>
</div>
}
</div>
}
func formatTimestamp(unixTime int64) string {
t := time.Unix(unixTime, 0)
return t.Format("Jan 2, 2006")
}

17
internal/view/seasonsview/detail_page.templ
View File

@@ -187,13 +187,14 @@ func formatDuration(start, end time.Time) string {
}
templ SlapVersionBadge(version string) {
if version == "rebound" {
<span class="inline-block bg-green px-3 py-1 rounded-full text-sm font-semibold text-mantle">
Rebound
</span>
} else if version == "slapshot1" {
<span class="inline-block bg-red px-3 py-1 rounded-full text-sm font-semibold text-mantle">
Slapshot 1
</span>
switch version {
case "rebound":
<span class="inline-block bg-green px-3 py-1 rounded-full text-sm font-semibold text-mantle">
Rebound
</span>
case "slapshot1":
<span class="inline-block bg-red px-3 py-1 rounded-full text-sm font-semibold text-mantle">
Slapshot 1
</span>
}
}