diff --git a/.justfile b/.justfile index a2937eb..93db81c 100644 --- a/.justfile +++ b/.justfile @@ -10,7 +10,7 @@ docker-compose +ARGS: start-dev-services: (docker-compose "up --remove-orphans") dev: - watchexec --restart --clear --watch src --watch dist cargo run + watchexec --no-vcs-ignore --clear --restart --watch=dist --watch=src cargo run migrate: (docker-compose "run dbmate migrate") diff --git a/bun.lock b/bun.lock index 7c67db7..f84270c 100644 --- a/bun.lock +++ b/bun.lock @@ -4,6 +4,7 @@ "": { "name": "compendium", "dependencies": { + "@mini-strap/components": "^0.1.0", "@mini-strap/core": "^0.1.2", "htmx.org": "2.0.4", }, @@ -22,6 +23,8 @@ "@alecodes/bun-static-builder": ["@alecodes/bun-static-builder@0.1.0", "https://git.alecodes.page/api/packages/alecodes/npm/%40alecodes%2Fbun-static-builder/-/0.1.0/bun-static-builder-0.1.0.tgz", { "dependencies": { "sass": "^1.85.0", "slug": "^10.0.0" }, "peerDependencies": { "typescript": "^5.0.0" }, "bin": { "@alecodes/bun-static-builder": "src/cli.ts" } }, "sha512-1droOGfCr25rnVZCr7WhrECrk/03Y7gAGzhj0hr3h9ECMwIELT8B0nrL/K7j8IxmqfkOvA50l4uxRzgXHpOjGQ=="], + "@mini-strap/components": ["@mini-strap/components@0.1.0", "https://git.alecodes.page/api/packages/alecodes/npm/%40mini-strap%2Fcomponents/-/0.1.0/components-0.1.0.tgz", { "peerDependencies": { "typescript": "^5.0.0" } }, "sha512-0FQxVSnk+YcFZpw7ldKncjVxtWWtMMUD9akNy4c1T4M3hgKf1s4ymo0lsTSMmM4o811VeSYfEWKXFXJWH9nU2A=="], + "@mini-strap/core": ["@mini-strap/core@0.1.2", "https://git.alecodes.page/api/packages/alecodes/npm/%40mini-strap%2Fcore/-/0.1.2/core-0.1.2.tgz", { "peerDependencies": { "typescript": "^5.0.0" }, "bin": { "@mini-strap/core": "build.ts" } }, "sha512-bt9su5jpslUMYmoNLz7s8P6RlN7Knriy8BtHBfVnpEizOh3DroStRr+yDCSLfhyByKXo6sa9ZNytc25ianEtbA=="], "@parcel/watcher": ["@parcel/watcher@2.5.1", "", { "dependencies": { "detect-libc": "^1.0.3", "is-glob": "^4.0.3", "micromatch": "^4.0.5", "node-addon-api": "^7.0.0" }, "optionalDependencies": { "@parcel/watcher-android-arm64": "2.5.1", "@parcel/watcher-darwin-arm64": "2.5.1", "@parcel/watcher-darwin-x64": "2.5.1", "@parcel/watcher-freebsd-x64": "2.5.1", "@parcel/watcher-linux-arm-glibc": "2.5.1", "@parcel/watcher-linux-arm-musl": "2.5.1", "@parcel/watcher-linux-arm64-glibc": "2.5.1", "@parcel/watcher-linux-arm64-musl": "2.5.1", "@parcel/watcher-linux-x64-glibc": "2.5.1", "@parcel/watcher-linux-x64-musl": "2.5.1", "@parcel/watcher-win32-arm64": "2.5.1", "@parcel/watcher-win32-ia32": "2.5.1", "@parcel/watcher-win32-x64": "2.5.1" } }, "sha512-dfUnCxiN9H4ap84DvD2ubjw+3vUNpstxa0TneY/Paat8a3R4uQZDLSvWjmznAY/DoahqTHl9V46HF/Zs3F29pg=="], diff --git a/frontend/css/style.css b/frontend/css/style.css deleted file mode 100644 index 818d406..0000000 --- a/frontend/css/style.css +++ /dev/null @@ -1,3 +0,0 @@ -h1 { - color: red; -} diff --git a/frontend/css/style.scss b/frontend/css/style.scss new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/frontend/css/style.scss @@ -0,0 +1 @@ + diff --git a/frontend/templates/base.html b/frontend/templates/base.html index d5b63a4..35a7d1b 100644 --- a/frontend/templates/base.html +++ b/frontend/templates/base.html @@ -4,16 +4,23 @@ - + + + + + {% block title %}Axum web service!{% endblock %} - {% include "partials/header.html" %} -
+
+ {% include "partials/header.html" %} +
+
diff --git a/frontend/templates/index.html b/frontend/templates/index.html index c7591f0..9137d3f 100644 --- a/frontend/templates/index.html +++ b/frontend/templates/index.html @@ -6,6 +6,7 @@ +

Axum example! 1

{% block htmx %} diff --git a/frontend/templates/partials/header.html b/frontend/templates/partials/header.html index 5b73f47..e69de29 100644 --- a/frontend/templates/partials/header.html +++ b/frontend/templates/partials/header.html @@ -1,34 +0,0 @@ - diff --git a/package.json b/package.json index 103eb10..0f6da9d 100644 --- a/package.json +++ b/package.json @@ -11,6 +11,7 @@ }, "type": "module", "dependencies": { + "@mini-strap/components": "^0.1.0", "@mini-strap/core": "^0.1.2", "htmx.org": "2.0.4" }