Compare commits
36 Commits
Features/F
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
14ac0f46de | ||
|
|
5a565f8165 | ||
|
|
12cbc68db6 | ||
|
|
699574e345 | ||
|
|
35c1a861f5 | ||
|
|
27101bbdd6 | ||
|
|
6ba04effcf | ||
|
|
913825f596 | ||
|
|
93ce3e07f0 | ||
|
|
25c6934801 | ||
|
|
fcf96590bb | ||
|
|
eeba19bbb6 | ||
|
|
dea9e7e6ff | ||
|
|
85bf971547 | ||
|
|
5d86a5124b | ||
|
|
7fdc5f2d22 | ||
|
|
630b3778db | ||
|
|
248a0b1828 | ||
|
|
fd429bdcdd | ||
|
|
bbebccfcf3 | ||
|
|
fd67af7101 | ||
|
|
829d7b3d8f | ||
|
|
35586729ba | ||
|
|
7d57792a82 | ||
|
|
f41dbc43fa | ||
|
|
76c24782c8 | ||
|
|
4ebee9e695 | ||
|
|
a5ca826a6e | ||
|
|
ecd214652a | ||
|
|
99538e30c8 | ||
|
|
90de5ca868 | ||
|
|
354dbc849b | ||
|
|
ddd25b6eb3 | ||
|
|
cc6243d630 | ||
|
|
9bceb2312d | ||
|
|
4c219c0084 |
13
.dockerignore
Normal file
13
.dockerignore
Normal file
@@ -0,0 +1,13 @@
|
|||||||
|
.DS_Store
|
||||||
|
.git
|
||||||
|
.gitignore
|
||||||
|
|
||||||
|
**/.pnpm-store
|
||||||
|
**/.output
|
||||||
|
**/dist
|
||||||
|
**/node_modules
|
||||||
|
|
||||||
|
Commands
|
||||||
|
Docker
|
||||||
|
Documentation
|
||||||
|
Env
|
||||||
6
.gitignore
vendored
6
.gitignore
vendored
@@ -21,3 +21,9 @@ pnpm-debug.log*
|
|||||||
# OS / editor files
|
# OS / editor files
|
||||||
.DS_Store
|
.DS_Store
|
||||||
.idea/
|
.idea/
|
||||||
|
|
||||||
|
# Go build output
|
||||||
|
tmp/
|
||||||
|
bin/
|
||||||
|
|
||||||
|
.cgcignore
|
||||||
|
|||||||
52
Backend/.air.api.toml
Normal file
52
Backend/.air.api.toml
Normal file
@@ -0,0 +1,52 @@
|
|||||||
|
root = "."
|
||||||
|
testdata_dir = "testdata"
|
||||||
|
tmp_dir = "tmp/dev"
|
||||||
|
|
||||||
|
[build]
|
||||||
|
args_bin = []
|
||||||
|
bin = "./tmp/dev/bin/api"
|
||||||
|
cmd = "go build -o ./tmp/dev/bin/api ./cmd/api"
|
||||||
|
delay = 1000
|
||||||
|
exclude_dir = ["tmp", "vendor", "testdata"]
|
||||||
|
exclude_file = []
|
||||||
|
exclude_regex = ["_test.go"]
|
||||||
|
exclude_unchanged = false
|
||||||
|
follow_symlink = false
|
||||||
|
full_bin = ""
|
||||||
|
include_dir = []
|
||||||
|
include_ext = ["go", "sql"]
|
||||||
|
include_file = []
|
||||||
|
kill_delay = "0s"
|
||||||
|
log = "tmp/dev/logs/build-errors.api.log"
|
||||||
|
poll = false
|
||||||
|
poll_interval = 0
|
||||||
|
post_cmd = []
|
||||||
|
pre_cmd = []
|
||||||
|
rerun = false
|
||||||
|
rerun_delay = 500
|
||||||
|
send_interrupt = false
|
||||||
|
stop_on_error = true
|
||||||
|
|
||||||
|
[color]
|
||||||
|
app = ""
|
||||||
|
build = "yellow"
|
||||||
|
main = "magenta"
|
||||||
|
runner = "green"
|
||||||
|
watcher = "cyan"
|
||||||
|
|
||||||
|
[log]
|
||||||
|
main_only = false
|
||||||
|
silent = false
|
||||||
|
time = true
|
||||||
|
|
||||||
|
[misc]
|
||||||
|
clean_on_exit = false
|
||||||
|
|
||||||
|
[proxy]
|
||||||
|
app_port = 0
|
||||||
|
enabled = false
|
||||||
|
proxy_port = 0
|
||||||
|
|
||||||
|
[screen]
|
||||||
|
clear_on_rebuild = true
|
||||||
|
keep_scroll = true
|
||||||
52
Backend/.air.web.toml
Normal file
52
Backend/.air.web.toml
Normal file
@@ -0,0 +1,52 @@
|
|||||||
|
root = "."
|
||||||
|
testdata_dir = "testdata"
|
||||||
|
tmp_dir = "tmp/dev"
|
||||||
|
|
||||||
|
[build]
|
||||||
|
args_bin = []
|
||||||
|
bin = "./tmp/dev/bin/web"
|
||||||
|
cmd = "go build -o ./tmp/dev/bin/web ./cmd/web"
|
||||||
|
delay = 1000
|
||||||
|
exclude_dir = ["tmp", "vendor", "testdata"]
|
||||||
|
exclude_file = []
|
||||||
|
exclude_regex = ["_test.go"]
|
||||||
|
exclude_unchanged = false
|
||||||
|
follow_symlink = false
|
||||||
|
full_bin = ""
|
||||||
|
include_dir = []
|
||||||
|
include_ext = ["go", "sql"]
|
||||||
|
include_file = []
|
||||||
|
kill_delay = "0s"
|
||||||
|
log = "tmp/dev/logs/build-errors.web.log"
|
||||||
|
poll = false
|
||||||
|
poll_interval = 0
|
||||||
|
post_cmd = []
|
||||||
|
pre_cmd = []
|
||||||
|
rerun = false
|
||||||
|
rerun_delay = 500
|
||||||
|
send_interrupt = false
|
||||||
|
stop_on_error = true
|
||||||
|
|
||||||
|
[color]
|
||||||
|
app = ""
|
||||||
|
build = "yellow"
|
||||||
|
main = "magenta"
|
||||||
|
runner = "green"
|
||||||
|
watcher = "cyan"
|
||||||
|
|
||||||
|
[log]
|
||||||
|
main_only = false
|
||||||
|
silent = false
|
||||||
|
time = true
|
||||||
|
|
||||||
|
[misc]
|
||||||
|
clean_on_exit = false
|
||||||
|
|
||||||
|
[proxy]
|
||||||
|
app_port = 0
|
||||||
|
enabled = false
|
||||||
|
proxy_port = 0
|
||||||
|
|
||||||
|
[screen]
|
||||||
|
clear_on_rebuild = true
|
||||||
|
keep_scroll = true
|
||||||
52
Backend/.air.worker.toml
Normal file
52
Backend/.air.worker.toml
Normal file
@@ -0,0 +1,52 @@
|
|||||||
|
root = "."
|
||||||
|
testdata_dir = "testdata"
|
||||||
|
tmp_dir = "tmp/dev"
|
||||||
|
|
||||||
|
[build]
|
||||||
|
args_bin = []
|
||||||
|
bin = "./tmp/dev/bin/worker"
|
||||||
|
cmd = "go build -o ./tmp/dev/bin/worker ./cmd/worker"
|
||||||
|
delay = 1000
|
||||||
|
exclude_dir = ["tmp", "vendor", "testdata"]
|
||||||
|
exclude_file = []
|
||||||
|
exclude_regex = ["_test.go"]
|
||||||
|
exclude_unchanged = false
|
||||||
|
follow_symlink = false
|
||||||
|
full_bin = ""
|
||||||
|
include_dir = []
|
||||||
|
include_ext = ["go", "sql"]
|
||||||
|
include_file = []
|
||||||
|
kill_delay = "0s"
|
||||||
|
log = "tmp/dev/logs/build-errors.worker.log"
|
||||||
|
poll = false
|
||||||
|
poll_interval = 0
|
||||||
|
post_cmd = []
|
||||||
|
pre_cmd = []
|
||||||
|
rerun = false
|
||||||
|
rerun_delay = 500
|
||||||
|
send_interrupt = false
|
||||||
|
stop_on_error = true
|
||||||
|
|
||||||
|
[color]
|
||||||
|
app = ""
|
||||||
|
build = "yellow"
|
||||||
|
main = "magenta"
|
||||||
|
runner = "green"
|
||||||
|
watcher = "cyan"
|
||||||
|
|
||||||
|
[log]
|
||||||
|
main_only = false
|
||||||
|
silent = false
|
||||||
|
time = true
|
||||||
|
|
||||||
|
[misc]
|
||||||
|
clean_on_exit = false
|
||||||
|
|
||||||
|
[proxy]
|
||||||
|
app_port = 0
|
||||||
|
enabled = false
|
||||||
|
proxy_port = 0
|
||||||
|
|
||||||
|
[screen]
|
||||||
|
clear_on_rebuild = true
|
||||||
|
keep_scroll = true
|
||||||
4
Backend/.dockerignore
Normal file
4
Backend/.dockerignore
Normal file
@@ -0,0 +1,4 @@
|
|||||||
|
.git
|
||||||
|
.gitignore
|
||||||
|
tmp
|
||||||
|
testdata
|
||||||
36
Backend/Dockerfile
Normal file
36
Backend/Dockerfile
Normal file
@@ -0,0 +1,36 @@
|
|||||||
|
# syntax=docker/dockerfile:1.7
|
||||||
|
|
||||||
|
FROM golang:1.25.7-alpine AS base
|
||||||
|
|
||||||
|
WORKDIR /app
|
||||||
|
|
||||||
|
RUN apk add --no-cache ca-certificates curl git tzdata && update-ca-certificates
|
||||||
|
|
||||||
|
COPY go.mod go.sum ./
|
||||||
|
RUN go mod download
|
||||||
|
|
||||||
|
FROM base AS development
|
||||||
|
|
||||||
|
RUN curl -fsSL https://raw.githubusercontent.com/air-verse/air/master/install.sh | sh -s -- -b /usr/local/bin
|
||||||
|
|
||||||
|
COPY . .
|
||||||
|
|
||||||
|
CMD ["air", "-c", ".air.web.toml"]
|
||||||
|
|
||||||
|
FROM base AS builder
|
||||||
|
|
||||||
|
ARG SERVICE_NAME=web
|
||||||
|
|
||||||
|
COPY . .
|
||||||
|
|
||||||
|
RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o /out/app ./cmd/${SERVICE_NAME}
|
||||||
|
|
||||||
|
FROM alpine:3.22 AS runtime
|
||||||
|
|
||||||
|
RUN apk add --no-cache ca-certificates tzdata && update-ca-certificates
|
||||||
|
|
||||||
|
WORKDIR /app
|
||||||
|
|
||||||
|
COPY --from=builder /out/app /usr/local/bin/app
|
||||||
|
|
||||||
|
CMD ["/usr/local/bin/app"]
|
||||||
35
Backend/cmd/api/main.go
Normal file
35
Backend/cmd/api/main.go
Normal file
@@ -0,0 +1,35 @@
|
|||||||
|
package main
|
||||||
|
|
||||||
|
import (
|
||||||
|
"log"
|
||||||
|
|
||||||
|
"moku-backend/internal/bootstrap"
|
||||||
|
"moku-backend/internal/httpx"
|
||||||
|
"moku-backend/internal/process"
|
||||||
|
)
|
||||||
|
|
||||||
|
func main() {
|
||||||
|
app, err := bootstrap.New("api")
|
||||||
|
if err != nil {
|
||||||
|
log.Fatalf("bootstrap api service: %v", err)
|
||||||
|
}
|
||||||
|
defer func() {
|
||||||
|
if closeErr := app.Close(); closeErr != nil {
|
||||||
|
app.Logger.Error("close api service", "error", closeErr)
|
||||||
|
}
|
||||||
|
}()
|
||||||
|
|
||||||
|
handler := httpx.NewRouter(httpx.RouterConfig{
|
||||||
|
ServiceName: app.ServiceName,
|
||||||
|
Config: app.Config,
|
||||||
|
Logger: app.Logger,
|
||||||
|
BuildInfo: app.BuildInfo,
|
||||||
|
Database: app.Database,
|
||||||
|
Cache: app.Cache,
|
||||||
|
})
|
||||||
|
|
||||||
|
if err := process.RunHTTPServer(app.ServiceName, app.Config.Address(app.ServiceName), handler, app.Logger, app.Config.ShutdownTimeout); err != nil {
|
||||||
|
app.Logger.Error("api service stopped", "error", err)
|
||||||
|
log.Fatal(err)
|
||||||
|
}
|
||||||
|
}
|
||||||
49
Backend/cmd/migrate/main.go
Normal file
49
Backend/cmd/migrate/main.go
Normal file
@@ -0,0 +1,49 @@
|
|||||||
|
package main
|
||||||
|
|
||||||
|
import (
|
||||||
|
"fmt"
|
||||||
|
"log"
|
||||||
|
"os"
|
||||||
|
|
||||||
|
"moku-backend/internal/config"
|
||||||
|
"moku-backend/internal/database"
|
||||||
|
)
|
||||||
|
|
||||||
|
func main() {
|
||||||
|
cfg := config.Load()
|
||||||
|
|
||||||
|
db, err := database.NewPostgres(cfg.PostgresURL)
|
||||||
|
if err != nil {
|
||||||
|
log.Fatalf("connect database for migrations: %v", err)
|
||||||
|
}
|
||||||
|
defer db.Close()
|
||||||
|
|
||||||
|
command := "up"
|
||||||
|
if len(os.Args) > 1 {
|
||||||
|
command = os.Args[1]
|
||||||
|
}
|
||||||
|
|
||||||
|
switch command {
|
||||||
|
case "up":
|
||||||
|
if err := db.MigrateUp(); err != nil {
|
||||||
|
log.Fatalf("run migrations: %v", err)
|
||||||
|
}
|
||||||
|
fmt.Println("migrations applied")
|
||||||
|
case "down":
|
||||||
|
if err := db.MigrateDown(); err != nil {
|
||||||
|
log.Fatalf("roll back migration: %v", err)
|
||||||
|
}
|
||||||
|
fmt.Println("latest migration rolled back")
|
||||||
|
case "reset":
|
||||||
|
if err := db.MigrateReset(); err != nil {
|
||||||
|
log.Fatalf("reset migrations: %v", err)
|
||||||
|
}
|
||||||
|
fmt.Println("migrations reset")
|
||||||
|
case "status":
|
||||||
|
if err := db.MigrateStatus(); err != nil {
|
||||||
|
log.Fatalf("show migration status: %v", err)
|
||||||
|
}
|
||||||
|
default:
|
||||||
|
log.Fatalf("unsupported migrate command %q (supported: up, down, reset, status)", command)
|
||||||
|
}
|
||||||
|
}
|
||||||
35
Backend/cmd/web/main.go
Normal file
35
Backend/cmd/web/main.go
Normal file
@@ -0,0 +1,35 @@
|
|||||||
|
package main
|
||||||
|
|
||||||
|
import (
|
||||||
|
"log"
|
||||||
|
|
||||||
|
"moku-backend/internal/bootstrap"
|
||||||
|
"moku-backend/internal/httpx"
|
||||||
|
"moku-backend/internal/process"
|
||||||
|
)
|
||||||
|
|
||||||
|
func main() {
|
||||||
|
app, err := bootstrap.New("web")
|
||||||
|
if err != nil {
|
||||||
|
log.Fatalf("bootstrap web service: %v", err)
|
||||||
|
}
|
||||||
|
defer func() {
|
||||||
|
if closeErr := app.Close(); closeErr != nil {
|
||||||
|
app.Logger.Error("close web service", "error", closeErr)
|
||||||
|
}
|
||||||
|
}()
|
||||||
|
|
||||||
|
handler := httpx.NewRouter(httpx.RouterConfig{
|
||||||
|
ServiceName: app.ServiceName,
|
||||||
|
Config: app.Config,
|
||||||
|
Logger: app.Logger,
|
||||||
|
BuildInfo: app.BuildInfo,
|
||||||
|
Database: app.Database,
|
||||||
|
Cache: app.Cache,
|
||||||
|
})
|
||||||
|
|
||||||
|
if err := process.RunHTTPServer(app.ServiceName, app.Config.Address(app.ServiceName), handler, app.Logger, app.Config.ShutdownTimeout); err != nil {
|
||||||
|
app.Logger.Error("web service stopped", "error", err)
|
||||||
|
log.Fatal(err)
|
||||||
|
}
|
||||||
|
}
|
||||||
27
Backend/cmd/worker/main.go
Normal file
27
Backend/cmd/worker/main.go
Normal file
@@ -0,0 +1,27 @@
|
|||||||
|
package main
|
||||||
|
|
||||||
|
import (
|
||||||
|
"log"
|
||||||
|
|
||||||
|
"moku-backend/internal/bootstrap"
|
||||||
|
"moku-backend/internal/process"
|
||||||
|
)
|
||||||
|
|
||||||
|
func main() {
|
||||||
|
app, err := bootstrap.New("worker")
|
||||||
|
if err != nil {
|
||||||
|
log.Fatalf("bootstrap worker service: %v", err)
|
||||||
|
}
|
||||||
|
defer func() {
|
||||||
|
if closeErr := app.Close(); closeErr != nil {
|
||||||
|
app.Logger.Error("close worker service", "error", closeErr)
|
||||||
|
}
|
||||||
|
}()
|
||||||
|
|
||||||
|
app.Logger.Info("worker ready", "service", app.ServiceName, "environment", app.Config.Environment)
|
||||||
|
|
||||||
|
if err := process.WaitForShutdown(app.ServiceName, app.Logger); err != nil {
|
||||||
|
app.Logger.Error("worker stopped", "error", err)
|
||||||
|
log.Fatal(err)
|
||||||
|
}
|
||||||
|
}
|
||||||
6
Backend/db/embed.go
Normal file
6
Backend/db/embed.go
Normal file
@@ -0,0 +1,6 @@
|
|||||||
|
package db
|
||||||
|
|
||||||
|
import "embed"
|
||||||
|
|
||||||
|
//go:embed migrations/*.sql
|
||||||
|
var Migrations embed.FS
|
||||||
26
Backend/db/migrations/000001_init.sql
Normal file
26
Backend/db/migrations/000001_init.sql
Normal file
@@ -0,0 +1,26 @@
|
|||||||
|
-- +goose Up
|
||||||
|
CREATE EXTENSION IF NOT EXISTS "pgcrypto";
|
||||||
|
|
||||||
|
CREATE TABLE IF NOT EXISTS organizations (
|
||||||
|
id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
|
||||||
|
name TEXT NOT NULL,
|
||||||
|
slug TEXT NOT NULL UNIQUE,
|
||||||
|
created_at TIMESTAMPTZ NOT NULL DEFAULT NOW(),
|
||||||
|
updated_at TIMESTAMPTZ NOT NULL DEFAULT NOW()
|
||||||
|
);
|
||||||
|
|
||||||
|
CREATE TABLE IF NOT EXISTS workspaces (
|
||||||
|
id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
|
||||||
|
organization_id UUID NOT NULL REFERENCES organizations(id) ON DELETE CASCADE,
|
||||||
|
name TEXT NOT NULL,
|
||||||
|
slug TEXT NOT NULL,
|
||||||
|
created_at TIMESTAMPTZ NOT NULL DEFAULT NOW(),
|
||||||
|
updated_at TIMESTAMPTZ NOT NULL DEFAULT NOW(),
|
||||||
|
UNIQUE (organization_id, slug)
|
||||||
|
);
|
||||||
|
|
||||||
|
CREATE INDEX IF NOT EXISTS idx_workspaces_organization_id ON workspaces (organization_id);
|
||||||
|
|
||||||
|
-- +goose Down
|
||||||
|
DROP TABLE IF EXISTS workspaces;
|
||||||
|
DROP TABLE IF EXISTS organizations;
|
||||||
180
Backend/db/migrations/000002_bootstrap_foundation.sql
Normal file
180
Backend/db/migrations/000002_bootstrap_foundation.sql
Normal file
@@ -0,0 +1,180 @@
|
|||||||
|
-- +goose Up
|
||||||
|
|
||||||
|
CREATE TYPE instance_mode AS ENUM ('personal', 'organizational');
|
||||||
|
CREATE TYPE instance_access AS ENUM ('local', 'remote');
|
||||||
|
CREATE TYPE instance_protocol AS ENUM ('http', 'https');
|
||||||
|
CREATE TYPE workspace_kind AS ENUM ('organization', 'department', 'team', 'project');
|
||||||
|
CREATE TYPE membership_role AS ENUM ('owner', 'admin', 'member');
|
||||||
|
|
||||||
|
CREATE TABLE IF NOT EXISTS installations (
|
||||||
|
id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
|
||||||
|
singleton BOOLEAN NOT NULL DEFAULT TRUE UNIQUE,
|
||||||
|
mode instance_mode NOT NULL,
|
||||||
|
access instance_access NOT NULL,
|
||||||
|
protocol instance_protocol NOT NULL DEFAULT 'http',
|
||||||
|
host TEXT NOT NULL,
|
||||||
|
is_bootstrapped BOOLEAN NOT NULL DEFAULT FALSE,
|
||||||
|
bootstrapped_at TIMESTAMPTZ,
|
||||||
|
created_at TIMESTAMPTZ NOT NULL DEFAULT NOW(),
|
||||||
|
updated_at TIMESTAMPTZ NOT NULL DEFAULT NOW()
|
||||||
|
);
|
||||||
|
|
||||||
|
CREATE TABLE IF NOT EXISTS users (
|
||||||
|
id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
|
||||||
|
email TEXT NOT NULL,
|
||||||
|
display_name TEXT NOT NULL,
|
||||||
|
password_hash TEXT NOT NULL,
|
||||||
|
is_instance_admin BOOLEAN NOT NULL DEFAULT FALSE,
|
||||||
|
created_at TIMESTAMPTZ NOT NULL DEFAULT NOW(),
|
||||||
|
updated_at TIMESTAMPTZ NOT NULL DEFAULT NOW()
|
||||||
|
);
|
||||||
|
|
||||||
|
CREATE UNIQUE INDEX IF NOT EXISTS idx_users_email_unique ON users (LOWER(email));
|
||||||
|
|
||||||
|
CREATE TABLE IF NOT EXISTS user_homes (
|
||||||
|
id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
|
||||||
|
user_id UUID NOT NULL UNIQUE REFERENCES users(id) ON DELETE CASCADE,
|
||||||
|
title TEXT NOT NULL,
|
||||||
|
created_at TIMESTAMPTZ NOT NULL DEFAULT NOW(),
|
||||||
|
updated_at TIMESTAMPTZ NOT NULL DEFAULT NOW()
|
||||||
|
);
|
||||||
|
|
||||||
|
ALTER TABLE organizations
|
||||||
|
ADD COLUMN IF NOT EXISTS created_by_user_id UUID REFERENCES users(id) ON DELETE SET NULL;
|
||||||
|
|
||||||
|
CREATE TABLE IF NOT EXISTS organization_memberships (
|
||||||
|
id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
|
||||||
|
organization_id UUID NOT NULL REFERENCES organizations(id) ON DELETE CASCADE,
|
||||||
|
user_id UUID NOT NULL REFERENCES users(id) ON DELETE CASCADE,
|
||||||
|
role membership_role NOT NULL DEFAULT 'member',
|
||||||
|
created_at TIMESTAMPTZ NOT NULL DEFAULT NOW(),
|
||||||
|
UNIQUE (organization_id, user_id)
|
||||||
|
);
|
||||||
|
|
||||||
|
CREATE INDEX IF NOT EXISTS idx_organization_memberships_user_id ON organization_memberships (user_id);
|
||||||
|
|
||||||
|
CREATE TABLE IF NOT EXISTS departments (
|
||||||
|
id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
|
||||||
|
organization_id UUID NOT NULL REFERENCES organizations(id) ON DELETE CASCADE,
|
||||||
|
name TEXT NOT NULL,
|
||||||
|
slug TEXT NOT NULL,
|
||||||
|
created_by_user_id UUID REFERENCES users(id) ON DELETE SET NULL,
|
||||||
|
created_at TIMESTAMPTZ NOT NULL DEFAULT NOW(),
|
||||||
|
updated_at TIMESTAMPTZ NOT NULL DEFAULT NOW(),
|
||||||
|
UNIQUE (organization_id, slug)
|
||||||
|
);
|
||||||
|
|
||||||
|
CREATE INDEX IF NOT EXISTS idx_departments_organization_id ON departments (organization_id);
|
||||||
|
|
||||||
|
CREATE TABLE IF NOT EXISTS teams (
|
||||||
|
id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
|
||||||
|
organization_id UUID NOT NULL REFERENCES organizations(id) ON DELETE CASCADE,
|
||||||
|
department_id UUID REFERENCES departments(id) ON DELETE SET NULL,
|
||||||
|
name TEXT NOT NULL,
|
||||||
|
slug TEXT NOT NULL,
|
||||||
|
created_by_user_id UUID REFERENCES users(id) ON DELETE SET NULL,
|
||||||
|
created_at TIMESTAMPTZ NOT NULL DEFAULT NOW(),
|
||||||
|
updated_at TIMESTAMPTZ NOT NULL DEFAULT NOW(),
|
||||||
|
UNIQUE (organization_id, slug)
|
||||||
|
);
|
||||||
|
|
||||||
|
CREATE INDEX IF NOT EXISTS idx_teams_organization_id ON teams (organization_id);
|
||||||
|
CREATE INDEX IF NOT EXISTS idx_teams_department_id ON teams (department_id);
|
||||||
|
|
||||||
|
CREATE TABLE IF NOT EXISTS team_memberships (
|
||||||
|
id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
|
||||||
|
team_id UUID NOT NULL REFERENCES teams(id) ON DELETE CASCADE,
|
||||||
|
user_id UUID NOT NULL REFERENCES users(id) ON DELETE CASCADE,
|
||||||
|
role membership_role NOT NULL DEFAULT 'member',
|
||||||
|
created_at TIMESTAMPTZ NOT NULL DEFAULT NOW(),
|
||||||
|
UNIQUE (team_id, user_id)
|
||||||
|
);
|
||||||
|
|
||||||
|
CREATE INDEX IF NOT EXISTS idx_team_memberships_user_id ON team_memberships (user_id);
|
||||||
|
|
||||||
|
CREATE TABLE IF NOT EXISTS projects (
|
||||||
|
id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
|
||||||
|
organization_id UUID NOT NULL REFERENCES organizations(id) ON DELETE CASCADE,
|
||||||
|
department_id UUID REFERENCES departments(id) ON DELETE SET NULL,
|
||||||
|
team_id UUID REFERENCES teams(id) ON DELETE SET NULL,
|
||||||
|
name TEXT NOT NULL,
|
||||||
|
slug TEXT NOT NULL,
|
||||||
|
created_by_user_id UUID REFERENCES users(id) ON DELETE SET NULL,
|
||||||
|
created_at TIMESTAMPTZ NOT NULL DEFAULT NOW(),
|
||||||
|
updated_at TIMESTAMPTZ NOT NULL DEFAULT NOW(),
|
||||||
|
UNIQUE (organization_id, slug)
|
||||||
|
);
|
||||||
|
|
||||||
|
CREATE INDEX IF NOT EXISTS idx_projects_organization_id ON projects (organization_id);
|
||||||
|
CREATE INDEX IF NOT EXISTS idx_projects_department_id ON projects (department_id);
|
||||||
|
CREATE INDEX IF NOT EXISTS idx_projects_team_id ON projects (team_id);
|
||||||
|
|
||||||
|
CREATE TABLE IF NOT EXISTS project_memberships (
|
||||||
|
id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
|
||||||
|
project_id UUID NOT NULL REFERENCES projects(id) ON DELETE CASCADE,
|
||||||
|
user_id UUID NOT NULL REFERENCES users(id) ON DELETE CASCADE,
|
||||||
|
role membership_role NOT NULL DEFAULT 'member',
|
||||||
|
created_at TIMESTAMPTZ NOT NULL DEFAULT NOW(),
|
||||||
|
UNIQUE (project_id, user_id)
|
||||||
|
);
|
||||||
|
|
||||||
|
CREATE INDEX IF NOT EXISTS idx_project_memberships_user_id ON project_memberships (user_id);
|
||||||
|
|
||||||
|
ALTER TABLE workspaces
|
||||||
|
ADD COLUMN IF NOT EXISTS kind workspace_kind NOT NULL DEFAULT 'organization',
|
||||||
|
ADD COLUMN IF NOT EXISTS created_by_user_id UUID REFERENCES users(id) ON DELETE SET NULL,
|
||||||
|
ADD COLUMN IF NOT EXISTS department_id UUID REFERENCES departments(id) ON DELETE SET NULL,
|
||||||
|
ADD COLUMN IF NOT EXISTS team_id UUID REFERENCES teams(id) ON DELETE SET NULL,
|
||||||
|
ADD COLUMN IF NOT EXISTS project_id UUID REFERENCES projects(id) ON DELETE SET NULL;
|
||||||
|
|
||||||
|
CREATE INDEX IF NOT EXISTS idx_workspaces_department_id ON workspaces (department_id);
|
||||||
|
CREATE INDEX IF NOT EXISTS idx_workspaces_team_id ON workspaces (team_id);
|
||||||
|
CREATE INDEX IF NOT EXISTS idx_workspaces_project_id ON workspaces (project_id);
|
||||||
|
|
||||||
|
-- +goose Down
|
||||||
|
|
||||||
|
DROP INDEX IF EXISTS idx_workspaces_project_id;
|
||||||
|
DROP INDEX IF EXISTS idx_workspaces_team_id;
|
||||||
|
DROP INDEX IF EXISTS idx_workspaces_department_id;
|
||||||
|
|
||||||
|
ALTER TABLE workspaces
|
||||||
|
DROP COLUMN IF EXISTS project_id,
|
||||||
|
DROP COLUMN IF EXISTS team_id,
|
||||||
|
DROP COLUMN IF EXISTS department_id,
|
||||||
|
DROP COLUMN IF EXISTS created_by_user_id,
|
||||||
|
DROP COLUMN IF EXISTS kind;
|
||||||
|
|
||||||
|
DROP INDEX IF EXISTS idx_project_memberships_user_id;
|
||||||
|
DROP TABLE IF EXISTS project_memberships;
|
||||||
|
|
||||||
|
DROP INDEX IF EXISTS idx_projects_team_id;
|
||||||
|
DROP INDEX IF EXISTS idx_projects_department_id;
|
||||||
|
DROP INDEX IF EXISTS idx_projects_organization_id;
|
||||||
|
DROP TABLE IF EXISTS projects;
|
||||||
|
|
||||||
|
DROP INDEX IF EXISTS idx_team_memberships_user_id;
|
||||||
|
DROP TABLE IF EXISTS team_memberships;
|
||||||
|
|
||||||
|
DROP INDEX IF EXISTS idx_teams_department_id;
|
||||||
|
DROP INDEX IF EXISTS idx_teams_organization_id;
|
||||||
|
DROP TABLE IF EXISTS teams;
|
||||||
|
|
||||||
|
DROP INDEX IF EXISTS idx_departments_organization_id;
|
||||||
|
DROP TABLE IF EXISTS departments;
|
||||||
|
|
||||||
|
DROP INDEX IF EXISTS idx_organization_memberships_user_id;
|
||||||
|
DROP TABLE IF EXISTS organization_memberships;
|
||||||
|
|
||||||
|
ALTER TABLE organizations
|
||||||
|
DROP COLUMN IF EXISTS created_by_user_id;
|
||||||
|
|
||||||
|
DROP TABLE IF EXISTS user_homes;
|
||||||
|
DROP INDEX IF EXISTS idx_users_email_unique;
|
||||||
|
DROP TABLE IF EXISTS users;
|
||||||
|
DROP TABLE IF EXISTS installations;
|
||||||
|
|
||||||
|
DROP TYPE IF EXISTS membership_role;
|
||||||
|
DROP TYPE IF EXISTS workspace_kind;
|
||||||
|
DROP TYPE IF EXISTS instance_protocol;
|
||||||
|
DROP TYPE IF EXISTS instance_access;
|
||||||
|
DROP TYPE IF EXISTS instance_mode;
|
||||||
9
Backend/db/migrations/000003_installation_name.sql
Normal file
9
Backend/db/migrations/000003_installation_name.sql
Normal file
@@ -0,0 +1,9 @@
|
|||||||
|
-- +goose Up
|
||||||
|
|
||||||
|
ALTER TABLE installations
|
||||||
|
ADD COLUMN IF NOT EXISTS name TEXT NOT NULL DEFAULT '';
|
||||||
|
|
||||||
|
-- +goose Down
|
||||||
|
|
||||||
|
ALTER TABLE installations
|
||||||
|
DROP COLUMN IF EXISTS name;
|
||||||
15
Backend/db/queries/organizations.sql
Normal file
15
Backend/db/queries/organizations.sql
Normal file
@@ -0,0 +1,15 @@
|
|||||||
|
-- name: ListOrganizations :many
|
||||||
|
SELECT id, name, slug, created_at, updated_at
|
||||||
|
FROM organizations
|
||||||
|
ORDER BY created_at DESC;
|
||||||
|
|
||||||
|
-- name: CreateOrganization :one
|
||||||
|
INSERT INTO organizations (name, slug)
|
||||||
|
VALUES ($1, $2)
|
||||||
|
RETURNING id, name, slug, created_at, updated_at;
|
||||||
|
|
||||||
|
-- name: ListWorkspacesByOrganization :many
|
||||||
|
SELECT id, organization_id, name, slug, created_at, updated_at
|
||||||
|
FROM workspaces
|
||||||
|
WHERE organization_id = $1
|
||||||
|
ORDER BY created_at DESC;
|
||||||
72
Backend/docker-bake.hcl
Normal file
72
Backend/docker-bake.hcl
Normal file
@@ -0,0 +1,72 @@
|
|||||||
|
variable "REGISTRY" {
|
||||||
|
default = "registry.example.com"
|
||||||
|
}
|
||||||
|
|
||||||
|
variable "TAG" {
|
||||||
|
default = "latest"
|
||||||
|
}
|
||||||
|
|
||||||
|
target "_app" {
|
||||||
|
context = "."
|
||||||
|
dockerfile = "Dockerfile"
|
||||||
|
}
|
||||||
|
|
||||||
|
target "dev" {
|
||||||
|
inherits = ["_app"]
|
||||||
|
target = "development"
|
||||||
|
tags = ["moku/work-backend:dev"]
|
||||||
|
}
|
||||||
|
|
||||||
|
target "dev-image" {
|
||||||
|
inherits = ["_app"]
|
||||||
|
target = "development"
|
||||||
|
tags = ["${REGISTRY}/moku/work-backend:dev-${TAG}"]
|
||||||
|
}
|
||||||
|
|
||||||
|
target "prod-api" {
|
||||||
|
inherits = ["_app"]
|
||||||
|
target = "runtime"
|
||||||
|
args = {
|
||||||
|
SERVICE_NAME = "api"
|
||||||
|
}
|
||||||
|
tags = ["moku/work-backend:local-prod-api"]
|
||||||
|
}
|
||||||
|
|
||||||
|
target "prod-worker" {
|
||||||
|
inherits = ["_app"]
|
||||||
|
target = "runtime"
|
||||||
|
args = {
|
||||||
|
SERVICE_NAME = "worker"
|
||||||
|
}
|
||||||
|
tags = ["moku/work-backend:local-prod-worker"]
|
||||||
|
}
|
||||||
|
|
||||||
|
target "prod-api-image" {
|
||||||
|
inherits = ["_app"]
|
||||||
|
target = "runtime"
|
||||||
|
args = {
|
||||||
|
SERVICE_NAME = "api"
|
||||||
|
}
|
||||||
|
tags = ["${REGISTRY}/moku/work-backend:prod-api-${TAG}"]
|
||||||
|
}
|
||||||
|
|
||||||
|
target "prod-worker-image" {
|
||||||
|
inherits = ["_app"]
|
||||||
|
target = "runtime"
|
||||||
|
args = {
|
||||||
|
SERVICE_NAME = "worker"
|
||||||
|
}
|
||||||
|
tags = ["${REGISTRY}/moku/work-backend:prod-worker-${TAG}"]
|
||||||
|
}
|
||||||
|
|
||||||
|
group "local" {
|
||||||
|
targets = ["dev", "prod-api", "prod-worker"]
|
||||||
|
}
|
||||||
|
|
||||||
|
group "registry" {
|
||||||
|
targets = ["dev-image", "prod-api-image", "prod-worker-image"]
|
||||||
|
}
|
||||||
|
|
||||||
|
group "default" {
|
||||||
|
targets = ["dev", "prod-api", "prod-worker"]
|
||||||
|
}
|
||||||
24
Backend/go.mod
Normal file
24
Backend/go.mod
Normal file
@@ -0,0 +1,24 @@
|
|||||||
|
module moku-backend
|
||||||
|
|
||||||
|
go 1.25.7
|
||||||
|
|
||||||
|
require (
|
||||||
|
github.com/go-chi/chi/v5 v5.3.0
|
||||||
|
github.com/google/uuid v1.6.0
|
||||||
|
github.com/jackc/pgx/v5 v5.10.0
|
||||||
|
github.com/pressly/goose/v3 v3.27.1
|
||||||
|
github.com/redis/go-redis/v9 v9.20.1
|
||||||
|
)
|
||||||
|
|
||||||
|
require (
|
||||||
|
github.com/cespare/xxhash/v2 v2.3.0 // indirect
|
||||||
|
github.com/jackc/pgpassfile v1.0.0 // indirect
|
||||||
|
github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect
|
||||||
|
github.com/jackc/puddle/v2 v2.2.2 // indirect
|
||||||
|
github.com/mfridman/interpolate v0.0.2 // indirect
|
||||||
|
github.com/sethvargo/go-retry v0.3.0 // indirect
|
||||||
|
go.uber.org/atomic v1.11.0 // indirect
|
||||||
|
go.uber.org/multierr v1.11.0 // indirect
|
||||||
|
golang.org/x/sync v0.20.0 // indirect
|
||||||
|
golang.org/x/text v0.36.0 // indirect
|
||||||
|
)
|
||||||
70
Backend/go.sum
Normal file
70
Backend/go.sum
Normal file
@@ -0,0 +1,70 @@
|
|||||||
|
github.com/bsm/ginkgo/v2 v2.12.0 h1:Ny8MWAHyOepLGlLKYmXG4IEkioBysk6GpaRTLC8zwWs=
|
||||||
|
github.com/bsm/ginkgo/v2 v2.12.0/go.mod h1:SwYbGRRDovPVboqFv0tPTcG1sN61LM1Z4ARdbAV9g4c=
|
||||||
|
github.com/bsm/gomega v1.27.10 h1:yeMWxP2pV2fG3FgAODIY8EiRE3dy0aeFYt4l7wh6yKA=
|
||||||
|
github.com/bsm/gomega v1.27.10/go.mod h1:JyEr/xRbxbtgWNi8tIEVPUYZ5Dzef52k01W3YH0H+O0=
|
||||||
|
github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs=
|
||||||
|
github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
|
||||||
|
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
||||||
|
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
|
||||||
|
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
||||||
|
github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY=
|
||||||
|
github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto=
|
||||||
|
github.com/go-chi/chi/v5 v5.3.0 h1:halUjDxhshgXHMrao5bB8eNBXo/rnzwr8m5m36glehM=
|
||||||
|
github.com/go-chi/chi/v5 v5.3.0/go.mod h1:R+tYY2hNuVUUjxoPtqUdgBqevM9s9njzkTLutVsOCto=
|
||||||
|
github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
|
||||||
|
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
|
||||||
|
github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM=
|
||||||
|
github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg=
|
||||||
|
github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 h1:iCEnooe7UlwOQYpKFhBabPMi4aNAfoODPEFNiAnClxo=
|
||||||
|
github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761/go.mod h1:5TJZWKEWniPve33vlWYSoGYefn3gLQRzjfDlhSJ9ZKM=
|
||||||
|
github.com/jackc/pgx/v5 v5.10.0 h1:VhSvgU2jSli8o3AqIEOTJr7rZwAEUVo4E4XhR94Zfr0=
|
||||||
|
github.com/jackc/pgx/v5 v5.10.0/go.mod h1:mal1tBGAFfLHvZzaYh77YS/eC6IX9OWbRV1QIIM0Jn4=
|
||||||
|
github.com/jackc/puddle/v2 v2.2.2 h1:PR8nw+E/1w0GLuRFSmiioY6UooMp6KJv0/61nB7icHo=
|
||||||
|
github.com/jackc/puddle/v2 v2.2.2/go.mod h1:vriiEXHvEE654aYKXXjOvZM39qJ0q+azkZFrfEOc3H4=
|
||||||
|
github.com/klauspost/cpuid/v2 v2.2.10 h1:tBs3QSyvjDyFTq3uoc/9xFpCuOsJQFNPiAhYdw2skhE=
|
||||||
|
github.com/klauspost/cpuid/v2 v2.2.10/go.mod h1:hqwkgyIinND0mEev00jJYCxPNVRVXFQeu1XKlok6oO0=
|
||||||
|
github.com/mattn/go-isatty v0.0.21 h1:xYae+lCNBP7QuW4PUnNG61ffM4hVIfm+zUzDuSzYLGs=
|
||||||
|
github.com/mattn/go-isatty v0.0.21/go.mod h1:ZXfXG4SQHsB/w3ZeOYbR0PrPwLy+n6xiMrJlRFqopa4=
|
||||||
|
github.com/mfridman/interpolate v0.0.2 h1:pnuTK7MQIxxFz1Gr+rjSIx9u7qVjf5VOoM/u6BbAxPY=
|
||||||
|
github.com/mfridman/interpolate v0.0.2/go.mod h1:p+7uk6oE07mpE/Ik1b8EckO0O4ZXiGAfshKBWLUM9Xg=
|
||||||
|
github.com/ncruces/go-strftime v1.0.0 h1:HMFp8mLCTPp341M/ZnA4qaf7ZlsbTc+miZjCLOFAw7w=
|
||||||
|
github.com/ncruces/go-strftime v1.0.0/go.mod h1:Fwc5htZGVVkseilnfgOVb9mKy6w1naJmn9CehxcKcls=
|
||||||
|
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
|
||||||
|
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
|
||||||
|
github.com/pressly/goose/v3 v3.27.1 h1:6uEvcprBybDmW4hcz3gYujhARhye+GoWKhEWyzD5sh4=
|
||||||
|
github.com/pressly/goose/v3 v3.27.1/go.mod h1:maruOxsPnIG2yHHyo8UqKWXYKFcH7Q76csUV7+7KYoM=
|
||||||
|
github.com/redis/go-redis/v9 v9.20.1 h1:sfCU6A8P3dXbKyWes02uxA2baehGux9dZHfEKtsTB1w=
|
||||||
|
github.com/redis/go-redis/v9 v9.20.1/go.mod h1:v/M13XI1PVCDcm01VtPFOADfZtHf8YW3baQf57KlIkA=
|
||||||
|
github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec h1:W09IVJc94icq4NjY3clb7Lk8O1qJ8BdBEF8z0ibU0rE=
|
||||||
|
github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
|
||||||
|
github.com/sethvargo/go-retry v0.3.0 h1:EEt31A35QhrcRZtrYFDTBg91cqZVnFL2navjDrah2SE=
|
||||||
|
github.com/sethvargo/go-retry v0.3.0/go.mod h1:mNX17F0C/HguQMyMyJxcnU471gOZGxCLyYaFyAZraas=
|
||||||
|
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
|
||||||
|
github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
|
||||||
|
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
|
||||||
|
github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
|
||||||
|
github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
|
||||||
|
github.com/zeebo/xxh3 v1.1.0 h1:s7DLGDK45Dyfg7++yxI0khrfwq9661w9EN78eP/UZVs=
|
||||||
|
github.com/zeebo/xxh3 v1.1.0/go.mod h1:IisAie1LELR4xhVinxWS5+zf1lA4p0MW4T+w+W07F5s=
|
||||||
|
go.uber.org/atomic v1.11.0 h1:ZvwS0R+56ePWxUNi+Atn9dWONBPp/AUETXlHW0DxSjE=
|
||||||
|
go.uber.org/atomic v1.11.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0=
|
||||||
|
go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=
|
||||||
|
go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=
|
||||||
|
golang.org/x/sync v0.20.0 h1:e0PTpb7pjO8GAtTs2dQ6jYa5BWYlMuX047Dco/pItO4=
|
||||||
|
golang.org/x/sync v0.20.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0=
|
||||||
|
golang.org/x/sys v0.43.0 h1:Rlag2XtaFTxp19wS8MXlJwTvoh8ArU6ezoyFsMyCTNI=
|
||||||
|
golang.org/x/sys v0.43.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
|
||||||
|
golang.org/x/text v0.36.0 h1:JfKh3XmcRPqZPKevfXVpI1wXPTqbkE5f7JA92a55Yxg=
|
||||||
|
golang.org/x/text v0.36.0/go.mod h1:NIdBknypM8iqVmPiuco0Dh6P5Jcdk8lJL0CUebqK164=
|
||||||
|
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
|
||||||
|
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
|
||||||
|
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
|
||||||
|
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
|
||||||
|
modernc.org/libc v1.72.1 h1:db1xwJ6u1kE3KHTFTTbe2GCrczHPKzlURP0aDC4NGD0=
|
||||||
|
modernc.org/libc v1.72.1/go.mod h1:HRMiC/PhPGLIPM7GzAFCbI+oSgE3dhZ8FWftmRrHVlY=
|
||||||
|
modernc.org/mathutil v1.7.1 h1:GCZVGXdaN8gTqB1Mf/usp1Y/hSqgI2vAGGP4jZMCxOU=
|
||||||
|
modernc.org/mathutil v1.7.1/go.mod h1:4p5IwJITfppl0G4sUEDtCr4DthTaT47/N3aT6MhfgJg=
|
||||||
|
modernc.org/memory v1.11.0 h1:o4QC8aMQzmcwCK3t3Ux/ZHmwFPzE6hf2Y5LbkRs+hbI=
|
||||||
|
modernc.org/memory v1.11.0/go.mod h1:/JP4VbVC+K5sU2wZi9bHoq2MAkCnrt2r98UGeSK7Mjw=
|
||||||
|
modernc.org/sqlite v1.49.1 h1:dYGHTKcX1sJ+EQDnUzvz4TJ5GbuvhNJa8Fg6ElGx73U=
|
||||||
|
modernc.org/sqlite v1.49.1/go.mod h1:m0w8xhwYUVY3H6pSDwc3gkJ/irZT/0YEXwBlhaxQEew=
|
||||||
85
Backend/internal/bootstrap/bootstrap.go
Normal file
85
Backend/internal/bootstrap/bootstrap.go
Normal file
@@ -0,0 +1,85 @@
|
|||||||
|
// Path: Backend/internal/bootstrap/bootstrap.go
|
||||||
|
|
||||||
|
package bootstrap
|
||||||
|
|
||||||
|
import (
|
||||||
|
"log/slog"
|
||||||
|
"os"
|
||||||
|
"strings"
|
||||||
|
|
||||||
|
"moku-backend/internal/buildinfo"
|
||||||
|
"moku-backend/internal/cache"
|
||||||
|
"moku-backend/internal/config"
|
||||||
|
"moku-backend/internal/database"
|
||||||
|
)
|
||||||
|
|
||||||
|
type App struct {
|
||||||
|
ServiceName string
|
||||||
|
Config *config.Config
|
||||||
|
Logger *slog.Logger
|
||||||
|
BuildInfo buildinfo.Info
|
||||||
|
Database *database.DB
|
||||||
|
Cache *cache.Client
|
||||||
|
}
|
||||||
|
|
||||||
|
func New(serviceName string) (*App, error) {
|
||||||
|
cfg := config.Load()
|
||||||
|
logger := newLogger(cfg)
|
||||||
|
|
||||||
|
db, err := database.NewPostgres(cfg.PostgresURL)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
valkey, err := cache.NewValkey(cfg.ValkeyURL)
|
||||||
|
if err != nil {
|
||||||
|
db.Close()
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
return &App{
|
||||||
|
ServiceName: serviceName,
|
||||||
|
Config: cfg,
|
||||||
|
Logger: logger.With("service", serviceName),
|
||||||
|
BuildInfo: buildinfo.Current(),
|
||||||
|
Database: db,
|
||||||
|
Cache: valkey,
|
||||||
|
}, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (a *App) Close() error {
|
||||||
|
var closeErr error
|
||||||
|
|
||||||
|
if a.Cache != nil {
|
||||||
|
if err := a.Cache.Close(); err != nil {
|
||||||
|
closeErr = err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if a.Database != nil {
|
||||||
|
a.Database.Close()
|
||||||
|
}
|
||||||
|
|
||||||
|
return closeErr
|
||||||
|
}
|
||||||
|
|
||||||
|
func newLogger(cfg *config.Config) *slog.Logger {
|
||||||
|
level := slog.LevelInfo
|
||||||
|
|
||||||
|
switch strings.ToLower(cfg.LogLevel) {
|
||||||
|
case "debug":
|
||||||
|
level = slog.LevelDebug
|
||||||
|
case "warn":
|
||||||
|
level = slog.LevelWarn
|
||||||
|
case "error":
|
||||||
|
level = slog.LevelError
|
||||||
|
}
|
||||||
|
|
||||||
|
options := &slog.HandlerOptions{Level: level}
|
||||||
|
|
||||||
|
if cfg.IsDevelopment() {
|
||||||
|
return slog.New(slog.NewTextHandler(os.Stdout, options))
|
||||||
|
}
|
||||||
|
|
||||||
|
return slog.New(slog.NewJSONHandler(os.Stdout, options))
|
||||||
|
}
|
||||||
903
Backend/internal/bootstrap/service.go
Normal file
903
Backend/internal/bootstrap/service.go
Normal file
@@ -0,0 +1,903 @@
|
|||||||
|
// Path: Backend/internal/bootstrap/service.go
|
||||||
|
|
||||||
|
package bootstrap
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"errors"
|
||||||
|
"fmt"
|
||||||
|
"strings"
|
||||||
|
|
||||||
|
"github.com/jackc/pgx/v5"
|
||||||
|
|
||||||
|
"moku-backend/internal/database"
|
||||||
|
)
|
||||||
|
|
||||||
|
const (
|
||||||
|
primaryOrganizationSlug = "primary-organization"
|
||||||
|
primaryDepartmentSlug = "primary-department"
|
||||||
|
primaryTeamSlug = "primary-team"
|
||||||
|
primaryProjectSlug = "primary-project"
|
||||||
|
organizationWorkspaceSlug = "organization-home"
|
||||||
|
departmentWorkspaceSlug = "department-home"
|
||||||
|
teamWorkspaceSlug = "team-home"
|
||||||
|
projectWorkspaceSlug = "project-home"
|
||||||
|
defaultInstallationHost = "localhost"
|
||||||
|
defaultInstallationMode = "personal"
|
||||||
|
defaultInstallationAccess = "local"
|
||||||
|
defaultInstallationProtocol = "http"
|
||||||
|
defaultOrganizationName = "Moku"
|
||||||
|
defaultPersonalServerSuffix = "Personal"
|
||||||
|
defaultPersonalDisplayName = "Personal"
|
||||||
|
bootstrapWorkspaceKindOrg = "organization"
|
||||||
|
bootstrapWorkspaceKindDept = "department"
|
||||||
|
bootstrapWorkspaceKindTeam = "team"
|
||||||
|
bootstrapWorkspaceKindProject = "project"
|
||||||
|
)
|
||||||
|
|
||||||
|
var (
|
||||||
|
ErrInstallationNotConfigured = errors.New("bootstrap installation step has not been completed")
|
||||||
|
ErrAdminNotConfigured = errors.New("bootstrap admin step has not been completed")
|
||||||
|
)
|
||||||
|
|
||||||
|
type Service struct {
|
||||||
|
db *database.DB
|
||||||
|
}
|
||||||
|
|
||||||
|
type SaveInstanceInput struct {
|
||||||
|
Protocol string
|
||||||
|
Access string
|
||||||
|
Host string
|
||||||
|
}
|
||||||
|
|
||||||
|
type SaveModeInput struct {
|
||||||
|
Mode string
|
||||||
|
Name string
|
||||||
|
}
|
||||||
|
|
||||||
|
type SaveAdminInput struct {
|
||||||
|
DisplayName string
|
||||||
|
Email string
|
||||||
|
Password string
|
||||||
|
}
|
||||||
|
|
||||||
|
type SaveStructureInput struct {
|
||||||
|
OrganizationName string
|
||||||
|
DepartmentName string
|
||||||
|
TeamName string
|
||||||
|
ProjectName string
|
||||||
|
}
|
||||||
|
|
||||||
|
type InstallationRecord struct {
|
||||||
|
ID string `json:"id"`
|
||||||
|
Name string `json:"name"`
|
||||||
|
Mode string `json:"mode"`
|
||||||
|
Access string `json:"access"`
|
||||||
|
Protocol string `json:"protocol"`
|
||||||
|
Host string `json:"host"`
|
||||||
|
IsBootstrapped bool `json:"isBootstrapped"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type AdminRecord struct {
|
||||||
|
ID string `json:"id"`
|
||||||
|
Email string `json:"email"`
|
||||||
|
DisplayName string `json:"displayName"`
|
||||||
|
IsInstanceAdmin bool `json:"isInstanceAdmin"`
|
||||||
|
HomeTitle string `json:"homeTitle"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type OrganizationRecord struct {
|
||||||
|
ID string `json:"id"`
|
||||||
|
Name string `json:"name"`
|
||||||
|
Slug string `json:"slug"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type DepartmentRecord struct {
|
||||||
|
ID string `json:"id"`
|
||||||
|
OrganizationID string `json:"organizationId"`
|
||||||
|
Name string `json:"name"`
|
||||||
|
Slug string `json:"slug"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type TeamRecord struct {
|
||||||
|
ID string `json:"id"`
|
||||||
|
OrganizationID string `json:"organizationId"`
|
||||||
|
DepartmentID *string `json:"departmentId,omitempty"`
|
||||||
|
Name string `json:"name"`
|
||||||
|
Slug string `json:"slug"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type ProjectRecord struct {
|
||||||
|
ID string `json:"id"`
|
||||||
|
OrganizationID string `json:"organizationId"`
|
||||||
|
DepartmentID *string `json:"departmentId,omitempty"`
|
||||||
|
TeamID *string `json:"teamId,omitempty"`
|
||||||
|
Name string `json:"name"`
|
||||||
|
Slug string `json:"slug"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type WorkspaceRecord struct {
|
||||||
|
ID string `json:"id"`
|
||||||
|
OrganizationID string `json:"organizationId"`
|
||||||
|
Name string `json:"name"`
|
||||||
|
Slug string `json:"slug"`
|
||||||
|
Kind string `json:"kind"`
|
||||||
|
DepartmentID *string `json:"departmentId,omitempty"`
|
||||||
|
TeamID *string `json:"teamId,omitempty"`
|
||||||
|
ProjectID *string `json:"projectId,omitempty"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type StructureRecord struct {
|
||||||
|
Installation InstallationRecord `json:"installation"`
|
||||||
|
Organization namedRecord `json:"organization"`
|
||||||
|
Department namedRecord `json:"department"`
|
||||||
|
Team namedRecord `json:"team"`
|
||||||
|
Project namedRecord `json:"project"`
|
||||||
|
Admin AdminSummary `json:"admin"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type AdminSummary struct {
|
||||||
|
ID string `json:"id"`
|
||||||
|
Email string `json:"email"`
|
||||||
|
DisplayName string `json:"displayName"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type BootstrapStructureState struct {
|
||||||
|
Organization *OrganizationRecord `json:"organization,omitempty"`
|
||||||
|
Department *DepartmentRecord `json:"department,omitempty"`
|
||||||
|
Team *TeamRecord `json:"team,omitempty"`
|
||||||
|
Project *ProjectRecord `json:"project,omitempty"`
|
||||||
|
Workspaces []WorkspaceRecord `json:"workspaces"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type BootstrapState struct {
|
||||||
|
Installation *InstallationRecord `json:"installation,omitempty"`
|
||||||
|
Admin *AdminRecord `json:"admin,omitempty"`
|
||||||
|
Structure BootstrapStructureState `json:"structure"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type AppShellState struct {
|
||||||
|
Installation *InstallationRecord `json:"installation,omitempty"`
|
||||||
|
Admin *AdminRecord `json:"admin,omitempty"`
|
||||||
|
Organizations []OrganizationRecord `json:"organizations"`
|
||||||
|
Departments []DepartmentRecord `json:"departments"`
|
||||||
|
Teams []TeamRecord `json:"teams"`
|
||||||
|
Projects []ProjectRecord `json:"projects"`
|
||||||
|
Workspaces []WorkspaceRecord `json:"workspaces"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type namedRecord struct {
|
||||||
|
ID string `json:"id"`
|
||||||
|
Name string `json:"name"`
|
||||||
|
Slug string `json:"slug"`
|
||||||
|
}
|
||||||
|
|
||||||
|
func NewService(db *database.DB) *Service {
|
||||||
|
return &Service{db: db}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (service *Service) SaveInstance(ctx context.Context, input SaveInstanceInput) (InstallationRecord, error) {
|
||||||
|
row := service.db.Pool.QueryRow(ctx, `
|
||||||
|
INSERT INTO installations (singleton, name, mode, access, protocol, host)
|
||||||
|
VALUES (
|
||||||
|
TRUE,
|
||||||
|
COALESCE((SELECT name FROM installations WHERE singleton = TRUE LIMIT 1), ''),
|
||||||
|
COALESCE((SELECT mode FROM installations WHERE singleton = TRUE LIMIT 1), 'personal'::instance_mode),
|
||||||
|
$1::instance_access,
|
||||||
|
$2::instance_protocol,
|
||||||
|
$3
|
||||||
|
)
|
||||||
|
ON CONFLICT (singleton) DO UPDATE
|
||||||
|
SET
|
||||||
|
access = EXCLUDED.access,
|
||||||
|
protocol = EXCLUDED.protocol,
|
||||||
|
host = EXCLUDED.host,
|
||||||
|
updated_at = NOW()
|
||||||
|
RETURNING id::text, name, mode::text, access::text, protocol::text, host, is_bootstrapped;
|
||||||
|
`, input.Access, input.Protocol, input.Host)
|
||||||
|
|
||||||
|
return scanInstallationRecord(row)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (service *Service) SaveMode(ctx context.Context, input SaveModeInput) (InstallationRecord, error) {
|
||||||
|
row := service.db.Pool.QueryRow(ctx, `
|
||||||
|
INSERT INTO installations (singleton, name, mode, access, protocol, host)
|
||||||
|
VALUES (
|
||||||
|
TRUE,
|
||||||
|
$2,
|
||||||
|
$1::instance_mode,
|
||||||
|
COALESCE((SELECT access FROM installations WHERE singleton = TRUE LIMIT 1), 'local'::instance_access),
|
||||||
|
COALESCE((SELECT protocol FROM installations WHERE singleton = TRUE LIMIT 1), 'http'::instance_protocol),
|
||||||
|
COALESCE((SELECT host FROM installations WHERE singleton = TRUE LIMIT 1), $3)
|
||||||
|
)
|
||||||
|
ON CONFLICT (singleton) DO UPDATE
|
||||||
|
SET
|
||||||
|
name = EXCLUDED.name,
|
||||||
|
mode = EXCLUDED.mode,
|
||||||
|
updated_at = NOW()
|
||||||
|
RETURNING id::text, name, mode::text, access::text, protocol::text, host, is_bootstrapped;
|
||||||
|
`, input.Mode, input.Name, defaultInstallationHost)
|
||||||
|
|
||||||
|
return scanInstallationRecord(row)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (service *Service) SaveAdmin(ctx context.Context, input SaveAdminInput) (AdminRecord, error) {
|
||||||
|
tx, err := service.db.Pool.BeginTx(ctx, pgx.TxOptions{})
|
||||||
|
if err != nil {
|
||||||
|
return AdminRecord{}, err
|
||||||
|
}
|
||||||
|
defer func() {
|
||||||
|
_ = tx.Rollback(ctx)
|
||||||
|
}()
|
||||||
|
|
||||||
|
if _, err := tx.Exec(ctx, `
|
||||||
|
UPDATE users
|
||||||
|
SET is_instance_admin = FALSE, updated_at = NOW()
|
||||||
|
WHERE is_instance_admin = TRUE;
|
||||||
|
`); err != nil {
|
||||||
|
return AdminRecord{}, err
|
||||||
|
}
|
||||||
|
|
||||||
|
var record AdminRecord
|
||||||
|
if err := tx.QueryRow(ctx, `
|
||||||
|
INSERT INTO users (email, display_name, password_hash, is_instance_admin)
|
||||||
|
VALUES ($1, $2, crypt($3, gen_salt('bf')), TRUE)
|
||||||
|
ON CONFLICT ((LOWER(email))) DO UPDATE
|
||||||
|
SET
|
||||||
|
email = EXCLUDED.email,
|
||||||
|
display_name = EXCLUDED.display_name,
|
||||||
|
password_hash = crypt($3, gen_salt('bf')),
|
||||||
|
is_instance_admin = TRUE,
|
||||||
|
updated_at = NOW()
|
||||||
|
RETURNING id::text, email, display_name, is_instance_admin;
|
||||||
|
`, input.Email, input.DisplayName, input.Password).Scan(
|
||||||
|
&record.ID,
|
||||||
|
&record.Email,
|
||||||
|
&record.DisplayName,
|
||||||
|
&record.IsInstanceAdmin,
|
||||||
|
); err != nil {
|
||||||
|
return AdminRecord{}, err
|
||||||
|
}
|
||||||
|
|
||||||
|
record.HomeTitle = personalHomeTitle(record.DisplayName)
|
||||||
|
if err := tx.QueryRow(ctx, `
|
||||||
|
INSERT INTO user_homes (user_id, title)
|
||||||
|
VALUES ($1::uuid, $2)
|
||||||
|
ON CONFLICT (user_id) DO UPDATE
|
||||||
|
SET title = EXCLUDED.title, updated_at = NOW()
|
||||||
|
RETURNING title;
|
||||||
|
`, record.ID, record.HomeTitle).Scan(&record.HomeTitle); err != nil {
|
||||||
|
return AdminRecord{}, err
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := tx.Commit(ctx); err != nil {
|
||||||
|
return AdminRecord{}, err
|
||||||
|
}
|
||||||
|
|
||||||
|
return record, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (service *Service) SaveStructure(ctx context.Context, input SaveStructureInput) (StructureRecord, error) {
|
||||||
|
tx, err := service.db.Pool.BeginTx(ctx, pgx.TxOptions{})
|
||||||
|
if err != nil {
|
||||||
|
return StructureRecord{}, err
|
||||||
|
}
|
||||||
|
defer func() {
|
||||||
|
_ = tx.Rollback(ctx)
|
||||||
|
}()
|
||||||
|
|
||||||
|
installation, err := loadInstallation(ctx, tx)
|
||||||
|
if err != nil {
|
||||||
|
if errors.Is(err, pgx.ErrNoRows) {
|
||||||
|
return StructureRecord{}, ErrInstallationNotConfigured
|
||||||
|
}
|
||||||
|
|
||||||
|
return StructureRecord{}, err
|
||||||
|
}
|
||||||
|
|
||||||
|
admin, err := loadPrimaryAdmin(ctx, tx)
|
||||||
|
if err != nil {
|
||||||
|
if errors.Is(err, pgx.ErrNoRows) {
|
||||||
|
return StructureRecord{}, ErrAdminNotConfigured
|
||||||
|
}
|
||||||
|
|
||||||
|
return StructureRecord{}, err
|
||||||
|
}
|
||||||
|
|
||||||
|
organizationName := strings.TrimSpace(input.OrganizationName)
|
||||||
|
if organizationName == "" {
|
||||||
|
organizationName = defaultRootOrganizationName(installation.Name, installation.Mode, installation.Host, admin.DisplayName)
|
||||||
|
}
|
||||||
|
|
||||||
|
organization, err := upsertNamedRecord(ctx, tx, `
|
||||||
|
INSERT INTO organizations (name, slug, created_by_user_id)
|
||||||
|
VALUES ($1, $2, $3::uuid)
|
||||||
|
ON CONFLICT (slug) DO UPDATE
|
||||||
|
SET name = EXCLUDED.name, created_by_user_id = EXCLUDED.created_by_user_id, updated_at = NOW()
|
||||||
|
RETURNING id::text, name, slug;
|
||||||
|
`, organizationName, primaryOrganizationSlug, admin.ID)
|
||||||
|
if err != nil {
|
||||||
|
return StructureRecord{}, err
|
||||||
|
}
|
||||||
|
|
||||||
|
if _, err := tx.Exec(ctx, `
|
||||||
|
INSERT INTO organization_memberships (organization_id, user_id, role)
|
||||||
|
VALUES ($1::uuid, $2::uuid, 'owner'::membership_role)
|
||||||
|
ON CONFLICT (organization_id, user_id) DO UPDATE
|
||||||
|
SET role = EXCLUDED.role;
|
||||||
|
`, organization.ID, admin.ID); err != nil {
|
||||||
|
return StructureRecord{}, err
|
||||||
|
}
|
||||||
|
|
||||||
|
department, err := upsertNamedRecord(ctx, tx, `
|
||||||
|
INSERT INTO departments (organization_id, name, slug, created_by_user_id)
|
||||||
|
VALUES ($1::uuid, $2, $3, $4::uuid)
|
||||||
|
ON CONFLICT (organization_id, slug) DO UPDATE
|
||||||
|
SET name = EXCLUDED.name, created_by_user_id = EXCLUDED.created_by_user_id, updated_at = NOW()
|
||||||
|
RETURNING id::text, name, slug;
|
||||||
|
`, organization.ID, input.DepartmentName, primaryDepartmentSlug, admin.ID)
|
||||||
|
if err != nil {
|
||||||
|
return StructureRecord{}, err
|
||||||
|
}
|
||||||
|
|
||||||
|
team, err := upsertNamedRecord(ctx, tx, `
|
||||||
|
INSERT INTO teams (organization_id, department_id, name, slug, created_by_user_id)
|
||||||
|
VALUES ($1::uuid, $2::uuid, $3, $4, $5::uuid)
|
||||||
|
ON CONFLICT (organization_id, slug) DO UPDATE
|
||||||
|
SET department_id = EXCLUDED.department_id, name = EXCLUDED.name, created_by_user_id = EXCLUDED.created_by_user_id, updated_at = NOW()
|
||||||
|
RETURNING id::text, name, slug;
|
||||||
|
`, organization.ID, department.ID, input.TeamName, primaryTeamSlug, admin.ID)
|
||||||
|
if err != nil {
|
||||||
|
return StructureRecord{}, err
|
||||||
|
}
|
||||||
|
|
||||||
|
if _, err := tx.Exec(ctx, `
|
||||||
|
INSERT INTO team_memberships (team_id, user_id, role)
|
||||||
|
VALUES ($1::uuid, $2::uuid, 'owner'::membership_role)
|
||||||
|
ON CONFLICT (team_id, user_id) DO UPDATE
|
||||||
|
SET role = EXCLUDED.role;
|
||||||
|
`, team.ID, admin.ID); err != nil {
|
||||||
|
return StructureRecord{}, err
|
||||||
|
}
|
||||||
|
|
||||||
|
project, err := upsertNamedRecord(ctx, tx, `
|
||||||
|
INSERT INTO projects (organization_id, department_id, team_id, name, slug, created_by_user_id)
|
||||||
|
VALUES ($1::uuid, $2::uuid, $3::uuid, $4, $5, $6::uuid)
|
||||||
|
ON CONFLICT (organization_id, slug) DO UPDATE
|
||||||
|
SET department_id = EXCLUDED.department_id, team_id = EXCLUDED.team_id, name = EXCLUDED.name, created_by_user_id = EXCLUDED.created_by_user_id, updated_at = NOW()
|
||||||
|
RETURNING id::text, name, slug;
|
||||||
|
`, organization.ID, department.ID, team.ID, input.ProjectName, primaryProjectSlug, admin.ID)
|
||||||
|
if err != nil {
|
||||||
|
return StructureRecord{}, err
|
||||||
|
}
|
||||||
|
|
||||||
|
if _, err := tx.Exec(ctx, `
|
||||||
|
INSERT INTO project_memberships (project_id, user_id, role)
|
||||||
|
VALUES ($1::uuid, $2::uuid, 'owner'::membership_role)
|
||||||
|
ON CONFLICT (project_id, user_id) DO UPDATE
|
||||||
|
SET role = EXCLUDED.role;
|
||||||
|
`, project.ID, admin.ID); err != nil {
|
||||||
|
return StructureRecord{}, err
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := upsertWorkspace(ctx, tx, organization.ID, organization.Name, organizationWorkspaceSlug, bootstrapWorkspaceKindOrg, admin.ID, nil, nil, nil); err != nil {
|
||||||
|
return StructureRecord{}, err
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := upsertWorkspace(ctx, tx, organization.ID, department.Name, departmentWorkspaceSlug, bootstrapWorkspaceKindDept, admin.ID, &department.ID, nil, nil); err != nil {
|
||||||
|
return StructureRecord{}, err
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := upsertWorkspace(ctx, tx, organization.ID, team.Name, teamWorkspaceSlug, bootstrapWorkspaceKindTeam, admin.ID, &department.ID, &team.ID, nil); err != nil {
|
||||||
|
return StructureRecord{}, err
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := upsertWorkspace(ctx, tx, organization.ID, project.Name, projectWorkspaceSlug, bootstrapWorkspaceKindProject, admin.ID, &department.ID, &team.ID, &project.ID); err != nil {
|
||||||
|
return StructureRecord{}, err
|
||||||
|
}
|
||||||
|
|
||||||
|
installation, err = updateBootstrappedInstallation(ctx, tx)
|
||||||
|
if err != nil {
|
||||||
|
return StructureRecord{}, err
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := tx.Commit(ctx); err != nil {
|
||||||
|
return StructureRecord{}, err
|
||||||
|
}
|
||||||
|
|
||||||
|
return StructureRecord{
|
||||||
|
Installation: installation,
|
||||||
|
Organization: organization,
|
||||||
|
Department: department,
|
||||||
|
Team: team,
|
||||||
|
Project: project,
|
||||||
|
Admin: admin,
|
||||||
|
}, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (service *Service) ResetDevelopmentState(ctx context.Context) error {
|
||||||
|
tx, err := service.db.Pool.BeginTx(ctx, pgx.TxOptions{})
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
defer func() {
|
||||||
|
_ = tx.Rollback(ctx)
|
||||||
|
}()
|
||||||
|
|
||||||
|
if _, err := tx.Exec(ctx, `
|
||||||
|
TRUNCATE TABLE
|
||||||
|
project_memberships,
|
||||||
|
team_memberships,
|
||||||
|
organization_memberships,
|
||||||
|
workspaces,
|
||||||
|
projects,
|
||||||
|
teams,
|
||||||
|
departments,
|
||||||
|
user_homes,
|
||||||
|
users,
|
||||||
|
organizations,
|
||||||
|
installations
|
||||||
|
RESTART IDENTITY;
|
||||||
|
`); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
return tx.Commit(ctx)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (service *Service) GetInstallation(ctx context.Context) (*InstallationRecord, error) {
|
||||||
|
record, err := scanInstallationRecord(service.db.Pool.QueryRow(ctx, `
|
||||||
|
SELECT id::text, name, mode::text, access::text, protocol::text, host, is_bootstrapped
|
||||||
|
FROM installations
|
||||||
|
WHERE singleton = TRUE
|
||||||
|
LIMIT 1;
|
||||||
|
`))
|
||||||
|
if err != nil {
|
||||||
|
if errors.Is(err, pgx.ErrNoRows) {
|
||||||
|
return nil, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
return &record, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (service *Service) GetAdmin(ctx context.Context) (*AdminRecord, error) {
|
||||||
|
var record AdminRecord
|
||||||
|
err := service.db.Pool.QueryRow(ctx, `
|
||||||
|
SELECT
|
||||||
|
u.id::text,
|
||||||
|
u.email,
|
||||||
|
u.display_name,
|
||||||
|
u.is_instance_admin,
|
||||||
|
COALESCE(uh.title, '')
|
||||||
|
FROM users u
|
||||||
|
LEFT JOIN user_homes uh ON uh.user_id = u.id
|
||||||
|
WHERE u.is_instance_admin = TRUE
|
||||||
|
ORDER BY u.created_at ASC
|
||||||
|
LIMIT 1;
|
||||||
|
`).Scan(
|
||||||
|
&record.ID,
|
||||||
|
&record.Email,
|
||||||
|
&record.DisplayName,
|
||||||
|
&record.IsInstanceAdmin,
|
||||||
|
&record.HomeTitle,
|
||||||
|
)
|
||||||
|
if err != nil {
|
||||||
|
if errors.Is(err, pgx.ErrNoRows) {
|
||||||
|
return nil, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
return &record, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (service *Service) GetStructure(ctx context.Context) (BootstrapStructureState, error) {
|
||||||
|
workspaces, err := service.listWorkspaces(ctx)
|
||||||
|
if err != nil {
|
||||||
|
return BootstrapStructureState{}, err
|
||||||
|
}
|
||||||
|
|
||||||
|
organization, err := service.loadPrimaryOrganization(ctx)
|
||||||
|
if err != nil {
|
||||||
|
return BootstrapStructureState{}, err
|
||||||
|
}
|
||||||
|
|
||||||
|
department, err := service.loadPrimaryDepartment(ctx)
|
||||||
|
if err != nil {
|
||||||
|
return BootstrapStructureState{}, err
|
||||||
|
}
|
||||||
|
|
||||||
|
team, err := service.loadPrimaryTeam(ctx)
|
||||||
|
if err != nil {
|
||||||
|
return BootstrapStructureState{}, err
|
||||||
|
}
|
||||||
|
|
||||||
|
project, err := service.loadPrimaryProject(ctx)
|
||||||
|
if err != nil {
|
||||||
|
return BootstrapStructureState{}, err
|
||||||
|
}
|
||||||
|
|
||||||
|
return BootstrapStructureState{
|
||||||
|
Organization: organization,
|
||||||
|
Department: department,
|
||||||
|
Team: team,
|
||||||
|
Project: project,
|
||||||
|
Workspaces: workspaces,
|
||||||
|
}, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (service *Service) GetState(ctx context.Context) (BootstrapState, error) {
|
||||||
|
installation, err := service.GetInstallation(ctx)
|
||||||
|
if err != nil {
|
||||||
|
return BootstrapState{}, err
|
||||||
|
}
|
||||||
|
|
||||||
|
admin, err := service.GetAdmin(ctx)
|
||||||
|
if err != nil {
|
||||||
|
return BootstrapState{}, err
|
||||||
|
}
|
||||||
|
|
||||||
|
structure, err := service.GetStructure(ctx)
|
||||||
|
if err != nil {
|
||||||
|
return BootstrapState{}, err
|
||||||
|
}
|
||||||
|
|
||||||
|
return BootstrapState{
|
||||||
|
Installation: installation,
|
||||||
|
Admin: admin,
|
||||||
|
Structure: structure,
|
||||||
|
}, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (service *Service) GetAppShellState(ctx context.Context) (AppShellState, error) {
|
||||||
|
installation, err := service.GetInstallation(ctx)
|
||||||
|
if err != nil {
|
||||||
|
return AppShellState{}, err
|
||||||
|
}
|
||||||
|
|
||||||
|
admin, err := service.GetAdmin(ctx)
|
||||||
|
if err != nil {
|
||||||
|
return AppShellState{}, err
|
||||||
|
}
|
||||||
|
|
||||||
|
organizations, err := service.listOrganizations(ctx)
|
||||||
|
if err != nil {
|
||||||
|
return AppShellState{}, err
|
||||||
|
}
|
||||||
|
|
||||||
|
departments, err := service.listDepartments(ctx)
|
||||||
|
if err != nil {
|
||||||
|
return AppShellState{}, err
|
||||||
|
}
|
||||||
|
|
||||||
|
teams, err := service.listTeams(ctx)
|
||||||
|
if err != nil {
|
||||||
|
return AppShellState{}, err
|
||||||
|
}
|
||||||
|
|
||||||
|
projects, err := service.listProjects(ctx)
|
||||||
|
if err != nil {
|
||||||
|
return AppShellState{}, err
|
||||||
|
}
|
||||||
|
|
||||||
|
workspaces, err := service.listWorkspaces(ctx)
|
||||||
|
if err != nil {
|
||||||
|
return AppShellState{}, err
|
||||||
|
}
|
||||||
|
|
||||||
|
return AppShellState{
|
||||||
|
Installation: installation,
|
||||||
|
Admin: admin,
|
||||||
|
Organizations: organizations,
|
||||||
|
Departments: departments,
|
||||||
|
Teams: teams,
|
||||||
|
Projects: projects,
|
||||||
|
Workspaces: workspaces,
|
||||||
|
}, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func scanInstallationRecord(row pgx.Row) (InstallationRecord, error) {
|
||||||
|
var record InstallationRecord
|
||||||
|
if err := row.Scan(&record.ID, &record.Name, &record.Mode, &record.Access, &record.Protocol, &record.Host, &record.IsBootstrapped); err != nil {
|
||||||
|
return InstallationRecord{}, err
|
||||||
|
}
|
||||||
|
|
||||||
|
return record, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (service *Service) loadPrimaryOrganization(ctx context.Context) (*OrganizationRecord, error) {
|
||||||
|
var record OrganizationRecord
|
||||||
|
err := service.db.Pool.QueryRow(ctx, `
|
||||||
|
SELECT id::text, name, slug
|
||||||
|
FROM organizations
|
||||||
|
ORDER BY CASE WHEN slug = $1 THEN 0 ELSE 1 END, created_at ASC
|
||||||
|
LIMIT 1;
|
||||||
|
`, primaryOrganizationSlug).Scan(&record.ID, &record.Name, &record.Slug)
|
||||||
|
if err != nil {
|
||||||
|
if errors.Is(err, pgx.ErrNoRows) {
|
||||||
|
return nil, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
return &record, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (service *Service) loadPrimaryDepartment(ctx context.Context) (*DepartmentRecord, error) {
|
||||||
|
var record DepartmentRecord
|
||||||
|
err := service.db.Pool.QueryRow(ctx, `
|
||||||
|
SELECT id::text, organization_id::text, name, slug
|
||||||
|
FROM departments
|
||||||
|
ORDER BY CASE WHEN slug = $1 THEN 0 ELSE 1 END, created_at ASC
|
||||||
|
LIMIT 1;
|
||||||
|
`, primaryDepartmentSlug).Scan(&record.ID, &record.OrganizationID, &record.Name, &record.Slug)
|
||||||
|
if err != nil {
|
||||||
|
if errors.Is(err, pgx.ErrNoRows) {
|
||||||
|
return nil, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
return &record, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (service *Service) loadPrimaryTeam(ctx context.Context) (*TeamRecord, error) {
|
||||||
|
var record TeamRecord
|
||||||
|
err := service.db.Pool.QueryRow(ctx, `
|
||||||
|
SELECT id::text, organization_id::text, department_id::text, name, slug
|
||||||
|
FROM teams
|
||||||
|
ORDER BY CASE WHEN slug = $1 THEN 0 ELSE 1 END, created_at ASC
|
||||||
|
LIMIT 1;
|
||||||
|
`, primaryTeamSlug).Scan(&record.ID, &record.OrganizationID, &record.DepartmentID, &record.Name, &record.Slug)
|
||||||
|
if err != nil {
|
||||||
|
if errors.Is(err, pgx.ErrNoRows) {
|
||||||
|
return nil, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
return &record, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (service *Service) loadPrimaryProject(ctx context.Context) (*ProjectRecord, error) {
|
||||||
|
var record ProjectRecord
|
||||||
|
err := service.db.Pool.QueryRow(ctx, `
|
||||||
|
SELECT id::text, organization_id::text, department_id::text, team_id::text, name, slug
|
||||||
|
FROM projects
|
||||||
|
ORDER BY CASE WHEN slug = $1 THEN 0 ELSE 1 END, created_at ASC
|
||||||
|
LIMIT 1;
|
||||||
|
`, primaryProjectSlug).Scan(&record.ID, &record.OrganizationID, &record.DepartmentID, &record.TeamID, &record.Name, &record.Slug)
|
||||||
|
if err != nil {
|
||||||
|
if errors.Is(err, pgx.ErrNoRows) {
|
||||||
|
return nil, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
return &record, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (service *Service) listOrganizations(ctx context.Context) ([]OrganizationRecord, error) {
|
||||||
|
rows, err := service.db.Pool.Query(ctx, `
|
||||||
|
SELECT id::text, name, slug
|
||||||
|
FROM organizations
|
||||||
|
ORDER BY created_at ASC;
|
||||||
|
`)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
defer rows.Close()
|
||||||
|
|
||||||
|
var records []OrganizationRecord
|
||||||
|
for rows.Next() {
|
||||||
|
var record OrganizationRecord
|
||||||
|
if err := rows.Scan(&record.ID, &record.Name, &record.Slug); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
records = append(records, record)
|
||||||
|
}
|
||||||
|
|
||||||
|
return records, rows.Err()
|
||||||
|
}
|
||||||
|
|
||||||
|
func (service *Service) listDepartments(ctx context.Context) ([]DepartmentRecord, error) {
|
||||||
|
rows, err := service.db.Pool.Query(ctx, `
|
||||||
|
SELECT id::text, organization_id::text, name, slug
|
||||||
|
FROM departments
|
||||||
|
ORDER BY created_at ASC;
|
||||||
|
`)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
defer rows.Close()
|
||||||
|
|
||||||
|
var records []DepartmentRecord
|
||||||
|
for rows.Next() {
|
||||||
|
var record DepartmentRecord
|
||||||
|
if err := rows.Scan(&record.ID, &record.OrganizationID, &record.Name, &record.Slug); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
records = append(records, record)
|
||||||
|
}
|
||||||
|
|
||||||
|
return records, rows.Err()
|
||||||
|
}
|
||||||
|
|
||||||
|
func (service *Service) listTeams(ctx context.Context) ([]TeamRecord, error) {
|
||||||
|
rows, err := service.db.Pool.Query(ctx, `
|
||||||
|
SELECT id::text, organization_id::text, department_id::text, name, slug
|
||||||
|
FROM teams
|
||||||
|
ORDER BY created_at ASC;
|
||||||
|
`)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
defer rows.Close()
|
||||||
|
|
||||||
|
var records []TeamRecord
|
||||||
|
for rows.Next() {
|
||||||
|
var record TeamRecord
|
||||||
|
if err := rows.Scan(&record.ID, &record.OrganizationID, &record.DepartmentID, &record.Name, &record.Slug); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
records = append(records, record)
|
||||||
|
}
|
||||||
|
|
||||||
|
return records, rows.Err()
|
||||||
|
}
|
||||||
|
|
||||||
|
func (service *Service) listProjects(ctx context.Context) ([]ProjectRecord, error) {
|
||||||
|
rows, err := service.db.Pool.Query(ctx, `
|
||||||
|
SELECT id::text, organization_id::text, department_id::text, team_id::text, name, slug
|
||||||
|
FROM projects
|
||||||
|
ORDER BY created_at ASC;
|
||||||
|
`)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
defer rows.Close()
|
||||||
|
|
||||||
|
var records []ProjectRecord
|
||||||
|
for rows.Next() {
|
||||||
|
var record ProjectRecord
|
||||||
|
if err := rows.Scan(&record.ID, &record.OrganizationID, &record.DepartmentID, &record.TeamID, &record.Name, &record.Slug); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
records = append(records, record)
|
||||||
|
}
|
||||||
|
|
||||||
|
return records, rows.Err()
|
||||||
|
}
|
||||||
|
|
||||||
|
func (service *Service) listWorkspaces(ctx context.Context) ([]WorkspaceRecord, error) {
|
||||||
|
rows, err := service.db.Pool.Query(ctx, `
|
||||||
|
SELECT id::text, organization_id::text, name, slug, kind::text, department_id::text, team_id::text, project_id::text
|
||||||
|
FROM workspaces
|
||||||
|
ORDER BY created_at ASC;
|
||||||
|
`)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
defer rows.Close()
|
||||||
|
|
||||||
|
var records []WorkspaceRecord
|
||||||
|
for rows.Next() {
|
||||||
|
var record WorkspaceRecord
|
||||||
|
if err := rows.Scan(&record.ID, &record.OrganizationID, &record.Name, &record.Slug, &record.Kind, &record.DepartmentID, &record.TeamID, &record.ProjectID); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
records = append(records, record)
|
||||||
|
}
|
||||||
|
|
||||||
|
return records, rows.Err()
|
||||||
|
}
|
||||||
|
|
||||||
|
func loadInstallation(ctx context.Context, tx pgx.Tx) (InstallationRecord, error) {
|
||||||
|
return scanInstallationRecord(tx.QueryRow(ctx, `
|
||||||
|
SELECT id::text, name, mode::text, access::text, protocol::text, host, is_bootstrapped
|
||||||
|
FROM installations
|
||||||
|
WHERE singleton = TRUE
|
||||||
|
LIMIT 1;
|
||||||
|
`))
|
||||||
|
}
|
||||||
|
|
||||||
|
func loadPrimaryAdmin(ctx context.Context, tx pgx.Tx) (AdminSummary, error) {
|
||||||
|
var admin AdminSummary
|
||||||
|
if err := tx.QueryRow(ctx, `
|
||||||
|
SELECT id::text, email, display_name
|
||||||
|
FROM users
|
||||||
|
WHERE is_instance_admin = TRUE
|
||||||
|
ORDER BY created_at ASC
|
||||||
|
LIMIT 1;
|
||||||
|
`).Scan(&admin.ID, &admin.Email, &admin.DisplayName); err != nil {
|
||||||
|
return AdminSummary{}, err
|
||||||
|
}
|
||||||
|
|
||||||
|
return admin, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func updateBootstrappedInstallation(ctx context.Context, tx pgx.Tx) (InstallationRecord, error) {
|
||||||
|
return scanInstallationRecord(tx.QueryRow(ctx, `
|
||||||
|
UPDATE installations
|
||||||
|
SET is_bootstrapped = TRUE, bootstrapped_at = COALESCE(bootstrapped_at, NOW()), updated_at = NOW()
|
||||||
|
WHERE singleton = TRUE
|
||||||
|
RETURNING id::text, name, mode::text, access::text, protocol::text, host, is_bootstrapped;
|
||||||
|
`))
|
||||||
|
}
|
||||||
|
|
||||||
|
func upsertNamedRecord(ctx context.Context, tx pgx.Tx, query string, args ...any) (namedRecord, error) {
|
||||||
|
var record namedRecord
|
||||||
|
if err := tx.QueryRow(ctx, query, args...).Scan(&record.ID, &record.Name, &record.Slug); err != nil {
|
||||||
|
return namedRecord{}, err
|
||||||
|
}
|
||||||
|
|
||||||
|
return record, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func upsertWorkspace(ctx context.Context, tx pgx.Tx, organizationID, name, slug, kind, createdByUserID string, departmentID, teamID, projectID *string) error {
|
||||||
|
_, err := tx.Exec(ctx, `
|
||||||
|
INSERT INTO workspaces (organization_id, name, slug, kind, created_by_user_id, department_id, team_id, project_id)
|
||||||
|
VALUES ($1::uuid, $2, $3, $4::workspace_kind, $5::uuid, $6::uuid, $7::uuid, $8::uuid)
|
||||||
|
ON CONFLICT (organization_id, slug) DO UPDATE
|
||||||
|
SET
|
||||||
|
name = EXCLUDED.name,
|
||||||
|
kind = EXCLUDED.kind,
|
||||||
|
created_by_user_id = EXCLUDED.created_by_user_id,
|
||||||
|
department_id = EXCLUDED.department_id,
|
||||||
|
team_id = EXCLUDED.team_id,
|
||||||
|
project_id = EXCLUDED.project_id,
|
||||||
|
updated_at = NOW();
|
||||||
|
`, organizationID, name, slug, kind, createdByUserID, departmentID, teamID, projectID)
|
||||||
|
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
func defaultRootOrganizationName(installationName, mode, host, adminDisplayName string) string {
|
||||||
|
trimmedInstallationName := strings.TrimSpace(installationName)
|
||||||
|
trimmedHost := strings.TrimSpace(host)
|
||||||
|
trimmedAdminDisplayName := strings.TrimSpace(adminDisplayName)
|
||||||
|
|
||||||
|
if trimmedInstallationName != "" {
|
||||||
|
return trimmedInstallationName
|
||||||
|
}
|
||||||
|
|
||||||
|
if strings.EqualFold(mode, defaultInstallationMode) {
|
||||||
|
if trimmedAdminDisplayName != "" {
|
||||||
|
return fmt.Sprintf("%s %s", trimmedAdminDisplayName, defaultPersonalServerSuffix)
|
||||||
|
}
|
||||||
|
|
||||||
|
return defaultPersonalDisplayName
|
||||||
|
}
|
||||||
|
|
||||||
|
if trimmedHost != "" {
|
||||||
|
return trimmedHost
|
||||||
|
}
|
||||||
|
|
||||||
|
return defaultOrganizationName
|
||||||
|
}
|
||||||
|
|
||||||
|
func personalHomeTitle(displayName string) string {
|
||||||
|
trimmedDisplayName := strings.TrimSpace(displayName)
|
||||||
|
if trimmedDisplayName == "" {
|
||||||
|
return "Home"
|
||||||
|
}
|
||||||
|
|
||||||
|
if strings.HasSuffix(strings.ToLower(trimmedDisplayName), "s") {
|
||||||
|
return fmt.Sprintf("%s' Home", trimmedDisplayName)
|
||||||
|
}
|
||||||
|
|
||||||
|
return fmt.Sprintf("%s's Home", trimmedDisplayName)
|
||||||
|
}
|
||||||
23
Backend/internal/buildinfo/buildinfo.go
Normal file
23
Backend/internal/buildinfo/buildinfo.go
Normal file
@@ -0,0 +1,23 @@
|
|||||||
|
// Path: Backend/internal/buildinfo/buildinfo.go
|
||||||
|
|
||||||
|
package buildinfo
|
||||||
|
|
||||||
|
var (
|
||||||
|
Version = "dev"
|
||||||
|
Commit = "unknown"
|
||||||
|
BuiltAt = "unknown"
|
||||||
|
)
|
||||||
|
|
||||||
|
type Info struct {
|
||||||
|
Version string `json:"version"`
|
||||||
|
Commit string `json:"commit"`
|
||||||
|
BuiltAt string `json:"builtAt"`
|
||||||
|
}
|
||||||
|
|
||||||
|
func Current() Info {
|
||||||
|
return Info{
|
||||||
|
Version: Version,
|
||||||
|
Commit: Commit,
|
||||||
|
BuiltAt: BuiltAt,
|
||||||
|
}
|
||||||
|
}
|
||||||
40
Backend/internal/cache/valkey.go
vendored
Normal file
40
Backend/internal/cache/valkey.go
vendored
Normal file
@@ -0,0 +1,40 @@
|
|||||||
|
// Path: Backend/internal/cache/valkey.go
|
||||||
|
|
||||||
|
package cache
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
|
||||||
|
"github.com/redis/go-redis/v9"
|
||||||
|
)
|
||||||
|
|
||||||
|
type Client struct {
|
||||||
|
Redis *redis.Client
|
||||||
|
}
|
||||||
|
|
||||||
|
func NewValkey(valkeyURL string) (*Client, error) {
|
||||||
|
options, err := redis.ParseURL(valkeyURL)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
client := redis.NewClient(options)
|
||||||
|
|
||||||
|
return &Client{Redis: client}, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c *Client) Health(ctx context.Context) error {
|
||||||
|
if c == nil || c.Redis == nil {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
return c.Redis.Ping(ctx).Err()
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c *Client) Close() error {
|
||||||
|
if c == nil || c.Redis == nil {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
return c.Redis.Close()
|
||||||
|
}
|
||||||
75
Backend/internal/config/config.go
Normal file
75
Backend/internal/config/config.go
Normal file
@@ -0,0 +1,75 @@
|
|||||||
|
// Path: Backend/internal/config/config.go
|
||||||
|
|
||||||
|
package config
|
||||||
|
|
||||||
|
import (
|
||||||
|
"fmt"
|
||||||
|
"os"
|
||||||
|
"strings"
|
||||||
|
"time"
|
||||||
|
)
|
||||||
|
|
||||||
|
type Config struct {
|
||||||
|
AppName string
|
||||||
|
Environment string
|
||||||
|
LogLevel string
|
||||||
|
WebPort string
|
||||||
|
APIPort string
|
||||||
|
PostgresURL string
|
||||||
|
ValkeyURL string
|
||||||
|
ShutdownTimeout time.Duration
|
||||||
|
}
|
||||||
|
|
||||||
|
func Load() *Config {
|
||||||
|
return &Config{
|
||||||
|
AppName: getEnv("APP_NAME", "moku"),
|
||||||
|
Environment: getEnv("GO_ENV", "development"),
|
||||||
|
LogLevel: getEnv("LOG_LEVEL", "debug"),
|
||||||
|
WebPort: getEnv("BACKEND_WEB_PORT", "8080"),
|
||||||
|
APIPort: getEnv("BACKEND_API_PORT", "8081"),
|
||||||
|
PostgresURL: getEnv("DATABASE_URL", "postgres://moku:moku_dev_password@localhost:5432/moku?sslmode=disable"),
|
||||||
|
ValkeyURL: getEnv("VALKEY_URL", "redis://localhost:6379/0"),
|
||||||
|
ShutdownTimeout: getDurationEnv("BACKEND_SHUTDOWN_TIMEOUT", 10*time.Second),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c *Config) Address(serviceName string) string {
|
||||||
|
var port string
|
||||||
|
|
||||||
|
switch strings.ToLower(serviceName) {
|
||||||
|
case "web":
|
||||||
|
port = c.WebPort
|
||||||
|
case "api":
|
||||||
|
port = c.APIPort
|
||||||
|
default:
|
||||||
|
port = c.WebPort
|
||||||
|
}
|
||||||
|
|
||||||
|
return fmt.Sprintf(":%s", port)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c *Config) IsDevelopment() bool {
|
||||||
|
return strings.EqualFold(c.Environment, "development")
|
||||||
|
}
|
||||||
|
|
||||||
|
func getEnv(key, fallback string) string {
|
||||||
|
if value, exists := os.LookupEnv(key); exists {
|
||||||
|
return value
|
||||||
|
}
|
||||||
|
|
||||||
|
return fallback
|
||||||
|
}
|
||||||
|
|
||||||
|
func getDurationEnv(key string, fallback time.Duration) time.Duration {
|
||||||
|
value, exists := os.LookupEnv(key)
|
||||||
|
if !exists {
|
||||||
|
return fallback
|
||||||
|
}
|
||||||
|
|
||||||
|
parsed, err := time.ParseDuration(value)
|
||||||
|
if err != nil {
|
||||||
|
return fallback
|
||||||
|
}
|
||||||
|
|
||||||
|
return parsed
|
||||||
|
}
|
||||||
95
Backend/internal/database/postgres.go
Normal file
95
Backend/internal/database/postgres.go
Normal file
@@ -0,0 +1,95 @@
|
|||||||
|
// Path: Backend/internal/database/postgres.go
|
||||||
|
|
||||||
|
package database
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"database/sql"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"github.com/jackc/pgx/v5/pgxpool"
|
||||||
|
"github.com/jackc/pgx/v5/stdlib"
|
||||||
|
"github.com/pressly/goose/v3"
|
||||||
|
|
||||||
|
"moku-backend/db"
|
||||||
|
)
|
||||||
|
|
||||||
|
type DB struct {
|
||||||
|
Pool *pgxpool.Pool
|
||||||
|
}
|
||||||
|
|
||||||
|
func NewPostgres(databaseURL string) (*DB, error) {
|
||||||
|
ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
|
||||||
|
defer cancel()
|
||||||
|
|
||||||
|
config, err := pgxpool.ParseConfig(databaseURL)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
config.MaxConns = 25
|
||||||
|
config.MinConns = 5
|
||||||
|
config.MaxConnLifetime = time.Hour
|
||||||
|
config.MaxConnIdleTime = 30 * time.Minute
|
||||||
|
|
||||||
|
pool, err := pgxpool.NewWithConfig(ctx, config)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := pool.Ping(ctx); err != nil {
|
||||||
|
pool.Close()
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
return &DB{Pool: pool}, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (d *DB) MigrateUp() error {
|
||||||
|
return d.runGoose(goose.Up)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (d *DB) MigrateDown() error {
|
||||||
|
return d.runGoose(goose.Down)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (d *DB) MigrateReset() error {
|
||||||
|
return d.runGoose(goose.Reset)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (d *DB) MigrateStatus() error {
|
||||||
|
return d.runGoose(goose.Status)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (d *DB) runGoose(command func(*sql.DB, string, ...goose.OptionsFunc) error) error {
|
||||||
|
if d == nil || d.Pool == nil {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
sqlDB := stdlib.OpenDBFromPool(d.Pool)
|
||||||
|
defer sqlDB.Close()
|
||||||
|
|
||||||
|
goose.SetBaseFS(db.Migrations)
|
||||||
|
|
||||||
|
if err := goose.SetDialect("postgres"); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
return command(sqlDB, "migrations")
|
||||||
|
}
|
||||||
|
|
||||||
|
func (d *DB) Health(ctx context.Context) error {
|
||||||
|
if d == nil || d.Pool == nil {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
return d.Pool.Ping(ctx)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (d *DB) Close() {
|
||||||
|
if d == nil || d.Pool == nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
d.Pool.Close()
|
||||||
|
}
|
||||||
396
Backend/internal/httpx/api_bootstrap_routes.go
Normal file
396
Backend/internal/httpx/api_bootstrap_routes.go
Normal file
@@ -0,0 +1,396 @@
|
|||||||
|
// Path: Backend/internal/httpx/api_bootstrap_routes.go
|
||||||
|
|
||||||
|
package httpx
|
||||||
|
|
||||||
|
import (
|
||||||
|
"encoding/json"
|
||||||
|
"errors"
|
||||||
|
"io"
|
||||||
|
"net/http"
|
||||||
|
"strings"
|
||||||
|
|
||||||
|
bootstrapservice "moku-backend/internal/bootstrap"
|
||||||
|
)
|
||||||
|
|
||||||
|
type bootstrapInstanceStepRequest struct {
|
||||||
|
Protocol string `json:"protocol"`
|
||||||
|
Access string `json:"access"`
|
||||||
|
Host string `json:"host"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type bootstrapModeStepRequest struct {
|
||||||
|
Mode string `json:"mode"`
|
||||||
|
Name string `json:"name"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type bootstrapAdminStepRequest struct {
|
||||||
|
DisplayName string `json:"displayName"`
|
||||||
|
Email string `json:"email"`
|
||||||
|
Password string `json:"password"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type bootstrapStructureStepRequest struct {
|
||||||
|
OrganizationName string `json:"organizationName"`
|
||||||
|
DepartmentName string `json:"departmentName"`
|
||||||
|
TeamName string `json:"teamName"`
|
||||||
|
ProjectName string `json:"projectName"`
|
||||||
|
}
|
||||||
|
|
||||||
|
func (routes apiRoutes) handleBootstrapOverview(w http.ResponseWriter, _ *http.Request) {
|
||||||
|
WriteJSON(w, http.StatusOK, map[string]any{
|
||||||
|
"data": map[string]any{
|
||||||
|
"resource": "bootstrap",
|
||||||
|
"status": "persisted",
|
||||||
|
"steps": []map[string]string{
|
||||||
|
{
|
||||||
|
"id": "instance",
|
||||||
|
"method": http.MethodPost,
|
||||||
|
"path": "/v1/bootstrap/steps/instance",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "mode",
|
||||||
|
"method": http.MethodPost,
|
||||||
|
"path": "/v1/bootstrap/steps/mode",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "admin",
|
||||||
|
"method": http.MethodPost,
|
||||||
|
"path": "/v1/bootstrap/steps/admin",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "structure",
|
||||||
|
"method": http.MethodPost,
|
||||||
|
"path": "/v1/bootstrap/steps/structure",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "installation",
|
||||||
|
"method": http.MethodGet,
|
||||||
|
"path": "/v1/bootstrap/installation",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "admin-state",
|
||||||
|
"method": http.MethodGet,
|
||||||
|
"path": "/v1/bootstrap/admin",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "structure-state",
|
||||||
|
"method": http.MethodGet,
|
||||||
|
"path": "/v1/bootstrap/structure",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "bootstrap-state",
|
||||||
|
"method": http.MethodGet,
|
||||||
|
"path": "/v1/bootstrap/state",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "app-shell",
|
||||||
|
"method": http.MethodGet,
|
||||||
|
"path": "/v1/app-shell",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
func (routes apiRoutes) handleBootstrapInstallation(w http.ResponseWriter, r *http.Request) {
|
||||||
|
record, err := routes.bootstrapService().GetInstallation(r.Context())
|
||||||
|
if err != nil {
|
||||||
|
routes.writeBootstrapPersistenceError(w, r, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
WriteJSON(w, http.StatusOK, map[string]any{
|
||||||
|
"data": record,
|
||||||
|
"meta": map[string]any{
|
||||||
|
"resource": "bootstrap-installation",
|
||||||
|
},
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
func (routes apiRoutes) handleBootstrapAdmin(w http.ResponseWriter, r *http.Request) {
|
||||||
|
record, err := routes.bootstrapService().GetAdmin(r.Context())
|
||||||
|
if err != nil {
|
||||||
|
routes.writeBootstrapPersistenceError(w, r, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
WriteJSON(w, http.StatusOK, map[string]any{
|
||||||
|
"data": record,
|
||||||
|
"meta": map[string]any{
|
||||||
|
"resource": "bootstrap-admin",
|
||||||
|
},
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
func (routes apiRoutes) handleBootstrapStructure(w http.ResponseWriter, r *http.Request) {
|
||||||
|
record, err := routes.bootstrapService().GetStructure(r.Context())
|
||||||
|
if err != nil {
|
||||||
|
routes.writeBootstrapPersistenceError(w, r, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
WriteJSON(w, http.StatusOK, map[string]any{
|
||||||
|
"data": record,
|
||||||
|
"meta": map[string]any{
|
||||||
|
"resource": "bootstrap-structure",
|
||||||
|
},
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
func (routes apiRoutes) handleBootstrapState(w http.ResponseWriter, r *http.Request) {
|
||||||
|
record, err := routes.bootstrapService().GetState(r.Context())
|
||||||
|
if err != nil {
|
||||||
|
routes.writeBootstrapPersistenceError(w, r, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
WriteJSON(w, http.StatusOK, map[string]any{
|
||||||
|
"data": record,
|
||||||
|
"meta": map[string]any{
|
||||||
|
"resource": "bootstrap-state",
|
||||||
|
},
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
func (routes apiRoutes) handleAppShellState(w http.ResponseWriter, r *http.Request) {
|
||||||
|
record, err := routes.bootstrapService().GetAppShellState(r.Context())
|
||||||
|
if err != nil {
|
||||||
|
routes.writeBootstrapPersistenceError(w, r, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
WriteJSON(w, http.StatusOK, map[string]any{
|
||||||
|
"data": record,
|
||||||
|
"meta": map[string]any{
|
||||||
|
"resource": "app-shell",
|
||||||
|
},
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
func (routes apiRoutes) handleDevelopmentBootstrapReset(w http.ResponseWriter, r *http.Request) {
|
||||||
|
if !routes.cfg.Config.IsDevelopment() {
|
||||||
|
WriteError(w, http.StatusNotFound, RequestIDFromContext(r.Context()), "not_found", "The requested endpoint does not exist.")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := routes.bootstrapService().ResetDevelopmentState(r.Context()); err != nil {
|
||||||
|
routes.writeBootstrapPersistenceError(w, r, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
WriteJSON(w, http.StatusOK, map[string]any{
|
||||||
|
"data": map[string]any{
|
||||||
|
"reset": true,
|
||||||
|
},
|
||||||
|
"meta": map[string]any{
|
||||||
|
"resource": "development-bootstrap-reset",
|
||||||
|
"developmentOnly": true,
|
||||||
|
},
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
func (routes apiRoutes) handleBootstrapInstanceStep(w http.ResponseWriter, r *http.Request) {
|
||||||
|
payload, ok := decodeBootstrapRequest[bootstrapInstanceStepRequest](w, r)
|
||||||
|
if !ok {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
payload.Protocol = strings.ToLower(strings.TrimSpace(payload.Protocol))
|
||||||
|
payload.Access = strings.ToLower(strings.TrimSpace(payload.Access))
|
||||||
|
payload.Host = strings.TrimSpace(payload.Host)
|
||||||
|
|
||||||
|
if payload.Protocol != "http" && payload.Protocol != "https" {
|
||||||
|
WriteError(w, http.StatusBadRequest, RequestIDFromContext(r.Context()), "invalid_request", "Protocol must be either 'http' or 'https'.")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
if payload.Access != "local" && payload.Access != "remote" {
|
||||||
|
WriteError(w, http.StatusBadRequest, RequestIDFromContext(r.Context()), "invalid_request", "Access must be either 'local' or 'remote'.")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
if payload.Host == "" {
|
||||||
|
WriteError(w, http.StatusBadRequest, RequestIDFromContext(r.Context()), "invalid_request", "Host is required.")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
record, err := routes.bootstrapService().SaveInstance(r.Context(), bootstrapservice.SaveInstanceInput{
|
||||||
|
Protocol: payload.Protocol,
|
||||||
|
Access: payload.Access,
|
||||||
|
Host: payload.Host,
|
||||||
|
})
|
||||||
|
if err != nil {
|
||||||
|
routes.writeBootstrapPersistenceError(w, r, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
routes.writeBootstrapStepResponse(w, http.StatusOK, "instance", map[string]any{
|
||||||
|
"request": payload,
|
||||||
|
"installation": record,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
func (routes apiRoutes) handleBootstrapModeStep(w http.ResponseWriter, r *http.Request) {
|
||||||
|
payload, ok := decodeBootstrapRequest[bootstrapModeStepRequest](w, r)
|
||||||
|
if !ok {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
payload.Mode = strings.ToLower(strings.TrimSpace(payload.Mode))
|
||||||
|
payload.Name = strings.TrimSpace(payload.Name)
|
||||||
|
|
||||||
|
if payload.Mode != "personal" && payload.Mode != "organizational" {
|
||||||
|
WriteError(w, http.StatusBadRequest, RequestIDFromContext(r.Context()), "invalid_request", "Mode must be either 'personal' or 'organizational'.")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
if payload.Name == "" {
|
||||||
|
WriteError(w, http.StatusBadRequest, RequestIDFromContext(r.Context()), "invalid_request", "Name is required.")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
record, err := routes.bootstrapService().SaveMode(r.Context(), bootstrapservice.SaveModeInput{Mode: payload.Mode, Name: payload.Name})
|
||||||
|
if err != nil {
|
||||||
|
routes.writeBootstrapPersistenceError(w, r, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
routes.writeBootstrapStepResponse(w, http.StatusOK, "mode", map[string]any{
|
||||||
|
"request": payload,
|
||||||
|
"installation": record,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
func (routes apiRoutes) handleBootstrapAdminStep(w http.ResponseWriter, r *http.Request) {
|
||||||
|
payload, ok := decodeBootstrapRequest[bootstrapAdminStepRequest](w, r)
|
||||||
|
if !ok {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
payload.DisplayName = strings.TrimSpace(payload.DisplayName)
|
||||||
|
payload.Email = strings.ToLower(strings.TrimSpace(payload.Email))
|
||||||
|
|
||||||
|
if payload.DisplayName == "" {
|
||||||
|
WriteError(w, http.StatusBadRequest, RequestIDFromContext(r.Context()), "invalid_request", "Display name is required.")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
if payload.Email == "" {
|
||||||
|
WriteError(w, http.StatusBadRequest, RequestIDFromContext(r.Context()), "invalid_request", "Email is required.")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
if strings.TrimSpace(payload.Password) == "" {
|
||||||
|
WriteError(w, http.StatusBadRequest, RequestIDFromContext(r.Context()), "invalid_request", "Password is required.")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
record, err := routes.bootstrapService().SaveAdmin(r.Context(), bootstrapservice.SaveAdminInput{
|
||||||
|
DisplayName: payload.DisplayName,
|
||||||
|
Email: payload.Email,
|
||||||
|
Password: payload.Password,
|
||||||
|
})
|
||||||
|
if err != nil {
|
||||||
|
routes.writeBootstrapPersistenceError(w, r, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
routes.writeBootstrapStepResponse(w, http.StatusOK, "admin", map[string]any{
|
||||||
|
"request": payload,
|
||||||
|
"admin": record,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
func (routes apiRoutes) handleBootstrapStructureStep(w http.ResponseWriter, r *http.Request) {
|
||||||
|
payload, ok := decodeBootstrapRequest[bootstrapStructureStepRequest](w, r)
|
||||||
|
if !ok {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
payload.OrganizationName = strings.TrimSpace(payload.OrganizationName)
|
||||||
|
payload.DepartmentName = strings.TrimSpace(payload.DepartmentName)
|
||||||
|
payload.TeamName = strings.TrimSpace(payload.TeamName)
|
||||||
|
payload.ProjectName = strings.TrimSpace(payload.ProjectName)
|
||||||
|
|
||||||
|
if payload.DepartmentName == "" {
|
||||||
|
WriteError(w, http.StatusBadRequest, RequestIDFromContext(r.Context()), "invalid_request", "Department name is required.")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
if payload.TeamName == "" {
|
||||||
|
WriteError(w, http.StatusBadRequest, RequestIDFromContext(r.Context()), "invalid_request", "Team name is required.")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
if payload.ProjectName == "" {
|
||||||
|
WriteError(w, http.StatusBadRequest, RequestIDFromContext(r.Context()), "invalid_request", "Project name is required.")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
record, err := routes.bootstrapService().SaveStructure(r.Context(), bootstrapservice.SaveStructureInput{
|
||||||
|
OrganizationName: payload.OrganizationName,
|
||||||
|
DepartmentName: payload.DepartmentName,
|
||||||
|
TeamName: payload.TeamName,
|
||||||
|
ProjectName: payload.ProjectName,
|
||||||
|
})
|
||||||
|
if err != nil {
|
||||||
|
routes.writeBootstrapPersistenceError(w, r, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
routes.writeBootstrapStepResponse(w, http.StatusOK, "structure", map[string]any{
|
||||||
|
"request": payload,
|
||||||
|
"structure": record,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
func (routes apiRoutes) bootstrapService() *bootstrapservice.Service {
|
||||||
|
return bootstrapservice.NewService(routes.cfg.Database)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (routes apiRoutes) writeBootstrapStepResponse(w http.ResponseWriter, status int, step string, payload any) {
|
||||||
|
WriteJSON(w, status, map[string]any{
|
||||||
|
"data": map[string]any{
|
||||||
|
"step": step,
|
||||||
|
"result": payload,
|
||||||
|
},
|
||||||
|
"meta": map[string]any{
|
||||||
|
"resource": "bootstrap-step",
|
||||||
|
"persisted": true,
|
||||||
|
},
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
func (routes apiRoutes) writeBootstrapPersistenceError(w http.ResponseWriter, r *http.Request, err error) {
|
||||||
|
switch {
|
||||||
|
case errors.Is(err, bootstrapservice.ErrInstallationNotConfigured), errors.Is(err, bootstrapservice.ErrAdminNotConfigured):
|
||||||
|
WriteError(w, http.StatusConflict, RequestIDFromContext(r.Context()), "bootstrap_prerequisite_missing", err.Error())
|
||||||
|
default:
|
||||||
|
routes.cfg.Logger.Error("persist bootstrap step", "error", err, "path", r.URL.Path)
|
||||||
|
message := "Failed to persist bootstrap data."
|
||||||
|
if routes.cfg.Config.IsDevelopment() {
|
||||||
|
message = message + " " + err.Error()
|
||||||
|
}
|
||||||
|
WriteError(w, http.StatusInternalServerError, RequestIDFromContext(r.Context()), "bootstrap_persist_failed", message)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func decodeBootstrapRequest[T any](w http.ResponseWriter, r *http.Request) (T, bool) {
|
||||||
|
var payload T
|
||||||
|
|
||||||
|
decoder := json.NewDecoder(r.Body)
|
||||||
|
decoder.DisallowUnknownFields()
|
||||||
|
|
||||||
|
if err := decoder.Decode(&payload); err != nil {
|
||||||
|
if errors.Is(err, io.EOF) {
|
||||||
|
WriteError(w, http.StatusBadRequest, RequestIDFromContext(r.Context()), "invalid_json", "The request body is required and must be valid JSON for this bootstrap step.")
|
||||||
|
return payload, false
|
||||||
|
}
|
||||||
|
|
||||||
|
WriteError(w, http.StatusBadRequest, RequestIDFromContext(r.Context()), "invalid_json", "The request body must be valid JSON for this bootstrap step.")
|
||||||
|
return payload, false
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := decoder.Decode(&struct{}{}); !errors.Is(err, io.EOF) {
|
||||||
|
WriteError(w, http.StatusBadRequest, RequestIDFromContext(r.Context()), "invalid_json", "The request body must contain a single JSON object.")
|
||||||
|
return payload, false
|
||||||
|
}
|
||||||
|
|
||||||
|
return payload, true
|
||||||
|
}
|
||||||
69
Backend/internal/httpx/api_routes.go
Normal file
69
Backend/internal/httpx/api_routes.go
Normal file
@@ -0,0 +1,69 @@
|
|||||||
|
// Path: Backend/internal/httpx/api_routes.go
|
||||||
|
|
||||||
|
package httpx
|
||||||
|
|
||||||
|
import (
|
||||||
|
"net/http"
|
||||||
|
|
||||||
|
"github.com/go-chi/chi/v5"
|
||||||
|
)
|
||||||
|
|
||||||
|
type apiRoutes struct {
|
||||||
|
cfg RouterConfig
|
||||||
|
}
|
||||||
|
|
||||||
|
func newAPIRoutes(cfg RouterConfig) routeRegistrar {
|
||||||
|
return apiRoutes{cfg: cfg}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (routes apiRoutes) Register(router chi.Router) {
|
||||||
|
router.Route("/v1", func(apiRouter chi.Router) {
|
||||||
|
apiRouter.Get("/", routes.handleIndex)
|
||||||
|
apiRouter.Get("/bootstrap", routes.handleBootstrapOverview)
|
||||||
|
apiRouter.Get("/bootstrap/installation", routes.handleBootstrapInstallation)
|
||||||
|
apiRouter.Get("/bootstrap/admin", routes.handleBootstrapAdmin)
|
||||||
|
apiRouter.Get("/bootstrap/structure", routes.handleBootstrapStructure)
|
||||||
|
apiRouter.Get("/bootstrap/state", routes.handleBootstrapState)
|
||||||
|
apiRouter.Route("/bootstrap/steps", func(bootstrapRouter chi.Router) {
|
||||||
|
bootstrapRouter.Post("/instance", routes.handleBootstrapInstanceStep)
|
||||||
|
bootstrapRouter.Post("/mode", routes.handleBootstrapModeStep)
|
||||||
|
bootstrapRouter.Post("/admin", routes.handleBootstrapAdminStep)
|
||||||
|
bootstrapRouter.Post("/structure", routes.handleBootstrapStructureStep)
|
||||||
|
})
|
||||||
|
apiRouter.Get("/app-shell", routes.handleAppShellState)
|
||||||
|
apiRouter.Get("/organizations", routes.handleOrganizations)
|
||||||
|
apiRouter.Get("/workspaces", routes.handleWorkspaces)
|
||||||
|
|
||||||
|
if routes.cfg.Config.IsDevelopment() {
|
||||||
|
apiRouter.Post("/dev/bootstrap/reset", routes.handleDevelopmentBootstrapReset)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
func (routes apiRoutes) handleIndex(w http.ResponseWriter, _ *http.Request) {
|
||||||
|
WriteJSON(w, http.StatusOK, map[string]any{
|
||||||
|
"service": routes.cfg.ServiceName,
|
||||||
|
"version": "v1",
|
||||||
|
"status": "scaffolded",
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
func (routes apiRoutes) handleOrganizations(w http.ResponseWriter, _ *http.Request) {
|
||||||
|
WriteJSON(w, http.StatusOK, map[string]any{
|
||||||
|
"data": []any{},
|
||||||
|
"meta": map[string]any{
|
||||||
|
"resource": "organizations",
|
||||||
|
"count": 0,
|
||||||
|
},
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
func (routes apiRoutes) handleWorkspaces(w http.ResponseWriter, _ *http.Request) {
|
||||||
|
WriteJSON(w, http.StatusOK, map[string]any{
|
||||||
|
"data": []any{},
|
||||||
|
"meta": map[string]any{
|
||||||
|
"resource": "workspaces",
|
||||||
|
"count": 0,
|
||||||
|
},
|
||||||
|
})
|
||||||
|
}
|
||||||
80
Backend/internal/httpx/middleware.go
Normal file
80
Backend/internal/httpx/middleware.go
Normal file
@@ -0,0 +1,80 @@
|
|||||||
|
// Path: Backend/internal/httpx/middleware.go
|
||||||
|
|
||||||
|
package httpx
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"log/slog"
|
||||||
|
"net/http"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"github.com/google/uuid"
|
||||||
|
)
|
||||||
|
|
||||||
|
type contextKey string
|
||||||
|
|
||||||
|
const requestIDContextKey contextKey = "requestID"
|
||||||
|
|
||||||
|
type statusRecorder struct {
|
||||||
|
http.ResponseWriter
|
||||||
|
statusCode int
|
||||||
|
}
|
||||||
|
|
||||||
|
func (r *statusRecorder) WriteHeader(statusCode int) {
|
||||||
|
r.statusCode = statusCode
|
||||||
|
r.ResponseWriter.WriteHeader(statusCode)
|
||||||
|
}
|
||||||
|
|
||||||
|
func RequestID(next http.Handler) http.Handler {
|
||||||
|
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||||
|
requestID := uuid.NewString()
|
||||||
|
ctx := context.WithValue(r.Context(), requestIDContextKey, requestID)
|
||||||
|
w.Header().Set("X-Request-ID", requestID)
|
||||||
|
next.ServeHTTP(w, r.WithContext(ctx))
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
func Recoverer(logger *slog.Logger) func(http.Handler) http.Handler {
|
||||||
|
return func(next http.Handler) http.Handler {
|
||||||
|
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||||
|
defer func() {
|
||||||
|
if recovered := recover(); recovered != nil {
|
||||||
|
requestID := RequestIDFromContext(r.Context())
|
||||||
|
logger.Error("panic recovered", "request_id", requestID, "panic", recovered, "path", r.URL.Path)
|
||||||
|
WriteError(w, http.StatusInternalServerError, requestID, "internal_error", "An unexpected error occurred.")
|
||||||
|
}
|
||||||
|
}()
|
||||||
|
|
||||||
|
next.ServeHTTP(w, r)
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func RequestLogger(logger *slog.Logger) func(http.Handler) http.Handler {
|
||||||
|
return func(next http.Handler) http.Handler {
|
||||||
|
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||||
|
startedAt := time.Now()
|
||||||
|
recorder := &statusRecorder{ResponseWriter: w, statusCode: http.StatusOK}
|
||||||
|
|
||||||
|
next.ServeHTTP(recorder, r)
|
||||||
|
|
||||||
|
logger.Info(
|
||||||
|
"http request",
|
||||||
|
"request_id", RequestIDFromContext(r.Context()),
|
||||||
|
"method", r.Method,
|
||||||
|
"path", r.URL.Path,
|
||||||
|
"status", recorder.statusCode,
|
||||||
|
"duration", time.Since(startedAt).String(),
|
||||||
|
)
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func RequestIDFromContext(ctx context.Context) string {
|
||||||
|
requestID, ok := ctx.Value(requestIDContextKey).(string)
|
||||||
|
if !ok {
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
|
||||||
|
return requestID
|
||||||
|
}
|
||||||
33
Backend/internal/httpx/response.go
Normal file
33
Backend/internal/httpx/response.go
Normal file
@@ -0,0 +1,33 @@
|
|||||||
|
// Path: Backend/internal/httpx/response.go
|
||||||
|
|
||||||
|
package httpx
|
||||||
|
|
||||||
|
import (
|
||||||
|
"encoding/json"
|
||||||
|
"net/http"
|
||||||
|
)
|
||||||
|
|
||||||
|
type ErrorResponse struct {
|
||||||
|
Error string `json:"error"`
|
||||||
|
Message string `json:"message"`
|
||||||
|
RequestID string `json:"requestId,omitempty"`
|
||||||
|
}
|
||||||
|
|
||||||
|
func WriteJSON(w http.ResponseWriter, status int, payload any) {
|
||||||
|
w.Header().Set("Content-Type", "application/json; charset=utf-8")
|
||||||
|
w.WriteHeader(status)
|
||||||
|
|
||||||
|
if payload == nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
_ = json.NewEncoder(w).Encode(payload)
|
||||||
|
}
|
||||||
|
|
||||||
|
func WriteError(w http.ResponseWriter, status int, requestID, code, message string) {
|
||||||
|
WriteJSON(w, status, ErrorResponse{
|
||||||
|
Error: code,
|
||||||
|
Message: message,
|
||||||
|
RequestID: requestID,
|
||||||
|
})
|
||||||
|
}
|
||||||
70
Backend/internal/httpx/router.go
Normal file
70
Backend/internal/httpx/router.go
Normal file
@@ -0,0 +1,70 @@
|
|||||||
|
// Path: Backend/internal/httpx/router.go
|
||||||
|
|
||||||
|
package httpx
|
||||||
|
|
||||||
|
import (
|
||||||
|
"log/slog"
|
||||||
|
"net/http"
|
||||||
|
"strings"
|
||||||
|
|
||||||
|
"github.com/go-chi/chi/v5"
|
||||||
|
chimiddleware "github.com/go-chi/chi/v5/middleware"
|
||||||
|
|
||||||
|
"moku-backend/internal/buildinfo"
|
||||||
|
"moku-backend/internal/cache"
|
||||||
|
"moku-backend/internal/config"
|
||||||
|
"moku-backend/internal/database"
|
||||||
|
)
|
||||||
|
|
||||||
|
type RouterConfig struct {
|
||||||
|
ServiceName string
|
||||||
|
Config *config.Config
|
||||||
|
Logger *slog.Logger
|
||||||
|
BuildInfo buildinfo.Info
|
||||||
|
Database *database.DB
|
||||||
|
Cache *cache.Client
|
||||||
|
}
|
||||||
|
|
||||||
|
type routeRegistrar interface {
|
||||||
|
Register(chi.Router)
|
||||||
|
}
|
||||||
|
|
||||||
|
func NewRouter(cfg RouterConfig) http.Handler {
|
||||||
|
router := chi.NewRouter()
|
||||||
|
|
||||||
|
registerMiddleware(router, cfg)
|
||||||
|
registerRoutes(router, routesForService(cfg)...)
|
||||||
|
router.NotFound(notFoundHandler)
|
||||||
|
|
||||||
|
return router
|
||||||
|
}
|
||||||
|
|
||||||
|
func registerMiddleware(router chi.Router, cfg RouterConfig) {
|
||||||
|
router.Use(chimiddleware.RealIP)
|
||||||
|
router.Use(RequestID)
|
||||||
|
router.Use(Recoverer(cfg.Logger))
|
||||||
|
router.Use(RequestLogger(cfg.Logger))
|
||||||
|
}
|
||||||
|
|
||||||
|
func registerRoutes(router chi.Router, registrars ...routeRegistrar) {
|
||||||
|
for _, registrar := range registrars {
|
||||||
|
registrar.Register(router)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func routesForService(cfg RouterConfig) []routeRegistrar {
|
||||||
|
registrars := []routeRegistrar{newSharedRoutes(cfg)}
|
||||||
|
|
||||||
|
switch strings.ToLower(cfg.ServiceName) {
|
||||||
|
case "web":
|
||||||
|
registrars = append(registrars, newWebRoutes(cfg))
|
||||||
|
case "api":
|
||||||
|
registrars = append(registrars, newAPIRoutes(cfg))
|
||||||
|
}
|
||||||
|
|
||||||
|
return registrars
|
||||||
|
}
|
||||||
|
|
||||||
|
func notFoundHandler(w http.ResponseWriter, r *http.Request) {
|
||||||
|
WriteError(w, http.StatusNotFound, RequestIDFromContext(r.Context()), "not_found", "The requested endpoint does not exist.")
|
||||||
|
}
|
||||||
69
Backend/internal/httpx/shared_routes.go
Normal file
69
Backend/internal/httpx/shared_routes.go
Normal file
@@ -0,0 +1,69 @@
|
|||||||
|
// Path: Backend/internal/httpx/shared_routes.go
|
||||||
|
|
||||||
|
package httpx
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"net/http"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"github.com/go-chi/chi/v5"
|
||||||
|
)
|
||||||
|
|
||||||
|
type sharedRoutes struct {
|
||||||
|
cfg RouterConfig
|
||||||
|
}
|
||||||
|
|
||||||
|
func newSharedRoutes(cfg RouterConfig) routeRegistrar {
|
||||||
|
return sharedRoutes{cfg: cfg}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (routes sharedRoutes) Register(router chi.Router) {
|
||||||
|
router.Get("/", routes.handleIndex)
|
||||||
|
router.Get("/health", routes.handleHealth)
|
||||||
|
router.Get("/version", routes.handleVersion)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (routes sharedRoutes) handleIndex(w http.ResponseWriter, _ *http.Request) {
|
||||||
|
WriteJSON(w, http.StatusOK, map[string]string{
|
||||||
|
"service": routes.cfg.ServiceName,
|
||||||
|
"status": "ok",
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
func (routes sharedRoutes) handleHealth(w http.ResponseWriter, r *http.Request) {
|
||||||
|
ctx, cancel := context.WithTimeout(r.Context(), 2*time.Second)
|
||||||
|
defer cancel()
|
||||||
|
|
||||||
|
databaseStatus := "ok"
|
||||||
|
if err := routes.cfg.Database.Health(ctx); err != nil {
|
||||||
|
databaseStatus = err.Error()
|
||||||
|
}
|
||||||
|
|
||||||
|
cacheStatus := "ok"
|
||||||
|
if err := routes.cfg.Cache.Health(ctx); err != nil {
|
||||||
|
cacheStatus = err.Error()
|
||||||
|
}
|
||||||
|
|
||||||
|
statusCode := http.StatusOK
|
||||||
|
if databaseStatus != "ok" || cacheStatus != "ok" {
|
||||||
|
statusCode = http.StatusServiceUnavailable
|
||||||
|
}
|
||||||
|
|
||||||
|
WriteJSON(w, statusCode, map[string]any{
|
||||||
|
"service": routes.cfg.ServiceName,
|
||||||
|
"status": map[string]string{
|
||||||
|
"database": databaseStatus,
|
||||||
|
"cache": cacheStatus,
|
||||||
|
},
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
func (routes sharedRoutes) handleVersion(w http.ResponseWriter, _ *http.Request) {
|
||||||
|
WriteJSON(w, http.StatusOK, map[string]any{
|
||||||
|
"service": routes.cfg.ServiceName,
|
||||||
|
"app": routes.cfg.Config.AppName,
|
||||||
|
"environment": routes.cfg.Config.Environment,
|
||||||
|
"build": routes.cfg.BuildInfo,
|
||||||
|
})
|
||||||
|
}
|
||||||
51
Backend/internal/httpx/web_routes.go
Normal file
51
Backend/internal/httpx/web_routes.go
Normal file
@@ -0,0 +1,51 @@
|
|||||||
|
// Path: Backend/internal/httpx/web_routes.go
|
||||||
|
|
||||||
|
package httpx
|
||||||
|
|
||||||
|
import (
|
||||||
|
"net/http"
|
||||||
|
|
||||||
|
"github.com/go-chi/chi/v5"
|
||||||
|
)
|
||||||
|
|
||||||
|
type webRoutes struct {
|
||||||
|
cfg RouterConfig
|
||||||
|
}
|
||||||
|
|
||||||
|
func newWebRoutes(cfg RouterConfig) routeRegistrar {
|
||||||
|
return webRoutes{cfg: cfg}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (routes webRoutes) Register(router chi.Router) {
|
||||||
|
router.Get("/session", routes.handleSession)
|
||||||
|
router.Get("/bootstrap", routes.handleBootstrap)
|
||||||
|
router.Get("/me", routes.handleCurrentUser)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (routes webRoutes) handleSession(w http.ResponseWriter, _ *http.Request) {
|
||||||
|
WriteJSON(w, http.StatusOK, map[string]any{
|
||||||
|
"service": routes.cfg.ServiceName,
|
||||||
|
"session": map[string]any{
|
||||||
|
"authenticated": false,
|
||||||
|
"mode": "cookie",
|
||||||
|
},
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
func (routes webRoutes) handleBootstrap(w http.ResponseWriter, _ *http.Request) {
|
||||||
|
WriteJSON(w, http.StatusOK, map[string]any{
|
||||||
|
"service": routes.cfg.ServiceName,
|
||||||
|
"app": map[string]any{
|
||||||
|
"name": routes.cfg.Config.AppName,
|
||||||
|
"environment": routes.cfg.Config.Environment,
|
||||||
|
},
|
||||||
|
"features": map[string]bool{
|
||||||
|
"auth": false,
|
||||||
|
"workspaces": false,
|
||||||
|
},
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
func (routes webRoutes) handleCurrentUser(w http.ResponseWriter, r *http.Request) {
|
||||||
|
WriteError(w, http.StatusNotImplemented, RequestIDFromContext(r.Context()), "not_implemented", "The current user endpoint is scaffolded but not implemented yet.")
|
||||||
|
}
|
||||||
65
Backend/internal/process/process.go
Normal file
65
Backend/internal/process/process.go
Normal file
@@ -0,0 +1,65 @@
|
|||||||
|
// Path: Backend/internal/process/process.go
|
||||||
|
|
||||||
|
package process
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"errors"
|
||||||
|
"fmt"
|
||||||
|
"log/slog"
|
||||||
|
"net/http"
|
||||||
|
"os"
|
||||||
|
"os/signal"
|
||||||
|
"syscall"
|
||||||
|
"time"
|
||||||
|
)
|
||||||
|
|
||||||
|
func RunHTTPServer(serviceName, address string, handler http.Handler, logger *slog.Logger, shutdownTimeout time.Duration) error {
|
||||||
|
server := &http.Server{
|
||||||
|
Addr: address,
|
||||||
|
Handler: handler,
|
||||||
|
ReadHeaderTimeout: 5 * time.Second,
|
||||||
|
}
|
||||||
|
|
||||||
|
serverErr := make(chan error, 1)
|
||||||
|
|
||||||
|
go func() {
|
||||||
|
logger.Info("http server starting", "service", serviceName, "address", address)
|
||||||
|
serverErr <- server.ListenAndServe()
|
||||||
|
}()
|
||||||
|
|
||||||
|
signalCtx, stop := signal.NotifyContext(context.Background(), os.Interrupt, syscall.SIGTERM)
|
||||||
|
defer stop()
|
||||||
|
|
||||||
|
select {
|
||||||
|
case err := <-serverErr:
|
||||||
|
if err != nil && !errors.Is(err, http.ErrServerClosed) {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
case <-signalCtx.Done():
|
||||||
|
logger.Info("shutdown requested", "service", serviceName)
|
||||||
|
}
|
||||||
|
|
||||||
|
shutdownCtx, cancel := context.WithTimeout(context.Background(), shutdownTimeout)
|
||||||
|
defer cancel()
|
||||||
|
|
||||||
|
if err := server.Shutdown(shutdownCtx); err != nil {
|
||||||
|
return fmt.Errorf("shutdown %s server: %w", serviceName, err)
|
||||||
|
}
|
||||||
|
|
||||||
|
logger.Info("http server stopped", "service", serviceName)
|
||||||
|
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func WaitForShutdown(serviceName string, logger *slog.Logger) error {
|
||||||
|
signalCtx, stop := signal.NotifyContext(context.Background(), os.Interrupt, syscall.SIGTERM)
|
||||||
|
defer stop()
|
||||||
|
|
||||||
|
logger.Info("process running", "service", serviceName)
|
||||||
|
<-signalCtx.Done()
|
||||||
|
logger.Info("shutdown requested", "service", serviceName)
|
||||||
|
|
||||||
|
return nil
|
||||||
|
}
|
||||||
12
Backend/sqlc.yaml
Normal file
12
Backend/sqlc.yaml
Normal file
@@ -0,0 +1,12 @@
|
|||||||
|
version: "2"
|
||||||
|
sql:
|
||||||
|
- engine: "postgresql"
|
||||||
|
schema: "db/migrations"
|
||||||
|
queries: "db/queries"
|
||||||
|
gen:
|
||||||
|
go:
|
||||||
|
package: "sqlc"
|
||||||
|
out: "internal/sqlc"
|
||||||
|
sql_package: "pgx/v5"
|
||||||
|
emit_json_tags: true
|
||||||
|
emit_empty_slices: true
|
||||||
26
Commands/Local/Dev/backend.just
Normal file
26
Commands/Local/Dev/backend.just
Normal file
@@ -0,0 +1,26 @@
|
|||||||
|
project_root := justfile_directory()
|
||||||
|
backend_dir := project_root + "/Backend"
|
||||||
|
|
||||||
|
# Apply embedded database migrations.
|
||||||
|
migrate-up:
|
||||||
|
cd '{{backend_dir}}' && go run ./cmd/migrate up
|
||||||
|
|
||||||
|
# Roll back the most recent embedded database migration.
|
||||||
|
migrate-down:
|
||||||
|
cd '{{backend_dir}}' && go run ./cmd/migrate down
|
||||||
|
|
||||||
|
# Reset all embedded database migrations and reapply from scratch.
|
||||||
|
migrate-reset:
|
||||||
|
cd '{{backend_dir}}' && go run ./cmd/migrate reset
|
||||||
|
|
||||||
|
# Show the embedded database migration status.
|
||||||
|
migrate-status:
|
||||||
|
cd '{{backend_dir}}' && go run ./cmd/migrate status
|
||||||
|
|
||||||
|
# Format backend Go source files.
|
||||||
|
fmt:
|
||||||
|
cd '{{backend_dir}}' && gofmt -w ./cmd ./db ./internal
|
||||||
|
|
||||||
|
# Run backend test suite.
|
||||||
|
test:
|
||||||
|
cd '{{backend_dir}}' && go test ./...
|
||||||
14
Commands/Local/Dev/frontend.just
Normal file
14
Commands/Local/Dev/frontend.just
Normal file
@@ -0,0 +1,14 @@
|
|||||||
|
project_root := justfile_directory()
|
||||||
|
local_compose := project_root + "/Docker/docker-compose.local.dev.yaml"
|
||||||
|
frontend_dir := project_root + "/Frontend"
|
||||||
|
node_modules_volume := "moku_work_frontend_node_modules"
|
||||||
|
|
||||||
|
# Recreate the frontend node_modules Docker volume.
|
||||||
|
node_modules:
|
||||||
|
docker compose -f '{{local_compose}}' rm -sf frontend >/dev/null 2>&1 || true
|
||||||
|
docker volume rm -f '{{node_modules_volume}}' >/dev/null 2>&1 || true
|
||||||
|
docker compose -f '{{local_compose}}' up -d --remove-orphans --force-recreate frontend
|
||||||
|
|
||||||
|
# Run the frontend TypeScript check.
|
||||||
|
tsc:
|
||||||
|
cd '{{frontend_dir}}' && pnpm typecheck
|
||||||
39
Commands/Local/Dev/mod.just
Normal file
39
Commands/Local/Dev/mod.just
Normal file
@@ -0,0 +1,39 @@
|
|||||||
|
stack_runner := justfile_directory() + "/Commands/Local/Dev/scripts/dev-stack.sh"
|
||||||
|
|
||||||
|
mod frontend
|
||||||
|
mod backend
|
||||||
|
|
||||||
|
# Build the combined local development stack assets.
|
||||||
|
build:
|
||||||
|
bash '{{stack_runner}}' build
|
||||||
|
|
||||||
|
# Start the full local development stack in the background.
|
||||||
|
up:
|
||||||
|
bash '{{stack_runner}}' up
|
||||||
|
|
||||||
|
# Build first, then start the full local development stack in the background.
|
||||||
|
start:
|
||||||
|
bash '{{stack_runner}}' start
|
||||||
|
|
||||||
|
# Alias for the main full local development flow.
|
||||||
|
dev: up
|
||||||
|
|
||||||
|
# Stop and remove the local development stack.
|
||||||
|
down:
|
||||||
|
bash '{{stack_runner}}' down
|
||||||
|
|
||||||
|
# Rebuild the full local development stack.
|
||||||
|
rebuild:
|
||||||
|
bash '{{stack_runner}}' rebuild
|
||||||
|
|
||||||
|
# Follow logs for the full local development stack.
|
||||||
|
logs:
|
||||||
|
bash '{{stack_runner}}' logs
|
||||||
|
|
||||||
|
# Restart the full local development stack.
|
||||||
|
restart:
|
||||||
|
bash '{{stack_runner}}' restart
|
||||||
|
|
||||||
|
# Stop the local development stack and remove local images, volumes, and backend dev state.
|
||||||
|
clean:
|
||||||
|
bash '{{stack_runner}}' clean
|
||||||
91
Commands/Local/Dev/scripts/backend-stack.sh
Normal file
91
Commands/Local/Dev/scripts/backend-stack.sh
Normal file
@@ -0,0 +1,91 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
|
|
||||||
|
# Path: Commands/Local/Dev/scripts/backend-stack.sh
|
||||||
|
set -euo pipefail
|
||||||
|
|
||||||
|
action=${1:-up}
|
||||||
|
|
||||||
|
script_dir=$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd)
|
||||||
|
project_root=$(cd -- "$script_dir/../../../.." && pwd)
|
||||||
|
backend_dir="$project_root/Backend"
|
||||||
|
backend_bake="$backend_dir/docker-bake.hcl"
|
||||||
|
env_dir="$project_root/Env"
|
||||||
|
compose_file="$project_root/Docker/docker-compose.local.dev.yaml"
|
||||||
|
runtime_dir="$backend_dir/tmp/dev"
|
||||||
|
backend_image="moku/work-backend:dev"
|
||||||
|
backend_go_pkg_volume="moku_work_backend_go_pkg"
|
||||||
|
backend_go_build_volume="moku_work_backend_go_build"
|
||||||
|
|
||||||
|
services=(web api worker)
|
||||||
|
|
||||||
|
source "$script_dir/docker.sh"
|
||||||
|
source "$script_dir/env.sh"
|
||||||
|
|
||||||
|
build_backend() {
|
||||||
|
cd "$backend_dir"
|
||||||
|
docker buildx bake -f "$backend_bake" dev
|
||||||
|
}
|
||||||
|
|
||||||
|
up_backend() {
|
||||||
|
docker compose -f "$compose_file" up -d --remove-orphans --force-recreate "${services[@]}"
|
||||||
|
}
|
||||||
|
|
||||||
|
down_backend() {
|
||||||
|
docker compose -f "$compose_file" stop "${services[@]}" >/dev/null 2>&1 || true
|
||||||
|
docker compose -f "$compose_file" rm -f "${services[@]}" >/dev/null 2>&1 || true
|
||||||
|
}
|
||||||
|
|
||||||
|
restart_backend() {
|
||||||
|
docker compose -f "$compose_file" restart "${services[@]}"
|
||||||
|
}
|
||||||
|
|
||||||
|
follow_logs() {
|
||||||
|
docker compose -f "$compose_file" logs -f "${services[@]}"
|
||||||
|
}
|
||||||
|
|
||||||
|
clean_runtime() {
|
||||||
|
rm -rf "$runtime_dir"
|
||||||
|
}
|
||||||
|
|
||||||
|
case "$action" in
|
||||||
|
check)
|
||||||
|
ensure_docker 'docker is required for the local backend dev runtime. Install Docker first.'
|
||||||
|
;;
|
||||||
|
build)
|
||||||
|
ensure_docker 'docker is required for the local backend dev runtime. Install Docker first.'
|
||||||
|
build_backend
|
||||||
|
;;
|
||||||
|
up)
|
||||||
|
ensure_docker 'docker is required for the local backend dev runtime. Install Docker first.'
|
||||||
|
ensure_local_env_file "$env_dir"
|
||||||
|
up_backend
|
||||||
|
;;
|
||||||
|
down)
|
||||||
|
ensure_docker 'docker is required for the local backend dev runtime. Install Docker first.'
|
||||||
|
ensure_local_env_file "$env_dir"
|
||||||
|
down_backend
|
||||||
|
;;
|
||||||
|
restart)
|
||||||
|
ensure_docker 'docker is required for the local backend dev runtime. Install Docker first.'
|
||||||
|
ensure_local_env_file "$env_dir"
|
||||||
|
restart_backend
|
||||||
|
;;
|
||||||
|
logs)
|
||||||
|
ensure_docker 'docker is required for the local backend dev runtime. Install Docker first.'
|
||||||
|
ensure_local_env_file "$env_dir"
|
||||||
|
follow_logs
|
||||||
|
;;
|
||||||
|
clean)
|
||||||
|
ensure_docker 'docker is required for the local backend dev runtime. Install Docker first.'
|
||||||
|
ensure_local_env_file "$env_dir"
|
||||||
|
down_backend
|
||||||
|
remove_docker_image_if_present "$backend_image"
|
||||||
|
remove_docker_volume_if_present "$backend_go_pkg_volume"
|
||||||
|
remove_docker_volume_if_present "$backend_go_build_volume"
|
||||||
|
clean_runtime
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
printf 'Unsupported backend stack action: %s\n' "$action" >&2
|
||||||
|
exit 1
|
||||||
|
;;
|
||||||
|
esac
|
||||||
102
Commands/Local/Dev/scripts/dev-stack.sh
Normal file
102
Commands/Local/Dev/scripts/dev-stack.sh
Normal file
@@ -0,0 +1,102 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
|
|
||||||
|
# Path: Commands/Local/Dev/scripts/dev-stack.sh
|
||||||
|
set -euo pipefail
|
||||||
|
|
||||||
|
action=${1:-up}
|
||||||
|
|
||||||
|
script_dir=$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd)
|
||||||
|
project_root=$(cd -- "$script_dir/../../../.." && pwd)
|
||||||
|
frontend_dir="$project_root/Frontend"
|
||||||
|
frontend_bake="$frontend_dir/docker-bake.hcl"
|
||||||
|
backend_dir="$project_root/Backend"
|
||||||
|
backend_bake="$backend_dir/docker-bake.hcl"
|
||||||
|
env_dir="$project_root/Env"
|
||||||
|
compose_file="$project_root/Docker/docker-compose.local.dev.yaml"
|
||||||
|
frontend_image="moku/work-frontend:dev"
|
||||||
|
backend_image="moku/work-backend:dev"
|
||||||
|
frontend_volume="moku_work_frontend_node_modules"
|
||||||
|
backend_go_pkg_volume="moku_work_backend_go_pkg"
|
||||||
|
backend_go_build_volume="moku_work_backend_go_build"
|
||||||
|
backend_runtime_dir="$backend_dir/tmp/dev"
|
||||||
|
|
||||||
|
source "$script_dir/docker.sh"
|
||||||
|
source "$script_dir/env.sh"
|
||||||
|
|
||||||
|
build_frontend() {
|
||||||
|
cd "$frontend_dir"
|
||||||
|
docker buildx bake -f "$frontend_bake" dev
|
||||||
|
}
|
||||||
|
|
||||||
|
build_backend() {
|
||||||
|
cd "$backend_dir"
|
||||||
|
docker buildx bake -f "$backend_bake" dev
|
||||||
|
}
|
||||||
|
|
||||||
|
build_images() {
|
||||||
|
build_frontend
|
||||||
|
build_backend
|
||||||
|
}
|
||||||
|
|
||||||
|
up_stack() {
|
||||||
|
docker compose -f "$compose_file" up -d --remove-orphans --force-recreate
|
||||||
|
}
|
||||||
|
|
||||||
|
down_stack() {
|
||||||
|
docker compose -f "$compose_file" down --remove-orphans --volumes
|
||||||
|
}
|
||||||
|
|
||||||
|
follow_logs() {
|
||||||
|
docker compose -f "$compose_file" logs -f
|
||||||
|
}
|
||||||
|
|
||||||
|
clean_stack() {
|
||||||
|
docker compose -f "$compose_file" down --remove-orphans --volumes >/dev/null 2>&1 || true
|
||||||
|
remove_docker_image_if_present "$frontend_image"
|
||||||
|
remove_docker_image_if_present "$backend_image"
|
||||||
|
remove_docker_volume_if_present "$frontend_volume"
|
||||||
|
remove_docker_volume_if_present "$backend_go_pkg_volume"
|
||||||
|
remove_docker_volume_if_present "$backend_go_build_volume"
|
||||||
|
rm -rf "$backend_runtime_dir"
|
||||||
|
}
|
||||||
|
|
||||||
|
start_stack() {
|
||||||
|
build_images
|
||||||
|
up_stack
|
||||||
|
}
|
||||||
|
|
||||||
|
case "$action" in
|
||||||
|
build)
|
||||||
|
ensure_docker 'docker is required for the local development stack. Install Docker first.'
|
||||||
|
build_images
|
||||||
|
;;
|
||||||
|
up|start|rebuild)
|
||||||
|
ensure_docker 'docker is required for the local development stack. Install Docker first.'
|
||||||
|
ensure_local_env_file "$env_dir"
|
||||||
|
start_stack
|
||||||
|
;;
|
||||||
|
down)
|
||||||
|
ensure_docker 'docker is required for the local development stack. Install Docker first.'
|
||||||
|
ensure_local_env_file "$env_dir"
|
||||||
|
down_stack
|
||||||
|
;;
|
||||||
|
restart)
|
||||||
|
ensure_docker 'docker is required for the local development stack. Install Docker first.'
|
||||||
|
ensure_local_env_file "$env_dir"
|
||||||
|
docker compose -f "$compose_file" restart
|
||||||
|
;;
|
||||||
|
logs)
|
||||||
|
ensure_docker 'docker is required for the local development stack. Install Docker first.'
|
||||||
|
ensure_local_env_file "$env_dir"
|
||||||
|
follow_logs
|
||||||
|
;;
|
||||||
|
clean)
|
||||||
|
ensure_docker 'docker is required for the local development stack. Install Docker first.'
|
||||||
|
ensure_local_env_file "$env_dir"
|
||||||
|
clean_stack
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
printf 'Unsupported dev stack action: %s\n' "$action" >&2
|
||||||
|
exit 1
|
||||||
|
;;
|
||||||
|
esac
|
||||||
20
Commands/Local/Dev/scripts/docker.sh
Normal file
20
Commands/Local/Dev/scripts/docker.sh
Normal file
@@ -0,0 +1,20 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
|
|
||||||
|
set -euo pipefail
|
||||||
|
|
||||||
|
ensure_docker() {
|
||||||
|
local error_message=${1:-docker is required. Install Docker first.}
|
||||||
|
|
||||||
|
if ! command -v docker >/dev/null 2>&1; then
|
||||||
|
printf '%s\n' "$error_message" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
remove_docker_image_if_present() {
|
||||||
|
docker image rm -f "$1" >/dev/null 2>&1 || true
|
||||||
|
}
|
||||||
|
|
||||||
|
remove_docker_volume_if_present() {
|
||||||
|
docker volume rm -f "$1" >/dev/null 2>&1 || true
|
||||||
|
}
|
||||||
21
Commands/Local/Dev/scripts/env.sh
Normal file
21
Commands/Local/Dev/scripts/env.sh
Normal file
@@ -0,0 +1,21 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
|
|
||||||
|
set -euo pipefail
|
||||||
|
|
||||||
|
ensure_local_env_file() {
|
||||||
|
local env_dir=$1
|
||||||
|
local example_env_file="$env_dir/.env.example"
|
||||||
|
local local_env_file="$env_dir/.env.local"
|
||||||
|
|
||||||
|
if [[ -f "$local_env_file" ]]; then
|
||||||
|
return
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [[ ! -f "$example_env_file" ]]; then
|
||||||
|
printf 'Missing env template: %s\n' "$example_env_file" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
cp "$example_env_file" "$local_env_file"
|
||||||
|
printf 'Created %s from %s\n' "$local_env_file" "$example_env_file"
|
||||||
|
}
|
||||||
@@ -1,36 +0,0 @@
|
|||||||
project_root := justfile_directory()
|
|
||||||
frontend_dir := project_root + "/Frontend"
|
|
||||||
frontend_bake := project_root + "/Frontend/docker-bake.hcl"
|
|
||||||
local_compose := project_root + "/Docker/docker-compose.local.dev.yaml"
|
|
||||||
|
|
||||||
# Build the Frontend development image.
|
|
||||||
build:
|
|
||||||
cd '{{frontend_dir}}' && docker buildx bake -f '{{frontend_bake}}' dev
|
|
||||||
|
|
||||||
# Start the local development stack in the background using the current image.
|
|
||||||
up:
|
|
||||||
docker compose -f '{{local_compose}}' up -d --remove-orphans --force-recreate
|
|
||||||
|
|
||||||
# Build first, then start the local development stack in the background.
|
|
||||||
start: build
|
|
||||||
docker compose -f '{{local_compose}}' up -d --remove-orphans --force-recreate
|
|
||||||
|
|
||||||
# Alias for the main local development flow.
|
|
||||||
dev: start
|
|
||||||
|
|
||||||
# Stop and remove the local development stack.
|
|
||||||
down:
|
|
||||||
docker compose -f '{{local_compose}}' down --remove-orphans --volumes
|
|
||||||
|
|
||||||
# Rebuild the Frontend development image and recreate the stack.
|
|
||||||
rebuild:
|
|
||||||
cd '{{frontend_dir}}' && docker buildx bake -f '{{frontend_bake}}' dev
|
|
||||||
docker compose -f '{{local_compose}}' up -d --remove-orphans --force-recreate
|
|
||||||
|
|
||||||
# Follow logs for the local development stack.
|
|
||||||
logs:
|
|
||||||
docker compose -f '{{local_compose}}' logs -f
|
|
||||||
|
|
||||||
# Restart the local development stack.
|
|
||||||
restart:
|
|
||||||
docker compose -f '{{local_compose}}' restart
|
|
||||||
@@ -1,2 +1,2 @@
|
|||||||
mod dev
|
mod dev "Dev"
|
||||||
mod prod
|
mod prod
|
||||||
|
|||||||
@@ -1,11 +1,44 @@
|
|||||||
project_root := justfile_directory()
|
project_root := justfile_directory()
|
||||||
frontend_dir := project_root + "/Frontend"
|
proxy_bake := project_root + "/Proxy/docker-bake.hcl"
|
||||||
frontend_bake := project_root + "/Frontend/docker-bake.hcl"
|
backend_bake := project_root + "/Backend/docker-bake.hcl"
|
||||||
|
local_compose := project_root + "/Docker/docker-compose.local.prod.yaml"
|
||||||
|
proxy_image := "moku/work-proxy:local-prod"
|
||||||
|
backend_api_image := "moku/work-backend:local-prod-api"
|
||||||
|
backend_worker_image := "moku/work-backend:local-prod-worker"
|
||||||
|
|
||||||
# Build the Frontend production image locally.
|
# Build the local production proxy image locally.
|
||||||
build:
|
build:
|
||||||
cd '{{frontend_dir}}' && docker buildx bake -f '{{frontend_bake}}' prod
|
cd '{{project_root}}' && docker buildx bake -f '{{proxy_bake}}' prod
|
||||||
|
cd '{{project_root}}' && docker buildx bake -f '{{backend_bake}}' prod-api prod-worker
|
||||||
|
|
||||||
# Rebuild the Frontend production image locally.
|
# Start the local production stack in the background using the current image.
|
||||||
|
up:
|
||||||
|
docker compose -f '{{local_compose}}' up -d --remove-orphans --force-recreate
|
||||||
|
|
||||||
|
# Build first, then start the local production stack in the background.
|
||||||
|
start: build up
|
||||||
|
|
||||||
|
# Rebuild the local production proxy image locally.
|
||||||
rebuild:
|
rebuild:
|
||||||
cd '{{frontend_dir}}' && docker buildx bake -f '{{frontend_bake}}' --set '*.no-cache=true' prod
|
cd '{{project_root}}' && docker buildx bake -f '{{proxy_bake}}' --set '*.no-cache=true' prod
|
||||||
|
cd '{{project_root}}' && docker buildx bake -f '{{backend_bake}}' --set '*.no-cache=true' prod-api prod-worker
|
||||||
|
docker compose -f '{{local_compose}}' up -d --remove-orphans --force-recreate
|
||||||
|
|
||||||
|
# Stop and remove the local production stack.
|
||||||
|
down:
|
||||||
|
docker compose -f '{{local_compose}}' down --remove-orphans --volumes
|
||||||
|
|
||||||
|
# Follow logs for the local production stack.
|
||||||
|
logs:
|
||||||
|
docker compose -f '{{local_compose}}' logs -f
|
||||||
|
|
||||||
|
# Restart the local production stack.
|
||||||
|
restart:
|
||||||
|
docker compose -f '{{local_compose}}' restart
|
||||||
|
|
||||||
|
# Stop the local production stack and remove local images.
|
||||||
|
clean:
|
||||||
|
docker compose -f '{{local_compose}}' down --remove-orphans --volumes
|
||||||
|
docker image rm -f '{{proxy_image}}' >/dev/null 2>&1 || true
|
||||||
|
docker image rm -f '{{backend_api_image}}' >/dev/null 2>&1 || true
|
||||||
|
docker image rm -f '{{backend_worker_image}}' >/dev/null 2>&1 || true
|
||||||
|
|||||||
@@ -1,15 +1,95 @@
|
|||||||
|
x-backend-service: &backend-service
|
||||||
|
image: moku/work-backend:dev
|
||||||
|
restart: unless-stopped
|
||||||
|
env_file:
|
||||||
|
- ../Env/.env.local
|
||||||
|
environment:
|
||||||
|
DATABASE_URL: postgres://moku:moku_dev_password@postgres:5432/moku?sslmode=disable
|
||||||
|
VALKEY_URL: redis://valkey:6379/0
|
||||||
|
depends_on:
|
||||||
|
postgres:
|
||||||
|
condition: service_healthy
|
||||||
|
valkey:
|
||||||
|
condition: service_healthy
|
||||||
|
volumes:
|
||||||
|
- ../Backend:/app
|
||||||
|
- moku_work_backend_go_pkg:/go/pkg/mod
|
||||||
|
- moku_work_backend_go_build:/root/.cache/go-build
|
||||||
|
|
||||||
services:
|
services:
|
||||||
frontend:
|
postgres:
|
||||||
image: moku/work-frontend:dev
|
image: postgres:17-alpine
|
||||||
container_name: moku-work-frontend
|
container_name: moku-work-postgres
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
env_file:
|
environment:
|
||||||
- ../Env/.env.local
|
POSTGRES_DB: moku
|
||||||
ports:
|
POSTGRES_USER: moku
|
||||||
- "3333:3333"
|
POSTGRES_PASSWORD: moku_dev_password
|
||||||
volumes:
|
ports:
|
||||||
- ../Frontend:/app
|
- "5432:5432"
|
||||||
- moku_work_frontend_node_modules:/app/node_modules
|
volumes:
|
||||||
|
- moku_work_postgres_data:/var/lib/postgresql/data
|
||||||
|
healthcheck:
|
||||||
|
test: ["CMD-SHELL", "pg_isready -U moku -d moku"]
|
||||||
|
interval: 10s
|
||||||
|
timeout: 5s
|
||||||
|
retries: 5
|
||||||
|
start_period: 10s
|
||||||
|
|
||||||
|
valkey:
|
||||||
|
image: valkey/valkey:8-alpine
|
||||||
|
container_name: moku-work-valkey
|
||||||
|
restart: unless-stopped
|
||||||
|
ports:
|
||||||
|
- "6379:6379"
|
||||||
|
volumes:
|
||||||
|
- moku_work_valkey_data:/data
|
||||||
|
healthcheck:
|
||||||
|
test: ["CMD", "valkey-cli", "ping"]
|
||||||
|
interval: 10s
|
||||||
|
timeout: 5s
|
||||||
|
retries: 5
|
||||||
|
start_period: 5s
|
||||||
|
|
||||||
|
frontend:
|
||||||
|
image: moku/work-frontend:dev
|
||||||
|
container_name: moku-work-frontend
|
||||||
|
restart: unless-stopped
|
||||||
|
env_file:
|
||||||
|
- ../Env/.env.local
|
||||||
|
depends_on:
|
||||||
|
postgres:
|
||||||
|
condition: service_healthy
|
||||||
|
valkey:
|
||||||
|
condition: service_healthy
|
||||||
|
ports:
|
||||||
|
- "3333:3333"
|
||||||
|
volumes:
|
||||||
|
- ../Frontend:/app
|
||||||
|
- moku_work_frontend_node_modules:/app/node_modules
|
||||||
|
|
||||||
|
web:
|
||||||
|
<<: *backend-service
|
||||||
|
container_name: moku-work-backend-web
|
||||||
|
command: ["air", "-c", ".air.web.toml"]
|
||||||
|
ports:
|
||||||
|
- "8080:8080"
|
||||||
|
|
||||||
|
api:
|
||||||
|
<<: *backend-service
|
||||||
|
container_name: moku-work-backend-api
|
||||||
|
command: ["air", "-c", ".air.api.toml"]
|
||||||
|
ports:
|
||||||
|
- "8081:8081"
|
||||||
|
|
||||||
|
worker:
|
||||||
|
<<: *backend-service
|
||||||
|
container_name: moku-work-backend-worker
|
||||||
|
command: ["air", "-c", ".air.worker.toml"]
|
||||||
|
|
||||||
volumes:
|
volumes:
|
||||||
moku_work_frontend_node_modules:
|
moku_work_postgres_data:
|
||||||
|
moku_work_valkey_data:
|
||||||
|
moku_work_frontend_node_modules:
|
||||||
|
moku_work_backend_go_pkg:
|
||||||
|
moku_work_backend_go_build:
|
||||||
|
|||||||
@@ -1 +1,67 @@
|
|||||||
# Reserved for a future local production compose stack.
|
x-backend-service: &backend-service
|
||||||
|
restart: unless-stopped
|
||||||
|
env_file:
|
||||||
|
- ../Env/.env.local
|
||||||
|
environment:
|
||||||
|
DATABASE_URL: postgres://moku:moku_dev_password@postgres:5432/moku?sslmode=disable
|
||||||
|
VALKEY_URL: redis://valkey:6379/0
|
||||||
|
depends_on:
|
||||||
|
postgres:
|
||||||
|
condition: service_healthy
|
||||||
|
valkey:
|
||||||
|
condition: service_healthy
|
||||||
|
|
||||||
|
services:
|
||||||
|
postgres:
|
||||||
|
image: postgres:17-alpine
|
||||||
|
container_name: moku-work-postgres-prod
|
||||||
|
restart: unless-stopped
|
||||||
|
environment:
|
||||||
|
POSTGRES_DB: moku
|
||||||
|
POSTGRES_USER: moku
|
||||||
|
POSTGRES_PASSWORD: moku_dev_password
|
||||||
|
volumes:
|
||||||
|
- moku_work_postgres_prod_data:/var/lib/postgresql/data
|
||||||
|
healthcheck:
|
||||||
|
test: ["CMD-SHELL", "pg_isready -U moku -d moku"]
|
||||||
|
interval: 10s
|
||||||
|
timeout: 5s
|
||||||
|
retries: 5
|
||||||
|
start_period: 10s
|
||||||
|
|
||||||
|
valkey:
|
||||||
|
image: valkey/valkey:8-alpine
|
||||||
|
container_name: moku-work-valkey-prod
|
||||||
|
restart: unless-stopped
|
||||||
|
volumes:
|
||||||
|
- moku_work_valkey_prod_data:/data
|
||||||
|
healthcheck:
|
||||||
|
test: ["CMD", "valkey-cli", "ping"]
|
||||||
|
interval: 10s
|
||||||
|
timeout: 5s
|
||||||
|
retries: 5
|
||||||
|
start_period: 5s
|
||||||
|
|
||||||
|
api:
|
||||||
|
<<: *backend-service
|
||||||
|
image: moku/work-backend:local-prod-api
|
||||||
|
container_name: moku-work-backend-api-prod
|
||||||
|
|
||||||
|
worker:
|
||||||
|
<<: *backend-service
|
||||||
|
image: moku/work-backend:local-prod-worker
|
||||||
|
container_name: moku-work-backend-worker-prod
|
||||||
|
|
||||||
|
proxy:
|
||||||
|
image: moku/work-proxy:local-prod
|
||||||
|
container_name: moku-work-proxy-local
|
||||||
|
restart: unless-stopped
|
||||||
|
depends_on:
|
||||||
|
api:
|
||||||
|
condition: service_started
|
||||||
|
ports:
|
||||||
|
- "8080:80"
|
||||||
|
|
||||||
|
volumes:
|
||||||
|
moku_work_postgres_prod_data:
|
||||||
|
moku_work_valkey_prod_data:
|
||||||
|
|||||||
@@ -9,8 +9,8 @@ This project is still in an early scaffold stage, so the goal is to keep changes
|
|||||||
### Project structure
|
### Project structure
|
||||||
|
|
||||||
- `Frontend/` — SolidStart frontend workspace
|
- `Frontend/` — SolidStart frontend workspace
|
||||||
- `Backend/` — backend placeholder
|
- `Backend/` — Go backend services (`web`, `api`, `worker`)
|
||||||
- `Proxy/` — proxy placeholder
|
- `Proxy/` — local production proxy/runtime assets
|
||||||
- `Docker/` — local Docker Compose files
|
- `Docker/` — local Docker Compose files
|
||||||
- `Env/` — local environment files
|
- `Env/` — local environment files
|
||||||
- `Commands/` — Just command modules and entrypoints
|
- `Commands/` — Just command modules and entrypoints
|
||||||
@@ -39,7 +39,8 @@ Main local development flow:
|
|||||||
just local dev
|
just local dev
|
||||||
```
|
```
|
||||||
|
|
||||||
This command builds the frontend development image and starts the local development stack.
|
This command builds the frontend and backend development images, then starts the
|
||||||
|
local development stack for Postgres, Valkey, frontend, and backend services.
|
||||||
|
|
||||||
### Local environment
|
### Local environment
|
||||||
|
|
||||||
@@ -49,7 +50,16 @@ Local development uses:
|
|||||||
Env/.env.local
|
Env/.env.local
|
||||||
```
|
```
|
||||||
|
|
||||||
If local environment values are missing, create or update that file before starting the stack.
|
The template lives at:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
Env/.env.example
|
||||||
|
```
|
||||||
|
|
||||||
|
When you start the local Docker stack, the dev scripts will create `Env/.env.local`
|
||||||
|
from `Env/.env.example` automatically if it does not already exist.
|
||||||
|
|
||||||
|
If you need custom local values, edit `Env/.env.local` after it is created.
|
||||||
|
|
||||||
## Commit Naming Convention
|
## Commit Naming Convention
|
||||||
|
|
||||||
|
|||||||
177
Documentation/STYLING-THEME-SAMPLE.json
Normal file
177
Documentation/STYLING-THEME-SAMPLE.json
Normal file
@@ -0,0 +1,177 @@
|
|||||||
|
{
|
||||||
|
"schemaVersion": "1.0.0",
|
||||||
|
"id": "moku-styling-sample",
|
||||||
|
"name": "Moku Styling Sample",
|
||||||
|
"description": "Sample theme showing the background, surface, border, accent, and primary tokens documented in Documentation/STYLING.md.",
|
||||||
|
"author": "Moku Work",
|
||||||
|
"tokens": {
|
||||||
|
"shared": {
|
||||||
|
"palette": {
|
||||||
|
"gray": {
|
||||||
|
"0": "hsl(210 20% 99%)",
|
||||||
|
"50": "hsl(220 20% 97%)",
|
||||||
|
"100": "hsl(220 16% 93%)",
|
||||||
|
"200": "hsl(220 13% 87%)",
|
||||||
|
"300": "hsl(220 11% 75%)",
|
||||||
|
"400": "hsl(220 9% 58%)",
|
||||||
|
"500": "hsl(220 10% 45%)",
|
||||||
|
"600": "hsl(220 14% 34%)",
|
||||||
|
"700": "hsl(220 18% 24%)",
|
||||||
|
"800": "hsl(220 22% 16%)",
|
||||||
|
"900": "hsl(220 28% 10%)"
|
||||||
|
},
|
||||||
|
"blue": {
|
||||||
|
"400": "hsl(218 88% 61%)",
|
||||||
|
"500": "hsl(221 83% 53%)",
|
||||||
|
"600": "hsl(224 76% 48%)"
|
||||||
|
},
|
||||||
|
"green": {
|
||||||
|
"500": "hsl(154 60% 40%)"
|
||||||
|
},
|
||||||
|
"red": {
|
||||||
|
"500": "hsl(0 72% 54%)"
|
||||||
|
},
|
||||||
|
"amber": {
|
||||||
|
"500": "hsl(36 100% 50%)"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"space": {
|
||||||
|
"1": "0.25rem",
|
||||||
|
"2": "0.5rem",
|
||||||
|
"3": "0.75rem",
|
||||||
|
"4": "1rem",
|
||||||
|
"5": "1.25rem",
|
||||||
|
"6": "1.5rem",
|
||||||
|
"8": "2rem",
|
||||||
|
"10": "2.5rem",
|
||||||
|
"12": "3rem"
|
||||||
|
},
|
||||||
|
"radius": {
|
||||||
|
"sm": "0.375rem",
|
||||||
|
"md": "0.625rem",
|
||||||
|
"lg": "0.875rem",
|
||||||
|
"xl": "1.25rem",
|
||||||
|
"pill": "999px"
|
||||||
|
},
|
||||||
|
"size": {
|
||||||
|
"controlMd": "2.25rem",
|
||||||
|
"controlLg": "2.5rem",
|
||||||
|
"contentWidthWide": "72rem",
|
||||||
|
"blurOverlay": "18px"
|
||||||
|
},
|
||||||
|
"shadow": {
|
||||||
|
"soft": "0 12px 32px hsl(220 30% 10% / 0.08)",
|
||||||
|
"strong": "0 20px 48px hsl(220 30% 10% / 0.16)"
|
||||||
|
},
|
||||||
|
"zIndex": {
|
||||||
|
"base": "1",
|
||||||
|
"dropdown": "100",
|
||||||
|
"sticky": "200",
|
||||||
|
"overlay": "400",
|
||||||
|
"modal": "500",
|
||||||
|
"toast": "600"
|
||||||
|
},
|
||||||
|
"motion": {
|
||||||
|
"durationFast": "140ms",
|
||||||
|
"durationBase": "220ms",
|
||||||
|
"durationSlow": "320ms",
|
||||||
|
"easeStandard": "cubic-bezier(0.2, 0.8, 0.2, 1)"
|
||||||
|
},
|
||||||
|
"typography": {
|
||||||
|
"fontFamily": {
|
||||||
|
"sans": "ui-sans-serif, system-ui, -apple-system, BlinkMacSystemFont, \"Segoe UI\", \"Helvetica Neue\", Arial, sans-serif",
|
||||||
|
"heading": "\"Avenir Next\", \"Segoe UI\", \"Helvetica Neue\", Arial, sans-serif",
|
||||||
|
"display": "\"Avenir Next\", \"Segoe UI\", \"Helvetica Neue\", Arial, sans-serif",
|
||||||
|
"serif": "ui-serif, Georgia, Cambria, \"Times New Roman\", Times, serif",
|
||||||
|
"mono": "ui-monospace, \"SF Mono\", \"SFMono-Regular\", Menlo, Monaco, Consolas, \"Liberation Mono\", \"Courier New\", monospace"
|
||||||
|
},
|
||||||
|
"fontSize": {
|
||||||
|
"caption": "0.75rem",
|
||||||
|
"label": "0.875rem",
|
||||||
|
"body": "1rem",
|
||||||
|
"title": "clamp(1.125rem, 1.05rem + 0.3vw, 1.25rem)",
|
||||||
|
"heading": "clamp(1.5rem, 1.2rem + 1vw, 2.125rem)",
|
||||||
|
"display": "clamp(2.25rem, 1.7rem + 2.2vw, 3.75rem)"
|
||||||
|
},
|
||||||
|
"lineHeight": {
|
||||||
|
"caption": "1.4",
|
||||||
|
"label": "1.35",
|
||||||
|
"body": "1.55",
|
||||||
|
"title": "1.3",
|
||||||
|
"heading": "1.15",
|
||||||
|
"display": "1.05"
|
||||||
|
},
|
||||||
|
"fontWeight": {
|
||||||
|
"caption": "500",
|
||||||
|
"label": "600",
|
||||||
|
"body": "400",
|
||||||
|
"title": "600",
|
||||||
|
"heading": "600",
|
||||||
|
"display": "700"
|
||||||
|
},
|
||||||
|
"letterSpacing": {
|
||||||
|
"caption": "0.01em",
|
||||||
|
"label": "0.005em",
|
||||||
|
"body": "0",
|
||||||
|
"title": "-0.01em",
|
||||||
|
"heading": "-0.02em",
|
||||||
|
"display": "-0.03em"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"modes": {
|
||||||
|
"light": {
|
||||||
|
"colorScheme": "light",
|
||||||
|
"colors": {
|
||||||
|
"canvas": "var(--gray-50)",
|
||||||
|
"surface": "hsl(0 0% 100% / 0.9)",
|
||||||
|
"surfaceMuted": "var(--gray-0)",
|
||||||
|
"surfaceHover": "var(--gray-100)",
|
||||||
|
"border": "hsl(220 15% 85% / 0.9)",
|
||||||
|
"borderStrong": "hsl(220 12% 70% / 0.9)",
|
||||||
|
"text": "var(--gray-800)",
|
||||||
|
"textMuted": "var(--gray-500)",
|
||||||
|
"accent": "var(--blue-500)",
|
||||||
|
"accentStrong": "var(--blue-600)",
|
||||||
|
"accentSoft": "hsl(218 88% 61% / 0.12)",
|
||||||
|
"accentContrast": "hsl(0 0% 100%)",
|
||||||
|
"primaryOne": "var(--blue-500)",
|
||||||
|
"primaryTwo": "hsl(271 72% 60%)",
|
||||||
|
"primaryThree": "hsl(192 76% 48%)",
|
||||||
|
"success": "var(--green-500)",
|
||||||
|
"danger": "var(--red-500)",
|
||||||
|
"warning": "var(--amber-500)",
|
||||||
|
"focusRing": "hsl(221 83% 53% / 0.55)"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"dark": {
|
||||||
|
"colorScheme": "dark",
|
||||||
|
"colors": {
|
||||||
|
"canvas": "var(--gray-900)",
|
||||||
|
"surface": "hsl(220 23% 14% / 0.92)",
|
||||||
|
"surfaceMuted": "hsl(220 22% 12% / 0.96)",
|
||||||
|
"surfaceHover": "hsl(220 18% 20% / 0.96)",
|
||||||
|
"border": "hsl(220 12% 26% / 0.9)",
|
||||||
|
"borderStrong": "hsl(220 12% 38% / 0.9)",
|
||||||
|
"text": "hsl(210 20% 96%)",
|
||||||
|
"textMuted": "hsl(220 12% 70%)",
|
||||||
|
"accent": "hsl(217 91% 67%)",
|
||||||
|
"accentStrong": "hsl(218 88% 61%)",
|
||||||
|
"accentSoft": "hsl(217 91% 67% / 0.18)",
|
||||||
|
"accentContrast": "hsl(220 28% 10%)",
|
||||||
|
"primaryOne": "hsl(217 91% 67%)",
|
||||||
|
"primaryTwo": "hsl(272 80% 70%)",
|
||||||
|
"primaryThree": "hsl(190 84% 62%)",
|
||||||
|
"success": "hsl(154 55% 48%)",
|
||||||
|
"danger": "hsl(0 72% 62%)",
|
||||||
|
"warning": "hsl(36 100% 60%)",
|
||||||
|
"focusRing": "hsl(217 91% 67% / 0.65)"
|
||||||
|
},
|
||||||
|
"shadow": {
|
||||||
|
"soft": "0 16px 40px hsl(220 40% 3% / 0.45)",
|
||||||
|
"strong": "0 24px 60px hsl(220 40% 3% / 0.55)"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
327
Documentation/STYLING.md
Normal file
327
Documentation/STYLING.md
Normal file
@@ -0,0 +1,327 @@
|
|||||||
|
# Styling Reference
|
||||||
|
|
||||||
|
This document explains which theme tokens control the main backgrounds, surfaces,
|
||||||
|
borders, and shell gradients in Moku Work.
|
||||||
|
|
||||||
|
It is focused on the current frontend shell scaffold so future visual tuning can
|
||||||
|
be done intentionally instead of by guesswork.
|
||||||
|
|
||||||
|
## Source Of Truth
|
||||||
|
|
||||||
|
There are two places to look when changing styling tokens:
|
||||||
|
|
||||||
|
- Runtime theme payload:
|
||||||
|
- `Frontend/public/themes/moku-default.json`
|
||||||
|
- SCSS fallback defaults:
|
||||||
|
- `Frontend/src/styles/themes/_light.scss`
|
||||||
|
- `Frontend/src/styles/themes/_dark.scss`
|
||||||
|
- Full sample theme file:
|
||||||
|
- `Documentation/STYLING-THEME-SAMPLE.json`
|
||||||
|
|
||||||
|
If you want to change the actual themed values used by the app, update the theme
|
||||||
|
JSON first. The SCSS files act as fallback/default variables.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Core Surface Tokens
|
||||||
|
|
||||||
|
These are the main tokens currently driving shell backgrounds and card surfaces:
|
||||||
|
|
||||||
|
- `--color-canvas`
|
||||||
|
- outer page background
|
||||||
|
- `--color-surface`
|
||||||
|
- standard panel/card/topbar surface
|
||||||
|
- `--color-surface-muted`
|
||||||
|
- quieter secondary panels and dropdown surfaces
|
||||||
|
- `--color-surface-hover`
|
||||||
|
- hover state for solid surface rows
|
||||||
|
- `--color-border`
|
||||||
|
- standard card/panel border
|
||||||
|
- `--color-border-strong`
|
||||||
|
- stronger shell edges, separators, and emphasized borders
|
||||||
|
- `--color-text`
|
||||||
|
- primary text color
|
||||||
|
- `--color-text-muted`
|
||||||
|
- secondary/meta text color
|
||||||
|
- `--color-accent`
|
||||||
|
- primary accent lane
|
||||||
|
- `--color-accent-strong`
|
||||||
|
- stronger accent emphasis
|
||||||
|
- `--color-accent-soft`
|
||||||
|
- soft accent wash for subtle fills
|
||||||
|
|
||||||
|
There are also ring-only multi-primary tokens currently used for the top-right
|
||||||
|
profile ring:
|
||||||
|
|
||||||
|
- `--color-primary-1`
|
||||||
|
- `--color-primary-2`
|
||||||
|
- `--color-primary-3`
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Light Mode Values
|
||||||
|
|
||||||
|
Current light-mode surface values:
|
||||||
|
|
||||||
|
```text
|
||||||
|
--color-canvas: var(--gray-50)
|
||||||
|
--color-surface: hsl(0 0% 100% / 0.9)
|
||||||
|
--color-surface-muted: var(--gray-0)
|
||||||
|
--color-surface-hover: var(--gray-100)
|
||||||
|
--color-border: hsl(220 15% 85% / 0.9)
|
||||||
|
--color-border-strong: hsl(220 12% 70% / 0.9)
|
||||||
|
--color-text: var(--gray-800)
|
||||||
|
--color-text-muted: var(--gray-500)
|
||||||
|
--color-accent: var(--blue-500)
|
||||||
|
--color-accent-strong: var(--blue-600)
|
||||||
|
--color-accent-soft: hsl(218 88% 61% / 0.12)
|
||||||
|
--color-primary-1: var(--blue-500)
|
||||||
|
--color-primary-2: hsl(271 72% 60%)
|
||||||
|
--color-primary-3: hsl(192 76% 48%)
|
||||||
|
```
|
||||||
|
|
||||||
|
## Dark Mode Values
|
||||||
|
|
||||||
|
Current dark-mode surface values:
|
||||||
|
|
||||||
|
```text
|
||||||
|
--color-canvas: var(--gray-900)
|
||||||
|
--color-surface: hsl(220 23% 14% / 0.92)
|
||||||
|
--color-surface-muted: hsl(220 22% 12% / 0.96)
|
||||||
|
--color-surface-hover: hsl(220 18% 20% / 0.96)
|
||||||
|
--color-border: hsl(220 12% 26% / 0.9)
|
||||||
|
--color-border-strong: hsl(220 12% 38% / 0.9)
|
||||||
|
--color-text: hsl(210 20% 96%)
|
||||||
|
--color-text-muted: hsl(220 12% 70%)
|
||||||
|
--color-accent: hsl(217 91% 67%)
|
||||||
|
--color-accent-strong: hsl(218 88% 61%)
|
||||||
|
--color-accent-soft: hsl(217 91% 67% / 0.18)
|
||||||
|
--color-primary-1: hsl(217 91% 67%)
|
||||||
|
--color-primary-2: hsl(272 80% 70%)
|
||||||
|
--color-primary-3: hsl(190 84% 62%)
|
||||||
|
```
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## What Controls What
|
||||||
|
|
||||||
|
### 1. App Background
|
||||||
|
|
||||||
|
File:
|
||||||
|
|
||||||
|
- `Frontend/src/components/shell/AppShell/AppShell.module.scss`
|
||||||
|
|
||||||
|
The outer app frame uses:
|
||||||
|
|
||||||
|
```scss
|
||||||
|
background: var(--color-canvas);
|
||||||
|
color: var(--color-text);
|
||||||
|
```
|
||||||
|
|
||||||
|
So if you want to change the overall page backdrop, change `--color-canvas`.
|
||||||
|
|
||||||
|
### 2. Main Shell Split Background
|
||||||
|
|
||||||
|
File:
|
||||||
|
|
||||||
|
- `Frontend/src/components/shell/AppShell/AppShell.module.scss`
|
||||||
|
|
||||||
|
The shell derives two important internal surface blends:
|
||||||
|
|
||||||
|
```text
|
||||||
|
--sidebar-panel-surface: color-mix(in srgb, var(--color-surface-muted) 92%, transparent)
|
||||||
|
--workspace-panel-surface: color-mix(in srgb, var(--color-canvas) 94%, var(--color-surface))
|
||||||
|
```
|
||||||
|
|
||||||
|
It also derives frame/separator borders:
|
||||||
|
|
||||||
|
```text
|
||||||
|
--shell-frame-border: color-mix(in srgb, var(--color-border-strong) 44%, transparent)
|
||||||
|
--shell-divider-border: color-mix(in srgb, var(--color-border-strong) 34%, transparent)
|
||||||
|
```
|
||||||
|
|
||||||
|
Surface usage inside the shell:
|
||||||
|
|
||||||
|
- `.body` → `var(--color-surface)`
|
||||||
|
- `.railColumn` → `var(--color-surface)`
|
||||||
|
- `.sidebarColumn` → `var(--sidebar-panel-surface)`
|
||||||
|
- `.workspaceMain` → `var(--workspace-panel-surface)`
|
||||||
|
|
||||||
|
The major left/right shell background is drawn by `workspaceRegion::before` using a
|
||||||
|
horizontal gradient from sidebar surface to workspace surface.
|
||||||
|
|
||||||
|
### 3. Standard Content Cards
|
||||||
|
|
||||||
|
File:
|
||||||
|
|
||||||
|
- `Frontend/src/components/workspace-home/WorkspaceHome/WorkspaceHome.module.scss`
|
||||||
|
|
||||||
|
Cards currently use:
|
||||||
|
|
||||||
|
```text
|
||||||
|
background: var(--color-surface)
|
||||||
|
border: 1px solid var(--color-border)
|
||||||
|
box-shadow: var(--shadow-soft)
|
||||||
|
```
|
||||||
|
|
||||||
|
If cards feel too flat or too strong, start by adjusting:
|
||||||
|
|
||||||
|
- `--color-surface`
|
||||||
|
- `--color-border`
|
||||||
|
|
||||||
|
### 4. Top Bar
|
||||||
|
|
||||||
|
File:
|
||||||
|
|
||||||
|
- `Frontend/src/components/shell/TopBar/TopBar.module.scss`
|
||||||
|
|
||||||
|
The top bar itself uses:
|
||||||
|
|
||||||
|
```text
|
||||||
|
background: var(--color-surface)
|
||||||
|
```
|
||||||
|
|
||||||
|
Hover/focus states for top-right controls use transparent mixes based on:
|
||||||
|
|
||||||
|
- `--color-text`
|
||||||
|
- `--color-accent-strong`
|
||||||
|
|
||||||
|
So the bar is mostly controlled by `--color-surface`, while the interactive polish
|
||||||
|
comes from text/accent tokens.
|
||||||
|
|
||||||
|
### 5. Server Dock
|
||||||
|
|
||||||
|
File:
|
||||||
|
|
||||||
|
- `Frontend/src/components/shell/ServerDock/ServerDock.module.scss`
|
||||||
|
|
||||||
|
The dock uses two derived tokens:
|
||||||
|
|
||||||
|
```text
|
||||||
|
--server-dock-border: color-mix(in srgb, var(--color-border-strong) 75%, transparent)
|
||||||
|
--server-dock-surface: color-mix(in srgb, var(--color-surface) 94%, transparent)
|
||||||
|
```
|
||||||
|
|
||||||
|
That means the dock is visually tied most strongly to:
|
||||||
|
|
||||||
|
- `--color-surface`
|
||||||
|
- `--color-border-strong`
|
||||||
|
|
||||||
|
The server glyph fill uses a soft accent wash derived from:
|
||||||
|
|
||||||
|
- `--color-accent-soft`
|
||||||
|
|
||||||
|
### 6. Project Drawer
|
||||||
|
|
||||||
|
File:
|
||||||
|
|
||||||
|
- `Frontend/src/components/shell/ProjectSelector/ProjectSelector.module.scss`
|
||||||
|
|
||||||
|
Important layers:
|
||||||
|
|
||||||
|
- scrim:
|
||||||
|
- `color-mix(in srgb, black 8%, transparent)`
|
||||||
|
- drawer panel surface:
|
||||||
|
- defined in `.drawer::before`
|
||||||
|
- vertical gradient from `--color-surface` to `--color-surface-muted`
|
||||||
|
- current-project summary block:
|
||||||
|
- `color-mix(in srgb, var(--color-surface) 72%, transparent)`
|
||||||
|
- menu row hover:
|
||||||
|
- based on `--color-surface-hover`
|
||||||
|
- menu row active:
|
||||||
|
- based on `--color-surface`
|
||||||
|
|
||||||
|
So the drawer’s look is mainly shaped by:
|
||||||
|
|
||||||
|
- `--color-surface`
|
||||||
|
- `--color-surface-muted`
|
||||||
|
- `--color-surface-hover`
|
||||||
|
- `--color-border-strong`
|
||||||
|
|
||||||
|
### 7. Department Selector Dropdown
|
||||||
|
|
||||||
|
File:
|
||||||
|
|
||||||
|
- `Frontend/src/components/shell/DepartmentSelector/DepartmentSelector.module.scss`
|
||||||
|
|
||||||
|
The department dropdown is intentionally solid, not blurred.
|
||||||
|
|
||||||
|
It uses:
|
||||||
|
|
||||||
|
```text
|
||||||
|
.menu background: var(--color-surface-muted)
|
||||||
|
.menu border: 1px solid var(--color-border-strong)
|
||||||
|
.menuItem background: var(--color-surface-muted)
|
||||||
|
.submenuItem background: var(--color-surface-muted)
|
||||||
|
hover/active rows: var(--color-surface)
|
||||||
|
```
|
||||||
|
|
||||||
|
If the department menu feels too heavy or too subtle, start by adjusting:
|
||||||
|
|
||||||
|
- `--color-surface-muted`
|
||||||
|
- `--color-surface`
|
||||||
|
- `--color-border-strong`
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Quick Tuning Guide
|
||||||
|
|
||||||
|
If you want to change the overall visual mood quickly, these are the highest-leverage tokens:
|
||||||
|
|
||||||
|
### Make the app feel lighter / airier
|
||||||
|
|
||||||
|
Adjust:
|
||||||
|
|
||||||
|
- `--color-canvas`
|
||||||
|
- `--color-surface`
|
||||||
|
- `--color-surface-muted`
|
||||||
|
|
||||||
|
### Make shells/cards feel more separated
|
||||||
|
|
||||||
|
Adjust:
|
||||||
|
|
||||||
|
- `--color-border`
|
||||||
|
- `--color-border-strong`
|
||||||
|
- `--color-surface-muted`
|
||||||
|
|
||||||
|
### Make accent washes more or less noticeable
|
||||||
|
|
||||||
|
Adjust:
|
||||||
|
|
||||||
|
- `--color-accent-soft`
|
||||||
|
|
||||||
|
### Change the visual personality of the profile ring
|
||||||
|
|
||||||
|
Adjust:
|
||||||
|
|
||||||
|
- `--color-primary-1`
|
||||||
|
- `--color-primary-2`
|
||||||
|
- `--color-primary-3`
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Practical Rule Of Thumb
|
||||||
|
|
||||||
|
Use this mental model:
|
||||||
|
|
||||||
|
```text
|
||||||
|
canvas = app/page background
|
||||||
|
surface = primary panel or card
|
||||||
|
surface-muted = quieter secondary panel
|
||||||
|
surface-hover = solid hover state
|
||||||
|
border = normal edge
|
||||||
|
border-strong = stronger shell edge or divider
|
||||||
|
accent-soft = subtle tinted wash
|
||||||
|
primary-1/2/3 = decorative multi-color accents
|
||||||
|
```
|
||||||
|
|
||||||
|
If you are unsure where to start, tune these in this order:
|
||||||
|
|
||||||
|
1. `--color-canvas`
|
||||||
|
2. `--color-surface`
|
||||||
|
3. `--color-surface-muted`
|
||||||
|
4. `--color-border`
|
||||||
|
5. `--color-border-strong`
|
||||||
|
6. `--color-accent-soft`
|
||||||
|
|
||||||
|
That usually gives the biggest visual shift with the fewest unintended side effects.
|
||||||
@@ -11,7 +11,19 @@
|
|||||||
- [ ] Project-Structure
|
- [ ] Project-Structure
|
||||||
- [ ] Stack-Decisions
|
- [ ] Stack-Decisions
|
||||||
- [ ] Proxy
|
- [ ] Proxy
|
||||||
|
- [ ] Local-Prod-NGINX-Proxy
|
||||||
|
- [ ] Static-Frontend-Serving
|
||||||
|
- [ ] First-Request-Web-Loader
|
||||||
|
- [ ] Bootstrap-Document
|
||||||
|
- [ ] Route-Intent-Handoff
|
||||||
|
- [ ] Tiny-First-Paint-Budget
|
||||||
- [ ] Dev-and-Prod-Builds
|
- [ ] Dev-and-Prod-Builds
|
||||||
|
- [x] Local-Dev-Just-Commands
|
||||||
|
- [x] Local-Dev-Docker-Compose
|
||||||
|
- [ ] Local-Prod-Just-Commands
|
||||||
|
- [ ] Local-Prod-Docker-Compose
|
||||||
|
- [ ] Frontend-Production-Dockerfile
|
||||||
|
- [ ] Frontend-docker-bake
|
||||||
|
|
||||||
#### Backend
|
#### Backend
|
||||||
|
|
||||||
@@ -54,6 +66,14 @@
|
|||||||
- [ ] Table
|
- [ ] Table
|
||||||
- [ ] CVA
|
- [ ] CVA
|
||||||
- [ ] Storyboard
|
- [ ] Storyboard
|
||||||
|
- [ ] Theme-System
|
||||||
|
- [ ] Theme-Registry
|
||||||
|
- [ ] Built-In-Theme-Presets
|
||||||
|
- [ ] Active-Theme-Persistence
|
||||||
|
- [ ] Theme-Switcher
|
||||||
|
- [ ] Theme-JSON-Upload
|
||||||
|
- [ ] Theme-JSON-Import-Validation
|
||||||
|
- [ ] Community-Theme-Readiness
|
||||||
|
|
||||||
### Version 0.3.0
|
### Version 0.3.0
|
||||||
|
|
||||||
|
|||||||
18
Env/.env.example
Normal file
18
Env/.env.example
Normal file
@@ -0,0 +1,18 @@
|
|||||||
|
ALLOWED_HOSTS=
|
||||||
|
|
||||||
|
APP_NAME=moku
|
||||||
|
GO_ENV=development
|
||||||
|
LOG_LEVEL=debug
|
||||||
|
|
||||||
|
BACKEND_WEB_PORT=8080
|
||||||
|
BACKEND_API_PORT=8081
|
||||||
|
BACKEND_SHUTDOWN_TIMEOUT=10s
|
||||||
|
|
||||||
|
DATABASE_URL=postgres://moku:moku_dev_password@localhost:5432/moku?sslmode=disable
|
||||||
|
VALKEY_URL=redis://localhost:6379/0
|
||||||
|
|
||||||
|
VITE_API_BASE_URL=/v1
|
||||||
|
|
||||||
|
# Local frontend dev uses the Vite proxy for /v1 requests.
|
||||||
|
# Override only if the browser must call the API directly:
|
||||||
|
# VITE_API_BASE_URL=http://localhost:8081/v1
|
||||||
@@ -1,5 +1,8 @@
|
|||||||
# syntax=docker/dockerfile:1.7
|
# syntax=docker/dockerfile:1.7
|
||||||
|
|
||||||
|
# Frontend development image only.
|
||||||
|
# Production static serving is owned by Proxy/Local/Dockerfile.
|
||||||
|
|
||||||
FROM node:22-alpine AS base
|
FROM node:22-alpine AS base
|
||||||
|
|
||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
@@ -16,27 +19,11 @@ FROM dependencies AS development
|
|||||||
ENV NODE_ENV=development
|
ENV NODE_ENV=development
|
||||||
ENV PORT=3333
|
ENV PORT=3333
|
||||||
|
|
||||||
|
ARG ALLOWED_HOSTS
|
||||||
|
ENV ALLOWED_HOSTS=${ALLOWED_HOSTS}
|
||||||
|
|
||||||
COPY . .
|
COPY . .
|
||||||
|
|
||||||
EXPOSE 3333
|
EXPOSE 3333
|
||||||
|
|
||||||
CMD ["pnpm", "dev", "--host", "0.0.0.0", "--port", "3333"]
|
CMD ["pnpm", "dev", "--host", "0.0.0.0", "--port", "3333"]
|
||||||
|
|
||||||
FROM dependencies AS build
|
|
||||||
|
|
||||||
ENV NODE_ENV=production
|
|
||||||
|
|
||||||
COPY . .
|
|
||||||
|
|
||||||
RUN pnpm build
|
|
||||||
|
|
||||||
FROM base AS production
|
|
||||||
|
|
||||||
ENV NODE_ENV=production
|
|
||||||
ENV PORT=3333
|
|
||||||
|
|
||||||
COPY --from=build /app /app
|
|
||||||
|
|
||||||
EXPOSE 3333
|
|
||||||
|
|
||||||
CMD ["pnpm", "start", "--host", "0.0.0.0", "--port", "3333"]
|
|
||||||
|
|||||||
@@ -17,30 +17,18 @@ target "dev" {
|
|||||||
tags = ["moku/work-frontend:dev"]
|
tags = ["moku/work-frontend:dev"]
|
||||||
}
|
}
|
||||||
|
|
||||||
target "prod" {
|
|
||||||
inherits = ["_app"]
|
|
||||||
target = "production"
|
|
||||||
tags = ["moku/work-frontend:prod"]
|
|
||||||
}
|
|
||||||
|
|
||||||
target "dev-image" {
|
target "dev-image" {
|
||||||
inherits = ["_app"]
|
inherits = ["_app"]
|
||||||
target = "development"
|
target = "development"
|
||||||
tags = ["${REGISTRY}/moku/work-frontend:dev-${TAG}"]
|
tags = ["${REGISTRY}/moku/work-frontend:dev-${TAG}"]
|
||||||
}
|
}
|
||||||
|
|
||||||
target "prod-image" {
|
|
||||||
inherits = ["_app"]
|
|
||||||
target = "production"
|
|
||||||
tags = ["${REGISTRY}/moku/work-frontend:prod-${TAG}"]
|
|
||||||
}
|
|
||||||
|
|
||||||
group "local" {
|
group "local" {
|
||||||
targets = ["dev", "prod"]
|
targets = ["dev"]
|
||||||
}
|
}
|
||||||
|
|
||||||
group "registry" {
|
group "registry" {
|
||||||
targets = ["dev-image", "prod-image"]
|
targets = ["dev-image"]
|
||||||
}
|
}
|
||||||
|
|
||||||
group "default" {
|
group "default" {
|
||||||
|
|||||||
@@ -11,6 +11,7 @@
|
|||||||
"scripts": {
|
"scripts": {
|
||||||
"dev": "vite dev",
|
"dev": "vite dev",
|
||||||
"build": "vite build",
|
"build": "vite build",
|
||||||
|
"build:static": "pnpm build && node ./scripts/render-static-index.mjs",
|
||||||
"typecheck": "tsc --noEmit",
|
"typecheck": "tsc --noEmit",
|
||||||
"start": "vite preview",
|
"start": "vite preview",
|
||||||
"preview": "vite preview"
|
"preview": "vite preview"
|
||||||
|
|||||||
176
Frontend/public/themes/moku-default.json
Normal file
176
Frontend/public/themes/moku-default.json
Normal file
@@ -0,0 +1,176 @@
|
|||||||
|
{
|
||||||
|
"schemaVersion": "1.0.0",
|
||||||
|
"id": "moku-default",
|
||||||
|
"name": "Moku Default",
|
||||||
|
"description": "Baseline Moku shell tokens for built-in light and dark modes.",
|
||||||
|
"tokens": {
|
||||||
|
"shared": {
|
||||||
|
"palette": {
|
||||||
|
"gray": {
|
||||||
|
"0": "hsl(210 20% 99%)",
|
||||||
|
"50": "hsl(220 20% 97%)",
|
||||||
|
"100": "hsl(220 16% 93%)",
|
||||||
|
"200": "hsl(220 13% 87%)",
|
||||||
|
"300": "hsl(220 11% 75%)",
|
||||||
|
"400": "hsl(220 9% 58%)",
|
||||||
|
"500": "hsl(220 10% 45%)",
|
||||||
|
"600": "hsl(220 14% 34%)",
|
||||||
|
"700": "hsl(220 18% 24%)",
|
||||||
|
"800": "hsl(220 22% 16%)",
|
||||||
|
"900": "hsl(220 28% 10%)"
|
||||||
|
},
|
||||||
|
"blue": {
|
||||||
|
"400": "hsl(218 88% 61%)",
|
||||||
|
"500": "hsl(221 83% 53%)",
|
||||||
|
"600": "hsl(224 76% 48%)"
|
||||||
|
},
|
||||||
|
"green": {
|
||||||
|
"500": "hsl(154 60% 40%)"
|
||||||
|
},
|
||||||
|
"red": {
|
||||||
|
"500": "hsl(0 72% 54%)"
|
||||||
|
},
|
||||||
|
"amber": {
|
||||||
|
"500": "hsl(36 100% 50%)"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"space": {
|
||||||
|
"1": "0.25rem",
|
||||||
|
"2": "0.5rem",
|
||||||
|
"3": "0.75rem",
|
||||||
|
"4": "1rem",
|
||||||
|
"5": "1.25rem",
|
||||||
|
"6": "1.5rem",
|
||||||
|
"8": "2rem",
|
||||||
|
"10": "2.5rem",
|
||||||
|
"12": "3rem"
|
||||||
|
},
|
||||||
|
"radius": {
|
||||||
|
"sm": "0.375rem",
|
||||||
|
"md": "0.625rem",
|
||||||
|
"lg": "0.875rem",
|
||||||
|
"xl": "1.25rem",
|
||||||
|
"pill": "999px"
|
||||||
|
},
|
||||||
|
"size": {
|
||||||
|
"controlMd": "2.25rem",
|
||||||
|
"controlLg": "2.5rem",
|
||||||
|
"contentWidthWide": "72rem",
|
||||||
|
"blurOverlay": "18px"
|
||||||
|
},
|
||||||
|
"shadow": {
|
||||||
|
"soft": "0 12px 32px hsl(220 30% 10% / 0.08)",
|
||||||
|
"strong": "0 20px 48px hsl(220 30% 10% / 0.16)"
|
||||||
|
},
|
||||||
|
"zIndex": {
|
||||||
|
"base": "1",
|
||||||
|
"dropdown": "100",
|
||||||
|
"sticky": "200",
|
||||||
|
"overlay": "400",
|
||||||
|
"modal": "500",
|
||||||
|
"toast": "600"
|
||||||
|
},
|
||||||
|
"motion": {
|
||||||
|
"durationFast": "140ms",
|
||||||
|
"durationBase": "220ms",
|
||||||
|
"durationSlow": "320ms",
|
||||||
|
"easeStandard": "cubic-bezier(0.2, 0.8, 0.2, 1)"
|
||||||
|
},
|
||||||
|
"typography": {
|
||||||
|
"fontFamily": {
|
||||||
|
"sans": "ui-sans-serif, system-ui, -apple-system, BlinkMacSystemFont, \"Segoe UI\", \"Helvetica Neue\", Arial, sans-serif",
|
||||||
|
"heading": "\"Avenir Next\", \"Segoe UI\", \"Helvetica Neue\", Arial, sans-serif",
|
||||||
|
"display": "\"Avenir Next\", \"Segoe UI\", \"Helvetica Neue\", Arial, sans-serif",
|
||||||
|
"serif": "ui-serif, Georgia, Cambria, \"Times New Roman\", Times, serif",
|
||||||
|
"mono": "ui-monospace, \"SF Mono\", \"SFMono-Regular\", Menlo, Monaco, Consolas, \"Liberation Mono\", \"Courier New\", monospace"
|
||||||
|
},
|
||||||
|
"fontSize": {
|
||||||
|
"caption": "0.75rem",
|
||||||
|
"label": "0.875rem",
|
||||||
|
"body": "1rem",
|
||||||
|
"title": "clamp(1.125rem, 1.05rem + 0.3vw, 1.25rem)",
|
||||||
|
"heading": "clamp(1.5rem, 1.2rem + 1vw, 2.125rem)",
|
||||||
|
"display": "clamp(2.25rem, 1.7rem + 2.2vw, 3.75rem)"
|
||||||
|
},
|
||||||
|
"lineHeight": {
|
||||||
|
"caption": "1.4",
|
||||||
|
"label": "1.35",
|
||||||
|
"body": "1.55",
|
||||||
|
"title": "1.3",
|
||||||
|
"heading": "1.15",
|
||||||
|
"display": "1.05"
|
||||||
|
},
|
||||||
|
"fontWeight": {
|
||||||
|
"caption": "500",
|
||||||
|
"label": "600",
|
||||||
|
"body": "400",
|
||||||
|
"title": "600",
|
||||||
|
"heading": "600",
|
||||||
|
"display": "700"
|
||||||
|
},
|
||||||
|
"letterSpacing": {
|
||||||
|
"caption": "0.01em",
|
||||||
|
"label": "0.005em",
|
||||||
|
"body": "0",
|
||||||
|
"title": "-0.01em",
|
||||||
|
"heading": "-0.02em",
|
||||||
|
"display": "-0.03em"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"modes": {
|
||||||
|
"light": {
|
||||||
|
"colorScheme": "light",
|
||||||
|
"colors": {
|
||||||
|
"canvas": "var(--gray-50)",
|
||||||
|
"surface": "hsl(0 0% 100% / 0.9)",
|
||||||
|
"surfaceMuted": "var(--gray-0)",
|
||||||
|
"surfaceHover": "var(--gray-100)",
|
||||||
|
"border": "hsl(220 15% 85% / 0.9)",
|
||||||
|
"borderStrong": "hsl(220 12% 70% / 0.9)",
|
||||||
|
"text": "var(--gray-800)",
|
||||||
|
"textMuted": "var(--gray-500)",
|
||||||
|
"accent": "var(--blue-500)",
|
||||||
|
"accentStrong": "var(--blue-600)",
|
||||||
|
"accentSoft": "hsl(218 88% 61% / 0.12)",
|
||||||
|
"accentContrast": "hsl(0 0% 100%)",
|
||||||
|
"primaryOne": "var(--blue-500)",
|
||||||
|
"primaryTwo": "hsl(271 72% 60%)",
|
||||||
|
"primaryThree": "hsl(192 76% 48%)",
|
||||||
|
"success": "var(--green-500)",
|
||||||
|
"danger": "var(--red-500)",
|
||||||
|
"warning": "var(--amber-500)",
|
||||||
|
"focusRing": "hsl(221 83% 53% / 0.55)"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"dark": {
|
||||||
|
"colorScheme": "dark",
|
||||||
|
"colors": {
|
||||||
|
"canvas": "var(--gray-900)",
|
||||||
|
"surface": "hsl(220 23% 14% / 0.92)",
|
||||||
|
"surfaceMuted": "hsl(220 22% 12% / 0.96)",
|
||||||
|
"surfaceHover": "hsl(220 18% 20% / 0.96)",
|
||||||
|
"border": "hsl(220 12% 26% / 0.9)",
|
||||||
|
"borderStrong": "hsl(220 12% 38% / 0.9)",
|
||||||
|
"text": "hsl(210 20% 96%)",
|
||||||
|
"textMuted": "hsl(220 12% 70%)",
|
||||||
|
"accent": "hsl(217 91% 67%)",
|
||||||
|
"accentStrong": "hsl(218 88% 61%)",
|
||||||
|
"accentSoft": "hsl(217 91% 67% / 0.18)",
|
||||||
|
"accentContrast": "hsl(220 28% 10%)",
|
||||||
|
"primaryOne": "hsl(217 91% 67%)",
|
||||||
|
"primaryTwo": "hsl(272 80% 70%)",
|
||||||
|
"primaryThree": "hsl(190 84% 62%)",
|
||||||
|
"success": "hsl(154 55% 48%)",
|
||||||
|
"danger": "hsl(0 72% 62%)",
|
||||||
|
"warning": "hsl(36 100% 60%)",
|
||||||
|
"focusRing": "hsl(217 91% 67% / 0.65)"
|
||||||
|
},
|
||||||
|
"shadow": {
|
||||||
|
"soft": "0 16px 40px hsl(220 40% 3% / 0.45)",
|
||||||
|
"strong": "0 24px 60px hsl(220 40% 3% / 0.55)"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
177
Frontend/public/themes/moku-midnight.json
Normal file
177
Frontend/public/themes/moku-midnight.json
Normal file
@@ -0,0 +1,177 @@
|
|||||||
|
{
|
||||||
|
"schemaVersion": "1.0.0",
|
||||||
|
"id": "moku-midnight",
|
||||||
|
"name": "Moku Midnight",
|
||||||
|
"description": "A warm, low-light Moku theme inspired by the mood and palette direction of refact0r's Midnight Discord theme, adapted to Moku's token schema.",
|
||||||
|
"author": "Moku Work",
|
||||||
|
"tokens": {
|
||||||
|
"shared": {
|
||||||
|
"palette": {
|
||||||
|
"gray": {
|
||||||
|
"0": "#f9f5d7",
|
||||||
|
"50": "#fbf1c7",
|
||||||
|
"100": "#ebdbb2",
|
||||||
|
"200": "#d5c4a1",
|
||||||
|
"300": "#bdae93",
|
||||||
|
"400": "#a89984",
|
||||||
|
"500": "#928374",
|
||||||
|
"600": "#7c6f64",
|
||||||
|
"700": "#665c54",
|
||||||
|
"800": "#3c3836",
|
||||||
|
"900": "#282828"
|
||||||
|
},
|
||||||
|
"blue": {
|
||||||
|
"400": "hsl(167 24% 68%)",
|
||||||
|
"500": "#7caea3",
|
||||||
|
"600": "hsl(167 24% 48%)"
|
||||||
|
},
|
||||||
|
"green": {
|
||||||
|
"500": "#a8b665"
|
||||||
|
},
|
||||||
|
"red": {
|
||||||
|
"500": "#ea6962"
|
||||||
|
},
|
||||||
|
"amber": {
|
||||||
|
"500": "#d8a656"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"space": {
|
||||||
|
"1": "0.25rem",
|
||||||
|
"2": "0.5rem",
|
||||||
|
"3": "0.75rem",
|
||||||
|
"4": "1rem",
|
||||||
|
"5": "1.25rem",
|
||||||
|
"6": "1.5rem",
|
||||||
|
"8": "2rem",
|
||||||
|
"10": "2.5rem",
|
||||||
|
"12": "3rem"
|
||||||
|
},
|
||||||
|
"radius": {
|
||||||
|
"sm": "0.375rem",
|
||||||
|
"md": "0.625rem",
|
||||||
|
"lg": "0.875rem",
|
||||||
|
"xl": "1.25rem",
|
||||||
|
"pill": "999px"
|
||||||
|
},
|
||||||
|
"size": {
|
||||||
|
"controlMd": "2.25rem",
|
||||||
|
"controlLg": "2.5rem",
|
||||||
|
"contentWidthWide": "72rem",
|
||||||
|
"blurOverlay": "18px"
|
||||||
|
},
|
||||||
|
"shadow": {
|
||||||
|
"soft": "0 12px 28px hsl(28 16% 12% / 0.08)",
|
||||||
|
"strong": "0 18px 40px hsl(28 18% 10% / 0.14)"
|
||||||
|
},
|
||||||
|
"zIndex": {
|
||||||
|
"base": "1",
|
||||||
|
"dropdown": "100",
|
||||||
|
"sticky": "200",
|
||||||
|
"overlay": "400",
|
||||||
|
"modal": "500",
|
||||||
|
"toast": "600"
|
||||||
|
},
|
||||||
|
"motion": {
|
||||||
|
"durationFast": "140ms",
|
||||||
|
"durationBase": "220ms",
|
||||||
|
"durationSlow": "320ms",
|
||||||
|
"easeStandard": "cubic-bezier(0.2, 0.8, 0.2, 1)"
|
||||||
|
},
|
||||||
|
"typography": {
|
||||||
|
"fontFamily": {
|
||||||
|
"sans": "Inter, ui-sans-serif, system-ui, -apple-system, BlinkMacSystemFont, \"Segoe UI\", \"Helvetica Neue\", Arial, sans-serif",
|
||||||
|
"heading": "Inter, \"Avenir Next\", \"Segoe UI\", \"Helvetica Neue\", Arial, sans-serif",
|
||||||
|
"display": "Inter, \"Avenir Next\", \"Segoe UI\", \"Helvetica Neue\", Arial, sans-serif",
|
||||||
|
"serif": "ui-serif, Georgia, Cambria, \"Times New Roman\", Times, serif",
|
||||||
|
"mono": "ui-monospace, \"SF Mono\", \"SFMono-Regular\", Menlo, Monaco, Consolas, \"Liberation Mono\", \"Courier New\", monospace"
|
||||||
|
},
|
||||||
|
"fontSize": {
|
||||||
|
"caption": "0.75rem",
|
||||||
|
"label": "0.875rem",
|
||||||
|
"body": "1rem",
|
||||||
|
"title": "clamp(1.125rem, 1.05rem + 0.3vw, 1.25rem)",
|
||||||
|
"heading": "clamp(1.5rem, 1.2rem + 1vw, 2.125rem)",
|
||||||
|
"display": "clamp(2.25rem, 1.7rem + 2.2vw, 3.75rem)"
|
||||||
|
},
|
||||||
|
"lineHeight": {
|
||||||
|
"caption": "1.4",
|
||||||
|
"label": "1.35",
|
||||||
|
"body": "1.55",
|
||||||
|
"title": "1.3",
|
||||||
|
"heading": "1.15",
|
||||||
|
"display": "1.05"
|
||||||
|
},
|
||||||
|
"fontWeight": {
|
||||||
|
"caption": "500",
|
||||||
|
"label": "600",
|
||||||
|
"body": "400",
|
||||||
|
"title": "600",
|
||||||
|
"heading": "600",
|
||||||
|
"display": "700"
|
||||||
|
},
|
||||||
|
"letterSpacing": {
|
||||||
|
"caption": "0.01em",
|
||||||
|
"label": "0.005em",
|
||||||
|
"body": "0",
|
||||||
|
"title": "-0.01em",
|
||||||
|
"heading": "-0.02em",
|
||||||
|
"display": "-0.03em"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"modes": {
|
||||||
|
"light": {
|
||||||
|
"colorScheme": "light",
|
||||||
|
"colors": {
|
||||||
|
"canvas": "hsl(38 24% 97%)",
|
||||||
|
"surface": "hsl(36 22% 99% / 0.94)",
|
||||||
|
"surfaceMuted": "hsl(36 20% 96%)",
|
||||||
|
"surfaceHover": "hsl(34 18% 93%)",
|
||||||
|
"border": "hsl(30 14% 76% / 0.72)",
|
||||||
|
"borderStrong": "hsl(28 16% 60% / 0.82)",
|
||||||
|
"text": "hsl(22 16% 22%)",
|
||||||
|
"textMuted": "hsl(28 10% 42%)",
|
||||||
|
"accent": "#d3869b",
|
||||||
|
"accentStrong": "hsl(344 47% 56%)",
|
||||||
|
"accentSoft": "hsl(344 47% 70% / 0.12)",
|
||||||
|
"accentContrast": "var(--gray-0)",
|
||||||
|
"primaryOne": "#7caea3",
|
||||||
|
"primaryTwo": "#d3869b",
|
||||||
|
"primaryThree": "#d8a656",
|
||||||
|
"success": "#a8b665",
|
||||||
|
"danger": "#ea6962",
|
||||||
|
"warning": "#d8a656",
|
||||||
|
"focusRing": "hsl(344 47% 56% / 0.28)"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"dark": {
|
||||||
|
"colorScheme": "dark",
|
||||||
|
"colors": {
|
||||||
|
"canvas": "var(--gray-900)",
|
||||||
|
"surface": "hsl(20 8% 16% / 0.94)",
|
||||||
|
"surfaceMuted": "var(--gray-800)",
|
||||||
|
"surfaceHover": "hsl(22 9% 24% / 0.96)",
|
||||||
|
"border": "hsl(20 10% 30% / 0.72)",
|
||||||
|
"borderStrong": "hsl(30 14% 55% / 0.62)",
|
||||||
|
"text": "#d4be98",
|
||||||
|
"textMuted": "#a79a83",
|
||||||
|
"accent": "#d3869b",
|
||||||
|
"accentStrong": "hsl(344 47% 63%)",
|
||||||
|
"accentSoft": "hsl(344 47% 63% / 0.18)",
|
||||||
|
"accentContrast": "var(--gray-900)",
|
||||||
|
"primaryOne": "#7caea3",
|
||||||
|
"primaryTwo": "#d3869b",
|
||||||
|
"primaryThree": "#d8a656",
|
||||||
|
"success": "#a8b665",
|
||||||
|
"danger": "#ea6962",
|
||||||
|
"warning": "#d8a656",
|
||||||
|
"focusRing": "hsl(344 47% 63% / 0.45)"
|
||||||
|
},
|
||||||
|
"shadow": {
|
||||||
|
"soft": "0 14px 32px hsl(20 16% 3% / 0.28)",
|
||||||
|
"strong": "0 20px 48px hsl(20 16% 2% / 0.38)"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
49
Frontend/scripts/render-static-index.mjs
Normal file
49
Frontend/scripts/render-static-index.mjs
Normal file
@@ -0,0 +1,49 @@
|
|||||||
|
import { mkdir, readFile, writeFile } from "node:fs/promises";
|
||||||
|
import { dirname, resolve } from "node:path";
|
||||||
|
|
||||||
|
const manifestPath = resolve("dist/client/.vite/manifest.json");
|
||||||
|
const outputPath = resolve("dist/client/index.html");
|
||||||
|
|
||||||
|
const themeBootstrapScript = `
|
||||||
|
(() => {
|
||||||
|
try {
|
||||||
|
const storageKey = "theme";
|
||||||
|
const stored = localStorage.getItem(storageKey);
|
||||||
|
const theme = stored === "light" || stored === "dark"
|
||||||
|
? stored
|
||||||
|
: (window.matchMedia("(prefers-color-scheme: dark)").matches ? "dark" : "light");
|
||||||
|
|
||||||
|
document.documentElement.setAttribute("data-theme", theme);
|
||||||
|
} catch {
|
||||||
|
document.documentElement.setAttribute("data-theme", "light");
|
||||||
|
}
|
||||||
|
})();
|
||||||
|
`.trim();
|
||||||
|
|
||||||
|
const manifest = JSON.parse(await readFile(manifestPath, "utf8"));
|
||||||
|
const entry = manifest["src/entry-client.tsx"];
|
||||||
|
|
||||||
|
if (!entry?.file) {
|
||||||
|
throw new Error("Could not find src/entry-client.tsx in the client manifest.");
|
||||||
|
}
|
||||||
|
|
||||||
|
const cssLinks = Array.isArray(entry.css) ? entry.css.map((href) => ` <link rel="stylesheet" href="/${href}">`).join("\n") : "";
|
||||||
|
|
||||||
|
const html = `<!doctype html>
|
||||||
|
<html lang="en" data-theme="light">
|
||||||
|
<head>
|
||||||
|
<meta charset="utf-8">
|
||||||
|
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||||
|
<link rel="icon" href="/favicon.ico">
|
||||||
|
<script>${themeBootstrapScript}</script>
|
||||||
|
${cssLinks}
|
||||||
|
</head>
|
||||||
|
<body>
|
||||||
|
<div id="app"></div>
|
||||||
|
<script type="module" src="/${entry.file}"></script>
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
|
`;
|
||||||
|
|
||||||
|
await mkdir(dirname(outputPath), { recursive: true });
|
||||||
|
await writeFile(outputPath, html, "utf8");
|
||||||
@@ -3,6 +3,7 @@
|
|||||||
import type { JSX } from "solid-js";
|
import type { JSX } from "solid-js";
|
||||||
import { AppShell } from "./components/shell/AppShell/AppShell";
|
import { AppShell } from "./components/shell/AppShell/AppShell";
|
||||||
import "./styles/main.scss";
|
import "./styles/main.scss";
|
||||||
|
import "./styles/user-overrides.scss";
|
||||||
|
|
||||||
const App = (): JSX.Element => {
|
const App = (): JSX.Element => {
|
||||||
return <AppShell />;
|
return <AppShell />;
|
||||||
|
|||||||
@@ -8,13 +8,16 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
.body {
|
.body {
|
||||||
|
--shell-dock-clearance: calc(var(--space-12) + var(--space-12) + var(--space-8));
|
||||||
--rail-width: 4.75rem;
|
--rail-width: 4.75rem;
|
||||||
--sidebar-width: 16.75rem;
|
--sidebar-width: 16.75rem;
|
||||||
|
--mobile-bottom-nav-clearance: 0rem;
|
||||||
--shell-top-left-radius: calc(var(--radius-xl) + var(--space-1));
|
--shell-top-left-radius: calc(var(--radius-xl) + var(--space-1));
|
||||||
--shell-frame-border: color-mix(in srgb, var(--color-border-strong) 44%, transparent);
|
--shell-frame-border: color-mix(in srgb, var(--color-border-strong) 44%, transparent);
|
||||||
--shell-divider-border: color-mix(in srgb, var(--color-border-strong) 34%, transparent);
|
--shell-divider-border: color-mix(in srgb, var(--color-border-strong) 34%, transparent);
|
||||||
--sidebar-panel-surface: color-mix(in srgb, var(--color-surface-muted) 92%, transparent);
|
--sidebar-panel-surface: color-mix(in srgb, var(--color-surface-muted) 92%, transparent);
|
||||||
--workspace-panel-surface: color-mix(in srgb, var(--color-canvas) 94%, var(--color-surface));
|
--workspace-panel-surface: color-mix(in srgb, var(--color-canvas) 94%, var(--color-surface));
|
||||||
|
position: relative;
|
||||||
min-height: 0;
|
min-height: 0;
|
||||||
display: grid;
|
display: grid;
|
||||||
grid-template-columns: var(--rail-width) minmax(0, 1fr);
|
grid-template-columns: var(--rail-width) minmax(0, 1fr);
|
||||||
@@ -22,11 +25,21 @@
|
|||||||
background: var(--color-surface);
|
background: var(--color-surface);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.bodyRailCollapsed {
|
||||||
|
--rail-width: 0rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.bodySidebarCollapsed {
|
||||||
|
--sidebar-width: 0rem;
|
||||||
|
}
|
||||||
|
|
||||||
.railColumn {
|
.railColumn {
|
||||||
min-height: 0;
|
min-height: 0;
|
||||||
display: flex;
|
display: flex;
|
||||||
position: relative;
|
position: relative;
|
||||||
z-index: 1;
|
z-index: 6;
|
||||||
|
isolation: isolate;
|
||||||
|
overflow: visible;
|
||||||
background: var(--color-surface);
|
background: var(--color-surface);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -90,11 +103,22 @@
|
|||||||
border-top-right-radius: 0;
|
border-top-right-radius: 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.mobileWorkspaceView {
|
||||||
|
min-width: 0;
|
||||||
|
min-height: 0;
|
||||||
|
height: 100%;
|
||||||
|
display: grid;
|
||||||
|
box-sizing: border-box;
|
||||||
|
overflow: hidden;
|
||||||
|
background: var(--workspace-panel-surface);
|
||||||
|
}
|
||||||
|
|
||||||
.sidebarDock {
|
.sidebarDock {
|
||||||
position: absolute;
|
position: absolute;
|
||||||
right: var(--space-1);
|
|
||||||
bottom: var(--space-3);
|
bottom: var(--space-3);
|
||||||
left: calc(var(--space-1) - (var(--rail-width) * 0.9));
|
left: calc(var(--space-1) + (var(--rail-width) * 0.1));
|
||||||
|
width: max(12rem, calc(var(--sidebar-width) + (var(--rail-width) * 0.9) - var(--space-2)));
|
||||||
|
right: auto;
|
||||||
z-index: calc(var(--z-modal) + 1);
|
z-index: calc(var(--z-modal) + 1);
|
||||||
pointer-events: none;
|
pointer-events: none;
|
||||||
|
|
||||||
@@ -108,6 +132,14 @@
|
|||||||
--rail-width: 5rem;
|
--rail-width: 5rem;
|
||||||
--sidebar-width: 17.25rem;
|
--sidebar-width: 17.25rem;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.bodyRailCollapsed {
|
||||||
|
--rail-width: 0rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.bodySidebarCollapsed {
|
||||||
|
--sidebar-width: 0rem;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@include respond-down(tablet) {
|
@include respond-down(tablet) {
|
||||||
@@ -115,21 +147,102 @@
|
|||||||
--rail-width: 4.5rem;
|
--rail-width: 4.5rem;
|
||||||
--sidebar-width: 13.25rem;
|
--sidebar-width: 13.25rem;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.bodyRailCollapsed {
|
||||||
|
--rail-width: 0rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.bodySidebarCollapsed {
|
||||||
|
--sidebar-width: 0rem;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
.bodyRailCollapsed .railColumn {
|
||||||
|
overflow: hidden;
|
||||||
|
}
|
||||||
|
|
||||||
|
.bodySidebarCollapsed .railColumn {
|
||||||
|
--rail-dock-clearance: 0rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.bodySidebarCollapsed:not(.bodyRailCollapsed) .railColumn {
|
||||||
|
--rail-bottom-offset: var(--space-3);
|
||||||
|
}
|
||||||
|
|
||||||
|
.bodySidebarCollapsed .sidebarColumn {
|
||||||
|
--sidebar-dock-clearance: 0rem;
|
||||||
|
display: none;
|
||||||
|
overflow: hidden;
|
||||||
|
border-left-width: 0;
|
||||||
|
border-top-width: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.bodySidebarCollapsed .workspaceRegion {
|
||||||
|
grid-template-columns: minmax(0, 1fr);
|
||||||
|
}
|
||||||
|
|
||||||
|
.bodySidebarCollapsed .workspaceMain {
|
||||||
|
border-left-color: transparent;
|
||||||
|
}
|
||||||
|
|
||||||
|
.bodySidebarCollapsed:not(.bodyRailCollapsed) .workspaceMain {
|
||||||
|
border-top-width: 1px;
|
||||||
|
border-top-color: var(--shell-frame-border);
|
||||||
|
border-left-color: var(--shell-frame-border);
|
||||||
|
border-top-left-radius: var(--shell-top-left-radius);
|
||||||
|
box-shadow: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
.bodySidebarCollapsed:not(.bodyRailCollapsed) .workspaceRegion::before {
|
||||||
|
display: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
.bodySidebarCollapsed .sidebarDock {
|
||||||
|
display: none;
|
||||||
}
|
}
|
||||||
|
|
||||||
@include respond-down(mobile) {
|
@include respond-down(mobile) {
|
||||||
.body {
|
.body {
|
||||||
grid-template-columns: 4.5rem minmax(0, 1fr);
|
grid-template-columns: minmax(0, 1fr);
|
||||||
--rail-width: 4.5rem;
|
--rail-width: 0rem;
|
||||||
|
--sidebar-width: 0rem;
|
||||||
|
--mobile-bottom-nav-clearance: calc(var(--space-12) + var(--space-10) + env(safe-area-inset-bottom, 0px));
|
||||||
}
|
}
|
||||||
|
|
||||||
.railColumn {
|
.railColumn {
|
||||||
position: sticky;
|
display: none;
|
||||||
top: 0;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.workspaceRegion,
|
.workspaceRegion {
|
||||||
|
display: grid;
|
||||||
|
grid-template-columns: minmax(0, 1fr);
|
||||||
|
border-top-left-radius: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.workspaceRegion::before {
|
||||||
|
background: var(--workspace-panel-surface);
|
||||||
|
border-left-width: 0;
|
||||||
|
border-right-width: 0;
|
||||||
|
border-top-left-radius: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.sidebarColumn,
|
||||||
.sidebarDock {
|
.sidebarDock {
|
||||||
display: none;
|
display: none;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.workspaceMain {
|
||||||
|
border-left-width: 0;
|
||||||
|
border-top-right-radius: 0;
|
||||||
|
border-top-left-radius: 0;
|
||||||
|
box-sizing: border-box;
|
||||||
|
padding-bottom: var(--mobile-bottom-nav-clearance);
|
||||||
|
}
|
||||||
|
|
||||||
|
.mobileWorkspaceView {
|
||||||
|
height: 100%;
|
||||||
|
max-height: none;
|
||||||
|
padding-bottom: 0;
|
||||||
|
background: var(--workspace-panel-surface);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,19 +1,54 @@
|
|||||||
// Path: Frontend/src/components/shell/AppShell/AppShell.tsx
|
// Path: Frontend/src/components/shell/AppShell/AppShell.tsx
|
||||||
|
|
||||||
import { createSignal, onMount, type JSX } from "solid-js";
|
import { createSignal, onCleanup, onMount, Show, type JSX } from "solid-js";
|
||||||
import { getDocumentTheme, setTheme, type Theme } from "../../../helpers/theme";
|
import { getDocumentTheme, setTheme, type Theme } from "../../../theme/runtime";
|
||||||
import { WorkspaceHome } from "../../workspace-home/WorkspaceHome/WorkspaceHome";
|
import { WorkspaceHome } from "../../workspace-home/WorkspaceHome/WorkspaceHome";
|
||||||
|
import { AppShellDataProvider, useAppShellData } from "../data/app-shell.context";
|
||||||
import { LeftRail } from "../LeftRail/LeftRail";
|
import { LeftRail } from "../LeftRail/LeftRail";
|
||||||
import { ProfileDock } from "../ProfileDock/ProfileDock";
|
import { MobileBottomNav } from "../MobileBottomNav/MobileBottomNav";
|
||||||
|
import { MobileWorkspaceBrowser } from "../MobileWorkspaceBrowser/MobileWorkspaceBrowser";
|
||||||
|
import { ServerDock } from "../ServerDock/ServerDock";
|
||||||
|
import { NotificationsMenu } from "../TopBar/NotificationsMenu";
|
||||||
|
import { ProfileMenu } from "../TopBar/ProfileMenu";
|
||||||
import { TopBar } from "../TopBar/TopBar";
|
import { TopBar } from "../TopBar/TopBar";
|
||||||
import { WorkspaceSidebar } from "../WorkspaceSidebar/WorkspaceSidebar";
|
import { WorkspaceSidebar } from "../WorkspaceSidebar/WorkspaceSidebar";
|
||||||
import styles from "./AppShell.module.scss";
|
import styles from "./AppShell.module.scss";
|
||||||
|
|
||||||
export const AppShell = (): JSX.Element => {
|
type MobileWorkspaceView = "notifications" | "profile" | null;
|
||||||
|
const MOBILE_VIEWPORT_QUERY = "(max-width: 48rem)";
|
||||||
|
|
||||||
|
const AppShellContent = (): JSX.Element => {
|
||||||
const [themeState, setThemeState] = createSignal<Theme>("light");
|
const [themeState, setThemeState] = createSignal<Theme>("light");
|
||||||
|
const [isRailCollapsed, setIsRailCollapsed] = createSignal(false);
|
||||||
|
const [isSidebarCollapsed, setIsSidebarCollapsed] = createSignal(false);
|
||||||
|
const [isMobileViewport, setIsMobileViewport] = createSignal(false);
|
||||||
|
const [isMobileWorkspaceBrowserOpen, setIsMobileWorkspaceBrowserOpen] = createSignal(false);
|
||||||
|
const [activeMobileWorkspaceView, setActiveMobileWorkspaceView] = createSignal<MobileWorkspaceView>(null);
|
||||||
|
const appShellData = useAppShellData();
|
||||||
|
|
||||||
onMount((): void => {
|
onMount((): void => {
|
||||||
setThemeState(getDocumentTheme());
|
setThemeState(getDocumentTheme());
|
||||||
|
|
||||||
|
if (typeof window === "undefined" || typeof window.matchMedia !== "function") {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
const mediaQuery = window.matchMedia(MOBILE_VIEWPORT_QUERY);
|
||||||
|
const syncMobileViewport = (): void => {
|
||||||
|
setIsMobileViewport(mediaQuery.matches);
|
||||||
|
|
||||||
|
if (!mediaQuery.matches) {
|
||||||
|
setIsMobileWorkspaceBrowserOpen(false);
|
||||||
|
setActiveMobileWorkspaceView(null);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
syncMobileViewport();
|
||||||
|
mediaQuery.addEventListener("change", syncMobileViewport);
|
||||||
|
|
||||||
|
onCleanup(() => {
|
||||||
|
mediaQuery.removeEventListener("change", syncMobileViewport);
|
||||||
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
const toggleTheme = (): void => {
|
const toggleTheme = (): void => {
|
||||||
@@ -23,28 +58,118 @@ export const AppShell = (): JSX.Element => {
|
|||||||
setThemeState(next);
|
setThemeState(next);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const openMobileWorkspaceView = (view: Exclude<MobileWorkspaceView, null>): void => {
|
||||||
|
setIsMobileWorkspaceBrowserOpen(false);
|
||||||
|
setActiveMobileWorkspaceView((current) => (current === view ? null : view));
|
||||||
|
};
|
||||||
|
|
||||||
|
const toggleMobileWorkspaceBrowser = (): void => {
|
||||||
|
setActiveMobileWorkspaceView(null);
|
||||||
|
setIsMobileWorkspaceBrowserOpen((open) => !open);
|
||||||
|
};
|
||||||
|
|
||||||
|
const toggleMobileNotifications = (): void => {
|
||||||
|
openMobileWorkspaceView("notifications");
|
||||||
|
};
|
||||||
|
|
||||||
|
const toggleMobileProfile = (): void => {
|
||||||
|
openMobileWorkspaceView("profile");
|
||||||
|
};
|
||||||
|
|
||||||
|
const closeMobileWorkspaceView = (): void => {
|
||||||
|
setActiveMobileWorkspaceView(null);
|
||||||
|
};
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div class={styles.shell}>
|
<div class={styles.shell} data-ui="app-shell" data-app-shell-status={appShellData.status()}>
|
||||||
<TopBar theme={themeState()} onToggleTheme={toggleTheme} />
|
<TopBar
|
||||||
<div class={styles.body}>
|
theme={themeState()}
|
||||||
<div class={styles.railColumn}>
|
onToggleTheme={toggleTheme}
|
||||||
<LeftRail />
|
isMobileViewport={isMobileViewport()}
|
||||||
|
isNotificationsOpen={activeMobileWorkspaceView() === "notifications"}
|
||||||
|
isProfileOpen={activeMobileWorkspaceView() === "profile"}
|
||||||
|
onToggleNotifications={toggleMobileNotifications}
|
||||||
|
onToggleProfile={toggleMobileProfile}
|
||||||
|
/>
|
||||||
|
|
||||||
|
<div
|
||||||
|
classList={{
|
||||||
|
[styles.body]: true,
|
||||||
|
[styles.bodyRailCollapsed]: isRailCollapsed(),
|
||||||
|
[styles.bodySidebarCollapsed]: isSidebarCollapsed(),
|
||||||
|
}}
|
||||||
|
data-slot="shell-body"
|
||||||
|
data-rail-collapsed={isRailCollapsed() ? "true" : "false"}
|
||||||
|
data-sidebar-collapsed={isSidebarCollapsed() ? "true" : "false"}
|
||||||
|
>
|
||||||
|
{/* Left server rail */}
|
||||||
|
<div class={styles.railColumn} data-slot="rail-column">
|
||||||
|
<LeftRail collapsed={isRailCollapsed()} />
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class={styles.workspaceRegion}>
|
{/* Sidebar + main workspace frame */}
|
||||||
<div class={styles.sidebarColumn}>
|
<div class={styles.workspaceRegion} data-slot="workspace-region">
|
||||||
<WorkspaceSidebar />
|
<div class={styles.sidebarColumn} data-slot="sidebar-column">
|
||||||
|
<WorkspaceSidebar
|
||||||
<div class={styles.sidebarDock}>
|
collapsed={isSidebarCollapsed()}
|
||||||
<ProfileDock />
|
railCollapsed={isRailCollapsed()}
|
||||||
</div>
|
onToggleRailCollapse={(): void => {
|
||||||
|
setIsRailCollapsed((collapsed) => !collapsed);
|
||||||
|
}}
|
||||||
|
/>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class={styles.workspaceMain}>
|
<div class={styles.workspaceMain} data-slot="workspace-main">
|
||||||
<WorkspaceHome />
|
{/* On mobile, top-bar menus become full workspace views instead of popovers. */}
|
||||||
|
<Show
|
||||||
|
when={isMobileViewport() && activeMobileWorkspaceView() !== null}
|
||||||
|
fallback={
|
||||||
|
<WorkspaceHome
|
||||||
|
sidebarCollapsed={isSidebarCollapsed()}
|
||||||
|
onToggleSidebarCollapse={(): void => {
|
||||||
|
setIsSidebarCollapsed((collapsed) => !collapsed);
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
}
|
||||||
|
>
|
||||||
|
<div class={styles.mobileWorkspaceView} data-slot="mobile-workspace-view" data-view={activeMobileWorkspaceView() ?? undefined}>
|
||||||
|
<Show when={activeMobileWorkspaceView() === "notifications"}>
|
||||||
|
<NotificationsMenu id="mobile-workspace-notifications" onSelect={closeMobileWorkspaceView} variant="workspace" />
|
||||||
|
</Show>
|
||||||
|
<Show when={activeMobileWorkspaceView() === "profile"}>
|
||||||
|
<ProfileMenu id="mobile-workspace-profile" onSelect={closeMobileWorkspaceView} variant="workspace" />
|
||||||
|
</Show>
|
||||||
|
</div>
|
||||||
|
</Show>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
{/* Floating server dock overlay */}
|
||||||
|
<div class={styles.sidebarDock} data-slot="sidebar-dock">
|
||||||
|
<ServerDock />
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<MobileBottomNav
|
||||||
|
isBrowseOpen={isMobileWorkspaceBrowserOpen()}
|
||||||
|
onBrowseToggle={(): void => {
|
||||||
|
toggleMobileWorkspaceBrowser();
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
<MobileWorkspaceBrowser
|
||||||
|
open={isMobileWorkspaceBrowserOpen()}
|
||||||
|
onClose={(): void => {
|
||||||
|
setIsMobileWorkspaceBrowserOpen(false);
|
||||||
|
}}
|
||||||
|
/>
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
export const AppShell = (): JSX.Element => {
|
||||||
|
return (
|
||||||
|
<AppShellDataProvider>
|
||||||
|
<AppShellContent />
|
||||||
|
</AppShellDataProvider>
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|||||||
@@ -0,0 +1,221 @@
|
|||||||
|
.root {
|
||||||
|
position: relative;
|
||||||
|
min-width: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.selector {
|
||||||
|
min-width: 0;
|
||||||
|
padding: 0;
|
||||||
|
display: inline-flex;
|
||||||
|
align-items: flex-end;
|
||||||
|
justify-content: flex-start;
|
||||||
|
gap: var(--space-2);
|
||||||
|
border: 0;
|
||||||
|
background: transparent;
|
||||||
|
color: var(--color-text);
|
||||||
|
text-align: left;
|
||||||
|
transition:
|
||||||
|
background-color 180ms var(--easing-standard),
|
||||||
|
color 180ms var(--easing-standard);
|
||||||
|
}
|
||||||
|
|
||||||
|
.selectorOpen {
|
||||||
|
.meta,
|
||||||
|
.icon {
|
||||||
|
color: var(--color-text-subtle);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
.selector:hover {
|
||||||
|
.value {
|
||||||
|
color: var(--color-text);
|
||||||
|
}
|
||||||
|
|
||||||
|
.meta,
|
||||||
|
.icon {
|
||||||
|
color: var(--color-text-subtle);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
.selector:focus-visible {
|
||||||
|
outline: none;
|
||||||
|
border-radius: var(--radius-sm);
|
||||||
|
box-shadow: 0 0 0 0.12rem color-mix(in srgb, var(--color-accent-soft) 14%, transparent);
|
||||||
|
}
|
||||||
|
|
||||||
|
.copy {
|
||||||
|
min-width: 0;
|
||||||
|
display: inline-flex;
|
||||||
|
align-items: baseline;
|
||||||
|
gap: var(--space-1);
|
||||||
|
}
|
||||||
|
|
||||||
|
.value {
|
||||||
|
@include text-title;
|
||||||
|
color: var(--color-text);
|
||||||
|
font-weight: var(--font-weight-title);
|
||||||
|
line-height: 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
.meta {
|
||||||
|
@include text-caption;
|
||||||
|
color: var(--color-text-muted);
|
||||||
|
line-height: 1;
|
||||||
|
padding-left: var(--space-1);
|
||||||
|
}
|
||||||
|
|
||||||
|
.icon {
|
||||||
|
flex: 0 0 auto;
|
||||||
|
color: var(--color-text-muted);
|
||||||
|
transition: transform 180ms var(--easing-standard), color 180ms var(--easing-standard);
|
||||||
|
}
|
||||||
|
|
||||||
|
.iconOpen {
|
||||||
|
transform: rotate(180deg);
|
||||||
|
}
|
||||||
|
|
||||||
|
.menu {
|
||||||
|
position: absolute;
|
||||||
|
top: calc(100% + var(--space-2));
|
||||||
|
left: 0;
|
||||||
|
min-width: min(18rem, calc(100vw - (var(--space-4) * 2)));
|
||||||
|
display: grid;
|
||||||
|
gap: var(--space-2);
|
||||||
|
padding: var(--space-2);
|
||||||
|
border: 1px solid var(--color-border-strong);
|
||||||
|
border-radius: var(--radius-md);
|
||||||
|
background: var(--color-surface-muted);
|
||||||
|
box-shadow: 0 16px 32px color-mix(in srgb, black 18%, transparent);
|
||||||
|
z-index: 20;
|
||||||
|
}
|
||||||
|
|
||||||
|
.menuSection {
|
||||||
|
display: grid;
|
||||||
|
gap: calc(var(--space-1) / 2);
|
||||||
|
}
|
||||||
|
|
||||||
|
.menuSectionLabel {
|
||||||
|
@include text-caption;
|
||||||
|
display: block;
|
||||||
|
color: var(--color-text-muted);
|
||||||
|
letter-spacing: 0.05em;
|
||||||
|
text-transform: uppercase;
|
||||||
|
padding-inline: var(--space-1);
|
||||||
|
margin-bottom: var(--space-2);
|
||||||
|
}
|
||||||
|
|
||||||
|
.menuDivider {
|
||||||
|
height: 1px;
|
||||||
|
background: var(--color-border);
|
||||||
|
}
|
||||||
|
|
||||||
|
.menuItem {
|
||||||
|
min-width: 0;
|
||||||
|
min-height: 2.75rem;
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
width: 100%;
|
||||||
|
padding: var(--space-2) var(--space-2);
|
||||||
|
border: 1px solid transparent;
|
||||||
|
border-radius: var(--radius-sm);
|
||||||
|
background: var(--color-surface-muted);
|
||||||
|
color: var(--color-text);
|
||||||
|
text-align: left;
|
||||||
|
transition:
|
||||||
|
background-color 160ms var(--easing-standard),
|
||||||
|
border-color 160ms var(--easing-standard);
|
||||||
|
}
|
||||||
|
|
||||||
|
.menuItem:hover {
|
||||||
|
border-color: var(--color-border);
|
||||||
|
background: var(--color-surface);
|
||||||
|
}
|
||||||
|
|
||||||
|
.menuItemActive {
|
||||||
|
border-color: var(--color-accent-soft);
|
||||||
|
background: var(--color-surface);
|
||||||
|
}
|
||||||
|
|
||||||
|
.menuItemCopy {
|
||||||
|
min-width: 0;
|
||||||
|
display: grid;
|
||||||
|
gap: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.menuItemValue {
|
||||||
|
@include text-label;
|
||||||
|
color: var(--color-text);
|
||||||
|
font-weight: var(--font-weight-semibold);
|
||||||
|
}
|
||||||
|
|
||||||
|
.menuItemMeta {
|
||||||
|
@include text-caption;
|
||||||
|
color: var(--color-text-muted);
|
||||||
|
}
|
||||||
|
|
||||||
|
.submenuItem {
|
||||||
|
min-width: 0;
|
||||||
|
min-height: 2.5rem;
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
width: 100%;
|
||||||
|
gap: var(--space-2);
|
||||||
|
padding: var(--space-2) var(--space-2) var(--space-2) var(--space-3);
|
||||||
|
border: 1px solid transparent;
|
||||||
|
border-radius: var(--radius-sm);
|
||||||
|
background: var(--color-surface-muted);
|
||||||
|
color: var(--color-text);
|
||||||
|
text-align: left;
|
||||||
|
transition:
|
||||||
|
background-color 160ms var(--easing-standard),
|
||||||
|
border-color 160ms var(--easing-standard);
|
||||||
|
}
|
||||||
|
|
||||||
|
.submenuItem:hover {
|
||||||
|
border-color: var(--color-border);
|
||||||
|
background: var(--color-surface);
|
||||||
|
}
|
||||||
|
|
||||||
|
.submenuItemActive {
|
||||||
|
border-color: var(--color-accent-soft);
|
||||||
|
background: var(--color-surface);
|
||||||
|
}
|
||||||
|
|
||||||
|
.submenuIndicator {
|
||||||
|
width: calc(var(--space-1) + (var(--space-1) / 2));
|
||||||
|
height: calc(var(--space-1) + (var(--space-1) / 2));
|
||||||
|
flex: 0 0 auto;
|
||||||
|
border-radius: 999px;
|
||||||
|
background: var(--color-accent-soft);
|
||||||
|
}
|
||||||
|
|
||||||
|
@include respond-down(mobile) {
|
||||||
|
.selector {
|
||||||
|
align-items: flex-end;
|
||||||
|
gap: var(--space-1);
|
||||||
|
}
|
||||||
|
|
||||||
|
.copy {
|
||||||
|
gap: var(--space-2);
|
||||||
|
}
|
||||||
|
|
||||||
|
.value {
|
||||||
|
line-height: 0.95;
|
||||||
|
}
|
||||||
|
|
||||||
|
.meta {
|
||||||
|
font-size: 0.68rem;
|
||||||
|
line-height: 1;
|
||||||
|
letter-spacing: 0.01em;
|
||||||
|
padding-bottom: calc(var(--space-1) / 2);
|
||||||
|
}
|
||||||
|
|
||||||
|
.icon {
|
||||||
|
align-self: flex-end;
|
||||||
|
margin-bottom: calc(var(--space-1) / 2);
|
||||||
|
}
|
||||||
|
|
||||||
|
.menu {
|
||||||
|
min-width: min(16rem, calc(100vw - (var(--space-4) * 2)));
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,120 @@
|
|||||||
|
import { For, createEffect, createSignal, onCleanup, onMount, type JSX } from "solid-js";
|
||||||
|
import { ChevronDown } from "../../../lib/icons";
|
||||||
|
import { useAppShellData } from "../data/app-shell.context";
|
||||||
|
import { type DepartmentItem } from "../data/shell.data";
|
||||||
|
import styles from "./DepartmentSelector.module.scss";
|
||||||
|
|
||||||
|
export const DepartmentSelector = (): JSX.Element => {
|
||||||
|
const appShellData = useAppShellData();
|
||||||
|
const [isOpen, setIsOpen] = createSignal(false);
|
||||||
|
const [selectedDepartment, setSelectedDepartment] = createSignal<DepartmentItem>(appShellData.departmentItems()[0] ?? appShellData.activeDepartment());
|
||||||
|
const [selectedTeamName, setSelectedTeamName] = createSignal(appShellData.activeDepartment().teamName);
|
||||||
|
|
||||||
|
let rootRef: HTMLDivElement | undefined;
|
||||||
|
|
||||||
|
createEffect(() => {
|
||||||
|
const activeDepartment = appShellData.activeDepartment();
|
||||||
|
const matchingDepartment = appShellData.departmentItems().find((item) => item.id === activeDepartment.id) ?? appShellData.departmentItems()[0];
|
||||||
|
|
||||||
|
if (!matchingDepartment) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
setSelectedDepartment(matchingDepartment);
|
||||||
|
setSelectedTeamName(activeDepartment.teamName || matchingDepartment.teams[0] || "");
|
||||||
|
});
|
||||||
|
|
||||||
|
onMount(() => {
|
||||||
|
const handlePointerDown = (event: PointerEvent): void => {
|
||||||
|
if (!isOpen()) return;
|
||||||
|
if (!rootRef) return;
|
||||||
|
|
||||||
|
const target = event.target;
|
||||||
|
if (target instanceof Node && !rootRef.contains(target)) {
|
||||||
|
setIsOpen(false);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
document.addEventListener("pointerdown", handlePointerDown);
|
||||||
|
onCleanup(() => document.removeEventListener("pointerdown", handlePointerDown));
|
||||||
|
});
|
||||||
|
|
||||||
|
const selectDepartment = (item: DepartmentItem): void => {
|
||||||
|
setSelectedDepartment(item);
|
||||||
|
setSelectedTeamName(item.teams[0] ?? "");
|
||||||
|
};
|
||||||
|
|
||||||
|
const selectTeam = (teamName: string): void => {
|
||||||
|
setSelectedTeamName(teamName);
|
||||||
|
setIsOpen(false);
|
||||||
|
};
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div class={styles.root} ref={rootRef}>
|
||||||
|
<button
|
||||||
|
classList={{ [styles.selector]: true, [styles.selectorOpen]: isOpen() }}
|
||||||
|
type="button"
|
||||||
|
aria-label="Select department"
|
||||||
|
title="Select department"
|
||||||
|
aria-haspopup="menu"
|
||||||
|
aria-expanded={isOpen()}
|
||||||
|
onClick={() => setIsOpen((open) => !open)}
|
||||||
|
>
|
||||||
|
<span class={styles.copy}>
|
||||||
|
<strong class={styles.value}>{selectedDepartment().name}</strong>
|
||||||
|
<span class={styles.meta}>{selectedTeamName()}</span>
|
||||||
|
</span>
|
||||||
|
|
||||||
|
<ChevronDown classList={{ [styles.icon]: true, [styles.iconOpen]: isOpen() }} size={16} strokeWidth={2} />
|
||||||
|
</button>
|
||||||
|
|
||||||
|
{isOpen() ? (
|
||||||
|
<div class={styles.menu} role="menu" aria-label="Department selector menu">
|
||||||
|
<div class={styles.menuSection}>
|
||||||
|
<span class={styles.menuSectionLabel}>Departments</span>
|
||||||
|
|
||||||
|
<For each={appShellData.departmentItems()}>
|
||||||
|
{(item): JSX.Element => (
|
||||||
|
<button
|
||||||
|
classList={{ [styles.menuItem]: true, [styles.menuItemActive]: item.id === selectedDepartment().id }}
|
||||||
|
type="button"
|
||||||
|
role="menuitemradio"
|
||||||
|
aria-checked={item.id === selectedDepartment().id}
|
||||||
|
onClick={() => selectDepartment(item)}
|
||||||
|
>
|
||||||
|
<div class={styles.menuItemCopy}>
|
||||||
|
<strong class={styles.menuItemValue}>{item.name}</strong>
|
||||||
|
<span class={styles.menuItemMeta}>{item.teams.length} teams</span>
|
||||||
|
</div>
|
||||||
|
</button>
|
||||||
|
)}
|
||||||
|
</For>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class={styles.menuDivider} aria-hidden="true" />
|
||||||
|
|
||||||
|
<div class={styles.menuSection}>
|
||||||
|
<span class={styles.menuSectionLabel}>Teams in {selectedDepartment().name}</span>
|
||||||
|
|
||||||
|
<For each={selectedDepartment().teams}>
|
||||||
|
{(teamName): JSX.Element => (
|
||||||
|
<button
|
||||||
|
classList={{ [styles.submenuItem]: true, [styles.submenuItemActive]: teamName === selectedTeamName() }}
|
||||||
|
type="button"
|
||||||
|
role="menuitemradio"
|
||||||
|
aria-checked={teamName === selectedTeamName()}
|
||||||
|
onClick={() => selectTeam(teamName)}
|
||||||
|
>
|
||||||
|
<span class={styles.submenuIndicator} aria-hidden="true" />
|
||||||
|
<div class={styles.menuItemCopy}>
|
||||||
|
<strong class={styles.menuItemValue}>{teamName}</strong>
|
||||||
|
</div>
|
||||||
|
</button>
|
||||||
|
)}
|
||||||
|
</For>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
) : null}
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
};
|
||||||
@@ -1,18 +1,26 @@
|
|||||||
.rail {
|
.rail {
|
||||||
--rail-workspace-size: var(--control-size-lg);
|
--rail-workspace-size: var(--control-size-lg);
|
||||||
--rail-action-size: var(--control-size-md);
|
position: relative;
|
||||||
|
z-index: 3;
|
||||||
flex: 1;
|
flex: 1;
|
||||||
min-height: 0;
|
min-height: 0;
|
||||||
display: flex;
|
display: flex;
|
||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
gap: var(--space-3);
|
gap: var(--space-3);
|
||||||
padding: var(--space-3) var(--space-2);
|
padding: var(--space-3) var(--space-2) calc(var(--space-3) + var(--rail-dock-clearance, var(--shell-dock-clearance)));
|
||||||
overflow: hidden;
|
overflow: visible;
|
||||||
}
|
}
|
||||||
|
|
||||||
.topCluster,
|
.railCollapsed {
|
||||||
.bottomCluster {
|
--rail-workspace-size: calc(var(--control-size-md) + 0.1rem);
|
||||||
|
justify-content: flex-start;
|
||||||
|
gap: 0;
|
||||||
|
padding-top: var(--space-4);
|
||||||
|
padding-inline: var(--space-1);
|
||||||
|
}
|
||||||
|
|
||||||
|
.topCluster {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
display: flex;
|
display: flex;
|
||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
@@ -20,6 +28,18 @@
|
|||||||
gap: var(--space-2);
|
gap: var(--space-2);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.topCluster {
|
||||||
|
gap: var(--space-3);
|
||||||
|
}
|
||||||
|
|
||||||
|
.railCollapsed .topCluster {
|
||||||
|
gap: var(--space-3);
|
||||||
|
}
|
||||||
|
|
||||||
|
.railCollapsed .topCluster {
|
||||||
|
align-items: center;
|
||||||
|
}
|
||||||
|
|
||||||
.items {
|
.items {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
min-height: 0;
|
min-height: 0;
|
||||||
@@ -28,22 +48,101 @@
|
|||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
gap: var(--space-2);
|
gap: var(--space-2);
|
||||||
overflow-y: auto;
|
overflow: visible;
|
||||||
overscroll-behavior: contain;
|
|
||||||
padding-block: var(--space-1);
|
padding-block: var(--space-1);
|
||||||
}
|
}
|
||||||
|
|
||||||
.logo {
|
.itemSlot {
|
||||||
width: var(--rail-workspace-size);
|
position: relative;
|
||||||
height: var(--rail-workspace-size);
|
width: 100%;
|
||||||
|
display: flex;
|
||||||
|
justify-content: center;
|
||||||
|
overflow: visible;
|
||||||
|
}
|
||||||
|
|
||||||
|
.itemSlot:hover,
|
||||||
|
.itemSlot:focus-within,
|
||||||
|
.itemSlotActive {
|
||||||
|
z-index: 12;
|
||||||
|
}
|
||||||
|
|
||||||
|
.activeIndicator {
|
||||||
|
position: absolute;
|
||||||
|
left: calc(50% - (var(--rail-workspace-size) / 2) - var(--space-2));
|
||||||
|
top: 50%;
|
||||||
|
width: 0.26rem;
|
||||||
|
height: 0.55rem;
|
||||||
|
border-radius: var(--radius-pill);
|
||||||
|
background: hsl(0 0% 100% / 0.94);
|
||||||
|
transform: translateY(-50%) scaleY(0.72);
|
||||||
|
transform-origin: center;
|
||||||
|
opacity: 0;
|
||||||
|
z-index: 2;
|
||||||
|
transition:
|
||||||
|
opacity 140ms var(--easing-standard),
|
||||||
|
height 180ms var(--easing-standard),
|
||||||
|
transform 180ms var(--easing-standard);
|
||||||
|
}
|
||||||
|
|
||||||
|
.itemSlot:hover .activeIndicator {
|
||||||
|
opacity: 1;
|
||||||
|
height: 1.1rem;
|
||||||
|
transform: translateY(-50%) scaleY(1);
|
||||||
|
}
|
||||||
|
|
||||||
|
.itemSlotActive .activeIndicator {
|
||||||
|
opacity: 1;
|
||||||
|
height: 2.1rem;
|
||||||
|
transform: translateY(-50%) scaleY(1);
|
||||||
|
}
|
||||||
|
|
||||||
|
.hoverLabel {
|
||||||
|
position: absolute;
|
||||||
|
left: calc(100% + var(--space-3));
|
||||||
|
top: 50%;
|
||||||
|
z-index: 8;
|
||||||
display: inline-flex;
|
display: inline-flex;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
justify-content: center;
|
min-height: 2rem;
|
||||||
border-radius: var(--radius-lg);
|
padding: 0 var(--space-3);
|
||||||
background: var(--color-accent);
|
border: 1px solid color-mix(in srgb, var(--color-border-strong) 52%, transparent);
|
||||||
color: var(--color-accent-contrast);
|
border-radius: var(--radius-md);
|
||||||
font-weight: 700;
|
background: var(--color-surface-muted);
|
||||||
letter-spacing: -0.02em;
|
color: var(--color-text);
|
||||||
|
white-space: nowrap;
|
||||||
|
box-shadow: 0 12px 28px color-mix(in srgb, black 16%, transparent);
|
||||||
|
@include text-label;
|
||||||
|
pointer-events: none;
|
||||||
|
opacity: 0;
|
||||||
|
transform: translateY(-50%) translateX(calc(var(--space-2) * -1));
|
||||||
|
transition:
|
||||||
|
opacity 140ms var(--easing-standard),
|
||||||
|
transform 180ms cubic-bezier(0.22, 1, 0.36, 1);
|
||||||
|
}
|
||||||
|
|
||||||
|
.hoverLabel::before {
|
||||||
|
content: "";
|
||||||
|
position: absolute;
|
||||||
|
top: 50%;
|
||||||
|
left: calc(var(--space-2) * -1);
|
||||||
|
width: 0.7rem;
|
||||||
|
height: 0.7rem;
|
||||||
|
border-left: 1px solid color-mix(in srgb, var(--color-border-strong) 52%, transparent);
|
||||||
|
border-bottom: 1px solid color-mix(in srgb, var(--color-border-strong) 52%, transparent);
|
||||||
|
background: var(--color-surface-muted);
|
||||||
|
transform: translateY(-50%) rotate(45deg);
|
||||||
|
}
|
||||||
|
|
||||||
|
.sectionDivider {
|
||||||
|
width: calc(var(--rail-workspace-size) - var(--space-2));
|
||||||
|
height: 1px;
|
||||||
|
border-radius: var(--radius-pill);
|
||||||
|
background: color-mix(in srgb, var(--color-border-strong) 58%, transparent);
|
||||||
|
}
|
||||||
|
|
||||||
|
.itemSlot:hover .hoverLabel {
|
||||||
|
opacity: 1;
|
||||||
|
transform: translateY(-50%) translateX(0);
|
||||||
}
|
}
|
||||||
|
|
||||||
.workspaceButton {
|
.workspaceButton {
|
||||||
@@ -55,28 +154,31 @@
|
|||||||
@include interactive-frame(var(--color-surface-muted), var(--color-border), var(--color-text-muted), var(--radius-lg));
|
@include interactive-frame(var(--color-surface-muted), var(--color-border), var(--color-text-muted), var(--radius-lg));
|
||||||
@include text-label;
|
@include text-label;
|
||||||
@include interactive-frame-hover();
|
@include interactive-frame-hover();
|
||||||
|
transition:
|
||||||
|
border-radius 180ms var(--easing-standard),
|
||||||
|
background 180ms var(--easing-standard),
|
||||||
|
color 180ms var(--easing-standard),
|
||||||
|
transform 180ms var(--easing-standard);
|
||||||
|
}
|
||||||
|
|
||||||
|
.personalButton {
|
||||||
|
background: var(--color-accent);
|
||||||
|
border-color: transparent;
|
||||||
|
color: var(--color-accent-contrast);
|
||||||
|
font-weight: 700;
|
||||||
|
letter-spacing: -0.02em;
|
||||||
|
}
|
||||||
|
|
||||||
|
.itemSlot:hover .workspaceButton,
|
||||||
|
.itemSlot:focus-within .workspaceButton {
|
||||||
|
border-radius: var(--radius-md);
|
||||||
|
transform: translateY(-1px);
|
||||||
}
|
}
|
||||||
|
|
||||||
.workspaceButtonActive {
|
.workspaceButtonActive {
|
||||||
background: var(--color-accent);
|
background: var(--color-accent);
|
||||||
border-color: transparent;
|
border-color: transparent;
|
||||||
color: var(--color-accent-contrast);
|
color: var(--color-accent-contrast);
|
||||||
box-shadow: var(--shadow-soft);
|
border-radius: var(--radius-md);
|
||||||
}
|
box-shadow: none;
|
||||||
|
|
||||||
.addButton {
|
|
||||||
width: var(--rail-action-size);
|
|
||||||
height: var(--rail-action-size);
|
|
||||||
display: inline-flex;
|
|
||||||
align-items: center;
|
|
||||||
justify-content: center;
|
|
||||||
border: 1px dashed var(--color-border-strong);
|
|
||||||
border-radius: var(--radius-pill);
|
|
||||||
background: transparent;
|
|
||||||
color: var(--color-text-muted);
|
|
||||||
|
|
||||||
&:hover {
|
|
||||||
background: var(--color-surface-hover);
|
|
||||||
color: var(--color-text);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,42 +1,83 @@
|
|||||||
// Path: Frontend/src/components/shell/LeftRail/LeftRail.tsx
|
// Path: Frontend/src/components/shell/LeftRail/LeftRail.tsx
|
||||||
|
|
||||||
import { For, type JSX } from "solid-js";
|
import { For, Show, type JSX } from "solid-js";
|
||||||
import { Plus } from "../../../lib/icons";
|
import { useAppShellData } from "../data/app-shell.context";
|
||||||
import { railItems } from "../data/shell.data";
|
import { type RailItem } from "../data/shell.data";
|
||||||
import styles from "./LeftRail.module.scss";
|
import styles from "./LeftRail.module.scss";
|
||||||
|
|
||||||
export const LeftRail = (): JSX.Element => {
|
type RailEntryProps = {
|
||||||
|
item: RailItem;
|
||||||
|
label: string;
|
||||||
|
abbreviation: string;
|
||||||
|
personal?: boolean;
|
||||||
|
};
|
||||||
|
|
||||||
|
const RailEntry = (props: RailEntryProps): JSX.Element => {
|
||||||
return (
|
return (
|
||||||
<aside class={styles.rail} aria-label="Workspace rail">
|
<div
|
||||||
|
classList={{
|
||||||
|
[styles.itemSlot]: true,
|
||||||
|
[styles.itemSlotActive]: !!props.item.active,
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
<span class={styles.activeIndicator} aria-hidden="true" />
|
||||||
|
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
classList={{
|
||||||
|
[styles.workspaceButton]: true,
|
||||||
|
[styles.workspaceButtonActive]: !!props.item.active,
|
||||||
|
[styles.personalButton]: !!props.personal,
|
||||||
|
}}
|
||||||
|
aria-label={props.label}
|
||||||
|
title={props.label}
|
||||||
|
>
|
||||||
|
{props.abbreviation}
|
||||||
|
</button>
|
||||||
|
|
||||||
|
<span class={styles.hoverLabel} role="presentation">
|
||||||
|
{props.label}
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
type LeftRailProps = {
|
||||||
|
collapsed: boolean;
|
||||||
|
};
|
||||||
|
|
||||||
|
export const LeftRail = (props: LeftRailProps): JSX.Element => {
|
||||||
|
const appShellData = useAppShellData();
|
||||||
|
const personalItem = () => appShellData.railItems().find((item) => item.kind === "personal");
|
||||||
|
const organizationItems = () => appShellData.railItems().filter((item) => item.kind === "organization");
|
||||||
|
|
||||||
|
return (
|
||||||
|
<aside
|
||||||
|
classList={{
|
||||||
|
[styles.rail]: true,
|
||||||
|
[styles.railCollapsed]: props.collapsed,
|
||||||
|
}}
|
||||||
|
aria-label="Server rail"
|
||||||
|
>
|
||||||
<div class={styles.topCluster}>
|
<div class={styles.topCluster}>
|
||||||
<div class={styles.logo} aria-hidden="true">
|
<Show when={!props.collapsed && personalItem()}>
|
||||||
M
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class={styles.items}>
|
|
||||||
<For each={railItems}>
|
|
||||||
{(item): JSX.Element => (
|
{(item): JSX.Element => (
|
||||||
<button
|
<RailEntry item={item()} label={item().label} abbreviation={item().abbreviation} personal />
|
||||||
type="button"
|
|
||||||
classList={{
|
|
||||||
[styles.workspaceButton]: true,
|
|
||||||
[styles.workspaceButtonActive]: !!item.active,
|
|
||||||
}}
|
|
||||||
title={item.label}
|
|
||||||
aria-label={item.label}
|
|
||||||
>
|
|
||||||
{item.abbreviation}
|
|
||||||
</button>
|
|
||||||
)}
|
)}
|
||||||
</For>
|
</Show>
|
||||||
|
|
||||||
|
<Show when={!props.collapsed}>
|
||||||
|
<div class={styles.sectionDivider} aria-hidden="true" />
|
||||||
|
</Show>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class={styles.bottomCluster}>
|
<Show when={!props.collapsed}>
|
||||||
<button type="button" class={styles.addButton} aria-label="Create workspace" title="Create workspace">
|
<div class={styles.items}>
|
||||||
<Plus size={16} strokeWidth={2} />
|
<For each={organizationItems()}>
|
||||||
</button>
|
{(item): JSX.Element => <RailEntry item={item} label={item.label} abbreviation={item.abbreviation} />}
|
||||||
</div>
|
</For>
|
||||||
|
</div>
|
||||||
|
</Show>
|
||||||
</aside>
|
</aside>
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -0,0 +1,108 @@
|
|||||||
|
.mobileNav {
|
||||||
|
display: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
@include respond-down(mobile) {
|
||||||
|
.mobileNav {
|
||||||
|
--mobile-nav-button-gap: var(--space-1);
|
||||||
|
--mobile-nav-button-padding-inline: var(--space-2);
|
||||||
|
--mobile-nav-button-padding-top: calc(var(--space-2) + (var(--space-1) / 2));
|
||||||
|
--mobile-nav-button-padding-bottom: var(--space-2);
|
||||||
|
position: fixed;
|
||||||
|
right: 0;
|
||||||
|
bottom: 0;
|
||||||
|
left: 0;
|
||||||
|
display: grid;
|
||||||
|
gap: var(--space-2);
|
||||||
|
padding: var(--space-2) var(--space-3) calc(var(--space-2) + env(safe-area-inset-bottom, 0px));
|
||||||
|
background:
|
||||||
|
linear-gradient(to top, color-mix(in srgb, var(--color-canvas) 98%, transparent), color-mix(in srgb, var(--color-canvas) 92%, transparent));
|
||||||
|
border-top: 1px solid color-mix(in srgb, var(--color-border-strong) 40%, transparent);
|
||||||
|
backdrop-filter: blur(var(--blur-overlay));
|
||||||
|
z-index: var(--z-sticky);
|
||||||
|
}
|
||||||
|
|
||||||
|
.contextBar {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: center;
|
||||||
|
gap: var(--space-2);
|
||||||
|
min-width: 0;
|
||||||
|
color: var(--color-text-muted);
|
||||||
|
}
|
||||||
|
|
||||||
|
.contextServer,
|
||||||
|
.contextProject {
|
||||||
|
@include text-caption;
|
||||||
|
overflow: hidden;
|
||||||
|
text-overflow: ellipsis;
|
||||||
|
white-space: nowrap;
|
||||||
|
}
|
||||||
|
|
||||||
|
.contextServer {
|
||||||
|
max-width: 45vw;
|
||||||
|
}
|
||||||
|
|
||||||
|
.contextProject {
|
||||||
|
max-width: 30vw;
|
||||||
|
}
|
||||||
|
|
||||||
|
.contextDivider {
|
||||||
|
@include text-caption;
|
||||||
|
color: var(--color-text-subtle);
|
||||||
|
}
|
||||||
|
|
||||||
|
.navGrid {
|
||||||
|
display: grid;
|
||||||
|
grid-template-columns: repeat(3, minmax(0, 1fr));
|
||||||
|
gap: var(--space-2);
|
||||||
|
}
|
||||||
|
|
||||||
|
.navButton {
|
||||||
|
min-width: 0;
|
||||||
|
display: grid;
|
||||||
|
justify-items: center;
|
||||||
|
gap: var(--mobile-nav-button-gap);
|
||||||
|
padding: var(--mobile-nav-button-padding-top) var(--mobile-nav-button-padding-inline) var(--mobile-nav-button-padding-bottom);
|
||||||
|
border: 1px solid transparent;
|
||||||
|
border-radius: var(--radius-xl);
|
||||||
|
background: transparent;
|
||||||
|
color: var(--color-text-muted);
|
||||||
|
transition:
|
||||||
|
background 160ms var(--easing-standard),
|
||||||
|
color 160ms var(--easing-standard),
|
||||||
|
border-color 160ms var(--easing-standard),
|
||||||
|
transform 180ms var(--easing-standard);
|
||||||
|
}
|
||||||
|
|
||||||
|
.navButton:hover,
|
||||||
|
.navButton:focus-visible {
|
||||||
|
color: var(--color-text);
|
||||||
|
background: color-mix(in srgb, var(--color-surface) 82%, transparent);
|
||||||
|
border-color: color-mix(in srgb, var(--color-border-strong) 28%, transparent);
|
||||||
|
}
|
||||||
|
|
||||||
|
.navButton:active {
|
||||||
|
transform: translateY(calc(var(--space-1) / 2));
|
||||||
|
}
|
||||||
|
|
||||||
|
.navButtonActive {
|
||||||
|
color: var(--color-text);
|
||||||
|
background: color-mix(in srgb, var(--color-surface) 90%, transparent);
|
||||||
|
border-color: color-mix(in srgb, var(--color-border-strong) 34%, transparent);
|
||||||
|
box-shadow: var(--shadow-soft);
|
||||||
|
}
|
||||||
|
|
||||||
|
.iconWrap {
|
||||||
|
display: inline-flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: center;
|
||||||
|
}
|
||||||
|
|
||||||
|
.label {
|
||||||
|
@include text-caption;
|
||||||
|
overflow: hidden;
|
||||||
|
text-overflow: ellipsis;
|
||||||
|
white-space: nowrap;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,66 @@
|
|||||||
|
// Path: Frontend/src/components/shell/MobileBottomNav/MobileBottomNav.tsx
|
||||||
|
|
||||||
|
import { For, type JSX } from "solid-js";
|
||||||
|
import { useAppShellData } from "../data/app-shell.context";
|
||||||
|
import { mobileBottomNavItems, type MobileBottomNavItem } from "../data/shell.data";
|
||||||
|
import styles from "./MobileBottomNav.module.scss";
|
||||||
|
|
||||||
|
type MobileBottomNavProps = {
|
||||||
|
isBrowseOpen: boolean;
|
||||||
|
onBrowseToggle: VoidFunction;
|
||||||
|
};
|
||||||
|
|
||||||
|
const MobileNavEntry = (props: {
|
||||||
|
item: MobileBottomNavItem;
|
||||||
|
isActive: boolean;
|
||||||
|
onSelect?: VoidFunction;
|
||||||
|
}): JSX.Element => {
|
||||||
|
const Icon = props.item.icon;
|
||||||
|
|
||||||
|
return (
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
onClick={() => props.onSelect?.()}
|
||||||
|
classList={{
|
||||||
|
[styles.navButton]: true,
|
||||||
|
[styles.navButtonActive]: props.isActive,
|
||||||
|
}}
|
||||||
|
aria-current={props.isActive ? "page" : undefined}
|
||||||
|
aria-expanded={props.item.id === "browse" ? props.isActive : undefined}
|
||||||
|
aria-label={props.item.label}
|
||||||
|
title={props.item.label}
|
||||||
|
>
|
||||||
|
<span class={styles.iconWrap} aria-hidden="true">
|
||||||
|
<Icon size={18} strokeWidth={2} />
|
||||||
|
</span>
|
||||||
|
|
||||||
|
<span class={styles.label}>{props.item.label}</span>
|
||||||
|
</button>
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
export const MobileBottomNav = (props: MobileBottomNavProps): JSX.Element => {
|
||||||
|
const appShellData = useAppShellData();
|
||||||
|
|
||||||
|
return (
|
||||||
|
<nav class={styles.mobileNav} aria-label="Mobile workspace navigation">
|
||||||
|
<div class={styles.contextBar}>
|
||||||
|
<span class={styles.contextServer}>{appShellData.activeServer().name}</span>
|
||||||
|
<span class={styles.contextDivider}>/</span>
|
||||||
|
<span class={styles.contextProject}>{appShellData.activeProject().name}</span>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class={styles.navGrid}>
|
||||||
|
<For each={mobileBottomNavItems}>
|
||||||
|
{(item): JSX.Element => (
|
||||||
|
<MobileNavEntry
|
||||||
|
item={item}
|
||||||
|
isActive={item.id === "browse" ? props.isBrowseOpen : (item.active ?? false) && !props.isBrowseOpen}
|
||||||
|
onSelect={item.id === "browse" ? props.onBrowseToggle : undefined}
|
||||||
|
/>
|
||||||
|
)}
|
||||||
|
</For>
|
||||||
|
</div>
|
||||||
|
</nav>
|
||||||
|
);
|
||||||
|
};
|
||||||
@@ -0,0 +1,190 @@
|
|||||||
|
.browserLayer {
|
||||||
|
display: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
@include respond-down(mobile) {
|
||||||
|
.browserLayer {
|
||||||
|
position: fixed;
|
||||||
|
inset: 0;
|
||||||
|
display: grid;
|
||||||
|
z-index: calc(var(--z-popover, 20) + 2);
|
||||||
|
background: color-mix(in srgb, var(--color-canvas) 96%, black 4%);
|
||||||
|
}
|
||||||
|
|
||||||
|
.sheet {
|
||||||
|
min-height: 100dvh;
|
||||||
|
display: grid;
|
||||||
|
grid-template-rows: auto minmax(0, 1fr);
|
||||||
|
background:
|
||||||
|
linear-gradient(180deg, color-mix(in srgb, var(--color-surface) 84%, transparent) 0%, transparent 8rem),
|
||||||
|
color-mix(in srgb, var(--color-canvas) 97%, black 3%);
|
||||||
|
overflow: clip;
|
||||||
|
}
|
||||||
|
|
||||||
|
.sheetHeader {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: space-between;
|
||||||
|
gap: var(--space-3);
|
||||||
|
padding: calc(var(--space-5) + env(safe-area-inset-top, 0px)) var(--space-4) var(--space-4);
|
||||||
|
border-bottom: 1px solid color-mix(in srgb, var(--color-border) 84%, transparent);
|
||||||
|
}
|
||||||
|
|
||||||
|
.headerActions {
|
||||||
|
display: inline-flex;
|
||||||
|
align-items: center;
|
||||||
|
gap: var(--space-2);
|
||||||
|
}
|
||||||
|
|
||||||
|
.brandBlock {
|
||||||
|
min-width: 0;
|
||||||
|
display: grid;
|
||||||
|
gap: var(--space-1);
|
||||||
|
}
|
||||||
|
|
||||||
|
.sectionLabel {
|
||||||
|
@include text-caption;
|
||||||
|
color: var(--color-text-muted);
|
||||||
|
text-transform: uppercase;
|
||||||
|
letter-spacing: 0.06em;
|
||||||
|
}
|
||||||
|
|
||||||
|
.brandEyebrow {
|
||||||
|
@include text-caption;
|
||||||
|
color: var(--color-text-muted);
|
||||||
|
text-transform: uppercase;
|
||||||
|
letter-spacing: 0.08em;
|
||||||
|
}
|
||||||
|
|
||||||
|
.brandTitle {
|
||||||
|
@include text-title;
|
||||||
|
color: var(--color-text);
|
||||||
|
font-weight: var(--font-weight-semibold);
|
||||||
|
}
|
||||||
|
|
||||||
|
.brandContext {
|
||||||
|
@include text-caption;
|
||||||
|
color: var(--color-text-subtle);
|
||||||
|
}
|
||||||
|
|
||||||
|
.closeButton {
|
||||||
|
display: inline-flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: center;
|
||||||
|
width: var(--control-size-md);
|
||||||
|
height: var(--control-size-md);
|
||||||
|
padding: 0;
|
||||||
|
border: 1px solid color-mix(in srgb, var(--color-border) 92%, transparent);
|
||||||
|
border-radius: 999px;
|
||||||
|
background: color-mix(in srgb, var(--color-surface) 92%, transparent);
|
||||||
|
color: var(--color-text-subtle);
|
||||||
|
}
|
||||||
|
|
||||||
|
.createButton {
|
||||||
|
display: inline-flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: center;
|
||||||
|
gap: var(--space-2);
|
||||||
|
min-height: var(--control-size-md);
|
||||||
|
padding: 0 var(--space-3);
|
||||||
|
border: 1px solid color-mix(in srgb, var(--color-border-strong, var(--color-border)) 82%, transparent);
|
||||||
|
border-radius: 999px;
|
||||||
|
background: color-mix(in srgb, var(--color-surface) 94%, var(--color-canvas) 6%);
|
||||||
|
color: var(--color-text);
|
||||||
|
box-shadow: var(--shadow-soft);
|
||||||
|
font: inherit;
|
||||||
|
font-weight: var(--font-weight-semibold);
|
||||||
|
}
|
||||||
|
|
||||||
|
.sheetBody {
|
||||||
|
min-height: 0;
|
||||||
|
display: grid;
|
||||||
|
gap: var(--space-5);
|
||||||
|
padding: var(--space-5) var(--space-5) calc(var(--space-12) + var(--space-10) + env(safe-area-inset-bottom, 0px));
|
||||||
|
overflow: auto;
|
||||||
|
}
|
||||||
|
|
||||||
|
.sectionBlock {
|
||||||
|
display: grid;
|
||||||
|
gap: var(--space-2);
|
||||||
|
}
|
||||||
|
|
||||||
|
.treeList,
|
||||||
|
.treeListItem {
|
||||||
|
list-style: none;
|
||||||
|
margin: 0;
|
||||||
|
padding: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.treeList {
|
||||||
|
display: grid;
|
||||||
|
gap: 0;
|
||||||
|
border-top: 1px solid color-mix(in srgb, var(--color-border) 92%, transparent);
|
||||||
|
}
|
||||||
|
|
||||||
|
.treeListNested {
|
||||||
|
display: grid;
|
||||||
|
gap: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.treeRow {
|
||||||
|
min-width: 0;
|
||||||
|
width: 100%;
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: space-between;
|
||||||
|
gap: var(--space-3);
|
||||||
|
min-height: calc(var(--control-size-lg) + var(--space-3));
|
||||||
|
padding: var(--space-4) var(--space-2) var(--space-4) calc(var(--space-2) + (var(--tree-depth, 0) * var(--space-4)));
|
||||||
|
border: 0;
|
||||||
|
border-bottom: 1px solid color-mix(in srgb, var(--color-border) 92%, transparent);
|
||||||
|
border-radius: 0;
|
||||||
|
background: transparent;
|
||||||
|
color: var(--color-text);
|
||||||
|
text-align: left;
|
||||||
|
}
|
||||||
|
|
||||||
|
.treeRowActive {
|
||||||
|
color: var(--color-text);
|
||||||
|
background: color-mix(in srgb, var(--color-surface) 72%, transparent);
|
||||||
|
}
|
||||||
|
|
||||||
|
.treeRowBranch {
|
||||||
|
font-weight: var(--font-weight-semibold);
|
||||||
|
}
|
||||||
|
|
||||||
|
.treeRowLead,
|
||||||
|
.treeRowTrail {
|
||||||
|
min-width: 0;
|
||||||
|
display: inline-flex;
|
||||||
|
align-items: center;
|
||||||
|
gap: var(--space-2);
|
||||||
|
}
|
||||||
|
|
||||||
|
.treeRowTrail {
|
||||||
|
flex: 0 0 auto;
|
||||||
|
color: var(--color-text-muted);
|
||||||
|
}
|
||||||
|
|
||||||
|
.treeLabel {
|
||||||
|
@include text-label;
|
||||||
|
min-width: 0;
|
||||||
|
overflow: hidden;
|
||||||
|
text-overflow: ellipsis;
|
||||||
|
white-space: nowrap;
|
||||||
|
}
|
||||||
|
|
||||||
|
.treeMeta {
|
||||||
|
@include text-caption;
|
||||||
|
min-width: 1rem;
|
||||||
|
text-align: right;
|
||||||
|
}
|
||||||
|
|
||||||
|
.treeChevron {
|
||||||
|
color: var(--color-text-subtle);
|
||||||
|
}
|
||||||
|
|
||||||
|
.treeListNested > .treeListItem > .treeRow {
|
||||||
|
min-height: calc(var(--control-size-lg) + var(--space-1));
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,247 @@
|
|||||||
|
import { For, Show, createSignal, type JSX } from "solid-js";
|
||||||
|
import { ChevronRight, Plus, X } from "../../../lib/icons";
|
||||||
|
import { useAppShellData } from "../data/app-shell.context";
|
||||||
|
import { createLongPressGesture } from "../createLongPressGesture";
|
||||||
|
import {
|
||||||
|
createWorkspaceStaticTarget,
|
||||||
|
createWorkspaceSurfaceTarget,
|
||||||
|
createWorkspaceTreeTarget,
|
||||||
|
getWorkspaceNodeIcon,
|
||||||
|
workspaceStaticItems,
|
||||||
|
type SidebarItem,
|
||||||
|
type WorkspaceContextMenuAction,
|
||||||
|
type WorkspaceContextMenuTarget,
|
||||||
|
type WorkspaceStaticItem,
|
||||||
|
type WorkspaceTreeNode,
|
||||||
|
} from "../data/shell.data";
|
||||||
|
import { WorkspaceMobileActionSheet } from "../WorkspaceMobileActionSheet/WorkspaceMobileActionSheet";
|
||||||
|
import styles from "./MobileWorkspaceBrowser.module.scss";
|
||||||
|
|
||||||
|
type MobileWorkspaceBrowserProps = {
|
||||||
|
open: boolean;
|
||||||
|
onClose: VoidFunction;
|
||||||
|
};
|
||||||
|
|
||||||
|
const TreeRow = (props: { node: WorkspaceTreeNode; depth?: number }): JSX.Element => {
|
||||||
|
const depth = props.depth ?? 0;
|
||||||
|
const Icon = getWorkspaceNodeIcon(props.node);
|
||||||
|
const hasChildren = (props.node.children?.length ?? 0) > 0;
|
||||||
|
|
||||||
|
return (
|
||||||
|
<button
|
||||||
|
classList={{
|
||||||
|
[styles.treeRow]: true,
|
||||||
|
[styles.treeRowActive]: props.node.active ?? false,
|
||||||
|
[styles.treeRowBranch]: hasChildren,
|
||||||
|
}}
|
||||||
|
type="button"
|
||||||
|
style={{ "--tree-depth": `${depth}` }}
|
||||||
|
data-slot="mobile-workspace-tree-row"
|
||||||
|
data-kind={props.node.kind}
|
||||||
|
data-item-type={props.node.kind === "item" ? props.node.itemType : undefined}
|
||||||
|
data-active={props.node.active ? "true" : "false"}
|
||||||
|
>
|
||||||
|
<span class={styles.treeRowLead}>
|
||||||
|
<Icon size={16} strokeWidth={2} />
|
||||||
|
<span class={styles.treeLabel}>{props.node.label}</span>
|
||||||
|
</span>
|
||||||
|
|
||||||
|
<span class={styles.treeRowTrail}>
|
||||||
|
<Show when={props.node.meta}>
|
||||||
|
<span class={styles.treeMeta}>{props.node.meta}</span>
|
||||||
|
</Show>
|
||||||
|
<Show when={hasChildren}>
|
||||||
|
<ChevronRight size={14} strokeWidth={2} class={styles.treeChevron} />
|
||||||
|
</Show>
|
||||||
|
</span>
|
||||||
|
</button>
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
const StaticRow = (props: { item: SidebarItem }): JSX.Element => {
|
||||||
|
const Icon = props.item.icon;
|
||||||
|
|
||||||
|
return (
|
||||||
|
<button classList={{ [styles.treeRow]: true, [styles.treeRowActive]: props.item.active ?? false }} type="button" style={{ "--tree-depth": "0" }} data-slot="mobile-workspace-static-row" data-active={props.item.active ? "true" : "false"}>
|
||||||
|
<span class={styles.treeRowLead}>
|
||||||
|
<Icon size={16} strokeWidth={2} />
|
||||||
|
<span class={styles.treeLabel}>{props.item.label}</span>
|
||||||
|
</span>
|
||||||
|
<span class={styles.treeRowTrail}>
|
||||||
|
<Show when={props.item.meta}>
|
||||||
|
<span class={styles.treeMeta}>{props.item.meta}</span>
|
||||||
|
</Show>
|
||||||
|
<ChevronRight size={14} strokeWidth={2} class={styles.treeChevron} />
|
||||||
|
</span>
|
||||||
|
</button>
|
||||||
|
);
|
||||||
|
};
|
||||||
|
const WorkspaceStaticRow = (props: {
|
||||||
|
item: WorkspaceStaticItem;
|
||||||
|
onOpenActionSheet: (target: WorkspaceContextMenuTarget) => void;
|
||||||
|
}): JSX.Element => {
|
||||||
|
const target = createWorkspaceStaticTarget(props.item);
|
||||||
|
const longPress = createLongPressGesture({
|
||||||
|
onLongPress: () => {
|
||||||
|
props.onOpenActionSheet(target);
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
|
return (
|
||||||
|
<li
|
||||||
|
class={styles.treeListItem}
|
||||||
|
data-slot="mobile-workspace-static-item"
|
||||||
|
data-target-kind={target.kind}
|
||||||
|
onContextMenu={(event): void => {
|
||||||
|
event.preventDefault();
|
||||||
|
props.onOpenActionSheet(target);
|
||||||
|
}}
|
||||||
|
{...longPress}
|
||||||
|
>
|
||||||
|
<StaticRow item={props.item} />
|
||||||
|
</li>
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
const WorkspaceTreeBranch = (props: {
|
||||||
|
nodes: readonly WorkspaceTreeNode[];
|
||||||
|
depth?: number;
|
||||||
|
onOpenActionSheet: (target: WorkspaceContextMenuTarget) => void;
|
||||||
|
}): JSX.Element => {
|
||||||
|
const depth = props.depth ?? 0;
|
||||||
|
|
||||||
|
return (
|
||||||
|
<For each={props.nodes}>
|
||||||
|
{(node): JSX.Element => {
|
||||||
|
const target = createWorkspaceTreeTarget(node);
|
||||||
|
const longPress = createLongPressGesture({
|
||||||
|
onLongPress: () => {
|
||||||
|
props.onOpenActionSheet(target);
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
|
return (
|
||||||
|
<li
|
||||||
|
class={styles.treeListItem}
|
||||||
|
data-slot="mobile-workspace-tree-item"
|
||||||
|
data-kind={node.kind}
|
||||||
|
data-item-type={node.kind === "item" ? node.itemType : undefined}
|
||||||
|
onContextMenu={(event): void => {
|
||||||
|
event.preventDefault();
|
||||||
|
props.onOpenActionSheet(target);
|
||||||
|
}}
|
||||||
|
{...longPress}
|
||||||
|
>
|
||||||
|
<TreeRow node={node} depth={depth} />
|
||||||
|
|
||||||
|
<Show when={node.children?.length}>
|
||||||
|
<ul class={styles.treeListNested}>
|
||||||
|
<WorkspaceTreeBranch nodes={node.children ?? []} depth={depth + 1} onOpenActionSheet={props.onOpenActionSheet} />
|
||||||
|
</ul>
|
||||||
|
</Show>
|
||||||
|
</li>
|
||||||
|
);
|
||||||
|
}}
|
||||||
|
</For>
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
export const MobileWorkspaceBrowser = (props: MobileWorkspaceBrowserProps): JSX.Element => {
|
||||||
|
const appShellData = useAppShellData();
|
||||||
|
const [actionSheetTarget, setActionSheetTarget] = createSignal<WorkspaceContextMenuTarget | null>(null);
|
||||||
|
const sectionNodes = () => appShellData.workspaceTree().filter((node) => (node.children?.length ?? 0) > 0);
|
||||||
|
const looseNodes = () => appShellData.workspaceTree().filter((node) => (node.children?.length ?? 0) === 0);
|
||||||
|
const workspaceTarget = () => createWorkspaceSurfaceTarget(appShellData.activeProject());
|
||||||
|
const openActionSheet = (target: WorkspaceContextMenuTarget): void => {
|
||||||
|
setActionSheetTarget(target);
|
||||||
|
};
|
||||||
|
const closeActionSheet = (): void => {
|
||||||
|
setActionSheetTarget(null);
|
||||||
|
};
|
||||||
|
const openWorkspaceActionSheet = (): void => {
|
||||||
|
openActionSheet(workspaceTarget());
|
||||||
|
};
|
||||||
|
|
||||||
|
const handleActionSelect = (_action: WorkspaceContextMenuAction, _target: WorkspaceContextMenuTarget): void => {
|
||||||
|
// Mobile first pass only establishes the action-sheet IA and long-press behavior.
|
||||||
|
};
|
||||||
|
|
||||||
|
const workspaceLongPress = createLongPressGesture({
|
||||||
|
onLongPress: openWorkspaceActionSheet,
|
||||||
|
});
|
||||||
|
|
||||||
|
return (
|
||||||
|
<Show when={props.open}>
|
||||||
|
<div class={styles.browserLayer} data-ui="mobile-workspace-browser">
|
||||||
|
<section class={styles.sheet} aria-label="Mobile workspace browser" data-slot="mobile-workspace-sheet">
|
||||||
|
<header class={styles.sheetHeader} data-slot="mobile-workspace-header">
|
||||||
|
<div
|
||||||
|
class={styles.brandBlock}
|
||||||
|
data-slot="mobile-workspace-brand"
|
||||||
|
onContextMenu={(event): void => {
|
||||||
|
event.preventDefault();
|
||||||
|
openWorkspaceActionSheet();
|
||||||
|
}}
|
||||||
|
{...workspaceLongPress}
|
||||||
|
>
|
||||||
|
{/* Long-pressing the browser header exposes workspace-level actions on mobile. */}
|
||||||
|
<span class={styles.brandEyebrow}>Moku Work</span>
|
||||||
|
<strong class={styles.brandTitle}>{appShellData.activeProject().name}</strong>
|
||||||
|
<span class={styles.brandContext}>{appShellData.activeServer().name}</span>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class={styles.headerActions} data-slot="mobile-workspace-header-actions">
|
||||||
|
<button
|
||||||
|
class={styles.createButton}
|
||||||
|
type="button"
|
||||||
|
aria-label="Create"
|
||||||
|
data-slot="mobile-workspace-create"
|
||||||
|
onClick={openWorkspaceActionSheet}
|
||||||
|
>
|
||||||
|
<Plus size={16} strokeWidth={2.25} />
|
||||||
|
<span>Create</span>
|
||||||
|
</button>
|
||||||
|
|
||||||
|
<button class={styles.closeButton} type="button" aria-label="Close workspace browser" data-slot="mobile-workspace-close" onClick={props.onClose}>
|
||||||
|
<X size={18} strokeWidth={2} />
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</header>
|
||||||
|
|
||||||
|
<div class={styles.sheetBody} data-slot="mobile-workspace-body">
|
||||||
|
<section class={styles.sectionBlock} data-slot="mobile-workspace-section" data-section-id="workspace">
|
||||||
|
<span class={styles.sectionLabel}>Workspace</span>
|
||||||
|
<ul class={styles.treeList} data-slot="mobile-workspace-list" data-section-id="workspace">
|
||||||
|
<For each={workspaceStaticItems}>
|
||||||
|
{(item): JSX.Element => <WorkspaceStaticRow item={item} onOpenActionSheet={openActionSheet} />}
|
||||||
|
</For>
|
||||||
|
</ul>
|
||||||
|
</section>
|
||||||
|
|
||||||
|
<section class={styles.sectionBlock} data-slot="mobile-workspace-section" data-section-id="items">
|
||||||
|
<span class={styles.sectionLabel}>Items</span>
|
||||||
|
<ul class={styles.treeList} data-slot="mobile-workspace-list" data-section-id="items">
|
||||||
|
<WorkspaceTreeBranch nodes={sectionNodes()} onOpenActionSheet={openActionSheet} />
|
||||||
|
</ul>
|
||||||
|
</section>
|
||||||
|
|
||||||
|
<Show when={looseNodes().length > 0}>
|
||||||
|
<section class={styles.sectionBlock} data-slot="mobile-workspace-section" data-section-id="more">
|
||||||
|
<span class={styles.sectionLabel}>More</span>
|
||||||
|
<ul class={styles.treeList} data-slot="mobile-workspace-list" data-section-id="more">
|
||||||
|
<WorkspaceTreeBranch nodes={looseNodes()} onOpenActionSheet={openActionSheet} />
|
||||||
|
</ul>
|
||||||
|
</section>
|
||||||
|
</Show>
|
||||||
|
</div>
|
||||||
|
</section>
|
||||||
|
|
||||||
|
<WorkspaceMobileActionSheet
|
||||||
|
target={actionSheetTarget()}
|
||||||
|
onClose={closeActionSheet}
|
||||||
|
onSelect={handleActionSelect}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
</Show>
|
||||||
|
);
|
||||||
|
};
|
||||||
@@ -1,35 +0,0 @@
|
|||||||
// Path: Frontend/src/components/shell/ProfileDock/ProfileDock.tsx
|
|
||||||
|
|
||||||
import type { JSX } from "solid-js";
|
|
||||||
import { Settings, User } from "../../../lib/icons";
|
|
||||||
import styles from "./ProfileDock.module.scss";
|
|
||||||
|
|
||||||
export const ProfileDock = (): JSX.Element => {
|
|
||||||
return (
|
|
||||||
<section class={styles.panel} aria-label="Profile dock">
|
|
||||||
<div class={styles.identity}>
|
|
||||||
<div class={styles.avatar} aria-hidden="true">
|
|
||||||
R
|
|
||||||
</div>
|
|
||||||
<div class={styles.copy}>
|
|
||||||
<span class={styles.name}>Ronald</span>
|
|
||||||
<span class={styles.status}>
|
|
||||||
<span class={styles.statusDot} aria-hidden="true" />
|
|
||||||
Online in Moku
|
|
||||||
</span>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class={styles.actions}>
|
|
||||||
<button type="button" class={styles.action}>
|
|
||||||
<User size={16} strokeWidth={2} />
|
|
||||||
<span class={styles.actionLabel}>Account</span>
|
|
||||||
</button>
|
|
||||||
<button type="button" class={styles.action}>
|
|
||||||
<Settings size={16} strokeWidth={2} />
|
|
||||||
<span class={styles.actionLabel}>Prefs</span>
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
</section>
|
|
||||||
);
|
|
||||||
};
|
|
||||||
@@ -0,0 +1,204 @@
|
|||||||
|
import { For, Show, createEffect, createMemo, createSignal, onMount, type JSX } from "solid-js";
|
||||||
|
import { Portal } from "solid-js/web";
|
||||||
|
import { ChevronRight, Plus } from "../../../lib/icons";
|
||||||
|
import {
|
||||||
|
getProjectContextMenuEyebrow,
|
||||||
|
getProjectContextMenuSections,
|
||||||
|
type ProjectContextMenuAction,
|
||||||
|
type ProjectMenuTarget,
|
||||||
|
type WorkspaceContextMenuShortcut,
|
||||||
|
} from "../data/shell.data";
|
||||||
|
import styles from "../WorkspaceContextMenu/WorkspaceContextMenu.module.scss";
|
||||||
|
|
||||||
|
type ShortcutPlatform = "mac" | "windows";
|
||||||
|
|
||||||
|
type NavigatorWithUserAgentData = Navigator & {
|
||||||
|
userAgentData?: {
|
||||||
|
platform?: string;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
type ProjectContextMenuPosition = {
|
||||||
|
x: number;
|
||||||
|
y: number;
|
||||||
|
};
|
||||||
|
|
||||||
|
type ProjectContextMenuProps = {
|
||||||
|
target: ProjectMenuTarget | null;
|
||||||
|
position: ProjectContextMenuPosition | null;
|
||||||
|
onClose: VoidFunction;
|
||||||
|
onSelect: (action: ProjectContextMenuAction, target: ProjectMenuTarget) => void;
|
||||||
|
menuRef: (element: HTMLDivElement) => void;
|
||||||
|
};
|
||||||
|
|
||||||
|
const getShortcutPlatform = (): ShortcutPlatform => {
|
||||||
|
if (typeof navigator === "undefined") {
|
||||||
|
return "mac";
|
||||||
|
}
|
||||||
|
|
||||||
|
const navigatorWithUserAgentData = navigator as NavigatorWithUserAgentData;
|
||||||
|
const platform =
|
||||||
|
typeof navigatorWithUserAgentData.userAgentData?.platform === "string"
|
||||||
|
? navigatorWithUserAgentData.userAgentData.platform
|
||||||
|
: navigator.platform;
|
||||||
|
|
||||||
|
return /mac|iphone|ipad|ipod/i.test(platform) ? "mac" : "windows";
|
||||||
|
};
|
||||||
|
|
||||||
|
const formatShortcut = (shortcut: WorkspaceContextMenuShortcut, platform: ShortcutPlatform): string => {
|
||||||
|
const keyLabel = (() => {
|
||||||
|
switch (shortcut.key) {
|
||||||
|
case "enter":
|
||||||
|
return platform === "mac" ? "↩" : "Enter";
|
||||||
|
case "delete":
|
||||||
|
return platform === "mac" ? "⌫" : "Del";
|
||||||
|
default:
|
||||||
|
return shortcut.key.toUpperCase();
|
||||||
|
}
|
||||||
|
})();
|
||||||
|
|
||||||
|
const modifierLabels =
|
||||||
|
shortcut.modifiers?.map((modifier) => {
|
||||||
|
switch (modifier) {
|
||||||
|
case "meta":
|
||||||
|
return platform === "mac" ? "⌘" : "Ctrl";
|
||||||
|
case "alt":
|
||||||
|
return platform === "mac" ? "⌥" : "Alt";
|
||||||
|
case "shift":
|
||||||
|
return platform === "mac" ? "⇧" : "Shift";
|
||||||
|
}
|
||||||
|
}) ?? [];
|
||||||
|
|
||||||
|
return platform === "mac" ? `${modifierLabels.join("")}${keyLabel}` : [...modifierLabels, keyLabel].join("+");
|
||||||
|
};
|
||||||
|
|
||||||
|
export const ProjectContextMenu = (props: ProjectContextMenuProps): JSX.Element => {
|
||||||
|
const [activeSubmenuActionId, setActiveSubmenuActionId] = createSignal<string | null>(null);
|
||||||
|
const [shortcutPlatform, setShortcutPlatform] = createSignal<ShortcutPlatform>("mac");
|
||||||
|
const sections = createMemo(() => (props.target ? getProjectContextMenuSections(props.target) : []));
|
||||||
|
const isCreateAction = (action: ProjectContextMenuAction): boolean => action.id.startsWith("new-");
|
||||||
|
const menuState = createMemo<{
|
||||||
|
target: ProjectMenuTarget;
|
||||||
|
position: ProjectContextMenuPosition;
|
||||||
|
} | null>(() => (props.target && props.position ? { target: props.target, position: props.position } : null));
|
||||||
|
|
||||||
|
onMount(() => {
|
||||||
|
setShortcutPlatform(getShortcutPlatform());
|
||||||
|
});
|
||||||
|
|
||||||
|
createEffect(() => {
|
||||||
|
void props.target;
|
||||||
|
setActiveSubmenuActionId(null);
|
||||||
|
});
|
||||||
|
|
||||||
|
return (
|
||||||
|
<Show when={menuState()}>
|
||||||
|
{(resolvedMenuState): JSX.Element => {
|
||||||
|
const target = resolvedMenuState().target;
|
||||||
|
const position = resolvedMenuState().position;
|
||||||
|
|
||||||
|
return (
|
||||||
|
<Portal>
|
||||||
|
<div
|
||||||
|
ref={props.menuRef}
|
||||||
|
class={styles.menu}
|
||||||
|
role="menu"
|
||||||
|
aria-label={`${target.label} project context menu`}
|
||||||
|
style={{ left: `${position.x}px`, top: `${position.y}px` }}
|
||||||
|
>
|
||||||
|
<Show when={target.kind !== "surface"}>
|
||||||
|
<header class={styles.header}>
|
||||||
|
<span class={styles.eyebrow}>{getProjectContextMenuEyebrow(target)}</span>
|
||||||
|
<strong class={styles.title}>{target.label}</strong>
|
||||||
|
</header>
|
||||||
|
</Show>
|
||||||
|
|
||||||
|
<div class={styles.sectionList}>
|
||||||
|
<For each={sections()}>
|
||||||
|
{(section): JSX.Element => (
|
||||||
|
<section class={styles.section}>
|
||||||
|
<Show when={section.label}>
|
||||||
|
<span class={styles.sectionLabel}>{section.label}</span>
|
||||||
|
</Show>
|
||||||
|
<div class={styles.actionList}>
|
||||||
|
<For each={section.items}>
|
||||||
|
{(action): JSX.Element => {
|
||||||
|
const isSubmenuOpen = () => activeSubmenuActionId() === action.id;
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div class={styles.actionItem} onMouseEnter={() => setActiveSubmenuActionId(action.children ? action.id : null)}>
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
role="menuitem"
|
||||||
|
classList={{
|
||||||
|
[styles.action]: true,
|
||||||
|
[styles.actionCreate]: isCreateAction(action),
|
||||||
|
[styles.actionDanger]: action.tone === "danger",
|
||||||
|
[styles.actionSubmenuOpen]: isSubmenuOpen(),
|
||||||
|
}}
|
||||||
|
onClick={() => {
|
||||||
|
if (action.children) {
|
||||||
|
setActiveSubmenuActionId(isSubmenuOpen() ? null : action.id);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
props.onSelect(action, target);
|
||||||
|
props.onClose();
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
<Show when={isCreateAction(action)}>
|
||||||
|
<span class={styles.actionCreateIcon} aria-hidden="true">
|
||||||
|
<Plus size={14} strokeWidth={2.25} />
|
||||||
|
</span>
|
||||||
|
</Show>
|
||||||
|
<span class={styles.actionLabel}>{action.label}</span>
|
||||||
|
<div class={styles.actionMeta}>
|
||||||
|
<Show when={action.shortcut}>
|
||||||
|
<span class={styles.actionShortcut}>{formatShortcut(action.shortcut!, shortcutPlatform())}</span>
|
||||||
|
</Show>
|
||||||
|
<Show when={action.children}>
|
||||||
|
<ChevronRight class={styles.actionChevron} size={16} strokeWidth={2} />
|
||||||
|
</Show>
|
||||||
|
</div>
|
||||||
|
</button>
|
||||||
|
|
||||||
|
<Show when={action.children && isSubmenuOpen()}>
|
||||||
|
<div class={styles.submenu} role="menu" aria-label={`${action.label} submenu`}>
|
||||||
|
<div class={styles.submenuList}>
|
||||||
|
<For each={action.children ?? []}>
|
||||||
|
{(childAction): JSX.Element => (
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
role="menuitem"
|
||||||
|
classList={{
|
||||||
|
[styles.action]: true,
|
||||||
|
[styles.actionDanger]: childAction.tone === "danger",
|
||||||
|
}}
|
||||||
|
onClick={() => {
|
||||||
|
props.onSelect(childAction, target);
|
||||||
|
props.onClose();
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
<span class={styles.actionLabel}>{childAction.label}</span>
|
||||||
|
</button>
|
||||||
|
)}
|
||||||
|
</For>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</Show>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}}
|
||||||
|
</For>
|
||||||
|
</div>
|
||||||
|
</section>
|
||||||
|
)}
|
||||||
|
</For>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</Portal>
|
||||||
|
);
|
||||||
|
}}
|
||||||
|
</Show>
|
||||||
|
);
|
||||||
|
};
|
||||||
@@ -0,0 +1,120 @@
|
|||||||
|
import { createEffect, createSignal, onCleanup } from "solid-js";
|
||||||
|
import type { ProjectMenuTarget } from "../data/shell.data";
|
||||||
|
|
||||||
|
type ProjectContextMenuState = {
|
||||||
|
target: ProjectMenuTarget;
|
||||||
|
x: number;
|
||||||
|
y: number;
|
||||||
|
};
|
||||||
|
|
||||||
|
const readRootPixelToken = (name: string, fallback: number): number => {
|
||||||
|
if (typeof window === "undefined") {
|
||||||
|
return fallback;
|
||||||
|
}
|
||||||
|
|
||||||
|
const value = window.getComputedStyle(document.documentElement).getPropertyValue(name).trim();
|
||||||
|
const parsed = Number.parseFloat(value);
|
||||||
|
|
||||||
|
if (!Number.isFinite(parsed)) {
|
||||||
|
return fallback;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (value.endsWith("px")) {
|
||||||
|
return parsed;
|
||||||
|
}
|
||||||
|
|
||||||
|
return parsed * 16;
|
||||||
|
};
|
||||||
|
|
||||||
|
const clampMenuPosition = (value: number, min: number, max: number): number => {
|
||||||
|
if (max <= min) {
|
||||||
|
return min;
|
||||||
|
}
|
||||||
|
|
||||||
|
return Math.min(Math.max(value, min), max);
|
||||||
|
};
|
||||||
|
|
||||||
|
export const createProjectContextMenuController = () => {
|
||||||
|
const [menuState, setMenuState] = createSignal<ProjectContextMenuState | null>(null);
|
||||||
|
let menuRef: HTMLDivElement | undefined;
|
||||||
|
|
||||||
|
const closeMenu = (): void => {
|
||||||
|
setMenuState(null);
|
||||||
|
};
|
||||||
|
|
||||||
|
const repositionMenu = (): void => {
|
||||||
|
if (typeof window === "undefined" || !menuRef) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
const current = menuState();
|
||||||
|
|
||||||
|
if (!current) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
const viewportPadding = readRootPixelToken("--space-4", 16);
|
||||||
|
const rect = menuRef.getBoundingClientRect();
|
||||||
|
const nextX = clampMenuPosition(current.x, viewportPadding, window.innerWidth - rect.width - viewportPadding);
|
||||||
|
const nextY = clampMenuPosition(current.y, viewportPadding, window.innerHeight - rect.height - viewportPadding);
|
||||||
|
|
||||||
|
if (nextX === current.x && nextY === current.y) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
setMenuState({ ...current, x: nextX, y: nextY });
|
||||||
|
};
|
||||||
|
|
||||||
|
const openMenu = (event: MouseEvent, target: ProjectMenuTarget): void => {
|
||||||
|
event.preventDefault();
|
||||||
|
setMenuState({ target, x: event.clientX, y: event.clientY });
|
||||||
|
};
|
||||||
|
|
||||||
|
createEffect(() => {
|
||||||
|
if (!menuState() || typeof window === "undefined") {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
const frame = window.requestAnimationFrame(() => {
|
||||||
|
repositionMenu();
|
||||||
|
});
|
||||||
|
|
||||||
|
const handlePointerDown = (event: PointerEvent): void => {
|
||||||
|
if (!menuRef?.contains(event.target as Node)) {
|
||||||
|
closeMenu();
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
const handleKeyDown = (event: KeyboardEvent): void => {
|
||||||
|
if (event.key === "Escape") {
|
||||||
|
closeMenu();
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
const handleViewportChange = (): void => {
|
||||||
|
closeMenu();
|
||||||
|
};
|
||||||
|
|
||||||
|
document.addEventListener("pointerdown", handlePointerDown);
|
||||||
|
window.addEventListener("resize", handleViewportChange);
|
||||||
|
window.addEventListener("scroll", handleViewportChange, true);
|
||||||
|
window.addEventListener("keydown", handleKeyDown);
|
||||||
|
|
||||||
|
onCleanup(() => {
|
||||||
|
window.cancelAnimationFrame(frame);
|
||||||
|
document.removeEventListener("pointerdown", handlePointerDown);
|
||||||
|
window.removeEventListener("resize", handleViewportChange);
|
||||||
|
window.removeEventListener("scroll", handleViewportChange, true);
|
||||||
|
window.removeEventListener("keydown", handleKeyDown);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
return {
|
||||||
|
menuState,
|
||||||
|
openMenu,
|
||||||
|
closeMenu,
|
||||||
|
setMenuRef: (element: HTMLDivElement): void => {
|
||||||
|
menuRef = element;
|
||||||
|
},
|
||||||
|
};
|
||||||
|
};
|
||||||
@@ -0,0 +1,268 @@
|
|||||||
|
.root {
|
||||||
|
display: grid;
|
||||||
|
--project-drawer-gap: var(--space-3);
|
||||||
|
--project-drawer-top: calc(var(--space-4) + var(--control-size-lg));
|
||||||
|
--project-drawer-bottom: calc(var(--sidebar-dock-clearance, var(--shell-dock-clearance)) + var(--project-drawer-gap));
|
||||||
|
}
|
||||||
|
|
||||||
|
.rootCompact {
|
||||||
|
justify-items: center;
|
||||||
|
}
|
||||||
|
|
||||||
|
.trigger {
|
||||||
|
width: 100%;
|
||||||
|
min-width: 0;
|
||||||
|
display: grid;
|
||||||
|
grid-template-columns: auto minmax(0, 1fr) auto;
|
||||||
|
align-items: center;
|
||||||
|
gap: var(--space-2);
|
||||||
|
min-height: calc(var(--control-size-lg) + var(--space-2));
|
||||||
|
padding: var(--space-2) var(--space-3) calc(var(--space-2) + 0.2rem);
|
||||||
|
border: 1px solid color-mix(in srgb, var(--color-border-strong) 44%, transparent);
|
||||||
|
border-radius: calc(var(--radius-lg) + var(--space-1));
|
||||||
|
background: color-mix(in srgb, var(--color-surface) 96%, transparent);
|
||||||
|
box-shadow: var(--shadow-soft);
|
||||||
|
text-align: left;
|
||||||
|
position: relative;
|
||||||
|
z-index: 5;
|
||||||
|
transition:
|
||||||
|
border-color var(--duration-fast) var(--easing-standard),
|
||||||
|
background var(--duration-fast) var(--easing-standard),
|
||||||
|
box-shadow var(--duration-fast) var(--easing-standard),
|
||||||
|
transform 180ms var(--easing-standard);
|
||||||
|
}
|
||||||
|
|
||||||
|
.trigger:hover {
|
||||||
|
background: var(--color-surface-hover);
|
||||||
|
border-color: var(--color-border);
|
||||||
|
}
|
||||||
|
|
||||||
|
.triggerOpen {
|
||||||
|
border-color: color-mix(in srgb, var(--color-accent-strong) 22%, var(--color-border-strong));
|
||||||
|
background: color-mix(in srgb, var(--color-accent-soft) 26%, var(--color-surface));
|
||||||
|
box-shadow: 0 10px 28px color-mix(in srgb, black 8%, transparent);
|
||||||
|
}
|
||||||
|
|
||||||
|
.triggerCompact {
|
||||||
|
width: var(--control-size-xl);
|
||||||
|
min-height: var(--control-size-xl);
|
||||||
|
grid-template-columns: auto;
|
||||||
|
justify-items: center;
|
||||||
|
gap: 0.15rem;
|
||||||
|
padding: var(--space-2) 0;
|
||||||
|
border-radius: var(--radius-xl);
|
||||||
|
}
|
||||||
|
|
||||||
|
.triggerCompact .triggerLead {
|
||||||
|
width: var(--control-size-md);
|
||||||
|
height: var(--control-size-md);
|
||||||
|
}
|
||||||
|
|
||||||
|
.triggerCompact .triggerIcon {
|
||||||
|
transform: rotate(0deg);
|
||||||
|
}
|
||||||
|
|
||||||
|
.triggerCompact .triggerIconOpen {
|
||||||
|
transform: rotate(180deg);
|
||||||
|
}
|
||||||
|
|
||||||
|
.triggerLead {
|
||||||
|
width: var(--control-size-md);
|
||||||
|
height: var(--control-size-md);
|
||||||
|
display: inline-flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: center;
|
||||||
|
border-radius: var(--radius-md);
|
||||||
|
background: color-mix(in srgb, var(--color-accent-soft) 82%, transparent);
|
||||||
|
color: var(--color-accent-strong);
|
||||||
|
}
|
||||||
|
|
||||||
|
.triggerCopy {
|
||||||
|
min-width: 0;
|
||||||
|
display: grid;
|
||||||
|
gap: 0.12rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.eyebrow {
|
||||||
|
@include text-caption;
|
||||||
|
color: var(--color-text-muted);
|
||||||
|
text-transform: uppercase;
|
||||||
|
letter-spacing: 0.08em;
|
||||||
|
}
|
||||||
|
|
||||||
|
.value {
|
||||||
|
@include text-label;
|
||||||
|
}
|
||||||
|
|
||||||
|
.triggerIcon {
|
||||||
|
color: var(--color-text-muted);
|
||||||
|
transform: rotate(-90deg);
|
||||||
|
transition: transform var(--duration-fast) var(--easing-standard);
|
||||||
|
}
|
||||||
|
|
||||||
|
.triggerIconOpen {
|
||||||
|
transform: rotate(0deg);
|
||||||
|
}
|
||||||
|
|
||||||
|
.scrim {
|
||||||
|
position: absolute;
|
||||||
|
inset: calc(var(--project-drawer-top) + var(--project-drawer-gap)) var(--space-4)
|
||||||
|
var(--project-drawer-bottom) var(--space-4);
|
||||||
|
z-index: 2;
|
||||||
|
opacity: 0;
|
||||||
|
pointer-events: none;
|
||||||
|
background: color-mix(in srgb, black 8%, transparent);
|
||||||
|
border-radius: var(--radius-lg);
|
||||||
|
transition: opacity 260ms var(--easing-standard);
|
||||||
|
}
|
||||||
|
|
||||||
|
.scrimOpen {
|
||||||
|
opacity: 1;
|
||||||
|
pointer-events: auto;
|
||||||
|
}
|
||||||
|
|
||||||
|
.rootCompact .scrim,
|
||||||
|
.rootCompact .drawer {
|
||||||
|
left: 0;
|
||||||
|
right: auto;
|
||||||
|
width: min(18rem, calc(100vw - 6rem));
|
||||||
|
}
|
||||||
|
|
||||||
|
.drawer {
|
||||||
|
position: absolute;
|
||||||
|
inset: calc(var(--project-drawer-top) + var(--project-drawer-gap)) var(--space-4)
|
||||||
|
var(--project-drawer-bottom) var(--space-4);
|
||||||
|
z-index: 3;
|
||||||
|
display: grid;
|
||||||
|
overflow: hidden;
|
||||||
|
border-radius: var(--radius-lg);
|
||||||
|
opacity: 0;
|
||||||
|
pointer-events: none;
|
||||||
|
transform: translateX(calc(-1 * (var(--space-5) + 12%)));
|
||||||
|
will-change: transform, opacity;
|
||||||
|
transition:
|
||||||
|
opacity 240ms var(--easing-standard),
|
||||||
|
transform 360ms cubic-bezier(0.16, 1, 0.3, 1);
|
||||||
|
}
|
||||||
|
|
||||||
|
.drawerOpen {
|
||||||
|
opacity: 1;
|
||||||
|
pointer-events: auto;
|
||||||
|
transform: translateX(0);
|
||||||
|
}
|
||||||
|
|
||||||
|
.drawer::before {
|
||||||
|
content: "";
|
||||||
|
position: absolute;
|
||||||
|
inset: 0;
|
||||||
|
border-radius: inherit;
|
||||||
|
border: 1px solid color-mix(in srgb, var(--color-border-strong) 52%, transparent);
|
||||||
|
background: var(--color-surface-muted);
|
||||||
|
box-shadow:
|
||||||
|
14px 0 30px color-mix(in srgb, black 7%, transparent),
|
||||||
|
inset -1px 0 0 color-mix(in srgb, white 4%, transparent);
|
||||||
|
pointer-events: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
.drawerBody {
|
||||||
|
position: relative;
|
||||||
|
z-index: 1;
|
||||||
|
min-height: 0;
|
||||||
|
display: grid;
|
||||||
|
align-content: start;
|
||||||
|
gap: var(--space-2);
|
||||||
|
padding: var(--space-4);
|
||||||
|
overflow-y: auto;
|
||||||
|
overscroll-behavior: contain;
|
||||||
|
scrollbar-width: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
.drawerBody::-webkit-scrollbar {
|
||||||
|
width: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.treeSectionLabel {
|
||||||
|
@include text-caption;
|
||||||
|
margin: 0 0 var(--space-2);
|
||||||
|
padding: 0 var(--space-3);
|
||||||
|
color: var(--color-text-subtle);
|
||||||
|
text-transform: uppercase;
|
||||||
|
letter-spacing: 0.04em;
|
||||||
|
}
|
||||||
|
|
||||||
|
.treeList {
|
||||||
|
list-style: none;
|
||||||
|
display: grid;
|
||||||
|
gap: var(--space-1);
|
||||||
|
padding: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.treeItem {
|
||||||
|
width: 100%;
|
||||||
|
min-width: 0;
|
||||||
|
display: grid;
|
||||||
|
grid-template-columns: auto auto minmax(0, 1fr) auto;
|
||||||
|
align-items: center;
|
||||||
|
gap: var(--space-2);
|
||||||
|
min-height: calc(var(--control-size-lg) - var(--space-2));
|
||||||
|
padding: var(--space-2) var(--space-3);
|
||||||
|
padding-left: calc(var(--space-3) + (var(--tree-depth, 0) * var(--space-4)));
|
||||||
|
border: 1px solid transparent;
|
||||||
|
border-radius: var(--radius-lg);
|
||||||
|
background: transparent;
|
||||||
|
color: var(--color-text-muted);
|
||||||
|
transition:
|
||||||
|
background 160ms var(--easing-standard),
|
||||||
|
color 160ms var(--easing-standard),
|
||||||
|
border-color 160ms var(--easing-standard),
|
||||||
|
transform 180ms var(--easing-standard);
|
||||||
|
text-align: left;
|
||||||
|
}
|
||||||
|
|
||||||
|
.treeItem:hover,
|
||||||
|
.treeItem:focus-visible {
|
||||||
|
background: var(--color-surface-hover);
|
||||||
|
color: var(--color-text);
|
||||||
|
}
|
||||||
|
|
||||||
|
.treeItemFolder {
|
||||||
|
color: var(--color-text);
|
||||||
|
}
|
||||||
|
|
||||||
|
.folderChevron {
|
||||||
|
color: var(--color-text-muted);
|
||||||
|
transition: transform 160ms var(--easing-standard);
|
||||||
|
}
|
||||||
|
|
||||||
|
.folderChevronOpen {
|
||||||
|
transform: rotate(90deg);
|
||||||
|
}
|
||||||
|
|
||||||
|
.treeItemActive {
|
||||||
|
border-color: var(--color-border);
|
||||||
|
background: var(--color-surface);
|
||||||
|
color: var(--color-text);
|
||||||
|
box-shadow: inset 0 1px 0 color-mix(in srgb, white 4%, transparent);
|
||||||
|
}
|
||||||
|
|
||||||
|
.icon {
|
||||||
|
color: inherit;
|
||||||
|
opacity: 0.85;
|
||||||
|
}
|
||||||
|
|
||||||
|
.label {
|
||||||
|
@include text-label;
|
||||||
|
min-width: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.itemMeta {
|
||||||
|
@include text-caption;
|
||||||
|
color: var(--color-text-muted);
|
||||||
|
}
|
||||||
|
|
||||||
|
@media (max-width: 720px) {
|
||||||
|
.rootCompact .scrim,
|
||||||
|
.rootCompact .drawer {
|
||||||
|
width: min(18rem, calc(100vw - 5rem));
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,322 @@
|
|||||||
|
// Path: Frontend/src/components/shell/ProjectSelector/ProjectSelector.tsx
|
||||||
|
|
||||||
|
import { For, Show, createEffect, createMemo, createSignal, onCleanup, onMount, type JSX } from "solid-js";
|
||||||
|
import { ChevronDown, ChevronRight, Folder, LayoutGrid } from "../../../lib/icons";
|
||||||
|
import { ProjectContextMenu } from "../ProjectContextMenu/ProjectContextMenu";
|
||||||
|
import { useAppShellData } from "../data/app-shell.context";
|
||||||
|
import {
|
||||||
|
createProjectFolderTarget,
|
||||||
|
createProjectSurfaceTarget,
|
||||||
|
createProjectTarget,
|
||||||
|
type ProjectItem,
|
||||||
|
type ProjectMenuTarget,
|
||||||
|
} from "../data/shell.data";
|
||||||
|
import { createProjectContextMenuController } from "../ProjectContextMenu/createProjectContextMenuController";
|
||||||
|
import styles from "./ProjectSelector.module.scss";
|
||||||
|
|
||||||
|
type ProjectSelectorProps = {
|
||||||
|
compact?: boolean;
|
||||||
|
isOpen: boolean;
|
||||||
|
onToggle: () => void;
|
||||||
|
onClose: () => void;
|
||||||
|
};
|
||||||
|
|
||||||
|
export const ProjectSelector = (props: ProjectSelectorProps): JSX.Element => {
|
||||||
|
const appShellData = useAppShellData();
|
||||||
|
const [selectedProject, setSelectedProject] = createSignal(appShellData.activeProject());
|
||||||
|
const [drawerTop, setDrawerTop] = createSignal<number>(0);
|
||||||
|
const [collapsedFolderIds, setCollapsedFolderIds] = createSignal<readonly string[]>([]);
|
||||||
|
let rootRef: HTMLDivElement | undefined;
|
||||||
|
let triggerRef: HTMLButtonElement | undefined;
|
||||||
|
let contextMenuRef: HTMLDivElement | undefined;
|
||||||
|
const contextMenu = createProjectContextMenuController();
|
||||||
|
|
||||||
|
const projectFolders = createMemo(() => {
|
||||||
|
const sections = new Map<string, ProjectItem[]>();
|
||||||
|
|
||||||
|
for (const item of appShellData.projectItems()) {
|
||||||
|
const key = item.parentLabel || item.groupLabel || "Projects";
|
||||||
|
const existing = sections.get(key);
|
||||||
|
|
||||||
|
if (existing) {
|
||||||
|
existing.push(item);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
sections.set(key, [item]);
|
||||||
|
}
|
||||||
|
|
||||||
|
return Array.from(sections.entries()).map(([label, items]) => ({
|
||||||
|
id: label.toLowerCase().replace(/\s+/g, "-"),
|
||||||
|
label,
|
||||||
|
meta: items[0]?.groupLabel && items[0].groupLabel !== label ? items[0].groupLabel : undefined,
|
||||||
|
items,
|
||||||
|
}));
|
||||||
|
});
|
||||||
|
|
||||||
|
const isFolderCollapsed = (folderId: string): boolean => collapsedFolderIds().includes(folderId);
|
||||||
|
|
||||||
|
const toggleFolder = (folderId: string): void => {
|
||||||
|
setCollapsedFolderIds((current) =>
|
||||||
|
current.includes(folderId) ? current.filter((id) => id !== folderId) : [...current, folderId],
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
createEffect(() => {
|
||||||
|
setSelectedProject(appShellData.activeProject());
|
||||||
|
});
|
||||||
|
|
||||||
|
onMount(() => {
|
||||||
|
if (triggerRef) {
|
||||||
|
const updateDrawerTop = (): void => {
|
||||||
|
if (!triggerRef) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
setDrawerTop(triggerRef.offsetTop + triggerRef.offsetHeight + 8);
|
||||||
|
};
|
||||||
|
|
||||||
|
updateDrawerTop();
|
||||||
|
|
||||||
|
const observer = new ResizeObserver(() => {
|
||||||
|
updateDrawerTop();
|
||||||
|
});
|
||||||
|
|
||||||
|
observer.observe(triggerRef);
|
||||||
|
window.addEventListener("resize", updateDrawerTop);
|
||||||
|
|
||||||
|
onCleanup(() => {
|
||||||
|
observer.disconnect();
|
||||||
|
window.removeEventListener("resize", updateDrawerTop);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
const handlePointerDown = (event: PointerEvent): void => {
|
||||||
|
if (!props.isOpen || !rootRef) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
const target = event.target;
|
||||||
|
|
||||||
|
if (target instanceof Node && rootRef.contains(target)) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (target instanceof Node && contextMenuRef?.contains(target)) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
props.onClose();
|
||||||
|
};
|
||||||
|
|
||||||
|
const handleEscape = (event: KeyboardEvent): void => {
|
||||||
|
if (event.key !== "Escape" || !props.isOpen) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
props.onClose();
|
||||||
|
triggerRef?.focus();
|
||||||
|
};
|
||||||
|
|
||||||
|
document.addEventListener("pointerdown", handlePointerDown);
|
||||||
|
window.addEventListener("keydown", handleEscape);
|
||||||
|
|
||||||
|
onCleanup(() => {
|
||||||
|
document.removeEventListener("pointerdown", handlePointerDown);
|
||||||
|
window.removeEventListener("keydown", handleEscape);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
const toggleOpen = (): void => {
|
||||||
|
if (!props.isOpen) {
|
||||||
|
props.onToggle();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
props.onClose();
|
||||||
|
};
|
||||||
|
|
||||||
|
const selectProject = (projectId: string): void => {
|
||||||
|
const nextProject = appShellData.projectItems().find((item): boolean => item.id === projectId);
|
||||||
|
|
||||||
|
if (!nextProject) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
setSelectedProject({ id: nextProject.id, name: nextProject.name });
|
||||||
|
props.onClose();
|
||||||
|
};
|
||||||
|
|
||||||
|
const handleContextActionSelect = (_action: { id: string; label: string }, _target: ProjectMenuTarget): void => {
|
||||||
|
// Initial implementation keeps the project menu aligned with workspace-menu IA.
|
||||||
|
};
|
||||||
|
|
||||||
|
const handleSurfaceContextMenu = (event: MouseEvent): void => {
|
||||||
|
event.stopPropagation();
|
||||||
|
contextMenu.openMenu(event, createProjectSurfaceTarget("Projects"));
|
||||||
|
};
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div
|
||||||
|
ref={rootRef}
|
||||||
|
classList={{
|
||||||
|
[styles.root]: true,
|
||||||
|
[styles.rootCompact]: !!props.compact,
|
||||||
|
}}
|
||||||
|
style={{
|
||||||
|
"--project-drawer-top": `${drawerTop()}px`,
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
ref={triggerRef}
|
||||||
|
classList={{
|
||||||
|
[styles.trigger]: true,
|
||||||
|
[styles.triggerCompact]: !!props.compact,
|
||||||
|
[styles.triggerOpen]: props.isOpen,
|
||||||
|
}}
|
||||||
|
aria-label={`Open project menu for ${selectedProject().name}`}
|
||||||
|
aria-expanded={props.isOpen}
|
||||||
|
aria-haspopup="menu"
|
||||||
|
title={selectedProject().name}
|
||||||
|
onClick={toggleOpen}
|
||||||
|
>
|
||||||
|
<span class={styles.triggerLead} aria-hidden="true">
|
||||||
|
<Folder size={18} strokeWidth={2} />
|
||||||
|
</span>
|
||||||
|
{!props.compact ? (
|
||||||
|
<span class={styles.triggerCopy}>
|
||||||
|
<span class={styles.eyebrow}>Projects</span>
|
||||||
|
<span class={styles.value}>{selectedProject().name}</span>
|
||||||
|
</span>
|
||||||
|
) : null}
|
||||||
|
<ChevronDown
|
||||||
|
classList={{
|
||||||
|
[styles.triggerIcon]: true,
|
||||||
|
[styles.triggerIconOpen]: props.isOpen,
|
||||||
|
}}
|
||||||
|
size={16}
|
||||||
|
strokeWidth={2}
|
||||||
|
/>
|
||||||
|
</button>
|
||||||
|
|
||||||
|
<Show when={props.isOpen}>
|
||||||
|
<>
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
classList={{
|
||||||
|
[styles.scrim]: true,
|
||||||
|
[styles.scrimOpen]: props.isOpen,
|
||||||
|
}}
|
||||||
|
aria-hidden={!props.isOpen}
|
||||||
|
tabIndex={props.isOpen ? 0 : -1}
|
||||||
|
onClick={props.onClose}
|
||||||
|
/>
|
||||||
|
|
||||||
|
<div
|
||||||
|
classList={{
|
||||||
|
[styles.drawer]: true,
|
||||||
|
[styles.drawerOpen]: props.isOpen,
|
||||||
|
}}
|
||||||
|
aria-hidden={!props.isOpen}
|
||||||
|
onContextMenu={handleSurfaceContextMenu}
|
||||||
|
>
|
||||||
|
<div class={styles.drawerBody}>
|
||||||
|
<Show when={!props.compact}>
|
||||||
|
<div class={styles.treeSectionLabel}>Projects</div>
|
||||||
|
</Show>
|
||||||
|
|
||||||
|
<ul class={styles.treeList} role="list">
|
||||||
|
<For each={projectFolders()}>
|
||||||
|
{(folder): JSX.Element => {
|
||||||
|
const isCollapsed = (): boolean => isFolderCollapsed(folder.id);
|
||||||
|
|
||||||
|
return (
|
||||||
|
<li>
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
classList={{
|
||||||
|
[styles.treeItem]: true,
|
||||||
|
[styles.treeItemFolder]: true,
|
||||||
|
}}
|
||||||
|
aria-expanded={!isCollapsed()}
|
||||||
|
onClick={() => toggleFolder(folder.id)}
|
||||||
|
onContextMenu={(event): void => {
|
||||||
|
event.stopPropagation();
|
||||||
|
contextMenu.openMenu(event, createProjectFolderTarget(folder.id, folder.label));
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
<ChevronRight
|
||||||
|
classList={{
|
||||||
|
[styles.folderChevron]: true,
|
||||||
|
[styles.folderChevronOpen]: !isCollapsed(),
|
||||||
|
}}
|
||||||
|
size={16}
|
||||||
|
strokeWidth={2}
|
||||||
|
/>
|
||||||
|
<Folder class={styles.icon} size={18} strokeWidth={2} />
|
||||||
|
<span class={styles.label}>{folder.label}</span>
|
||||||
|
<Show when={folder.meta}>
|
||||||
|
<span class={styles.itemMeta}>{folder.meta}</span>
|
||||||
|
</Show>
|
||||||
|
</button>
|
||||||
|
|
||||||
|
<Show when={!isCollapsed()}>
|
||||||
|
<ul class={styles.treeList} role="list">
|
||||||
|
<For each={folder.items}>
|
||||||
|
{(item): JSX.Element => {
|
||||||
|
const isSelected = (): boolean => selectedProject().id === item.id;
|
||||||
|
|
||||||
|
return (
|
||||||
|
<li>
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
classList={{
|
||||||
|
[styles.treeItem]: true,
|
||||||
|
[styles.treeItemActive]: isSelected(),
|
||||||
|
}}
|
||||||
|
style={{ "--tree-depth": "1" }}
|
||||||
|
onClick={(): void => selectProject(item.id)}
|
||||||
|
onContextMenu={(event): void => {
|
||||||
|
event.stopPropagation();
|
||||||
|
contextMenu.openMenu(event, createProjectTarget(item));
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
<LayoutGrid class={styles.icon} size={18} strokeWidth={2} />
|
||||||
|
<span class={styles.label}>{item.name}</span>
|
||||||
|
<Show when={item.meta}>
|
||||||
|
<span class={styles.itemMeta}>{item.meta}</span>
|
||||||
|
</Show>
|
||||||
|
</button>
|
||||||
|
</li>
|
||||||
|
);
|
||||||
|
}}
|
||||||
|
</For>
|
||||||
|
</ul>
|
||||||
|
</Show>
|
||||||
|
</li>
|
||||||
|
);
|
||||||
|
}}
|
||||||
|
</For>
|
||||||
|
</ul>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</>
|
||||||
|
</Show>
|
||||||
|
|
||||||
|
<ProjectContextMenu
|
||||||
|
target={contextMenu.menuState()?.target ?? null}
|
||||||
|
position={(() => {
|
||||||
|
const state = contextMenu.menuState();
|
||||||
|
return state ? { x: state.x, y: state.y } : null;
|
||||||
|
})()}
|
||||||
|
menuRef={(element) => {
|
||||||
|
contextMenuRef = element;
|
||||||
|
contextMenu.setMenuRef(element);
|
||||||
|
}}
|
||||||
|
onClose={contextMenu.closeMenu}
|
||||||
|
onSelect={handleContextActionSelect}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
};
|
||||||
@@ -1,18 +1,17 @@
|
|||||||
.panel {
|
.panel {
|
||||||
--profile-dock-avatar-size: var(--control-size-md);
|
--server-dock-glyph-size: var(--control-size-md);
|
||||||
--profile-dock-action-min-height: var(--space-8);
|
--server-dock-action-min-height: var(--space-8);
|
||||||
--profile-dock-border: color-mix(in srgb, var(--color-border-strong) 75%, transparent);
|
--server-dock-border: color-mix(in srgb, var(--color-border-strong) 75%, transparent);
|
||||||
--profile-dock-surface: color-mix(in srgb, var(--color-surface) 94%, transparent);
|
--server-dock-surface: color-mix(in srgb, var(--color-surface) 94%, transparent);
|
||||||
--profile-dock-status-ring: 0 0 0 3px color-mix(in srgb, var(--color-success) 18%, transparent);
|
|
||||||
position: relative;
|
position: relative;
|
||||||
z-index: 1;
|
z-index: 1;
|
||||||
width: 100%;
|
width: 100%;
|
||||||
display: grid;
|
display: grid;
|
||||||
gap: var(--space-2);
|
gap: var(--space-2);
|
||||||
padding: var(--space-3) var(--space-3) var(--space-2);
|
padding: var(--space-3) var(--space-3) var(--space-2);
|
||||||
border: 1px solid var(--profile-dock-border);
|
border: 1px solid var(--server-dock-border);
|
||||||
border-radius: calc(var(--radius-xl) + var(--space-1));
|
border-radius: calc(var(--radius-xl) + var(--space-1));
|
||||||
background: var(--profile-dock-surface);
|
background: var(--server-dock-surface);
|
||||||
box-shadow:
|
box-shadow:
|
||||||
0 20px 48px color-mix(in srgb, black 16%, transparent),
|
0 20px 48px color-mix(in srgb, black 16%, transparent),
|
||||||
var(--shadow-strong);
|
var(--shadow-strong);
|
||||||
@@ -26,14 +25,14 @@
|
|||||||
align-items: center;
|
align-items: center;
|
||||||
}
|
}
|
||||||
|
|
||||||
.avatar {
|
.glyph {
|
||||||
width: var(--profile-dock-avatar-size);
|
width: var(--server-dock-glyph-size);
|
||||||
height: var(--profile-dock-avatar-size);
|
height: var(--server-dock-glyph-size);
|
||||||
display: inline-flex;
|
display: inline-flex;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
justify-content: center;
|
justify-content: center;
|
||||||
border-radius: 50%;
|
border-radius: var(--radius-lg);
|
||||||
background: var(--color-accent-soft);
|
background: color-mix(in srgb, var(--color-accent-soft) 84%, transparent);
|
||||||
color: var(--color-accent-strong);
|
color: var(--color-accent-strong);
|
||||||
@include text-label;
|
@include text-label;
|
||||||
}
|
}
|
||||||
@@ -48,20 +47,25 @@
|
|||||||
@include text-label;
|
@include text-label;
|
||||||
}
|
}
|
||||||
|
|
||||||
.status {
|
.status,
|
||||||
|
.subtitle {
|
||||||
@include text-caption;
|
@include text-caption;
|
||||||
display: inline-flex;
|
|
||||||
align-items: center;
|
|
||||||
gap: var(--space-2);
|
|
||||||
color: var(--color-text-muted);
|
color: var(--color-text-muted);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.status {
|
||||||
|
display: inline-flex;
|
||||||
|
align-items: center;
|
||||||
|
gap: var(--space-1);
|
||||||
|
}
|
||||||
|
|
||||||
.statusDot {
|
.statusDot {
|
||||||
width: 0.5rem;
|
width: 0.45rem;
|
||||||
height: 0.5rem;
|
height: 0.45rem;
|
||||||
border-radius: 50%;
|
flex: 0 0 auto;
|
||||||
|
border-radius: 999px;
|
||||||
background: var(--color-success);
|
background: var(--color-success);
|
||||||
box-shadow: var(--profile-dock-status-ring);
|
box-shadow: 0 0 0 0.1rem color-mix(in srgb, var(--color-success) 18%, transparent);
|
||||||
}
|
}
|
||||||
|
|
||||||
.actions {
|
.actions {
|
||||||
@@ -71,7 +75,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
.action {
|
.action {
|
||||||
min-height: var(--profile-dock-action-min-height);
|
min-height: var(--server-dock-action-min-height);
|
||||||
display: inline-flex;
|
display: inline-flex;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
justify-content: center;
|
justify-content: center;
|
||||||
49
Frontend/src/components/shell/ServerDock/ServerDock.tsx
Normal file
49
Frontend/src/components/shell/ServerDock/ServerDock.tsx
Normal file
@@ -0,0 +1,49 @@
|
|||||||
|
// Path: Frontend/src/components/shell/ServerDock/ServerDock.tsx
|
||||||
|
|
||||||
|
import { For, Show, type JSX } from "solid-js";
|
||||||
|
import { useAppShellData } from "../data/app-shell.context";
|
||||||
|
import styles from "./ServerDock.module.scss";
|
||||||
|
|
||||||
|
export const ServerDock = (): JSX.Element => {
|
||||||
|
const appShellData = useAppShellData();
|
||||||
|
const activeServer = () => appShellData.activeServer();
|
||||||
|
|
||||||
|
return (
|
||||||
|
<section class={styles.panel} aria-label="Server dock" data-ui="server-dock" data-server-kind={activeServer().kind}>
|
||||||
|
<div class={styles.identity} data-slot="server-dock-identity">
|
||||||
|
<div class={styles.glyph} aria-hidden="true">
|
||||||
|
{activeServer().abbreviation}
|
||||||
|
</div>
|
||||||
|
<div class={styles.copy} data-slot="server-dock-copy">
|
||||||
|
<span class={styles.name}>{activeServer().name}</span>
|
||||||
|
<Show
|
||||||
|
when={activeServer().kind === "organization"}
|
||||||
|
fallback={<span class={styles.subtitle}>{activeServer().subtitle}</span>}
|
||||||
|
>
|
||||||
|
<span class={styles.status}>
|
||||||
|
<span class={styles.statusDot} aria-hidden="true" />
|
||||||
|
<span>{activeServer().connectedLabel}</span>
|
||||||
|
</span>
|
||||||
|
</Show>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<Show when={activeServer().dockActions.length > 0}>
|
||||||
|
<div class={styles.actions} data-slot="server-dock-actions">
|
||||||
|
<For each={activeServer().dockActions}>
|
||||||
|
{(item): JSX.Element => {
|
||||||
|
const Icon = item.icon;
|
||||||
|
|
||||||
|
return (
|
||||||
|
<button type="button" class={styles.action} aria-label={item.label} title={item.label} data-slot="server-dock-action" data-action-id={item.id}>
|
||||||
|
<Icon size={16} strokeWidth={2} />
|
||||||
|
<span class={styles.actionLabel}>{item.label}</span>
|
||||||
|
</button>
|
||||||
|
);
|
||||||
|
}}
|
||||||
|
</For>
|
||||||
|
</div>
|
||||||
|
</Show>
|
||||||
|
</section>
|
||||||
|
);
|
||||||
|
};
|
||||||
@@ -0,0 +1,66 @@
|
|||||||
|
.button {
|
||||||
|
display: inline-flex;
|
||||||
|
justify-content: center;
|
||||||
|
align-items: center;
|
||||||
|
width: 2.75rem;
|
||||||
|
height: 2.75rem;
|
||||||
|
aspect-ratio: 1;
|
||||||
|
padding: 0;
|
||||||
|
border: 0;
|
||||||
|
border-radius: 999px;
|
||||||
|
flex-shrink: 0;
|
||||||
|
cursor: pointer;
|
||||||
|
background: transparent;
|
||||||
|
color: var(--color-text-muted);
|
||||||
|
transition:
|
||||||
|
background-color 220ms var(--easing-standard),
|
||||||
|
color 220ms var(--easing-standard),
|
||||||
|
transform 180ms var(--easing-standard);
|
||||||
|
}
|
||||||
|
|
||||||
|
.button:hover {
|
||||||
|
background: color-mix(in srgb, var(--color-text) 8%, transparent);
|
||||||
|
color: var(--color-text);
|
||||||
|
}
|
||||||
|
|
||||||
|
.buttonOpen {
|
||||||
|
background: color-mix(in srgb, var(--color-surface) 92%, transparent);
|
||||||
|
color: var(--color-text);
|
||||||
|
}
|
||||||
|
|
||||||
|
.button:focus-visible {
|
||||||
|
outline: none;
|
||||||
|
background: color-mix(in srgb, var(--color-accent-strong) 12%, transparent);
|
||||||
|
box-shadow: 0 0 0 0.12rem color-mix(in srgb, var(--color-accent-strong) 28%, transparent);
|
||||||
|
color: var(--color-text);
|
||||||
|
}
|
||||||
|
|
||||||
|
.iconWrap {
|
||||||
|
position: relative;
|
||||||
|
display: inline-flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: center;
|
||||||
|
width: 1.5rem;
|
||||||
|
height: 1.5rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.badge {
|
||||||
|
@include text-caption;
|
||||||
|
position: absolute;
|
||||||
|
top: -0.45rem;
|
||||||
|
right: -0.7rem;
|
||||||
|
min-width: 1rem;
|
||||||
|
height: 1rem;
|
||||||
|
display: inline-flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: center;
|
||||||
|
padding: 0 0.24rem;
|
||||||
|
border: 1px solid color-mix(in srgb, var(--color-surface) 68%, transparent);
|
||||||
|
border-radius: 999px;
|
||||||
|
background: color-mix(in srgb, var(--color-primary-3) 84%, black 16%);
|
||||||
|
color: white;
|
||||||
|
font-weight: var(--font-weight-semibold);
|
||||||
|
line-height: 1;
|
||||||
|
box-shadow: 0 6px 14px color-mix(in srgb, black 18%, transparent);
|
||||||
|
pointer-events: none;
|
||||||
|
}
|
||||||
36
Frontend/src/components/shell/TopBar/NotificationsButton.tsx
Normal file
36
Frontend/src/components/shell/TopBar/NotificationsButton.tsx
Normal file
@@ -0,0 +1,36 @@
|
|||||||
|
import type { JSX } from "solid-js";
|
||||||
|
import { Bell } from "../../../lib/icons";
|
||||||
|
import { unreadNotificationCount } from "../data/shell.data";
|
||||||
|
import styles from "./NotificationsButton.module.scss";
|
||||||
|
|
||||||
|
type NotificationsButtonProps = {
|
||||||
|
isOpen: boolean;
|
||||||
|
menuId: string;
|
||||||
|
onToggle: () => void;
|
||||||
|
};
|
||||||
|
|
||||||
|
export const NotificationsButton = (props: NotificationsButtonProps): JSX.Element => {
|
||||||
|
const hasUnread = unreadNotificationCount > 0;
|
||||||
|
const unreadLabel = hasUnread ? `, ${unreadNotificationCount} unread` : "";
|
||||||
|
|
||||||
|
return (
|
||||||
|
<button
|
||||||
|
classList={{
|
||||||
|
[styles.button]: true,
|
||||||
|
[styles.buttonOpen]: props.isOpen,
|
||||||
|
}}
|
||||||
|
type="button"
|
||||||
|
aria-label={`${props.isOpen ? "Close" : "Open"} notifications${unreadLabel}`}
|
||||||
|
title={`${props.isOpen ? "Close" : "Open"} notifications`}
|
||||||
|
aria-haspopup="menu"
|
||||||
|
aria-controls={props.menuId}
|
||||||
|
aria-expanded={props.isOpen}
|
||||||
|
onClick={props.onToggle}
|
||||||
|
>
|
||||||
|
<span class={styles.iconWrap} aria-hidden="true">
|
||||||
|
<Bell size={18} strokeWidth={2} />
|
||||||
|
{hasUnread ? <span class={styles.badge}>{unreadNotificationCount}</span> : null}
|
||||||
|
</span>
|
||||||
|
</button>
|
||||||
|
);
|
||||||
|
};
|
||||||
@@ -0,0 +1,271 @@
|
|||||||
|
.menu {
|
||||||
|
position: absolute;
|
||||||
|
top: calc(100% + var(--space-2));
|
||||||
|
right: 0;
|
||||||
|
width: min(24rem, calc(100vw - (var(--space-4) * 2)));
|
||||||
|
display: grid;
|
||||||
|
gap: var(--space-3);
|
||||||
|
padding: var(--space-3);
|
||||||
|
border: 1px solid var(--color-border-strong);
|
||||||
|
border-radius: calc(var(--radius-lg) + (var(--space-1) / 2));
|
||||||
|
background: color-mix(in srgb, var(--color-surface-muted) 96%, transparent);
|
||||||
|
box-shadow: var(--shadow-strong);
|
||||||
|
backdrop-filter: blur(var(--blur-overlay));
|
||||||
|
z-index: var(--z-dropdown);
|
||||||
|
}
|
||||||
|
|
||||||
|
.menu.menuWorkspace {
|
||||||
|
position: static;
|
||||||
|
top: auto;
|
||||||
|
right: auto;
|
||||||
|
left: auto;
|
||||||
|
bottom: auto;
|
||||||
|
width: 100%;
|
||||||
|
max-width: none;
|
||||||
|
height: 100%;
|
||||||
|
min-height: 0;
|
||||||
|
display: grid;
|
||||||
|
grid-template-rows: auto minmax(0, 1fr) auto;
|
||||||
|
gap: var(--space-4);
|
||||||
|
padding: var(--space-4);
|
||||||
|
border: 0;
|
||||||
|
border-radius: 0;
|
||||||
|
background: transparent;
|
||||||
|
box-shadow: none;
|
||||||
|
backdrop-filter: none;
|
||||||
|
z-index: auto;
|
||||||
|
overflow: hidden;
|
||||||
|
}
|
||||||
|
|
||||||
|
.header,
|
||||||
|
.footer {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: space-between;
|
||||||
|
gap: var(--space-3);
|
||||||
|
}
|
||||||
|
|
||||||
|
.header {
|
||||||
|
padding-bottom: var(--space-3);
|
||||||
|
border-bottom: 1px solid var(--color-border);
|
||||||
|
}
|
||||||
|
|
||||||
|
.headerCopy {
|
||||||
|
min-width: 0;
|
||||||
|
display: grid;
|
||||||
|
gap: calc(var(--space-1) / 2);
|
||||||
|
}
|
||||||
|
|
||||||
|
.title {
|
||||||
|
@include text-label;
|
||||||
|
color: var(--color-text);
|
||||||
|
}
|
||||||
|
|
||||||
|
.subtitle,
|
||||||
|
.sectionLabel,
|
||||||
|
.itemMeta,
|
||||||
|
.itemTime {
|
||||||
|
@include text-caption;
|
||||||
|
color: var(--color-text-muted);
|
||||||
|
}
|
||||||
|
|
||||||
|
.headerAction,
|
||||||
|
.footerAction {
|
||||||
|
@include text-caption;
|
||||||
|
display: inline-flex;
|
||||||
|
align-items: center;
|
||||||
|
gap: var(--space-1);
|
||||||
|
padding: 0;
|
||||||
|
border: 0;
|
||||||
|
background: transparent;
|
||||||
|
color: var(--color-text-muted);
|
||||||
|
transition: color 160ms var(--easing-standard);
|
||||||
|
}
|
||||||
|
|
||||||
|
.headerAction:hover,
|
||||||
|
.headerAction:focus-visible,
|
||||||
|
.footerAction:hover,
|
||||||
|
.footerAction:focus-visible {
|
||||||
|
outline: none;
|
||||||
|
color: var(--color-text);
|
||||||
|
}
|
||||||
|
|
||||||
|
.listWrap {
|
||||||
|
display: grid;
|
||||||
|
gap: var(--space-3);
|
||||||
|
max-height: min(24rem, 60vh);
|
||||||
|
overflow-y: auto;
|
||||||
|
padding-right: var(--space-1);
|
||||||
|
margin-right: calc(var(--space-1) * -1);
|
||||||
|
}
|
||||||
|
|
||||||
|
.stateCard {
|
||||||
|
display: grid;
|
||||||
|
justify-items: start;
|
||||||
|
gap: var(--space-2);
|
||||||
|
padding: var(--space-3);
|
||||||
|
border: 1px solid color-mix(in srgb, var(--color-border) 18%, transparent);
|
||||||
|
border-radius: var(--radius-md);
|
||||||
|
background: color-mix(in srgb, var(--color-surface) 92%, transparent);
|
||||||
|
}
|
||||||
|
|
||||||
|
.stateIcon {
|
||||||
|
width: 2.2rem;
|
||||||
|
height: 2.2rem;
|
||||||
|
display: inline-flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: center;
|
||||||
|
border-radius: 999px;
|
||||||
|
background: color-mix(in srgb, var(--color-surface-muted) 88%, transparent);
|
||||||
|
color: var(--color-text);
|
||||||
|
}
|
||||||
|
|
||||||
|
.stateTitle {
|
||||||
|
@include text-label;
|
||||||
|
color: var(--color-text);
|
||||||
|
}
|
||||||
|
|
||||||
|
.stateCopy {
|
||||||
|
@include text-caption;
|
||||||
|
color: var(--color-text-muted);
|
||||||
|
}
|
||||||
|
|
||||||
|
.section {
|
||||||
|
display: grid;
|
||||||
|
gap: var(--space-2);
|
||||||
|
}
|
||||||
|
|
||||||
|
.section + .section {
|
||||||
|
padding-top: var(--space-3);
|
||||||
|
border-top: 1px solid var(--color-border);
|
||||||
|
}
|
||||||
|
|
||||||
|
.sectionLabel {
|
||||||
|
text-transform: uppercase;
|
||||||
|
letter-spacing: 0.06em;
|
||||||
|
color: var(--color-text-subtle);
|
||||||
|
}
|
||||||
|
|
||||||
|
.list {
|
||||||
|
display: grid;
|
||||||
|
gap: var(--space-1);
|
||||||
|
}
|
||||||
|
|
||||||
|
.item {
|
||||||
|
width: 100%;
|
||||||
|
min-width: 0;
|
||||||
|
display: grid;
|
||||||
|
grid-template-columns: auto minmax(0, 1fr) auto;
|
||||||
|
align-items: start;
|
||||||
|
gap: var(--space-2);
|
||||||
|
padding: var(--space-2);
|
||||||
|
border: 1px solid transparent;
|
||||||
|
border-radius: var(--radius-sm);
|
||||||
|
background: transparent;
|
||||||
|
color: var(--color-text);
|
||||||
|
text-align: left;
|
||||||
|
transition:
|
||||||
|
background-color 160ms var(--easing-standard),
|
||||||
|
border-color 160ms var(--easing-standard),
|
||||||
|
color 160ms var(--easing-standard);
|
||||||
|
}
|
||||||
|
|
||||||
|
.item:hover {
|
||||||
|
background: color-mix(in srgb, var(--color-surface) 88%, transparent);
|
||||||
|
border-color: color-mix(in srgb, var(--color-border) 20%, transparent);
|
||||||
|
}
|
||||||
|
|
||||||
|
.item:focus-visible {
|
||||||
|
outline: none;
|
||||||
|
background: color-mix(in srgb, var(--color-surface) 92%, transparent);
|
||||||
|
border-color: color-mix(in srgb, var(--color-accent-soft) 52%, transparent);
|
||||||
|
box-shadow: 0 0 0 0.12rem color-mix(in srgb, var(--color-accent-soft) 14%, transparent);
|
||||||
|
}
|
||||||
|
|
||||||
|
.itemUnread {
|
||||||
|
background: color-mix(in srgb, var(--color-surface) 90%, transparent);
|
||||||
|
border-color: color-mix(in srgb, var(--color-border) 16%, transparent);
|
||||||
|
}
|
||||||
|
|
||||||
|
.itemMarker,
|
||||||
|
.itemMarkerMuted {
|
||||||
|
width: 0.5rem;
|
||||||
|
height: 0.5rem;
|
||||||
|
margin-top: 0.45rem;
|
||||||
|
border-radius: 999px;
|
||||||
|
flex-shrink: 0;
|
||||||
|
background: color-mix(in srgb, var(--color-primary-2) 78%, white 22%);
|
||||||
|
}
|
||||||
|
|
||||||
|
.itemMarkerMuted {
|
||||||
|
background: color-mix(in srgb, var(--color-text-subtle) 36%, transparent);
|
||||||
|
}
|
||||||
|
|
||||||
|
.itemBody {
|
||||||
|
min-width: 0;
|
||||||
|
display: grid;
|
||||||
|
gap: calc(var(--space-1) / 2);
|
||||||
|
}
|
||||||
|
|
||||||
|
.itemTitle {
|
||||||
|
@include text-label;
|
||||||
|
color: var(--color-text);
|
||||||
|
}
|
||||||
|
|
||||||
|
.itemTime {
|
||||||
|
padding-top: calc(var(--space-1) / 4);
|
||||||
|
white-space: nowrap;
|
||||||
|
color: var(--color-text-subtle);
|
||||||
|
}
|
||||||
|
|
||||||
|
.footer {
|
||||||
|
padding-top: var(--space-3);
|
||||||
|
border-top: 1px solid var(--color-border);
|
||||||
|
justify-content: space-between;
|
||||||
|
flex-wrap: wrap;
|
||||||
|
}
|
||||||
|
|
||||||
|
.menu.menuWorkspace .listWrap {
|
||||||
|
min-height: 0;
|
||||||
|
max-height: none;
|
||||||
|
height: 100%;
|
||||||
|
padding-right: 0;
|
||||||
|
margin-right: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.menu.menuWorkspace .header,
|
||||||
|
.menu.menuWorkspace .footer {
|
||||||
|
padding-left: 0;
|
||||||
|
padding-right: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
@include respond-down(mobile) {
|
||||||
|
.menu.menuWorkspace {
|
||||||
|
height: 100%;
|
||||||
|
min-height: 0;
|
||||||
|
padding: var(--space-5);
|
||||||
|
}
|
||||||
|
|
||||||
|
.menu.menuWorkspace .listWrap {
|
||||||
|
min-height: 0;
|
||||||
|
max-height: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
.menu.menuWorkspace .item {
|
||||||
|
grid-template-columns: auto minmax(0, 1fr);
|
||||||
|
}
|
||||||
|
|
||||||
|
.menu.menuWorkspace .itemTime {
|
||||||
|
grid-column: 2;
|
||||||
|
padding-top: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.menu.menuWorkspace .footer {
|
||||||
|
align-items: flex-start;
|
||||||
|
flex-direction: column;
|
||||||
|
}
|
||||||
|
|
||||||
|
.menu.menuWorkspace .footerAction {
|
||||||
|
padding: var(--space-1) 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
125
Frontend/src/components/shell/TopBar/NotificationsMenu.tsx
Normal file
125
Frontend/src/components/shell/TopBar/NotificationsMenu.tsx
Normal file
@@ -0,0 +1,125 @@
|
|||||||
|
import { For, Show, type JSX } from "solid-js";
|
||||||
|
import { Bell, Settings } from "../../../lib/icons";
|
||||||
|
import { notificationItems, unreadNotificationCount } from "../data/shell.data";
|
||||||
|
import styles from "./NotificationsMenu.module.scss";
|
||||||
|
|
||||||
|
type NotificationsMenuProps = {
|
||||||
|
id: string;
|
||||||
|
menuRef?: (element: HTMLDivElement) => void;
|
||||||
|
onSelect: () => void;
|
||||||
|
variant?: "popover" | "workspace";
|
||||||
|
};
|
||||||
|
|
||||||
|
export const NotificationsMenu = (props: NotificationsMenuProps): JSX.Element => {
|
||||||
|
const unreadItems = notificationItems.filter((item) => item.unread);
|
||||||
|
const earlierItems = notificationItems.filter((item) => !item.unread);
|
||||||
|
const hasNotifications = notificationItems.length > 0;
|
||||||
|
const isCaughtUp = unreadItems.length === 0 && hasNotifications;
|
||||||
|
const variant = props.variant ?? "popover";
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div
|
||||||
|
id={props.id}
|
||||||
|
classList={{
|
||||||
|
[styles.menu]: true,
|
||||||
|
[styles.menuWorkspace]: variant === "workspace",
|
||||||
|
}}
|
||||||
|
role="menu"
|
||||||
|
aria-label="Notifications"
|
||||||
|
ref={props.menuRef}
|
||||||
|
data-ui="notifications-menu"
|
||||||
|
data-variant={variant}
|
||||||
|
>
|
||||||
|
<div class={styles.header} data-slot="notifications-header">
|
||||||
|
<div class={styles.headerCopy} data-slot="notifications-header-copy">
|
||||||
|
<strong class={styles.title}>Notifications</strong>
|
||||||
|
<span class={styles.subtitle}>
|
||||||
|
{unreadNotificationCount > 0
|
||||||
|
? `You have ${unreadNotificationCount} unread`
|
||||||
|
: "You’re all caught up"}
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<Show when={unreadNotificationCount > 0}>
|
||||||
|
<button type="button" role="menuitem" class={styles.headerAction} onClick={props.onSelect}>
|
||||||
|
Mark all read
|
||||||
|
</button>
|
||||||
|
</Show>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class={styles.listWrap} data-slot="notifications-body">
|
||||||
|
<Show when={!hasNotifications}>
|
||||||
|
<div class={styles.stateCard}>
|
||||||
|
<span class={styles.stateIcon} aria-hidden="true">
|
||||||
|
<Bell size={18} strokeWidth={2} />
|
||||||
|
</span>
|
||||||
|
<strong class={styles.stateTitle}>No notifications yet</strong>
|
||||||
|
<span class={styles.stateCopy}>When activity starts across your workspace, it’ll show up here.</span>
|
||||||
|
</div>
|
||||||
|
</Show>
|
||||||
|
|
||||||
|
<Show when={isCaughtUp}>
|
||||||
|
<div class={styles.stateCard}>
|
||||||
|
<span class={styles.stateIcon} aria-hidden="true">
|
||||||
|
<Bell size={18} strokeWidth={2} />
|
||||||
|
</span>
|
||||||
|
<strong class={styles.stateTitle}>You’re all caught up</strong>
|
||||||
|
<span class={styles.stateCopy}>No unread notifications right now. Earlier activity is still available below.</span>
|
||||||
|
</div>
|
||||||
|
</Show>
|
||||||
|
|
||||||
|
<Show when={unreadItems.length > 0}>
|
||||||
|
<section class={styles.section} aria-label="Unread notifications" data-slot="notifications-section" data-section-id="unread">
|
||||||
|
<span class={styles.sectionLabel}>Unread</span>
|
||||||
|
<div class={styles.list} data-slot="notifications-list" data-section-id="unread">
|
||||||
|
<For each={unreadItems}>
|
||||||
|
{(item): JSX.Element => (
|
||||||
|
<button type="button" role="menuitem" classList={{ [styles.item]: true, [styles.itemUnread]: true }} data-slot="notification-item" data-state="unread" onClick={props.onSelect}>
|
||||||
|
<span class={styles.itemMarker} aria-hidden="true" />
|
||||||
|
<div class={styles.itemBody}>
|
||||||
|
<span class={styles.itemTitle}>{item.title}</span>
|
||||||
|
<span class={styles.itemMeta}>{item.contextLabel}</span>
|
||||||
|
</div>
|
||||||
|
<span class={styles.itemTime}>{item.timeLabel}</span>
|
||||||
|
</button>
|
||||||
|
)}
|
||||||
|
</For>
|
||||||
|
</div>
|
||||||
|
</section>
|
||||||
|
</Show>
|
||||||
|
|
||||||
|
<Show when={earlierItems.length > 0}>
|
||||||
|
<section class={styles.section} aria-label="Earlier notifications" data-slot="notifications-section" data-section-id="earlier">
|
||||||
|
<span class={styles.sectionLabel}>Earlier</span>
|
||||||
|
<div class={styles.list} data-slot="notifications-list" data-section-id="earlier">
|
||||||
|
<For each={earlierItems}>
|
||||||
|
{(item): JSX.Element => (
|
||||||
|
<button type="button" role="menuitem" class={styles.item} data-slot="notification-item" data-state="read" onClick={props.onSelect}>
|
||||||
|
<span class={styles.itemMarkerMuted} aria-hidden="true" />
|
||||||
|
<div class={styles.itemBody}>
|
||||||
|
<span class={styles.itemTitle}>{item.title}</span>
|
||||||
|
<span class={styles.itemMeta}>{item.contextLabel}</span>
|
||||||
|
</div>
|
||||||
|
<span class={styles.itemTime}>{item.timeLabel}</span>
|
||||||
|
</button>
|
||||||
|
)}
|
||||||
|
</For>
|
||||||
|
</div>
|
||||||
|
</section>
|
||||||
|
</Show>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class={styles.footer} data-slot="notifications-footer">
|
||||||
|
<button type="button" role="menuitem" class={styles.footerAction} onClick={props.onSelect}>
|
||||||
|
<Settings size={16} strokeWidth={2} />
|
||||||
|
<span>Notification settings</span>
|
||||||
|
</button>
|
||||||
|
|
||||||
|
<button type="button" role="menuitem" class={styles.footerAction} onClick={props.onSelect}>
|
||||||
|
<Bell size={16} strokeWidth={2} />
|
||||||
|
<span>View all notifications</span>
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
};
|
||||||
@@ -0,0 +1,5 @@
|
|||||||
|
.root {
|
||||||
|
position: relative;
|
||||||
|
display: inline-flex;
|
||||||
|
align-items: center;
|
||||||
|
}
|
||||||
38
Frontend/src/components/shell/TopBar/NotificationsNav.tsx
Normal file
38
Frontend/src/components/shell/TopBar/NotificationsNav.tsx
Normal file
@@ -0,0 +1,38 @@
|
|||||||
|
import { createUniqueId, Show, type JSX } from "solid-js";
|
||||||
|
import { NotificationsButton } from "./NotificationsButton";
|
||||||
|
import { NotificationsMenu } from "./NotificationsMenu";
|
||||||
|
import { createDesktopMenuController } from "./createDesktopMenuController";
|
||||||
|
import styles from "./NotificationsNav.module.scss";
|
||||||
|
|
||||||
|
type NotificationsNavProps = {
|
||||||
|
isMobileViewport: boolean;
|
||||||
|
isMobileWorkspaceOpen: boolean;
|
||||||
|
onToggleMobileWorkspace: VoidFunction;
|
||||||
|
};
|
||||||
|
|
||||||
|
export const NotificationsNav = (props: NotificationsNavProps): JSX.Element => {
|
||||||
|
const menuId = createUniqueId();
|
||||||
|
|
||||||
|
return (
|
||||||
|
<Show
|
||||||
|
when={props.isMobileViewport}
|
||||||
|
fallback={<DesktopNotificationsNav />}
|
||||||
|
>
|
||||||
|
<div class={styles.root}>
|
||||||
|
<NotificationsButton isOpen={props.isMobileWorkspaceOpen} menuId={menuId} onToggle={props.onToggleMobileWorkspace} />
|
||||||
|
</div>
|
||||||
|
</Show>
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
const DesktopNotificationsNav = (): JSX.Element => {
|
||||||
|
const controller = createDesktopMenuController();
|
||||||
|
const menuId = createUniqueId();
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div class={styles.root} ref={controller.setRootRef}>
|
||||||
|
<NotificationsButton isOpen={controller.isOpen()} menuId={menuId} onToggle={controller.toggleMenu} />
|
||||||
|
{controller.isOpen() ? <NotificationsMenu id={menuId} menuRef={controller.setMenuRef} onSelect={controller.closeMenu} /> : null}
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
};
|
||||||
200
Frontend/src/components/shell/TopBar/ProfileMenu.module.scss
Normal file
200
Frontend/src/components/shell/TopBar/ProfileMenu.module.scss
Normal file
@@ -0,0 +1,200 @@
|
|||||||
|
.menu {
|
||||||
|
position: absolute;
|
||||||
|
top: calc(100% + var(--space-2));
|
||||||
|
right: 0;
|
||||||
|
width: min(21rem, calc(100vw - (var(--space-4) * 2)));
|
||||||
|
display: grid;
|
||||||
|
gap: var(--space-3);
|
||||||
|
padding: var(--space-3);
|
||||||
|
border: 1px solid var(--color-border-strong);
|
||||||
|
border-radius: calc(var(--radius-lg) + (var(--space-1) / 2));
|
||||||
|
background: color-mix(in srgb, var(--color-surface-muted) 96%, transparent);
|
||||||
|
box-shadow: var(--shadow-strong);
|
||||||
|
backdrop-filter: blur(var(--blur-overlay));
|
||||||
|
z-index: var(--z-dropdown);
|
||||||
|
}
|
||||||
|
|
||||||
|
.menu.menuWorkspace {
|
||||||
|
position: static;
|
||||||
|
top: auto;
|
||||||
|
right: auto;
|
||||||
|
left: auto;
|
||||||
|
bottom: auto;
|
||||||
|
width: 100%;
|
||||||
|
max-width: none;
|
||||||
|
height: 100%;
|
||||||
|
min-height: 0;
|
||||||
|
display: grid;
|
||||||
|
grid-template-rows: auto minmax(0, 1fr);
|
||||||
|
gap: var(--space-4);
|
||||||
|
padding: var(--space-4);
|
||||||
|
border: 0;
|
||||||
|
border-radius: 0;
|
||||||
|
background: transparent;
|
||||||
|
box-shadow: none;
|
||||||
|
backdrop-filter: none;
|
||||||
|
z-index: auto;
|
||||||
|
overflow: hidden;
|
||||||
|
}
|
||||||
|
|
||||||
|
.sections {
|
||||||
|
display: grid;
|
||||||
|
gap: var(--space-3);
|
||||||
|
}
|
||||||
|
|
||||||
|
.summary {
|
||||||
|
display: grid;
|
||||||
|
grid-template-columns: auto minmax(0, 1fr);
|
||||||
|
gap: var(--space-3);
|
||||||
|
align-items: center;
|
||||||
|
padding-bottom: var(--space-3);
|
||||||
|
border-bottom: 1px solid var(--color-border);
|
||||||
|
}
|
||||||
|
|
||||||
|
.avatar {
|
||||||
|
position: relative;
|
||||||
|
display: inline-flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: center;
|
||||||
|
width: 3rem;
|
||||||
|
height: 3rem;
|
||||||
|
align-self: center;
|
||||||
|
margin-right: var(--space-1);
|
||||||
|
}
|
||||||
|
|
||||||
|
.avatarRing {
|
||||||
|
position: absolute;
|
||||||
|
inset: 0;
|
||||||
|
border-radius: 999px;
|
||||||
|
background:
|
||||||
|
conic-gradient(
|
||||||
|
from 0deg,
|
||||||
|
transparent 0deg 24deg,
|
||||||
|
var(--color-primary-1) 24deg 118deg,
|
||||||
|
transparent 118deg 144deg,
|
||||||
|
var(--color-primary-2) 144deg 238deg,
|
||||||
|
transparent 238deg 264deg,
|
||||||
|
var(--color-primary-3) 264deg 356deg,
|
||||||
|
transparent 356deg 360deg
|
||||||
|
);
|
||||||
|
mask: radial-gradient(circle, transparent 64%, black 67%);
|
||||||
|
-webkit-mask: radial-gradient(circle, transparent 64%, black 67%);
|
||||||
|
}
|
||||||
|
|
||||||
|
.avatarCore {
|
||||||
|
@include text-label;
|
||||||
|
position: relative;
|
||||||
|
z-index: 1;
|
||||||
|
display: inline-flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: center;
|
||||||
|
width: 78%;
|
||||||
|
height: 78%;
|
||||||
|
border-radius: 999px;
|
||||||
|
background: var(--color-surface);
|
||||||
|
color: var(--color-text);
|
||||||
|
font-weight: var(--font-weight-semibold);
|
||||||
|
}
|
||||||
|
|
||||||
|
.summaryCopy {
|
||||||
|
min-width: 0;
|
||||||
|
display: grid;
|
||||||
|
gap: calc(var(--space-1) / 2);
|
||||||
|
}
|
||||||
|
|
||||||
|
.name,
|
||||||
|
.itemLabel {
|
||||||
|
@include text-label;
|
||||||
|
}
|
||||||
|
|
||||||
|
.name {
|
||||||
|
color: var(--color-text);
|
||||||
|
}
|
||||||
|
|
||||||
|
.email,
|
||||||
|
.role,
|
||||||
|
.context {
|
||||||
|
@include text-caption;
|
||||||
|
color: var(--color-text-muted);
|
||||||
|
}
|
||||||
|
|
||||||
|
.context {
|
||||||
|
margin-top: var(--space-1);
|
||||||
|
color: var(--color-text-subtle);
|
||||||
|
}
|
||||||
|
|
||||||
|
.section {
|
||||||
|
display: grid;
|
||||||
|
gap: var(--space-1);
|
||||||
|
}
|
||||||
|
|
||||||
|
.section + .section {
|
||||||
|
padding-top: var(--space-3);
|
||||||
|
border-top: 1px solid var(--color-border);
|
||||||
|
}
|
||||||
|
|
||||||
|
.item {
|
||||||
|
width: 100%;
|
||||||
|
min-width: 0;
|
||||||
|
min-height: calc(var(--control-size-lg) + (var(--space-1) / 2));
|
||||||
|
display: grid;
|
||||||
|
grid-template-columns: auto minmax(0, 1fr);
|
||||||
|
align-items: center;
|
||||||
|
gap: var(--space-2);
|
||||||
|
padding: var(--space-2);
|
||||||
|
border: 1px solid transparent;
|
||||||
|
border-radius: var(--radius-sm);
|
||||||
|
background: transparent;
|
||||||
|
color: var(--color-text);
|
||||||
|
text-align: left;
|
||||||
|
transition:
|
||||||
|
background-color 160ms var(--easing-standard),
|
||||||
|
border-color 160ms var(--easing-standard),
|
||||||
|
color 160ms var(--easing-standard);
|
||||||
|
}
|
||||||
|
|
||||||
|
.item:hover {
|
||||||
|
background: color-mix(in srgb, var(--color-surface) 88%, transparent);
|
||||||
|
border-color: color-mix(in srgb, var(--color-border) 20%, transparent);
|
||||||
|
}
|
||||||
|
|
||||||
|
.item:focus-visible {
|
||||||
|
outline: none;
|
||||||
|
background: color-mix(in srgb, var(--color-surface) 92%, transparent);
|
||||||
|
border-color: color-mix(in srgb, var(--color-accent-soft) 52%, transparent);
|
||||||
|
box-shadow: 0 0 0 0.12rem color-mix(in srgb, var(--color-accent-soft) 14%, transparent);
|
||||||
|
}
|
||||||
|
|
||||||
|
.itemDanger {
|
||||||
|
color: color-mix(in srgb, var(--color-primary-3) 74%, var(--color-text) 26%);
|
||||||
|
}
|
||||||
|
|
||||||
|
.itemDanger:hover,
|
||||||
|
.itemDanger:focus-visible {
|
||||||
|
background: color-mix(in srgb, var(--color-primary-3) 8%, transparent);
|
||||||
|
border-color: color-mix(in srgb, var(--color-primary-3) 16%, transparent);
|
||||||
|
}
|
||||||
|
|
||||||
|
.itemIcon {
|
||||||
|
width: calc(var(--control-size-lg) - var(--space-2));
|
||||||
|
height: calc(var(--control-size-lg) - var(--space-2));
|
||||||
|
display: inline-flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: center;
|
||||||
|
border-radius: var(--radius-sm);
|
||||||
|
background: color-mix(in srgb, var(--color-surface) 92%, transparent);
|
||||||
|
color: currentColor;
|
||||||
|
}
|
||||||
|
|
||||||
|
.menu.menuWorkspace .sections {
|
||||||
|
min-height: 0;
|
||||||
|
height: 100%;
|
||||||
|
align-content: start;
|
||||||
|
overflow-y: auto;
|
||||||
|
}
|
||||||
|
|
||||||
|
.menu.menuWorkspace .summary,
|
||||||
|
.menu.menuWorkspace .sections {
|
||||||
|
padding-left: 0;
|
||||||
|
padding-right: 0;
|
||||||
|
}
|
||||||
83
Frontend/src/components/shell/TopBar/ProfileMenu.tsx
Normal file
83
Frontend/src/components/shell/TopBar/ProfileMenu.tsx
Normal file
@@ -0,0 +1,83 @@
|
|||||||
|
import { For, type JSX } from "solid-js";
|
||||||
|
import { User } from "../../../lib/icons";
|
||||||
|
import { useAppShellData } from "../data/app-shell.context";
|
||||||
|
import { profileMenuSections } from "../data/shell.data";
|
||||||
|
import styles from "./ProfileMenu.module.scss";
|
||||||
|
|
||||||
|
type ProfileMenuProps = {
|
||||||
|
id: string;
|
||||||
|
menuRef?: (element: HTMLDivElement) => void;
|
||||||
|
onSelect: () => void;
|
||||||
|
variant?: "popover" | "workspace";
|
||||||
|
};
|
||||||
|
|
||||||
|
export const ProfileMenu = (props: ProfileMenuProps): JSX.Element => {
|
||||||
|
const variant = props.variant ?? "popover";
|
||||||
|
const appShellData = useAppShellData();
|
||||||
|
const activeUserProfile = () => appShellData.activeUserProfile();
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div
|
||||||
|
id={props.id}
|
||||||
|
classList={{
|
||||||
|
[styles.menu]: true,
|
||||||
|
[styles.menuWorkspace]: variant === "workspace",
|
||||||
|
}}
|
||||||
|
role="menu"
|
||||||
|
aria-label="Profile menu"
|
||||||
|
ref={props.menuRef}
|
||||||
|
data-ui="profile-menu"
|
||||||
|
data-variant={variant}
|
||||||
|
>
|
||||||
|
<div class={styles.summary} data-slot="profile-summary">
|
||||||
|
<div class={styles.avatar} aria-hidden="true">
|
||||||
|
<span class={styles.avatarRing} />
|
||||||
|
<span class={styles.avatarCore}>
|
||||||
|
<User size={16} strokeWidth={2} />
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class={styles.summaryCopy}>
|
||||||
|
<strong class={styles.name}>{activeUserProfile().name}</strong>
|
||||||
|
<span class={styles.email}>{activeUserProfile().email}</span>
|
||||||
|
<span class={styles.role}>{activeUserProfile().roleLabel}</span>
|
||||||
|
<span class={styles.context}>{activeUserProfile().contextLabel}</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class={styles.sections} data-slot="profile-sections">
|
||||||
|
<For each={profileMenuSections}>
|
||||||
|
{(section): JSX.Element => (
|
||||||
|
<div class={styles.section} data-slot="profile-section" data-section-id={section.id}>
|
||||||
|
<For each={section.items}>
|
||||||
|
{(item): JSX.Element => {
|
||||||
|
const Icon = item.icon;
|
||||||
|
|
||||||
|
return (
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
role="menuitem"
|
||||||
|
classList={{
|
||||||
|
[styles.item]: true,
|
||||||
|
[styles.itemDanger]: item.tone === "danger",
|
||||||
|
}}
|
||||||
|
data-slot="profile-action"
|
||||||
|
data-action-id={item.id}
|
||||||
|
data-tone={item.tone ?? "default"}
|
||||||
|
onClick={props.onSelect}
|
||||||
|
>
|
||||||
|
<span class={styles.itemIcon} aria-hidden="true">
|
||||||
|
<Icon size={16} strokeWidth={2} />
|
||||||
|
</span>
|
||||||
|
<span class={styles.itemLabel}>{item.label}</span>
|
||||||
|
</button>
|
||||||
|
);
|
||||||
|
}}
|
||||||
|
</For>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
</For>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
};
|
||||||
68
Frontend/src/components/shell/TopBar/ThemeToggle.module.scss
Normal file
68
Frontend/src/components/shell/TopBar/ThemeToggle.module.scss
Normal file
@@ -0,0 +1,68 @@
|
|||||||
|
.toggleButton {
|
||||||
|
display: inline-flex;
|
||||||
|
justify-content: center;
|
||||||
|
align-items: center;
|
||||||
|
width: 2.75rem;
|
||||||
|
height: 2.75rem;
|
||||||
|
aspect-ratio: 1;
|
||||||
|
padding: 0;
|
||||||
|
border: 0;
|
||||||
|
border-radius: 999px;
|
||||||
|
flex-shrink: 0;
|
||||||
|
cursor: pointer;
|
||||||
|
background: transparent;
|
||||||
|
color: var(--color-text-muted);
|
||||||
|
transition:
|
||||||
|
background-color 500ms ease,
|
||||||
|
color 220ms var(--easing-standard),
|
||||||
|
transform 180ms var(--easing-standard);
|
||||||
|
}
|
||||||
|
|
||||||
|
.toggleButton:hover {
|
||||||
|
background: color-mix(in srgb, var(--color-text) 8%, transparent);
|
||||||
|
color: var(--color-text);
|
||||||
|
}
|
||||||
|
|
||||||
|
.toggleButton:focus-visible {
|
||||||
|
outline: none;
|
||||||
|
background: color-mix(in srgb, var(--color-accent-strong) 12%, transparent);
|
||||||
|
box-shadow: 0 0 0 0.12rem color-mix(in srgb, var(--color-accent-strong) 28%, transparent);
|
||||||
|
color: var(--color-text);
|
||||||
|
}
|
||||||
|
|
||||||
|
.iconContainer {
|
||||||
|
position: relative;
|
||||||
|
width: 1.375rem;
|
||||||
|
height: 1.375rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.iconLayer {
|
||||||
|
position: absolute;
|
||||||
|
inset: 0;
|
||||||
|
display: inline-flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: center;
|
||||||
|
transition:
|
||||||
|
transform 1000ms ease,
|
||||||
|
opacity 500ms ease;
|
||||||
|
}
|
||||||
|
|
||||||
|
.moonLayer {
|
||||||
|
transform: rotate(90deg);
|
||||||
|
opacity: 0;
|
||||||
|
|
||||||
|
:global([data-theme="dark"]) & {
|
||||||
|
transform: rotate(0deg);
|
||||||
|
opacity: 1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
.sunLayer {
|
||||||
|
transform: rotate(0deg);
|
||||||
|
opacity: 1;
|
||||||
|
|
||||||
|
:global([data-theme="dark"]) & {
|
||||||
|
transform: rotate(-90deg);
|
||||||
|
opacity: 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
32
Frontend/src/components/shell/TopBar/ThemeToggle.tsx
Normal file
32
Frontend/src/components/shell/TopBar/ThemeToggle.tsx
Normal file
@@ -0,0 +1,32 @@
|
|||||||
|
// Path: Frontend/src/components/shell/TopBar/ThemeToggle.tsx
|
||||||
|
|
||||||
|
import type { JSX } from "solid-js";
|
||||||
|
import type { Theme } from "../../../theme/runtime";
|
||||||
|
import { Moon, Sun } from "../../../lib/icons";
|
||||||
|
import styles from "./ThemeToggle.module.scss";
|
||||||
|
|
||||||
|
type ThemeToggleProps = {
|
||||||
|
theme: Theme;
|
||||||
|
onToggle: VoidFunction;
|
||||||
|
};
|
||||||
|
|
||||||
|
export const ThemeToggle = (props: ThemeToggleProps): JSX.Element => {
|
||||||
|
return (
|
||||||
|
<button
|
||||||
|
class={styles.toggleButton}
|
||||||
|
type="button"
|
||||||
|
onClick={props.onToggle}
|
||||||
|
aria-label={`Switch to ${props.theme === "dark" ? "light" : "dark"} theme`}
|
||||||
|
title={`Switch to ${props.theme === "dark" ? "light" : "dark"} theme`}
|
||||||
|
>
|
||||||
|
<span class={styles.iconContainer} aria-hidden="true">
|
||||||
|
<span class={`${styles.iconLayer} ${styles.moonLayer}`}>
|
||||||
|
<Moon size={18} strokeWidth={2} />
|
||||||
|
</span>
|
||||||
|
<span class={`${styles.iconLayer} ${styles.sunLayer}`}>
|
||||||
|
<Sun size={18} strokeWidth={2} />
|
||||||
|
</span>
|
||||||
|
</span>
|
||||||
|
</button>
|
||||||
|
);
|
||||||
|
};
|
||||||
@@ -1,8 +1,8 @@
|
|||||||
.topBar {
|
.topBar {
|
||||||
--topbar-control-size: var(--control-size-md);
|
--topbar-control-size: 2.5rem;
|
||||||
min-height: 4rem;
|
min-height: 4rem;
|
||||||
display: grid;
|
display: grid;
|
||||||
grid-template-columns: minmax(0, 1fr) auto auto;
|
grid-template-columns: minmax(0, 1fr) auto;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
gap: var(--space-3);
|
gap: var(--space-3);
|
||||||
padding: var(--space-3) var(--space-4) var(--space-3);
|
padding: var(--space-3) var(--space-4) var(--space-3);
|
||||||
@@ -12,6 +12,7 @@
|
|||||||
.identity {
|
.identity {
|
||||||
min-width: 0;
|
min-width: 0;
|
||||||
display: grid;
|
display: grid;
|
||||||
|
justify-items: start;
|
||||||
gap: 0;
|
gap: 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -22,55 +23,50 @@
|
|||||||
letter-spacing: 0.08em;
|
letter-spacing: 0.08em;
|
||||||
}
|
}
|
||||||
|
|
||||||
.title {
|
.controls,
|
||||||
@include text-title;
|
|
||||||
display: flex;
|
|
||||||
align-items: center;
|
|
||||||
gap: var(--space-2);
|
|
||||||
|
|
||||||
strong {
|
|
||||||
font: inherit;
|
|
||||||
font-weight: var(--font-weight-title);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
.context {
|
|
||||||
color: var(--color-text-muted);
|
|
||||||
}
|
|
||||||
|
|
||||||
.actions {
|
.actions {
|
||||||
display: flex;
|
display: flex;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
|
}
|
||||||
|
|
||||||
|
.controls {
|
||||||
gap: var(--space-1);
|
gap: var(--space-1);
|
||||||
}
|
}
|
||||||
|
|
||||||
.actionButton,
|
.actions {
|
||||||
.themeButton {
|
gap: var(--space-1);
|
||||||
height: var(--topbar-control-size);
|
|
||||||
display: inline-flex;
|
|
||||||
align-items: center;
|
|
||||||
justify-content: center;
|
|
||||||
@include interactive-frame();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.actionButton {
|
.actionButton {
|
||||||
|
display: inline-flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: center;
|
||||||
width: var(--topbar-control-size);
|
width: var(--topbar-control-size);
|
||||||
|
height: var(--topbar-control-size);
|
||||||
|
aspect-ratio: 1;
|
||||||
|
padding: 0;
|
||||||
|
border: 0;
|
||||||
|
border-radius: 999px;
|
||||||
|
flex-shrink: 0;
|
||||||
|
cursor: pointer;
|
||||||
|
background: transparent;
|
||||||
|
color: var(--color-text-muted);
|
||||||
|
transition:
|
||||||
|
background-color 220ms var(--easing-standard),
|
||||||
|
color 220ms var(--easing-standard),
|
||||||
|
transform 180ms var(--easing-standard);
|
||||||
}
|
}
|
||||||
|
|
||||||
.themeButton {
|
.actionButton:hover {
|
||||||
width: auto;
|
background: color-mix(in srgb, var(--color-text) 8%, transparent);
|
||||||
padding-inline: var(--space-2);
|
|
||||||
gap: var(--space-1);
|
|
||||||
color: var(--color-text);
|
color: var(--color-text);
|
||||||
}
|
}
|
||||||
|
|
||||||
.actionButton,
|
.actionButton:focus-visible {
|
||||||
.themeButton {
|
outline: none;
|
||||||
@include interactive-frame-hover();
|
background: color-mix(in srgb, var(--color-accent-strong) 12%, transparent);
|
||||||
}
|
box-shadow: 0 0 0 0.12rem color-mix(in srgb, var(--color-accent-strong) 28%, transparent);
|
||||||
|
color: var(--color-text);
|
||||||
.themeLabel {
|
|
||||||
@include text-label;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@include respond-down(mobile) {
|
@include respond-down(mobile) {
|
||||||
@@ -82,4 +78,8 @@
|
|||||||
.actions {
|
.actions {
|
||||||
display: none;
|
display: none;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.controls {
|
||||||
|
gap: 0;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,44 +1,58 @@
|
|||||||
// Path: Frontend/src/components/shell/TopBar/TopBar.tsx
|
// Path: Frontend/src/components/shell/TopBar/TopBar.tsx
|
||||||
|
|
||||||
import { For, type JSX } from "solid-js";
|
import { For, type JSX } from "solid-js";
|
||||||
import type { Theme } from "../../../helpers/theme";
|
import type { Theme } from "../../../theme/runtime";
|
||||||
import { ChevronDown } from "../../../lib/icons";
|
|
||||||
import { topBarActions } from "../data/shell.data";
|
import { topBarActions } from "../data/shell.data";
|
||||||
|
import { DepartmentSelector } from "../DepartmentSelector/DepartmentSelector";
|
||||||
|
import { NotificationsNav } from "./NotificationsNav";
|
||||||
|
import { ThemeToggle } from "./ThemeToggle";
|
||||||
|
import { UserNav } from "./UserNav";
|
||||||
import styles from "./TopBar.module.scss";
|
import styles from "./TopBar.module.scss";
|
||||||
|
|
||||||
type TopBarProps = {
|
type TopBarProps = {
|
||||||
theme: Theme;
|
theme: Theme;
|
||||||
onToggleTheme: VoidFunction;
|
onToggleTheme: VoidFunction;
|
||||||
|
isMobileViewport: boolean;
|
||||||
|
isNotificationsOpen: boolean;
|
||||||
|
isProfileOpen: boolean;
|
||||||
|
onToggleNotifications: VoidFunction;
|
||||||
|
onToggleProfile: VoidFunction;
|
||||||
};
|
};
|
||||||
|
|
||||||
export const TopBar = (props: TopBarProps): JSX.Element => {
|
export const TopBar = (props: TopBarProps): JSX.Element => {
|
||||||
return (
|
return (
|
||||||
<header class={styles.topBar}>
|
<header class={styles.topBar} data-ui="top-bar">
|
||||||
<div class={styles.identity}>
|
<div class={styles.identity} data-slot="top-bar-identity">
|
||||||
<span class={styles.eyebrow}>Moku Work</span>
|
<span class={styles.eyebrow}>Moku Work</span>
|
||||||
<div class={styles.title}>
|
<DepartmentSelector />
|
||||||
<strong>Workspace Shell</strong>
|
|
||||||
<span class={styles.context}>Moku / Product</span>
|
|
||||||
<ChevronDown size={16} strokeWidth={2} />
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<button class={styles.themeButton} type="button" onClick={props.onToggleTheme}>
|
<div class={styles.controls} data-slot="top-bar-controls">
|
||||||
<span class={styles.themeLabel}>{props.theme === "dark" ? "Dark" : "Light"}</span>
|
<div class={styles.actions} data-slot="top-bar-actions">
|
||||||
</button>
|
<For each={topBarActions}>
|
||||||
|
{(item): JSX.Element => {
|
||||||
|
const Icon = item.icon;
|
||||||
|
|
||||||
<div class={styles.actions}>
|
return (
|
||||||
<For each={topBarActions}>
|
<button class={styles.actionButton} type="button" aria-label={item.label} title={item.label} data-slot="top-bar-action" data-action-id={item.id}>
|
||||||
{(item): JSX.Element => {
|
<Icon size={18} strokeWidth={2} />
|
||||||
const Icon = item.icon;
|
</button>
|
||||||
|
);
|
||||||
|
}}
|
||||||
|
</For>
|
||||||
|
</div>
|
||||||
|
|
||||||
return (
|
<NotificationsNav
|
||||||
<button class={styles.actionButton} type="button" aria-label={item.label} title={item.label}>
|
isMobileViewport={props.isMobileViewport}
|
||||||
<Icon size={18} strokeWidth={2} />
|
isMobileWorkspaceOpen={props.isNotificationsOpen}
|
||||||
</button>
|
onToggleMobileWorkspace={props.onToggleNotifications}
|
||||||
);
|
/>
|
||||||
}}
|
<ThemeToggle theme={props.theme} onToggle={props.onToggleTheme} />
|
||||||
</For>
|
<UserNav
|
||||||
|
isMobileViewport={props.isMobileViewport}
|
||||||
|
isMobileWorkspaceOpen={props.isProfileOpen}
|
||||||
|
onToggleMobileWorkspace={props.onToggleProfile}
|
||||||
|
/>
|
||||||
</div>
|
</div>
|
||||||
</header>
|
</header>
|
||||||
);
|
);
|
||||||
|
|||||||
5
Frontend/src/components/shell/TopBar/UserNav.module.scss
Normal file
5
Frontend/src/components/shell/TopBar/UserNav.module.scss
Normal file
@@ -0,0 +1,5 @@
|
|||||||
|
.root {
|
||||||
|
position: relative;
|
||||||
|
display: inline-flex;
|
||||||
|
align-items: center;
|
||||||
|
}
|
||||||
38
Frontend/src/components/shell/TopBar/UserNav.tsx
Normal file
38
Frontend/src/components/shell/TopBar/UserNav.tsx
Normal file
@@ -0,0 +1,38 @@
|
|||||||
|
import { createUniqueId, Show, type JSX } from "solid-js";
|
||||||
|
import { ProfileMenu } from "./ProfileMenu";
|
||||||
|
import { UserNavButton } from "./UserNavButton";
|
||||||
|
import { createDesktopMenuController } from "./createDesktopMenuController";
|
||||||
|
import styles from "./UserNav.module.scss";
|
||||||
|
|
||||||
|
type UserNavProps = {
|
||||||
|
isMobileViewport: boolean;
|
||||||
|
isMobileWorkspaceOpen: boolean;
|
||||||
|
onToggleMobileWorkspace: VoidFunction;
|
||||||
|
};
|
||||||
|
|
||||||
|
export const UserNav = (props: UserNavProps): JSX.Element => {
|
||||||
|
const menuId = createUniqueId();
|
||||||
|
|
||||||
|
return (
|
||||||
|
<Show
|
||||||
|
when={props.isMobileViewport}
|
||||||
|
fallback={<DesktopUserNav />}
|
||||||
|
>
|
||||||
|
<div class={styles.root}>
|
||||||
|
<UserNavButton isOpen={props.isMobileWorkspaceOpen} menuId={menuId} onToggle={props.onToggleMobileWorkspace} />
|
||||||
|
</div>
|
||||||
|
</Show>
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
const DesktopUserNav = (): JSX.Element => {
|
||||||
|
const controller = createDesktopMenuController();
|
||||||
|
const menuId = createUniqueId();
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div class={styles.root} ref={controller.setRootRef}>
|
||||||
|
<UserNavButton isOpen={controller.isOpen()} menuId={menuId} onToggle={controller.toggleMenu} />
|
||||||
|
{controller.isOpen() ? <ProfileMenu id={menuId} menuRef={controller.setMenuRef} onSelect={controller.closeMenu} /> : null}
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
};
|
||||||
105
Frontend/src/components/shell/TopBar/UserNavButton.module.scss
Normal file
105
Frontend/src/components/shell/TopBar/UserNavButton.module.scss
Normal file
@@ -0,0 +1,105 @@
|
|||||||
|
.userButton {
|
||||||
|
position: relative;
|
||||||
|
display: inline-flex;
|
||||||
|
justify-content: center;
|
||||||
|
align-items: center;
|
||||||
|
width: 2.75rem;
|
||||||
|
height: 2.75rem;
|
||||||
|
margin-left: var(--space-1);
|
||||||
|
padding: 0;
|
||||||
|
border: 0;
|
||||||
|
border-radius: 999px;
|
||||||
|
background: transparent;
|
||||||
|
color: var(--color-text-muted);
|
||||||
|
cursor: pointer;
|
||||||
|
overflow: hidden;
|
||||||
|
transition:
|
||||||
|
transform 180ms var(--easing-standard),
|
||||||
|
color 220ms var(--easing-standard);
|
||||||
|
}
|
||||||
|
|
||||||
|
.userButton:hover {
|
||||||
|
transform: scale(1.05);
|
||||||
|
color: var(--color-text);
|
||||||
|
}
|
||||||
|
|
||||||
|
.userButtonOpen {
|
||||||
|
color: var(--color-text);
|
||||||
|
}
|
||||||
|
|
||||||
|
.userButton:hover .spinContainer,
|
||||||
|
.userButtonOpen .spinContainer {
|
||||||
|
animation-play-state: running;
|
||||||
|
opacity: 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
.userButton:focus-visible {
|
||||||
|
outline: none;
|
||||||
|
color: var(--color-text);
|
||||||
|
box-shadow: 0 0 0 0.12rem color-mix(in srgb, var(--color-accent-strong) 28%, transparent);
|
||||||
|
}
|
||||||
|
|
||||||
|
.spinContainer {
|
||||||
|
position: absolute;
|
||||||
|
inset: 0;
|
||||||
|
display: inline-flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: center;
|
||||||
|
opacity: 0.72;
|
||||||
|
transition: opacity 220ms var(--easing-standard);
|
||||||
|
animation: spin-reverse 1.5s ease-in-out infinite reverse;
|
||||||
|
animation-play-state: paused;
|
||||||
|
pointer-events: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
.spinRing {
|
||||||
|
width: 100%;
|
||||||
|
height: 100%;
|
||||||
|
border-radius: 999px;
|
||||||
|
background:
|
||||||
|
conic-gradient(
|
||||||
|
from 0deg,
|
||||||
|
transparent 0deg 28deg,
|
||||||
|
var(--color-primary-1) 28deg 118deg,
|
||||||
|
transparent 118deg 148deg,
|
||||||
|
var(--color-primary-2) 148deg 238deg,
|
||||||
|
transparent 238deg 268deg,
|
||||||
|
var(--color-primary-3) 268deg 358deg,
|
||||||
|
transparent 358deg 360deg
|
||||||
|
);
|
||||||
|
mask: radial-gradient(circle, transparent 63%, black 66%);
|
||||||
|
-webkit-mask: radial-gradient(circle, transparent 63%, black 66%);
|
||||||
|
animation: spin-forward 14s linear infinite;
|
||||||
|
}
|
||||||
|
|
||||||
|
.userCore {
|
||||||
|
position: relative;
|
||||||
|
z-index: 1;
|
||||||
|
display: inline-flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: center;
|
||||||
|
width: 78%;
|
||||||
|
height: 78%;
|
||||||
|
border-radius: 999px;
|
||||||
|
background: var(--color-surface-muted);
|
||||||
|
}
|
||||||
|
|
||||||
|
@keyframes spin-forward {
|
||||||
|
from {
|
||||||
|
transform: rotate(0deg);
|
||||||
|
}
|
||||||
|
|
||||||
|
to {
|
||||||
|
transform: rotate(360deg);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@keyframes spin-reverse {
|
||||||
|
from {
|
||||||
|
transform: rotate(0deg);
|
||||||
|
}
|
||||||
|
|
||||||
|
to {
|
||||||
|
transform: rotate(-360deg);
|
||||||
|
}
|
||||||
|
}
|
||||||
37
Frontend/src/components/shell/TopBar/UserNavButton.tsx
Normal file
37
Frontend/src/components/shell/TopBar/UserNavButton.tsx
Normal file
@@ -0,0 +1,37 @@
|
|||||||
|
// Path: Frontend/src/components/shell/TopBar/UserNavButton.tsx
|
||||||
|
|
||||||
|
import type { JSX } from "solid-js";
|
||||||
|
import { User } from "../../../lib/icons";
|
||||||
|
import styles from "./UserNavButton.module.scss";
|
||||||
|
|
||||||
|
type UserNavButtonProps = {
|
||||||
|
isOpen: boolean;
|
||||||
|
menuId: string;
|
||||||
|
onToggle: () => void;
|
||||||
|
};
|
||||||
|
|
||||||
|
export const UserNavButton = (props: UserNavButtonProps): JSX.Element => {
|
||||||
|
return (
|
||||||
|
<button
|
||||||
|
classList={{
|
||||||
|
[styles.userButton]: true,
|
||||||
|
[styles.userButtonOpen]: props.isOpen,
|
||||||
|
}}
|
||||||
|
type="button"
|
||||||
|
aria-label={props.isOpen ? "Close profile menu" : "Open profile menu"}
|
||||||
|
title={props.isOpen ? "Close profile menu" : "Open profile menu"}
|
||||||
|
aria-haspopup="menu"
|
||||||
|
aria-controls={props.menuId}
|
||||||
|
aria-expanded={props.isOpen}
|
||||||
|
onClick={props.onToggle}
|
||||||
|
>
|
||||||
|
<span class={styles.spinContainer} aria-hidden="true">
|
||||||
|
<span class={styles.spinRing} />
|
||||||
|
</span>
|
||||||
|
|
||||||
|
<span class={styles.userCore} aria-hidden="true">
|
||||||
|
<User size={16} strokeWidth={2.2} />
|
||||||
|
</span>
|
||||||
|
</button>
|
||||||
|
);
|
||||||
|
};
|
||||||
@@ -0,0 +1,72 @@
|
|||||||
|
import { createEffect, createSignal, onCleanup } from "solid-js";
|
||||||
|
|
||||||
|
type DesktopMenuController = {
|
||||||
|
isOpen: () => boolean;
|
||||||
|
rootRef: HTMLDivElement | undefined;
|
||||||
|
menuRef: HTMLDivElement | undefined;
|
||||||
|
setRootRef: (element: HTMLDivElement) => void;
|
||||||
|
setMenuRef: (element: HTMLDivElement) => void;
|
||||||
|
closeMenu: VoidFunction;
|
||||||
|
toggleMenu: VoidFunction;
|
||||||
|
};
|
||||||
|
|
||||||
|
// Shared desktop popover behavior for top-bar menus.
|
||||||
|
export const createDesktopMenuController = (): DesktopMenuController => {
|
||||||
|
const [isOpen, setIsOpen] = createSignal(false);
|
||||||
|
let rootRef: HTMLDivElement | undefined;
|
||||||
|
let menuRef: HTMLDivElement | undefined;
|
||||||
|
|
||||||
|
const closeMenu = (): void => {
|
||||||
|
setIsOpen(false);
|
||||||
|
};
|
||||||
|
|
||||||
|
const toggleMenu = (): void => {
|
||||||
|
setIsOpen((open) => !open);
|
||||||
|
};
|
||||||
|
|
||||||
|
createEffect(() => {
|
||||||
|
if (!isOpen()) return;
|
||||||
|
|
||||||
|
const handlePointerDown = (event: PointerEvent): void => {
|
||||||
|
if (!rootRef) return;
|
||||||
|
|
||||||
|
const target = event.target;
|
||||||
|
if (target instanceof Node && !rootRef.contains(target)) {
|
||||||
|
closeMenu();
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
const handleKeyDown = (event: KeyboardEvent): void => {
|
||||||
|
if (event.key === "Escape") {
|
||||||
|
closeMenu();
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
document.addEventListener("pointerdown", handlePointerDown);
|
||||||
|
document.addEventListener("keydown", handleKeyDown);
|
||||||
|
menuRef?.querySelector<HTMLButtonElement>("[role='menuitem']")?.focus();
|
||||||
|
|
||||||
|
onCleanup(() => {
|
||||||
|
document.removeEventListener("pointerdown", handlePointerDown);
|
||||||
|
document.removeEventListener("keydown", handleKeyDown);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
return {
|
||||||
|
isOpen,
|
||||||
|
get rootRef() {
|
||||||
|
return rootRef;
|
||||||
|
},
|
||||||
|
get menuRef() {
|
||||||
|
return menuRef;
|
||||||
|
},
|
||||||
|
setRootRef: (element: HTMLDivElement): void => {
|
||||||
|
rootRef = element;
|
||||||
|
},
|
||||||
|
setMenuRef: (element: HTMLDivElement): void => {
|
||||||
|
menuRef = element;
|
||||||
|
},
|
||||||
|
closeMenu,
|
||||||
|
toggleMenu,
|
||||||
|
};
|
||||||
|
};
|
||||||
@@ -0,0 +1,194 @@
|
|||||||
|
.menu {
|
||||||
|
--context-menu-width: 13.5rem;
|
||||||
|
position: fixed;
|
||||||
|
width: min(var(--context-menu-width), calc(100vw - (var(--space-4) * 2)));
|
||||||
|
display: grid;
|
||||||
|
gap: 0;
|
||||||
|
padding: var(--space-1);
|
||||||
|
border: 1px solid color-mix(in srgb, var(--color-border-strong) 56%, transparent);
|
||||||
|
border-radius: calc(var(--radius-md) + (var(--space-1) / 2));
|
||||||
|
background: var(--color-surface);
|
||||||
|
box-shadow: var(--shadow-soft);
|
||||||
|
z-index: 2147483647;
|
||||||
|
user-select: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
.header {
|
||||||
|
display: grid;
|
||||||
|
gap: calc(var(--space-1) / 2);
|
||||||
|
padding: var(--space-2) calc(var(--space-2) + (var(--space-1) / 2));
|
||||||
|
}
|
||||||
|
|
||||||
|
.eyebrow {
|
||||||
|
@include text-caption;
|
||||||
|
color: var(--color-text-muted);
|
||||||
|
text-transform: uppercase;
|
||||||
|
letter-spacing: 0.06em;
|
||||||
|
}
|
||||||
|
|
||||||
|
.title {
|
||||||
|
@include text-label;
|
||||||
|
color: var(--color-text);
|
||||||
|
font-weight: var(--font-weight-title);
|
||||||
|
}
|
||||||
|
|
||||||
|
.sectionList {
|
||||||
|
display: grid;
|
||||||
|
gap: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.sectionListCompact {
|
||||||
|
gap: calc(var(--space-1) / 2);
|
||||||
|
}
|
||||||
|
|
||||||
|
.section {
|
||||||
|
display: grid;
|
||||||
|
gap: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.section:first-child {
|
||||||
|
padding-top: calc(var(--space-1) / 2);
|
||||||
|
}
|
||||||
|
|
||||||
|
.section + .section {
|
||||||
|
margin-top: calc(var(--space-1) / 2);
|
||||||
|
padding-top: var(--space-2);
|
||||||
|
border-top: 1px solid color-mix(in srgb, var(--color-border) 78%, transparent);
|
||||||
|
}
|
||||||
|
|
||||||
|
.sectionLabel {
|
||||||
|
@include text-caption;
|
||||||
|
color: var(--color-text-subtle);
|
||||||
|
padding: 0 var(--space-2);
|
||||||
|
text-transform: uppercase;
|
||||||
|
letter-spacing: 0.04em;
|
||||||
|
}
|
||||||
|
|
||||||
|
.actionList {
|
||||||
|
display: grid;
|
||||||
|
gap: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.actionItem {
|
||||||
|
position: relative;
|
||||||
|
}
|
||||||
|
|
||||||
|
.action {
|
||||||
|
width: 100%;
|
||||||
|
min-height: calc(var(--control-size-md) - var(--space-2));
|
||||||
|
display: inline-flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: flex-start;
|
||||||
|
gap: var(--space-2);
|
||||||
|
padding: var(--space-2) calc(var(--space-2) + (var(--space-1) / 2));
|
||||||
|
border: 1px solid transparent;
|
||||||
|
border-radius: var(--radius-sm);
|
||||||
|
background: transparent;
|
||||||
|
color: var(--color-text);
|
||||||
|
text-align: left;
|
||||||
|
font-size: var(--font-size-label);
|
||||||
|
line-height: var(--line-height-label);
|
||||||
|
font-weight: var(--font-weight-label);
|
||||||
|
transition:
|
||||||
|
background var(--motion-duration-fast) var(--motion-ease-standard),
|
||||||
|
border-color var(--motion-duration-fast) var(--motion-ease-standard),
|
||||||
|
color var(--motion-duration-fast) var(--motion-ease-standard);
|
||||||
|
}
|
||||||
|
|
||||||
|
.actionCreate {
|
||||||
|
border-color: transparent;
|
||||||
|
background: transparent;
|
||||||
|
font-weight: var(--font-weight-title);
|
||||||
|
box-shadow: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
.actionCreate:hover,
|
||||||
|
.actionCreate:focus-visible,
|
||||||
|
.actionCreate.actionSubmenuOpen {
|
||||||
|
background: color-mix(in srgb, var(--color-surface-hover) 82%, var(--color-surface));
|
||||||
|
border-color: color-mix(in srgb, var(--color-border) 72%, transparent);
|
||||||
|
}
|
||||||
|
|
||||||
|
.actionCreateIcon {
|
||||||
|
width: calc(var(--control-size-md) - var(--space-3));
|
||||||
|
height: calc(var(--control-size-md) - var(--space-3));
|
||||||
|
display: inline-flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: center;
|
||||||
|
border-radius: var(--radius-sm);
|
||||||
|
background: color-mix(in srgb, var(--color-surface-hover) 72%, var(--color-surface));
|
||||||
|
color: var(--color-text);
|
||||||
|
box-shadow: inset 0 0 0 1px color-mix(in srgb, var(--color-border) 74%, transparent);
|
||||||
|
}
|
||||||
|
|
||||||
|
.actionLabel {
|
||||||
|
min-width: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.actionMeta {
|
||||||
|
margin-left: auto;
|
||||||
|
display: inline-flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: flex-end;
|
||||||
|
gap: var(--space-2);
|
||||||
|
padding-left: var(--space-3);
|
||||||
|
}
|
||||||
|
|
||||||
|
.actionShortcut {
|
||||||
|
color: var(--color-text-muted);
|
||||||
|
font-size: var(--font-size-caption);
|
||||||
|
line-height: var(--line-height-caption);
|
||||||
|
font-weight: var(--font-weight-caption);
|
||||||
|
white-space: nowrap;
|
||||||
|
}
|
||||||
|
|
||||||
|
.actionChevron {
|
||||||
|
color: var(--color-text-subtle);
|
||||||
|
flex: 0 0 auto;
|
||||||
|
}
|
||||||
|
|
||||||
|
.actionSubmenuOpen {
|
||||||
|
background: color-mix(in srgb, var(--color-surface-hover) 82%, var(--color-surface));
|
||||||
|
border-color: color-mix(in srgb, var(--color-border-strong) 72%, transparent);
|
||||||
|
}
|
||||||
|
|
||||||
|
.action:hover,
|
||||||
|
.action:focus-visible {
|
||||||
|
background: color-mix(in srgb, var(--color-surface-hover) 78%, var(--color-surface));
|
||||||
|
border-color: color-mix(in srgb, var(--color-border) 72%, transparent);
|
||||||
|
}
|
||||||
|
|
||||||
|
.actionDanger {
|
||||||
|
color: var(--color-danger-text, var(--color-text));
|
||||||
|
}
|
||||||
|
|
||||||
|
.actionDanger:hover,
|
||||||
|
.actionDanger:focus-visible {
|
||||||
|
background: color-mix(in srgb, var(--color-danger-soft, var(--color-surface-hover)) 72%, transparent);
|
||||||
|
border-color: color-mix(in srgb, var(--color-danger-border, var(--color-border)) 72%, transparent);
|
||||||
|
color: var(--color-danger-text, var(--color-text));
|
||||||
|
}
|
||||||
|
|
||||||
|
.submenu {
|
||||||
|
position: absolute;
|
||||||
|
top: calc(var(--space-1) * -1);
|
||||||
|
left: calc(100% + var(--space-2));
|
||||||
|
width: min(var(--context-menu-width), calc(100vw - (var(--space-4) * 2)));
|
||||||
|
padding: var(--space-1);
|
||||||
|
border: 1px solid color-mix(in srgb, var(--color-border-strong) 56%, transparent);
|
||||||
|
border-radius: calc(var(--radius-md) + (var(--space-1) / 2));
|
||||||
|
background: var(--color-surface);
|
||||||
|
box-shadow: var(--shadow-soft);
|
||||||
|
z-index: 2147483647;
|
||||||
|
}
|
||||||
|
|
||||||
|
.submenuList {
|
||||||
|
display: grid;
|
||||||
|
gap: var(--space-1);
|
||||||
|
}
|
||||||
|
|
||||||
|
@include respond-down(mobile) {
|
||||||
|
.menu {
|
||||||
|
display: none;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,242 @@
|
|||||||
|
import { For, Show, createEffect, createMemo, createSignal, onMount, type JSX } from "solid-js";
|
||||||
|
import { Portal } from "solid-js/web";
|
||||||
|
import { ChevronRight, Plus } from "../../../lib/icons";
|
||||||
|
import {
|
||||||
|
getWorkspaceContextMenuEyebrow,
|
||||||
|
getWorkspaceContextMenuSections,
|
||||||
|
type WorkspaceContextMenuAction,
|
||||||
|
type WorkspaceContextMenuShortcut,
|
||||||
|
type WorkspaceContextMenuTarget,
|
||||||
|
} from "../data/shell.data";
|
||||||
|
import styles from "./WorkspaceContextMenu.module.scss";
|
||||||
|
|
||||||
|
type ShortcutPlatform = "mac" | "windows";
|
||||||
|
|
||||||
|
type NavigatorWithUserAgentData = Navigator & {
|
||||||
|
userAgentData?: {
|
||||||
|
platform?: string;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
type WorkspaceContextMenuPosition = {
|
||||||
|
x: number;
|
||||||
|
y: number;
|
||||||
|
};
|
||||||
|
|
||||||
|
type WorkspaceContextMenuProps = {
|
||||||
|
target: WorkspaceContextMenuTarget | null;
|
||||||
|
position: WorkspaceContextMenuPosition | null;
|
||||||
|
onClose: VoidFunction;
|
||||||
|
onSelect: (action: WorkspaceContextMenuAction, target: WorkspaceContextMenuTarget) => void;
|
||||||
|
menuRef: (element: HTMLDivElement) => void;
|
||||||
|
};
|
||||||
|
|
||||||
|
const getShortcutPlatform = (): ShortcutPlatform => {
|
||||||
|
if (typeof navigator === "undefined") {
|
||||||
|
return "mac";
|
||||||
|
}
|
||||||
|
|
||||||
|
const navigatorWithUserAgentData = navigator as NavigatorWithUserAgentData;
|
||||||
|
|
||||||
|
const platform =
|
||||||
|
typeof navigatorWithUserAgentData.userAgentData?.platform === "string"
|
||||||
|
? navigatorWithUserAgentData.userAgentData.platform
|
||||||
|
: navigator.platform;
|
||||||
|
|
||||||
|
return /mac|iphone|ipad|ipod/i.test(platform) ? "mac" : "windows";
|
||||||
|
};
|
||||||
|
|
||||||
|
const formatShortcut = (shortcut: WorkspaceContextMenuShortcut, platform: ShortcutPlatform): string => {
|
||||||
|
const keyLabel = (() => {
|
||||||
|
switch (shortcut.key) {
|
||||||
|
case "enter":
|
||||||
|
return platform === "mac" ? "↩" : "Enter";
|
||||||
|
case "delete":
|
||||||
|
return platform === "mac" ? "⌫" : "Del";
|
||||||
|
default:
|
||||||
|
return shortcut.key.toUpperCase();
|
||||||
|
}
|
||||||
|
})();
|
||||||
|
|
||||||
|
const modifierLabels =
|
||||||
|
shortcut.modifiers?.map((modifier) => {
|
||||||
|
switch (modifier) {
|
||||||
|
case "meta":
|
||||||
|
return platform === "mac" ? "⌘" : "Ctrl";
|
||||||
|
case "alt":
|
||||||
|
return platform === "mac" ? "⌥" : "Alt";
|
||||||
|
case "shift":
|
||||||
|
return platform === "mac" ? "⇧" : "Shift";
|
||||||
|
}
|
||||||
|
}) ?? [];
|
||||||
|
|
||||||
|
if (platform === "mac") {
|
||||||
|
return `${modifierLabels.join("")}${keyLabel}`;
|
||||||
|
}
|
||||||
|
|
||||||
|
return [...modifierLabels, keyLabel].join("+");
|
||||||
|
};
|
||||||
|
|
||||||
|
export const WorkspaceContextMenu = (props: WorkspaceContextMenuProps): JSX.Element => {
|
||||||
|
const [activeSubmenuActionId, setActiveSubmenuActionId] = createSignal<string | null>(null);
|
||||||
|
const [shortcutPlatform, setShortcutPlatform] = createSignal<ShortcutPlatform>("mac");
|
||||||
|
const sections = createMemo(() => (props.target ? getWorkspaceContextMenuSections(props.target) : []));
|
||||||
|
const handleActionSelect = (action: WorkspaceContextMenuAction, target: WorkspaceContextMenuTarget): void => {
|
||||||
|
props.onSelect(action, target);
|
||||||
|
props.onClose();
|
||||||
|
};
|
||||||
|
const menuState = createMemo<{
|
||||||
|
target: WorkspaceContextMenuTarget;
|
||||||
|
position: WorkspaceContextMenuPosition;
|
||||||
|
} | null>(() =>
|
||||||
|
props.target && props.position
|
||||||
|
? {
|
||||||
|
target: props.target,
|
||||||
|
position: props.position,
|
||||||
|
}
|
||||||
|
: null,
|
||||||
|
);
|
||||||
|
const showHeader = (): boolean => props.target?.kind !== "workspace";
|
||||||
|
const sectionHasLabel = createMemo(() => sections().some((section) => Boolean(section.label)));
|
||||||
|
|
||||||
|
onMount(() => {
|
||||||
|
setShortcutPlatform(getShortcutPlatform());
|
||||||
|
});
|
||||||
|
|
||||||
|
createEffect(() => {
|
||||||
|
void props.target;
|
||||||
|
setActiveSubmenuActionId(null);
|
||||||
|
});
|
||||||
|
|
||||||
|
return (
|
||||||
|
<Show when={menuState()}>
|
||||||
|
{(resolvedMenuState): JSX.Element => {
|
||||||
|
const target = resolvedMenuState().target;
|
||||||
|
const position = resolvedMenuState().position;
|
||||||
|
|
||||||
|
return (
|
||||||
|
<Portal>
|
||||||
|
<div
|
||||||
|
ref={props.menuRef}
|
||||||
|
class={styles.menu}
|
||||||
|
role="menu"
|
||||||
|
aria-label={`${target.label} context menu`}
|
||||||
|
data-ui="workspace-context-menu"
|
||||||
|
data-target-kind={target.kind}
|
||||||
|
data-item-type={target.kind === "item" ? target.itemType : undefined}
|
||||||
|
style={{
|
||||||
|
left: `${position.x}px`,
|
||||||
|
top: `${position.y}px`,
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
<Show when={target.kind !== "workspace"}>
|
||||||
|
<header class={styles.header} data-slot="context-menu-header">
|
||||||
|
<span class={styles.eyebrow}>{getWorkspaceContextMenuEyebrow(target)}</span>
|
||||||
|
<strong class={styles.title}>{target.label}</strong>
|
||||||
|
</header>
|
||||||
|
</Show>
|
||||||
|
|
||||||
|
<div classList={{ [styles.sectionList]: true, [styles.sectionListCompact]: !sectionHasLabel() }} data-slot="context-menu-sections">
|
||||||
|
<For each={sections()}>
|
||||||
|
{(section): JSX.Element => (
|
||||||
|
<section class={styles.section} data-slot="context-menu-section" data-section-id={section.id}>
|
||||||
|
<Show when={section.label}>
|
||||||
|
<span class={styles.sectionLabel}>{section.label}</span>
|
||||||
|
</Show>
|
||||||
|
|
||||||
|
<div class={styles.actionList} data-slot="context-menu-action-list">
|
||||||
|
<For each={section.items}>
|
||||||
|
{(action): JSX.Element => {
|
||||||
|
const isSubmenuOpen = () => activeSubmenuActionId() === action.id;
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div
|
||||||
|
class={styles.actionItem}
|
||||||
|
data-slot="context-menu-action-item"
|
||||||
|
data-action-id={action.id}
|
||||||
|
onMouseEnter={() => {
|
||||||
|
setActiveSubmenuActionId(action.children ? action.id : null);
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
role="menuitem"
|
||||||
|
classList={{
|
||||||
|
[styles.action]: true,
|
||||||
|
[styles.actionCreate]: action.id === "create",
|
||||||
|
[styles.actionDanger]: action.tone === "danger",
|
||||||
|
[styles.actionSubmenuOpen]: isSubmenuOpen(),
|
||||||
|
}}
|
||||||
|
data-slot="context-menu-action"
|
||||||
|
data-action-id={action.id}
|
||||||
|
data-tone={action.tone ?? "default"}
|
||||||
|
onClick={() => {
|
||||||
|
if (action.children) {
|
||||||
|
setActiveSubmenuActionId(isSubmenuOpen() ? null : action.id);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
handleActionSelect(action, target);
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
<Show when={action.id === "create"}>
|
||||||
|
<span class={styles.actionCreateIcon} aria-hidden="true">
|
||||||
|
<Plus size={14} strokeWidth={2.25} />
|
||||||
|
</span>
|
||||||
|
</Show>
|
||||||
|
<span class={styles.actionLabel}>{action.label}</span>
|
||||||
|
<div class={styles.actionMeta}>
|
||||||
|
<Show when={action.shortcut}>
|
||||||
|
<span class={styles.actionShortcut}>{formatShortcut(action.shortcut!, shortcutPlatform())}</span>
|
||||||
|
</Show>
|
||||||
|
<Show when={action.children}>
|
||||||
|
<ChevronRight class={styles.actionChevron} size={16} strokeWidth={2} />
|
||||||
|
</Show>
|
||||||
|
</div>
|
||||||
|
</button>
|
||||||
|
|
||||||
|
<Show when={action.children && isSubmenuOpen()}>
|
||||||
|
<div class={styles.submenu} role="menu" aria-label={`${action.label} submenu`} data-slot="context-menu-submenu">
|
||||||
|
<div class={styles.submenuList} data-slot="context-menu-submenu-list">
|
||||||
|
<For each={action.children ?? []}>
|
||||||
|
{(childAction): JSX.Element => (
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
role="menuitem"
|
||||||
|
classList={{
|
||||||
|
[styles.action]: true,
|
||||||
|
[styles.actionDanger]: childAction.tone === "danger",
|
||||||
|
}}
|
||||||
|
data-slot="context-menu-submenu-action"
|
||||||
|
data-action-id={childAction.id}
|
||||||
|
data-tone={childAction.tone ?? "default"}
|
||||||
|
onClick={() => handleActionSelect(childAction, target)}
|
||||||
|
>
|
||||||
|
<span class={styles.actionLabel}>{childAction.label}</span>
|
||||||
|
<div class={styles.actionMeta}>
|
||||||
|
<Show when={childAction.shortcut}>
|
||||||
|
<span class={styles.actionShortcut}>{formatShortcut(childAction.shortcut!, shortcutPlatform())}</span>
|
||||||
|
</Show>
|
||||||
|
</div>
|
||||||
|
</button>
|
||||||
|
)}
|
||||||
|
</For>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</Show>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}}
|
||||||
|
</For>
|
||||||
|
</div>
|
||||||
|
</section>
|
||||||
|
)}
|
||||||
|
</For>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</Portal>
|
||||||
|
);
|
||||||
|
}}
|
||||||
|
</Show>
|
||||||
|
);
|
||||||
|
};
|
||||||
@@ -0,0 +1,134 @@
|
|||||||
|
import { createEffect, createSignal, onCleanup } from "solid-js";
|
||||||
|
import type { WorkspaceContextMenuTarget } from "../data/shell.data";
|
||||||
|
|
||||||
|
type WorkspaceContextMenuState = {
|
||||||
|
target: WorkspaceContextMenuTarget;
|
||||||
|
x: number;
|
||||||
|
y: number;
|
||||||
|
};
|
||||||
|
|
||||||
|
const readRootPixelToken = (name: string, fallback: number): number => {
|
||||||
|
if (typeof window === "undefined") {
|
||||||
|
return fallback;
|
||||||
|
}
|
||||||
|
|
||||||
|
const value = window.getComputedStyle(document.documentElement).getPropertyValue(name).trim();
|
||||||
|
const parsed = Number.parseFloat(value);
|
||||||
|
|
||||||
|
if (!Number.isFinite(parsed)) {
|
||||||
|
return fallback;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (value.endsWith("px")) {
|
||||||
|
return parsed;
|
||||||
|
}
|
||||||
|
|
||||||
|
return parsed * 16;
|
||||||
|
};
|
||||||
|
|
||||||
|
const clampMenuPosition = (value: number, min: number, max: number): number => {
|
||||||
|
if (max <= min) {
|
||||||
|
return min;
|
||||||
|
}
|
||||||
|
|
||||||
|
return Math.min(Math.max(value, min), max);
|
||||||
|
};
|
||||||
|
|
||||||
|
export const createWorkspaceContextMenuController = () => {
|
||||||
|
const [menuState, setMenuState] = createSignal<WorkspaceContextMenuState | null>(null);
|
||||||
|
let menuRef: HTMLDivElement | undefined;
|
||||||
|
|
||||||
|
const closeMenu = (): void => {
|
||||||
|
setMenuState(null);
|
||||||
|
};
|
||||||
|
|
||||||
|
const repositionMenu = (): void => {
|
||||||
|
if (typeof window === "undefined" || !menuRef) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
const current = menuState();
|
||||||
|
|
||||||
|
if (!current) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
const viewportPadding = readRootPixelToken("--space-4", 16);
|
||||||
|
const rect = menuRef.getBoundingClientRect();
|
||||||
|
const nextX = clampMenuPosition(current.x, viewportPadding, window.innerWidth - rect.width - viewportPadding);
|
||||||
|
const nextY = clampMenuPosition(current.y, viewportPadding, window.innerHeight - rect.height - viewportPadding);
|
||||||
|
|
||||||
|
if (nextX === current.x && nextY === current.y) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
setMenuState({ ...current, x: nextX, y: nextY });
|
||||||
|
};
|
||||||
|
|
||||||
|
const openMenu = (event: MouseEvent, target: WorkspaceContextMenuTarget): void => {
|
||||||
|
event.preventDefault();
|
||||||
|
setMenuState({ target, x: event.clientX, y: event.clientY });
|
||||||
|
};
|
||||||
|
|
||||||
|
const openMenuFromElement = (element: HTMLElement, target: WorkspaceContextMenuTarget): void => {
|
||||||
|
const rect = element.getBoundingClientRect();
|
||||||
|
setMenuState({
|
||||||
|
target,
|
||||||
|
x: rect.left + rect.width / 2,
|
||||||
|
y: rect.top + rect.height / 2,
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
|
createEffect(() => {
|
||||||
|
if (!menuState()) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (typeof window === "undefined") {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
const frame = window.requestAnimationFrame(() => {
|
||||||
|
repositionMenu();
|
||||||
|
});
|
||||||
|
|
||||||
|
const handlePointerDown = (event: PointerEvent): void => {
|
||||||
|
if (!menuRef?.contains(event.target as Node)) {
|
||||||
|
closeMenu();
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
const handleKeyDown = (event: KeyboardEvent): void => {
|
||||||
|
if (event.key === "Escape") {
|
||||||
|
closeMenu();
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
const handleViewportChange = (): void => {
|
||||||
|
closeMenu();
|
||||||
|
};
|
||||||
|
|
||||||
|
document.addEventListener("pointerdown", handlePointerDown);
|
||||||
|
window.addEventListener("resize", handleViewportChange);
|
||||||
|
window.addEventListener("scroll", handleViewportChange, true);
|
||||||
|
window.addEventListener("keydown", handleKeyDown);
|
||||||
|
|
||||||
|
onCleanup(() => {
|
||||||
|
window.cancelAnimationFrame(frame);
|
||||||
|
document.removeEventListener("pointerdown", handlePointerDown);
|
||||||
|
window.removeEventListener("resize", handleViewportChange);
|
||||||
|
window.removeEventListener("scroll", handleViewportChange, true);
|
||||||
|
window.removeEventListener("keydown", handleKeyDown);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
return {
|
||||||
|
menuState,
|
||||||
|
openMenu,
|
||||||
|
openMenuFromElement,
|
||||||
|
closeMenu,
|
||||||
|
setMenuRef: (element: HTMLDivElement): void => {
|
||||||
|
menuRef = element;
|
||||||
|
},
|
||||||
|
};
|
||||||
|
};
|
||||||
@@ -0,0 +1,146 @@
|
|||||||
|
.layer {
|
||||||
|
display: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
@include respond-down(mobile) {
|
||||||
|
.layer {
|
||||||
|
position: fixed;
|
||||||
|
inset: 0;
|
||||||
|
display: block;
|
||||||
|
z-index: var(--z-modal);
|
||||||
|
}
|
||||||
|
|
||||||
|
.backdrop {
|
||||||
|
position: absolute;
|
||||||
|
inset: 0;
|
||||||
|
border: 0;
|
||||||
|
background: color-mix(in srgb, black 52%, transparent);
|
||||||
|
}
|
||||||
|
|
||||||
|
.sheet {
|
||||||
|
position: absolute;
|
||||||
|
right: 0;
|
||||||
|
bottom: 0;
|
||||||
|
left: 0;
|
||||||
|
max-height: calc(100dvh - (var(--space-12) * 2));
|
||||||
|
display: grid;
|
||||||
|
gap: var(--space-3);
|
||||||
|
padding: var(--space-3) var(--space-3) calc(var(--space-4) + env(safe-area-inset-bottom, 0px));
|
||||||
|
border-top: 1px solid color-mix(in srgb, var(--color-border) 88%, transparent);
|
||||||
|
border-radius: var(--radius-xl) var(--radius-xl) 0 0;
|
||||||
|
background: var(--color-surface);
|
||||||
|
box-shadow: var(--shadow-strong);
|
||||||
|
overflow: auto;
|
||||||
|
}
|
||||||
|
|
||||||
|
.handle {
|
||||||
|
width: var(--space-10);
|
||||||
|
height: var(--space-1);
|
||||||
|
margin: 0 auto;
|
||||||
|
border-radius: var(--radius-pill);
|
||||||
|
background: color-mix(in srgb, var(--color-text-muted) 24%, transparent);
|
||||||
|
}
|
||||||
|
|
||||||
|
.header {
|
||||||
|
display: flex;
|
||||||
|
align-items: start;
|
||||||
|
justify-content: space-between;
|
||||||
|
gap: var(--space-3);
|
||||||
|
padding-bottom: var(--space-3);
|
||||||
|
border-bottom: 1px solid color-mix(in srgb, var(--color-border) 88%, transparent);
|
||||||
|
}
|
||||||
|
|
||||||
|
.headerCopy {
|
||||||
|
min-width: 0;
|
||||||
|
display: grid;
|
||||||
|
gap: calc(var(--space-1) / 2);
|
||||||
|
}
|
||||||
|
|
||||||
|
.eyebrow {
|
||||||
|
@include text-caption;
|
||||||
|
color: var(--color-text-muted);
|
||||||
|
text-transform: uppercase;
|
||||||
|
letter-spacing: 0.06em;
|
||||||
|
}
|
||||||
|
|
||||||
|
.title {
|
||||||
|
@include text-title;
|
||||||
|
color: var(--color-text);
|
||||||
|
font-weight: var(--font-weight-semibold);
|
||||||
|
}
|
||||||
|
|
||||||
|
.closeButton {
|
||||||
|
flex: 0 0 auto;
|
||||||
|
display: inline-flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: center;
|
||||||
|
width: var(--control-size-md);
|
||||||
|
height: var(--control-size-md);
|
||||||
|
padding: 0;
|
||||||
|
border: 1px solid color-mix(in srgb, var(--color-border) 88%, transparent);
|
||||||
|
border-radius: var(--radius-pill);
|
||||||
|
background: color-mix(in srgb, var(--color-surface) 84%, var(--color-surface-elevated, var(--color-surface)) 16%);
|
||||||
|
color: var(--color-text-subtle);
|
||||||
|
}
|
||||||
|
|
||||||
|
.sectionList {
|
||||||
|
display: grid;
|
||||||
|
gap: var(--space-3);
|
||||||
|
}
|
||||||
|
|
||||||
|
.section {
|
||||||
|
display: grid;
|
||||||
|
gap: var(--space-2);
|
||||||
|
}
|
||||||
|
|
||||||
|
.section + .section {
|
||||||
|
padding-top: var(--space-3);
|
||||||
|
border-top: 1px solid color-mix(in srgb, var(--color-border) 92%, transparent);
|
||||||
|
}
|
||||||
|
|
||||||
|
.sectionLabel {
|
||||||
|
@include text-caption;
|
||||||
|
padding-inline: var(--space-1);
|
||||||
|
color: var(--color-text-muted);
|
||||||
|
text-transform: uppercase;
|
||||||
|
letter-spacing: 0.06em;
|
||||||
|
}
|
||||||
|
|
||||||
|
.actionList {
|
||||||
|
display: grid;
|
||||||
|
overflow: hidden;
|
||||||
|
border: 1px solid color-mix(in srgb, var(--color-border) 88%, transparent);
|
||||||
|
border-radius: var(--radius-lg);
|
||||||
|
background: color-mix(in srgb, var(--color-surface) 88%, var(--color-surface-elevated, var(--color-surface)) 12%);
|
||||||
|
}
|
||||||
|
|
||||||
|
.action {
|
||||||
|
min-width: 0;
|
||||||
|
width: 100%;
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: space-between;
|
||||||
|
min-height: calc(var(--control-size-lg) + var(--space-2));
|
||||||
|
padding: 0 var(--space-3);
|
||||||
|
border: 0;
|
||||||
|
background: transparent;
|
||||||
|
color: var(--color-text);
|
||||||
|
text-align: left;
|
||||||
|
}
|
||||||
|
|
||||||
|
.action:active {
|
||||||
|
background: color-mix(in srgb, var(--color-text) 6%, transparent);
|
||||||
|
}
|
||||||
|
|
||||||
|
.action + .action {
|
||||||
|
border-top: 1px solid color-mix(in srgb, var(--color-border) 92%, transparent);
|
||||||
|
}
|
||||||
|
|
||||||
|
.actionLabel {
|
||||||
|
@include text-label;
|
||||||
|
}
|
||||||
|
|
||||||
|
.actionDanger {
|
||||||
|
color: var(--color-danger-text, var(--color-text));
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,134 @@
|
|||||||
|
import { For, Show, createMemo, type JSX } from "solid-js";
|
||||||
|
import { Portal } from "solid-js/web";
|
||||||
|
import { X } from "../../../lib/icons";
|
||||||
|
import {
|
||||||
|
getWorkspaceContextMenuEyebrow,
|
||||||
|
getWorkspaceContextMenuSections,
|
||||||
|
type WorkspaceContextMenuAction,
|
||||||
|
type WorkspaceContextMenuSection,
|
||||||
|
type WorkspaceContextMenuTarget,
|
||||||
|
} from "../data/shell.data";
|
||||||
|
import styles from "./WorkspaceMobileActionSheet.module.scss";
|
||||||
|
|
||||||
|
type WorkspaceMobileActionSheetProps = {
|
||||||
|
target: WorkspaceContextMenuTarget | null;
|
||||||
|
onClose: VoidFunction;
|
||||||
|
onSelect: (action: WorkspaceContextMenuAction, target: WorkspaceContextMenuTarget) => void;
|
||||||
|
};
|
||||||
|
|
||||||
|
type FlattenedActionSection = {
|
||||||
|
id: string;
|
||||||
|
label?: string;
|
||||||
|
items: readonly WorkspaceContextMenuAction[];
|
||||||
|
};
|
||||||
|
|
||||||
|
const flattenMobileSections = (
|
||||||
|
sections: readonly WorkspaceContextMenuSection[],
|
||||||
|
): readonly FlattenedActionSection[] => {
|
||||||
|
// Mobile uses a flat action-sheet model, so desktop flyout groups become
|
||||||
|
// standalone labeled sections instead of nested menus.
|
||||||
|
return sections.flatMap((section) => {
|
||||||
|
const directActions = section.items.filter((action) => !action.children?.length);
|
||||||
|
const nestedSections = section.items
|
||||||
|
.filter((action) => action.children?.length)
|
||||||
|
.map((action) => ({
|
||||||
|
id: `${section.id}-${action.id}`,
|
||||||
|
label: action.label,
|
||||||
|
items: action.children ?? [],
|
||||||
|
}));
|
||||||
|
|
||||||
|
const flattenedSections: FlattenedActionSection[] = [];
|
||||||
|
|
||||||
|
if (directActions.length > 0) {
|
||||||
|
flattenedSections.push({
|
||||||
|
id: section.id,
|
||||||
|
label: section.label,
|
||||||
|
items: directActions,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
return [...flattenedSections, ...nestedSections];
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
|
export const WorkspaceMobileActionSheet = (props: WorkspaceMobileActionSheetProps): JSX.Element => {
|
||||||
|
const sheetState = createMemo(() => {
|
||||||
|
if (!props.target) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
return {
|
||||||
|
target: props.target,
|
||||||
|
sections: flattenMobileSections(getWorkspaceContextMenuSections(props.target)),
|
||||||
|
};
|
||||||
|
});
|
||||||
|
|
||||||
|
const handleActionSelect = (action: WorkspaceContextMenuAction, target: WorkspaceContextMenuTarget): void => {
|
||||||
|
props.onSelect(action, target);
|
||||||
|
props.onClose();
|
||||||
|
};
|
||||||
|
|
||||||
|
return (
|
||||||
|
<Show when={sheetState()}>
|
||||||
|
{(sheetState): JSX.Element => {
|
||||||
|
const target = sheetState().target;
|
||||||
|
const sections = sheetState().sections;
|
||||||
|
|
||||||
|
return (
|
||||||
|
<Portal>
|
||||||
|
<div class={styles.layer} data-ui="workspace-mobile-action-sheet" data-target-kind={target.kind} data-item-type={target.kind === "item" ? target.itemType : undefined}>
|
||||||
|
<button class={styles.backdrop} type="button" aria-label="Close action sheet" data-slot="mobile-action-sheet-backdrop" onClick={props.onClose} />
|
||||||
|
|
||||||
|
<section class={styles.sheet} aria-label={`${target.label} actions`} data-slot="mobile-action-sheet-panel">
|
||||||
|
<div class={styles.handle} data-slot="mobile-action-sheet-handle" aria-hidden="true" />
|
||||||
|
|
||||||
|
<header class={styles.header} data-slot="mobile-action-sheet-header">
|
||||||
|
<div class={styles.headerCopy} data-slot="mobile-action-sheet-header-copy">
|
||||||
|
<span class={styles.eyebrow}>{getWorkspaceContextMenuEyebrow(target)}</span>
|
||||||
|
<strong class={styles.title}>{target.label}</strong>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<button class={styles.closeButton} type="button" aria-label="Close action sheet" data-slot="mobile-action-sheet-close" onClick={props.onClose}>
|
||||||
|
<X size={18} strokeWidth={2} />
|
||||||
|
</button>
|
||||||
|
</header>
|
||||||
|
|
||||||
|
<div class={styles.sectionList} data-slot="mobile-action-sheet-sections">
|
||||||
|
<For each={sections}>
|
||||||
|
{(section): JSX.Element => (
|
||||||
|
<section class={styles.section} data-slot="mobile-action-sheet-section" data-section-id={section.id}>
|
||||||
|
<Show when={section.label}>
|
||||||
|
<span class={styles.sectionLabel}>{section.label}</span>
|
||||||
|
</Show>
|
||||||
|
|
||||||
|
<div class={styles.actionList} data-slot="mobile-action-sheet-action-list">
|
||||||
|
<For each={section.items}>
|
||||||
|
{(action): JSX.Element => (
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
classList={{
|
||||||
|
[styles.action]: true,
|
||||||
|
[styles.actionDanger]: action.tone === "danger",
|
||||||
|
}}
|
||||||
|
data-slot="mobile-action-sheet-action"
|
||||||
|
data-action-id={action.id}
|
||||||
|
data-tone={action.tone ?? "default"}
|
||||||
|
onClick={() => handleActionSelect(action, target)}
|
||||||
|
>
|
||||||
|
<span class={styles.actionLabel}>{action.label}</span>
|
||||||
|
</button>
|
||||||
|
)}
|
||||||
|
</For>
|
||||||
|
</div>
|
||||||
|
</section>
|
||||||
|
)}
|
||||||
|
</For>
|
||||||
|
</div>
|
||||||
|
</section>
|
||||||
|
</div>
|
||||||
|
</Portal>
|
||||||
|
);
|
||||||
|
}}
|
||||||
|
</Show>
|
||||||
|
);
|
||||||
|
};
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
.sidebar {
|
.sidebar {
|
||||||
--sidebar-nav-item-min-height: var(--control-size-lg);
|
--sidebar-nav-item-min-height: var(--control-size-lg);
|
||||||
--sidebar-dock-clearance: 8rem;
|
position: relative;
|
||||||
min-width: 0;
|
min-width: 0;
|
||||||
min-height: 0;
|
min-height: 0;
|
||||||
display: grid;
|
display: grid;
|
||||||
@@ -8,28 +8,64 @@
|
|||||||
gap: var(--space-4);
|
gap: var(--space-4);
|
||||||
padding: var(--space-4);
|
padding: var(--space-4);
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
|
border-top-left-radius: inherit;
|
||||||
|
isolation: isolate;
|
||||||
}
|
}
|
||||||
|
|
||||||
.header {
|
.header {
|
||||||
display: grid;
|
display: grid;
|
||||||
gap: 0.2rem;
|
gap: var(--space-3);
|
||||||
}
|
}
|
||||||
|
|
||||||
.eyebrow {
|
.headerActions {
|
||||||
@include text-caption;
|
display: grid;
|
||||||
|
grid-template-columns: repeat(5, minmax(0, 1fr));
|
||||||
|
gap: var(--space-2);
|
||||||
|
justify-items: stretch;
|
||||||
|
}
|
||||||
|
|
||||||
|
.headerControls {
|
||||||
|
display: grid;
|
||||||
|
grid-template-columns: minmax(0, 1fr);
|
||||||
|
align-items: start;
|
||||||
|
}
|
||||||
|
|
||||||
|
.headerDrawerOpen {
|
||||||
|
z-index: 4;
|
||||||
|
}
|
||||||
|
|
||||||
|
.headerActionButton {
|
||||||
|
width: 100%;
|
||||||
|
min-height: var(--control-size-md);
|
||||||
|
display: inline-flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: center;
|
||||||
|
border: 1px solid color-mix(in srgb, var(--color-border-strong) 44%, transparent);
|
||||||
|
border-radius: var(--radius-pill);
|
||||||
|
background: color-mix(in srgb, var(--color-surface) 94%, transparent);
|
||||||
color: var(--color-text-muted);
|
color: var(--color-text-muted);
|
||||||
text-transform: uppercase;
|
box-shadow: var(--shadow-soft);
|
||||||
letter-spacing: 0.08em;
|
transition:
|
||||||
|
background 160ms var(--easing-standard),
|
||||||
|
color 160ms var(--easing-standard),
|
||||||
|
border-color 160ms var(--easing-standard),
|
||||||
|
transform 180ms var(--easing-standard);
|
||||||
}
|
}
|
||||||
|
|
||||||
.title {
|
.headerActionButton:hover,
|
||||||
@include text-title;
|
.headerActionButton:focus-visible {
|
||||||
|
background: var(--color-surface-hover);
|
||||||
|
border-color: var(--color-border);
|
||||||
|
color: var(--color-text);
|
||||||
}
|
}
|
||||||
|
|
||||||
.meta {
|
.headerActionButton:hover {
|
||||||
@include text-caption;
|
transform: translateY(-1px);
|
||||||
color: var(--color-text-muted);
|
}
|
||||||
max-width: 28ch;
|
|
||||||
|
.headerCollapseButton {
|
||||||
|
background: color-mix(in srgb, var(--color-accent-soft) 58%, transparent);
|
||||||
|
color: var(--color-accent-strong);
|
||||||
}
|
}
|
||||||
|
|
||||||
.section {
|
.section {
|
||||||
@@ -37,6 +73,17 @@
|
|||||||
grid-template-rows: auto minmax(0, 1fr);
|
grid-template-rows: auto minmax(0, 1fr);
|
||||||
gap: var(--space-2);
|
gap: var(--space-2);
|
||||||
min-height: 0;
|
min-height: 0;
|
||||||
|
position: relative;
|
||||||
|
z-index: 1;
|
||||||
|
transition:
|
||||||
|
opacity 180ms var(--easing-standard),
|
||||||
|
transform 220ms var(--easing-standard);
|
||||||
|
}
|
||||||
|
|
||||||
|
.sectionHidden {
|
||||||
|
opacity: 0;
|
||||||
|
pointer-events: none;
|
||||||
|
transform: translateX(var(--space-3));
|
||||||
}
|
}
|
||||||
|
|
||||||
.navScroller {
|
.navScroller {
|
||||||
@@ -44,7 +91,7 @@
|
|||||||
overflow-y: auto;
|
overflow-y: auto;
|
||||||
overscroll-behavior: contain;
|
overscroll-behavior: contain;
|
||||||
padding-right: var(--space-1);
|
padding-right: var(--space-1);
|
||||||
padding-bottom: calc(var(--space-4) + var(--sidebar-dock-clearance));
|
padding-bottom: calc(var(--space-4) + var(--sidebar-dock-clearance, var(--shell-dock-clearance)));
|
||||||
margin-right: calc(var(--space-1) * -1);
|
margin-right: calc(var(--space-1) * -1);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -60,6 +107,22 @@
|
|||||||
padding: 0;
|
padding: 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.treeSectionLabel {
|
||||||
|
@include text-caption;
|
||||||
|
margin: var(--space-3) 0 var(--space-2);
|
||||||
|
padding: 0 var(--space-3);
|
||||||
|
color: var(--color-text-subtle);
|
||||||
|
text-transform: uppercase;
|
||||||
|
letter-spacing: 0.04em;
|
||||||
|
}
|
||||||
|
|
||||||
|
.treeList {
|
||||||
|
list-style: none;
|
||||||
|
display: grid;
|
||||||
|
gap: var(--space-1);
|
||||||
|
padding: 0;
|
||||||
|
}
|
||||||
|
|
||||||
.navItem {
|
.navItem {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
min-width: 0;
|
min-width: 0;
|
||||||
@@ -74,11 +137,50 @@
|
|||||||
@include interactive-frame-hover(var(--color-surface-hover), transparent, var(--color-text));
|
@include interactive-frame-hover(var(--color-surface-hover), transparent, var(--color-text));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.treeItem {
|
||||||
|
width: 100%;
|
||||||
|
min-width: 0;
|
||||||
|
display: grid;
|
||||||
|
grid-template-columns: auto minmax(0, 1fr) auto;
|
||||||
|
align-items: center;
|
||||||
|
gap: var(--space-2);
|
||||||
|
min-height: calc(var(--control-size-lg) - var(--space-2));
|
||||||
|
padding: var(--space-2) var(--space-3);
|
||||||
|
padding-left: calc(var(--space-3) + (var(--tree-depth, 0) * var(--space-4)));
|
||||||
|
border: 1px solid transparent;
|
||||||
|
border-radius: var(--radius-lg);
|
||||||
|
background: transparent;
|
||||||
|
color: var(--color-text-muted);
|
||||||
|
text-align: left;
|
||||||
|
transition:
|
||||||
|
background 160ms var(--easing-standard),
|
||||||
|
color 160ms var(--easing-standard),
|
||||||
|
border-color 160ms var(--easing-standard),
|
||||||
|
transform 180ms var(--easing-standard);
|
||||||
|
}
|
||||||
|
|
||||||
|
.treeItem:hover,
|
||||||
|
.treeItem:focus-visible {
|
||||||
|
background: var(--color-surface-hover);
|
||||||
|
color: var(--color-text);
|
||||||
|
}
|
||||||
|
|
||||||
|
.treeItemFolder {
|
||||||
|
color: var(--color-text);
|
||||||
|
}
|
||||||
|
|
||||||
|
.treeItemActive {
|
||||||
|
border-color: var(--color-border);
|
||||||
|
background: var(--color-surface);
|
||||||
|
color: var(--color-text);
|
||||||
|
box-shadow: inset 0 1px 0 color-mix(in srgb, white 4%, transparent);
|
||||||
|
}
|
||||||
|
|
||||||
.navItemActive {
|
.navItemActive {
|
||||||
border-color: var(--color-border);
|
border-color: var(--color-border);
|
||||||
background: var(--color-surface);
|
background: var(--color-surface);
|
||||||
color: var(--color-text);
|
color: var(--color-text);
|
||||||
box-shadow: var(--shadow-soft);
|
box-shadow: inset 0 1px 0 color-mix(in srgb, white 4%, transparent);
|
||||||
}
|
}
|
||||||
|
|
||||||
.icon {
|
.icon {
|
||||||
@@ -96,6 +198,52 @@
|
|||||||
color: var(--color-text-muted);
|
color: var(--color-text-muted);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.sidebarCollapsed {
|
||||||
|
gap: var(--space-3);
|
||||||
|
padding: var(--space-3) var(--space-2);
|
||||||
|
}
|
||||||
|
|
||||||
|
.sidebarCollapsed .headerActions {
|
||||||
|
grid-template-columns: repeat(3, minmax(0, 1fr));
|
||||||
|
}
|
||||||
|
|
||||||
|
.sidebarCollapsed .headerControls {
|
||||||
|
justify-items: center;
|
||||||
|
}
|
||||||
|
|
||||||
|
.sidebarCollapsed .header {
|
||||||
|
justify-items: center;
|
||||||
|
}
|
||||||
|
|
||||||
|
.sidebarCollapsed .navScroller {
|
||||||
|
padding-right: 0;
|
||||||
|
margin-right: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.sidebarCollapsed .navItem {
|
||||||
|
grid-template-columns: auto;
|
||||||
|
justify-content: center;
|
||||||
|
gap: 0;
|
||||||
|
min-height: calc(var(--control-size-lg) - var(--space-1));
|
||||||
|
padding: var(--space-2);
|
||||||
|
border-radius: var(--radius-md);
|
||||||
|
}
|
||||||
|
|
||||||
|
.sidebarCollapsed .label,
|
||||||
|
.sidebarCollapsed .itemMeta,
|
||||||
|
.sidebarCollapsed .treeSectionLabel,
|
||||||
|
.sidebarCollapsed .treeList {
|
||||||
|
display: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
.sidebarCollapsed .icon {
|
||||||
|
opacity: 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
.sidebarCollapsed .section {
|
||||||
|
gap: var(--space-3);
|
||||||
|
}
|
||||||
|
|
||||||
@include respond-down(mobile) {
|
@include respond-down(mobile) {
|
||||||
.sidebar {
|
.sidebar {
|
||||||
display: none;
|
display: none;
|
||||||
|
|||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user