diff --git a/.gitignore b/.gitignore
index 8682019..7ca2482 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
.idea/
.data/
+dist/
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..052f425
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,13 @@
+.PHONY: build dev
+
+all:
+ @echo Nothing
+ cd web && yarn
+
+build:
+ cd web && yarn build
+ mkdir -p dist && go build -o dist/daisy ./cmd/daisy
+
+dev:
+ cd web && yarn build
+ go run -tags nullauth ./cmd/daisy serve -conf .data/config.json
diff --git a/server.go b/server.go
index b3b18c1..eae957f 100644
--- a/server.go
+++ b/server.go
@@ -1,15 +1,21 @@
package daisy
import (
+ "embed"
"git.sr.ht/~sircmpwn/tokidoki/storage"
"github.com/1f349/cardcaldav"
"github.com/emersion/go-webdav"
"github.com/emersion/go-webdav/carddav"
"net/http"
+ "path"
"path/filepath"
+ "strings"
"time"
)
+//go:embed web/dist
+var webEmbedded embed.FS
+
type Conf struct {
Listen string `json:"listen"`
DB string `json:"db"`
@@ -28,12 +34,12 @@ func (d *daisyHandler) ServeHTTP(rw http.ResponseWriter, req *http.Request) {
}
var homeSets []webdav.BackendSuppliedHomeSet
- path, err := d.backend.AddressBookHomeSetPath(req.Context())
+ homeSetPath, err := d.backend.AddressBookHomeSetPath(req.Context())
if err != nil {
http.Error(rw, http.StatusText(http.StatusBadRequest), http.StatusBadRequest)
return
}
- homeSets = append(homeSets, carddav.NewAddressBookHomeSet(path))
+ homeSets = append(homeSets, carddav.NewAddressBookHomeSet(homeSetPath))
if req.URL.Path == principlePath {
opts := webdav.ServePrincipalOptions{
@@ -48,7 +54,16 @@ func (d *daisyHandler) ServeHTTP(rw http.ResponseWriter, req *http.Request) {
}
if req.URL.Path == "/" {
- http.Error(rw, "Daisy API Endpoint", http.StatusOK)
+ http.ServeFileFS(rw, req, webEmbedded, "web/dist/index.html")
+ return
+ }
+
+ if after, found := strings.CutPrefix(req.URL.Path, "/assets/"); found {
+ if strings.Contains(after, "..") {
+ http.Error(rw, "400 Bad Request", http.StatusBadRequest)
+ return
+ }
+ http.ServeFileFS(rw, req, webEmbedded, path.Join("web/dist/assets", after))
return
}
diff --git a/web/.gitignore b/web/.gitignore
new file mode 100644
index 0000000..a547bf3
--- /dev/null
+++ b/web/.gitignore
@@ -0,0 +1,24 @@
+# Logs
+logs
+*.log
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+pnpm-debug.log*
+lerna-debug.log*
+
+node_modules
+dist
+dist-ssr
+*.local
+
+# Editor directories and files
+.vscode/*
+!.vscode/extensions.json
+.idea
+.DS_Store
+*.suo
+*.ntvs*
+*.njsproj
+*.sln
+*.sw?
diff --git a/web/.vscode/extensions.json b/web/.vscode/extensions.json
new file mode 100644
index 0000000..bdef820
--- /dev/null
+++ b/web/.vscode/extensions.json
@@ -0,0 +1,3 @@
+{
+ "recommendations": ["svelte.svelte-vscode"]
+}
diff --git a/web/README.md b/web/README.md
new file mode 100644
index 0000000..e6cd94f
--- /dev/null
+++ b/web/README.md
@@ -0,0 +1,47 @@
+# Svelte + TS + Vite
+
+This template should help get you started developing with Svelte and TypeScript in Vite.
+
+## Recommended IDE Setup
+
+[VS Code](https://code.visualstudio.com/) + [Svelte](https://marketplace.visualstudio.com/items?itemName=svelte.svelte-vscode).
+
+## Need an official Svelte framework?
+
+Check out [SvelteKit](https://github.com/sveltejs/kit#readme), which is also powered by Vite. Deploy anywhere with its serverless-first approach and adapt to various platforms, with out of the box support for TypeScript, SCSS, and Less, and easily-added support for mdsvex, GraphQL, PostCSS, Tailwind CSS, and more.
+
+## Technical considerations
+
+**Why use this over SvelteKit?**
+
+- It brings its own routing solution which might not be preferable for some users.
+- It is first and foremost a framework that just happens to use Vite under the hood, not a Vite app.
+
+This template contains as little as possible to get started with Vite + TypeScript + Svelte, while taking into account the developer experience with regards to HMR and intellisense. It demonstrates capabilities on par with the other `create-vite` templates and is a good starting point for beginners dipping their toes into a Vite + Svelte project.
+
+Should you later need the extended capabilities and extensibility provided by SvelteKit, the template has been structured similarly to SvelteKit so that it is easy to migrate.
+
+**Why `global.d.ts` instead of `compilerOptions.types` inside `jsconfig.json` or `tsconfig.json`?**
+
+Setting `compilerOptions.types` shuts out all other types not explicitly listed in the configuration. Using triple-slash references keeps the default TypeScript setting of accepting type information from the entire workspace, while also adding `svelte` and `vite/client` type information.
+
+**Why include `.vscode/extensions.json`?**
+
+Other templates indirectly recommend extensions via the README, but this file allows VS Code to prompt the user to install the recommended extension upon opening the project.
+
+**Why enable `allowJs` in the TS template?**
+
+While `allowJs: false` would indeed prevent the use of `.js` files in the project, it does not prevent the use of JavaScript syntax in `.svelte` files. In addition, it would force `checkJs: false`, bringing the worst of both worlds: not being able to guarantee the entire codebase is TypeScript, and also having worse typechecking for the existing JavaScript. In addition, there are valid use cases in which a mixed codebase may be relevant.
+
+**Why is HMR not preserving my local component state?**
+
+HMR state preservation comes with a number of gotchas! It has been disabled by default in both `svelte-hmr` and `@sveltejs/vite-plugin-svelte` due to its often surprising behavior. You can read the details [here](https://github.com/rixo/svelte-hmr#svelte-hmr).
+
+If you have state that's important to retain within a component, consider creating an external store which would not be replaced by HMR.
+
+```ts
+// store.ts
+// An extremely simple external store
+import { writable } from 'svelte/store'
+export default writable(0)
+```
diff --git a/web/index.html b/web/index.html
new file mode 100644
index 0000000..b6c5f0a
--- /dev/null
+++ b/web/index.html
@@ -0,0 +1,13 @@
+
+
+
+ Vite + Svelte + TS
+
+
+
+
+
+
diff --git a/web/package.json b/web/package.json
new file mode 100644
index 0000000..55cec4e
--- /dev/null
+++ b/web/package.json
@@ -0,0 +1,21 @@
+{
+ "name": "daisy",
+ "private": true,
+ "version": "0.0.0",
+ "type": "module",
+ "scripts": {
+ "dev": "vite",
+ "build": "vite build",
+ "preview": "vite preview",
+ "check": "svelte-check --tsconfig ./tsconfig.json && tsc -p tsconfig.node.json"
+ },
+ "devDependencies": {
+ "@sveltejs/vite-plugin-svelte": "^3.1.1",
+ "@tsconfig/svelte": "^5.0.4",
+ "svelte": "^4.2.18",
+ "svelte-check": "^3.8.5",
+ "tslib": "^2.6.3",
+ "typescript": "^5.5.3",
+ "vite": "^5.4.1"
+ }
+}
diff --git a/web/public/vite.svg b/web/public/vite.svg
new file mode 100644
index 0000000..e7b8dfb
--- /dev/null
+++ b/web/public/vite.svg
@@ -0,0 +1 @@
+
+
+ Vite + Svelte
+
+
+
+
+
+ Check out SvelteKit , the official Svelte app framework powered by Vite!
+
+
+
+ Click on the Vite and Svelte logos to learn more
+
+
+
+
diff --git a/web/src/app.css b/web/src/app.css
new file mode 100644
index 0000000..617f5e9
--- /dev/null
+++ b/web/src/app.css
@@ -0,0 +1,79 @@
+:root {
+ font-family: Inter, system-ui, Avenir, Helvetica, Arial, sans-serif;
+ line-height: 1.5;
+ font-weight: 400;
+
+ color-scheme: light dark;
+ color: rgba(255, 255, 255, 0.87);
+ background-color: #242424;
+
+ font-synthesis: none;
+ text-rendering: optimizeLegibility;
+ -webkit-font-smoothing: antialiased;
+ -moz-osx-font-smoothing: grayscale;
+}
+
+a {
+ font-weight: 500;
+ color: #646cff;
+ text-decoration: inherit;
+}
+a:hover {
+ color: #535bf2;
+}
+
+body {
+ margin: 0;
+ display: flex;
+ place-items: center;
+ min-width: 320px;
+ min-height: 100vh;
+}
+
+h1 {
+ font-size: 3.2em;
+ line-height: 1.1;
+}
+
+.card {
+ padding: 2em;
+}
+
+#app {
+ max-width: 1280px;
+ margin: 0 auto;
+ padding: 2rem;
+ text-align: center;
+}
+
+button {
+ border-radius: 8px;
+ border: 1px solid transparent;
+ padding: 0.6em 1.2em;
+ font-size: 1em;
+ font-weight: 500;
+ font-family: inherit;
+ background-color: #1a1a1a;
+ cursor: pointer;
+ transition: border-color 0.25s;
+}
+button:hover {
+ border-color: #646cff;
+}
+button:focus,
+button:focus-visible {
+ outline: 4px auto -webkit-focus-ring-color;
+}
+
+@media (prefers-color-scheme: light) {
+ :root {
+ color: #213547;
+ background-color: #ffffff;
+ }
+ a:hover {
+ color: #747bff;
+ }
+ button {
+ background-color: #f9f9f9;
+ }
+}
diff --git a/web/src/assets/svelte.svg b/web/src/assets/svelte.svg
new file mode 100644
index 0000000..c5e0848
--- /dev/null
+++ b/web/src/assets/svelte.svg
@@ -0,0 +1 @@
+
+ count is {count}
+
diff --git a/web/src/main.ts b/web/src/main.ts
new file mode 100644
index 0000000..4d67e2a
--- /dev/null
+++ b/web/src/main.ts
@@ -0,0 +1,8 @@
+import './app.css'
+import App from './App.svelte'
+
+const app = new App({
+ target: document.getElementById('app')!,
+})
+
+export default app
diff --git a/web/src/vite-env.d.ts b/web/src/vite-env.d.ts
new file mode 100644
index 0000000..4078e74
--- /dev/null
+++ b/web/src/vite-env.d.ts
@@ -0,0 +1,2 @@
+///