Skip to content

Commit a71cd79

Browse files
authored
Merge pull request #20 from spikeninja/dev
feat: version 1.4.0
2 parents 0bf8379 + e875f16 commit a71cd79

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

80 files changed

+6303
-6243
lines changed

.prettierrc.cjs

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
/**
2+
* @see https://prettier.io/docs/configuration
3+
* @type {import("prettier").Config}
4+
*/
5+
const config = {
6+
trailingComma: 'none',
7+
tabWidth: 2,
8+
semi: false,
9+
singleQuote: true,
10+
singleAttributePerLine: true
11+
}
12+
13+
module.exports = config

README.md

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -31,21 +31,22 @@ TASKIQ_ADMIN_API_TOKEN = "..." # or os.getenv() to use .env vars
3131

3232

3333
class TaskiqAdminMiddleware(TaskiqMiddleware):
34+
def __init__(self, taskiq_broker_name: str | None = None):
35+
super().__init__()
36+
self.__ta_broker_name = taskiq_broker_name
37+
3438
async def pre_execute(self, message: TaskiqMessage):
3539
""""""
36-
3740
async with httpx.AsyncClient() as client:
3841
await client.post(
3942
headers={"access-token": TASKIQ_ADMIN_API_TOKEN},
40-
url=urljoin(TASKIQ_ADMIN_URL, "/api/tasks/{message.task_id}/started"),
43+
url=urljoin(TASKIQ_ADMIN_URL, f"/api/tasks/{message.task_id}/started"),
4144
json={
42-
"worker": "WIP",
4345
"args": message.args,
4446
"kwargs": message.kwargs,
4547
"taskName": message.task_name,
46-
"startedAt": datetime.now(UTC)
47-
.replace(tzinfo=None)
48-
.isoformat(),
48+
"worker": self.__ta_broker_name,
49+
"startedAt": datetime.now(UTC).replace(tzinfo=None).isoformat(),
4950
},
5051
)
5152

@@ -57,21 +58,17 @@ class TaskiqAdminMiddleware(TaskiqMiddleware):
5758
result: TaskiqResult[Any],
5859
):
5960
""""""
60-
6161
async with httpx.AsyncClient() as client:
6262
await client.post(
6363
headers={"access-token": TASKIQ_ADMIN_API_TOKEN},
64-
url=urljoin(TASKIQ_ADMIN_URL, "/api/tasks/{message.task_id}/executed"),
64+
url=urljoin(TASKIQ_ADMIN_URL, f"/api/tasks/{message.task_id}/executed"),
6565
json={
6666
"error": result.error
6767
if result.error is None
6868
else repr(result.error),
69-
"result": result.return_value,
70-
"returnValue": result.return_value,
7169
"executionTime": result.execution_time,
72-
"finishedAt": datetime.now(UTC)
73-
.replace(tzinfo=None)
74-
.isoformat(),
70+
"returnValue": {"return_value": result.return_value},
71+
"finishedAt": datetime.now(UTC).replace(tzinfo=None).isoformat(),
7572
},
7673
)
7774

components.json

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
{
2+
"$schema": "https://shadcn-vue.com/schema.json",
3+
"style": "new-york",
4+
"typescript": true,
5+
"tailwind": {
6+
"config": "",
7+
"css": "src/assets/css/main.css",
8+
"baseColor": "neutral",
9+
"cssVariables": true,
10+
"prefix": ""
11+
},
12+
"aliases": {
13+
"components": "@/components",
14+
"composables": "@/composables",
15+
"utils": "@/lib/utils",
16+
"ui": "@/components/ui",
17+
"lib": "@/lib"
18+
},
19+
"iconLibrary": "lucide"
20+
}

docker/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ARG NODE_VERSION=22.12.0
1+
ARG NODE_VERSION=22.14.0
22

33
FROM node:${NODE_VERSION}-slim AS build
44

@@ -12,7 +12,7 @@ WORKDIR /app
1212
# install dependencies
1313
COPY ./package.json /app/
1414
COPY ./pnpm-lock.yaml /app/
15-
RUN pnpm install --shamefully-hoist
15+
RUN pnpm install --frozen-lockfile
1616

1717
# copy other files
1818
COPY . ./

docs/images/preview1.png

16.3 KB
Loading

docs/images/preview2.png

9.64 KB
Loading

env-example

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
DB_FILE_PATH=database/database.db
2+
BACKUP_FILE_PATH=database/backup.db

nuxt.config.ts

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,16 @@
1+
import tailwindcss from "@tailwindcss/vite"
2+
13
export default defineNuxtConfig({
24
compatibilityDate: "2024-11-01",
35
devtools: { enabled: true },
6+
css: ["~/assets/css/main.css"],
47
srcDir: "src/",
5-
modules: ["@nuxtjs/tailwindcss"],
8+
imports: {
9+
scan: false,
10+
},
11+
vite: {
12+
plugins: [tailwindcss()],
13+
},
614
typescript: {
715
strict: true,
816
},

package.json

Lines changed: 23 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,32 +2,46 @@
22
"name": "nuxt-app",
33
"private": true,
44
"type": "module",
5-
"version": "1.3.0",
5+
"version": "1.4.0",
66
"scripts": {
77
"build": "nuxt build",
88
"dev": "nuxt dev",
99
"generate": "nuxt generate",
1010
"preview": "nuxt preview",
1111
"postinstall": "nuxt prepare",
1212
"db:push": "drizzle-kit push",
13-
"generate:sql": "drizzle-kit export --sql | sed 's/CREATE TABLE/CREATE TABLE IF NOT EXISTS/g; s/CREATE INDEX/CREATE INDEX IF NOT EXISTS/g' > dbschema.sql"
13+
"generate:sql": "drizzle-kit export --sql | sed 's/CREATE TABLE/CREATE TABLE IF NOT EXISTS/g; s/CREATE INDEX/CREATE INDEX IF NOT EXISTS/g' > dbschema.sql",
14+
"generate:future:sql": "drizzle-kit export --sql | sed 's/CREATE TABLE/CREATE TABLE IF NOT EXISTS/g; s/CREATE INDEX/CREATE INDEX IF NOT EXISTS/g' > dbschema.sql; sed -i '1s/^/PRAGMA journal_mode = WAL; PRAGMA synchronous = normal; PRAGMA journal_size_limit = 6144000;\\n/' dbschema.sql"
1415
},
1516
"dependencies": {
16-
"@vueuse/core": "^12.0.0",
17-
"better-sqlite3": "^11.8.1",
17+
"@tailwindcss/vite": "^4.1.3",
18+
"@tanstack/vue-table": "^8.21.2",
19+
"@vueuse/core": "^12.8.2",
20+
"better-sqlite3": "^11.9.1",
1821
"bootstrap": "^5.3.3",
22+
"class-variance-authority": "^0.7.1",
23+
"clsx": "^2.1.1",
1924
"dayjs": "^1.11.13",
2025
"dotenv": "^16.4.7",
21-
"drizzle-orm": "^0.38.4",
22-
"nuxt": "^3.15.2",
26+
"drizzle-orm": "^0.41.0",
27+
"lucide-vue-next": "^0.487.0",
28+
"nuxt": "^3.16.2",
29+
"reka-ui": "^2.2.0",
30+
"tailwind-merge": "^3.2.0",
31+
"tailwindcss": "^4.1.3",
32+
"tw-animate-css": "^1.2.5",
2333
"vue": "^3.5.13",
2434
"vue-router": "^4.5.0",
25-
"zod": "^3.24.1"
35+
"vue-sonner": "^1.3.0",
36+
"zod": "^3.24.2"
2637
},
2738
"packageManager": "pnpm@8.7.6+sha1.a428b12202bc4f23b17e6dffe730734dae5728e2",
2839
"devDependencies": {
29-
"@nuxtjs/tailwindcss": "^6.12.2",
40+
"@iconify-json/radix-icons": "^1.2.2",
41+
"@iconify/vue": "^4.3.0",
3042
"@types/better-sqlite3": "^7.6.12",
31-
"drizzle-kit": "^0.30.2"
43+
"drizzle-kit": "^0.30.6",
44+
"prettier": "^3.5.3",
45+
"typescript": "^5.8.3"
3246
}
3347
}

0 commit comments

Comments
 (0)