5 Commits
v1.0.0 ... main

Author SHA1 Message Date
davidtio
905a9112f8 fix: correct Thorium API usage
- Import Mapping.* instead of data.mapping.* (mapping/text live in companion object)
- Use Mapping("field", text) for single-field binding instead of mapping[String]
- Pass request explicitly: bindFromRequest()(using request)
- Replace .as(String) with .as(MediaType.JSON) / .as(MediaType.HTML_UTF_8)
- Remove 'implicit' from Action lambda (Scala 3 uses 'using' instead)

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-02-28 23:42:22 +08:00
davidtio
6692d5a053 refactor: migrate from Java HttpServer to Thorium framework
Replace com.sun.net.httpserver routing with Thorium's Server/Action/annotation
pattern. TaskController now owns @Get/@Post routes, form binding via data-mapping,
and the renderPage()/esc() helpers moved from Main. Main reduced to a 9-line
Thorium server entry point.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-02-28 23:31:18 +08:00
davidtio
9f0ecf67da fix: revert uid=1000 pin — compose sets user: "0" instead
In rootless Docker, uid=0 in-container = cldrzd on host (not privileged).
Pinning to uid=1000 in-container mapped to host uid=100999 (phantom UID),
which cannot write to the cldrzd-owned data directory.

The Dockerfile USER directive is overridden by compose user: "0" anyway,
so revert to a standard non-root app user without explicit uid/gid.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-02-28 19:05:19 +08:00
davidtio
776a6e8973 Pin app user to uid/gid=1000 for Clouderized bind mount compatibility
Clouderized platform convention: all containers run as uid=1000/gid=1000
so data directories (owned by host cldrzd user) are writable without
insecure world-write permissions.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-02-28 18:47:21 +08:00
davidtio
4760fd22c0 Bump to v2.0.0: blue theme upgrade demo
Changes version to 2.0.0 and header color from teal (#0F766E) to blue (#1D4ED8).
Used to demonstrate a zero-data-loss upgrade on Clouderized.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-02-28 17:59:31 +08:00
3 changed files with 124 additions and 162 deletions

View File

@@ -1,8 +1,8 @@
app { app {
name = "DemoCust Tasks" name = "DemoCust Tasks"
version = "1.0.0" version = "2.0.0"
theme { theme {
background = "#0F766E" background = "#1D4ED8"
font = "DM Sans" font = "DM Sans"
fontSize = "16px" fontSize = "16px"
} }

View File

@@ -1,162 +1,10 @@
import com.sun.net.httpserver.{HttpExchange, HttpServer} import com.greenfossil.thorium.{*, given}
import java.net.InetSocketAddress
import java.net.URLDecoder
import java.nio.charset.StandardCharsets
object Main: object Main:
def main(args: Array[String]): Unit = def main(args: Array[String]): Unit =
val port = sys.env.getOrElse("PORT", "8080").toInt val port = sys.env.getOrElse("PORT", "8080").toInt
val server = HttpServer.create(InetSocketAddress(port), 0) Server(port)
.addServices(TaskController)
server.createContext("/health", exchange => { .start()
val response = """{"status":"ok"}"""
exchange.getResponseHeaders.set("Content-Type", "application/json")
exchange.sendResponseHeaders(200, response.getBytes.length)
val os = exchange.getResponseBody
os.write(response.getBytes)
os.close()
})
server.createContext("/tasks", exchange => {
val method = exchange.getRequestMethod
val path = exchange.getRequestURI.getPath
(method, path) match
case ("POST", "/tasks") =>
val body = String(exchange.getRequestBody.readAllBytes(), StandardCharsets.UTF_8)
val title = parseFormField(body, "title")
TaskController.createTask(title)
redirect(exchange, "/")
case ("POST", p) if p.endsWith("/toggle") =>
val id = p.stripPrefix("/tasks/").stripSuffix("/toggle")
TaskController.toggleTask(id)
redirect(exchange, "/")
case ("POST", p) if p.endsWith("/delete") =>
val id = p.stripPrefix("/tasks/").stripSuffix("/delete")
TaskController.deleteTask(id)
redirect(exchange, "/")
case _ =>
exchange.sendResponseHeaders(404, -1)
exchange.close()
})
server.createContext("/", exchange => {
val path = exchange.getRequestURI.getPath
if path == "/" || path.isEmpty then
val html = renderPage()
exchange.getResponseHeaders.set("Content-Type", "text/html; charset=utf-8")
exchange.sendResponseHeaders(200, html.getBytes(StandardCharsets.UTF_8).length)
val os = exchange.getResponseBody
os.write(html.getBytes(StandardCharsets.UTF_8))
os.close()
else
exchange.sendResponseHeaders(404, -1)
exchange.close()
})
server.setExecutor(null)
server.start()
println(s"demoapp started on port $port") println(s"demoapp started on port $port")
println(s" app: ${SiteConfig.appName} v${SiteConfig.appVersion}") println(s" app: ${SiteConfig.appName} v${SiteConfig.appVersion}")
private def redirect(exchange: HttpExchange, location: String): Unit =
exchange.getResponseHeaders.set("Location", location)
exchange.sendResponseHeaders(303, -1)
exchange.close()
private def parseFormField(body: String, field: String): String =
body.split("&").map(_.split("=", 2)).collectFirst {
case Array(k, v) if k == field =>
URLDecoder.decode(v, StandardCharsets.UTF_8)
}.getOrElse("")
private def esc(s: String): String =
s.replace("&", "&amp;").replace("<", "&lt;").replace(">", "&gt;")
.replace("\"", "&quot;").replace("'", "&#39;")
private def renderPage(): String =
val cfg = SiteConfig
val tasks = TaskStore.all()
val totalCount = tasks.size
val doneCount = tasks.count(_.completed)
val taskRows = tasks.map { t =>
val checkedClass = if t.completed then "line-through text-gray-400" else ""
val checkIcon = if t.completed then "&#10003;" else ""
s"""
<div class="flex items-center gap-3 p-3 rounded-lg hover:bg-gray-50 group transition-colors">
<form method="POST" action="/tasks/${t.id}/toggle" class="flex-none">
<button type="submit"
class="w-6 h-6 rounded-full border-2 ${if t.completed then "bg-emerald-500 border-emerald-500 text-white" else "border-gray-300 hover:border-teal-500"} flex items-center justify-center text-xs transition-colors">
$checkIcon
</button>
</form>
<span class="flex-1 $checkedClass">${esc(t.title)}</span>
<form method="POST" action="/tasks/${t.id}/delete" class="flex-none opacity-0 group-hover:opacity-100 transition-opacity">
<button type="submit" class="text-red-400 hover:text-red-600 text-sm px-2 py-1 rounded hover:bg-red-50 transition-colors">
Delete
</button>
</form>
</div>"""
}.mkString("\n")
s"""<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>${esc(cfg.appName)}</title>
<script src="https://cdn.tailwindcss.com"></script>
<link href="https://fonts.googleapis.com/css2?family=Instrument+Serif:ital@0;1&family=DM+Sans:wght@400;500;700&display=swap" rel="stylesheet">
<style>
body { font-family: '${cfg.font}', sans-serif; font-size: ${cfg.fontSize}; }
</style>
</head>
<body class="bg-gray-50 min-h-screen">
<header style="background-color: ${cfg.bgColor};" class="shadow-lg">
<div class="max-w-2xl mx-auto px-6 py-5 flex items-center justify-between">
<h1 class="text-white text-2xl font-bold" style="font-family: 'Instrument Serif', serif;">
${esc(cfg.appName)}
</h1>
<span class="text-white/70 text-sm font-mono">v${esc(cfg.appVersion)}</span>
</div>
</header>
<main class="max-w-2xl mx-auto px-6 py-8">
<div class="bg-white rounded-xl shadow-md p-6 mb-6">
<div class="flex items-center justify-between mb-4">
<h2 class="text-lg font-semibold text-gray-800">Tasks</h2>
<span class="text-sm text-gray-500">$doneCount / $totalCount completed</span>
</div>
<div class="space-y-1">
$taskRows
${if tasks.isEmpty then """<p class="text-gray-400 text-center py-8">No tasks yet. Add one below!</p>""" else ""}
</div>
</div>
<div class="bg-white rounded-xl shadow-md p-6">
<h2 class="text-lg font-semibold text-gray-800 mb-4">Add Task</h2>
<form method="POST" action="/tasks" class="flex gap-3">
<input type="text" name="title" placeholder="What needs to be done?"
required
class="flex-1 border-2 border-gray-200 rounded-lg px-4 py-2 focus:border-teal-600 focus:ring-2 focus:ring-teal-600/10 outline-none transition-colors"
style="border-color: #E2E8F0;">
<button type="submit"
class="px-6 py-2 rounded-lg text-white font-medium hover:-translate-y-0.5 hover:shadow-lg transition-all duration-300"
style="background-color: ${cfg.bgColor};">
Add
</button>
</form>
</div>
<footer class="text-center text-gray-400 text-xs mt-8">
Powered by <span class="font-semibold">Clouderized</span> &middot; Thorium/Scala
</footer>
</main>
</body>
</html>"""

View File

@@ -1,14 +1,128 @@
import com.greenfossil.thorium.{*, given}
import com.greenfossil.data.mapping.Mapping
import com.greenfossil.data.mapping.Mapping.*
import com.linecorp.armeria.common.MediaType
import com.linecorp.armeria.server.annotation.{Get, Post, Param}
import java.util.UUID import java.util.UUID
object TaskController: object TaskController:
def createTask(title: String): Unit = private val titleField = Mapping("title", text)
if title.trim.nonEmpty then TaskStore.add(title)
def toggleTask(id: String): Unit = @Get("/health")
def health = Action: _ =>
Ok("""{"status":"ok"}""").as(MediaType.JSON)
@Get("/")
def index = Action: _ =>
Ok(renderPage()).as(MediaType.HTML_UTF_8)
@Post("/tasks")
def create = Action: request =>
val bound = titleField.bindFromRequest()(using request)
if bound.hasErrors then Redirect("/")
else
val title = bound.typedValueOpt.get
if title.trim.nonEmpty then TaskStore.add(title)
Redirect("/")
@Post("/tasks/:id/toggle")
def toggle(@Param id: String) = Action: _ =>
try TaskStore.toggle(UUID.fromString(id)) try TaskStore.toggle(UUID.fromString(id))
catch case _: IllegalArgumentException => () catch case _: IllegalArgumentException => ()
Redirect("/")
def deleteTask(id: String): Unit = @Post("/tasks/:id/delete")
def delete(@Param id: String) = Action: _ =>
try TaskStore.delete(UUID.fromString(id)) try TaskStore.delete(UUID.fromString(id))
catch case _: IllegalArgumentException => () catch case _: IllegalArgumentException => ()
Redirect("/")
// ── rendering helpers (moved from Main) ──────────────────────────────────
private def esc(s: String): String =
s.replace("&", "&amp;").replace("<", "&lt;").replace(">", "&gt;")
.replace("\"", "&quot;").replace("'", "&#39;")
private def renderPage(): String =
val cfg = SiteConfig
val tasks = TaskStore.all()
val totalCount = tasks.size
val doneCount = tasks.count(_.completed)
val taskRows = tasks.map { t =>
val checkedClass = if t.completed then "line-through text-gray-400" else ""
val checkIcon = if t.completed then "&#10003;" else ""
s"""
<div class="flex items-center gap-3 p-3 rounded-lg hover:bg-gray-50 group transition-colors">
<form method="POST" action="/tasks/${t.id}/toggle" class="flex-none">
<button type="submit"
class="w-6 h-6 rounded-full border-2 ${if t.completed then "bg-emerald-500 border-emerald-500 text-white" else "border-gray-300 hover:border-teal-500"} flex items-center justify-center text-xs transition-colors">
$checkIcon
</button>
</form>
<span class="flex-1 $checkedClass">${esc(t.title)}</span>
<form method="POST" action="/tasks/${t.id}/delete" class="flex-none opacity-0 group-hover:opacity-100 transition-opacity">
<button type="submit" class="text-red-400 hover:text-red-600 text-sm px-2 py-1 rounded hover:bg-red-50 transition-colors">
Delete
</button>
</form>
</div>"""
}.mkString("\n")
s"""<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>${esc(cfg.appName)}</title>
<script src="https://cdn.tailwindcss.com"></script>
<link href="https://fonts.googleapis.com/css2?family=Instrument+Serif:ital@0;1&family=DM+Sans:wght@400;500;700&display=swap" rel="stylesheet">
<style>
body { font-family: '${cfg.font}', sans-serif; font-size: ${cfg.fontSize}; }
</style>
</head>
<body class="bg-gray-50 min-h-screen">
<header style="background-color: ${cfg.bgColor};" class="shadow-lg">
<div class="max-w-2xl mx-auto px-6 py-5 flex items-center justify-between">
<h1 class="text-white text-2xl font-bold" style="font-family: 'Instrument Serif', serif;">
${esc(cfg.appName)}
</h1>
<span class="text-white/70 text-sm font-mono">v${esc(cfg.appVersion)}</span>
</div>
</header>
<main class="max-w-2xl mx-auto px-6 py-8">
<div class="bg-white rounded-xl shadow-md p-6 mb-6">
<div class="flex items-center justify-between mb-4">
<h2 class="text-lg font-semibold text-gray-800">Tasks</h2>
<span class="text-sm text-gray-500">$doneCount / $totalCount completed</span>
</div>
<div class="space-y-1">
$taskRows
${if tasks.isEmpty then """<p class="text-gray-400 text-center py-8">No tasks yet. Add one below!</p>""" else ""}
</div>
</div>
<div class="bg-white rounded-xl shadow-md p-6">
<h2 class="text-lg font-semibold text-gray-800 mb-4">Add Task</h2>
<form method="POST" action="/tasks" class="flex gap-3">
<input type="text" name="title" placeholder="What needs to be done?"
required
class="flex-1 border-2 border-gray-200 rounded-lg px-4 py-2 focus:border-teal-600 focus:ring-2 focus:ring-teal-600/10 outline-none transition-colors"
style="border-color: #E2E8F0;">
<button type="submit"
class="px-6 py-2 rounded-lg text-white font-medium hover:-translate-y-0.5 hover:shadow-lg transition-all duration-300"
style="background-color: ${cfg.bgColor};">
Add
</button>
</form>
</div>
<footer class="text-center text-gray-400 text-xs mt-8">
Powered by <span class="font-semibold">Clouderized</span> &middot; Thorium/Scala
</footer>
</main>
</body>
</html>"""