Skip to content

Commit 11f285e

Browse files
committed
posts dialog rework (wip)
1 parent 7334ee7 commit 11f285e

69 files changed

Lines changed: 4838 additions & 1699 deletions

Some content is hidden

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

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,3 +48,6 @@ yarn-error.log*
4848

4949
# drizzle
5050
volumes/atlas/ddl.sql
51+
52+
# s3 buckets/objects
53+
volumes/s3/buckets

.vscode/settings.json

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
11
{
2-
"typescript.tsdk": "node_modules/typescript/lib"
3-
}
2+
"typescript.tsdk": "node_modules/typescript/lib",
3+
"files.associations": {
4+
"*.css": "tailwindcss",
5+
"*.scss": "tailwindcss",
6+
},
7+
}

docker-compose.yml

Lines changed: 19 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,30 @@
11
services:
22
s3:
3-
image: localstack/localstack:s3-latest
3+
image: localstack/localstack:4.14
44
ports:
55
- "${S3_PORT:-4566}:4566"
66
environment:
77
AWS_REGION: ${S3_REGION:-us-east-1}
88
AWS_ACCESS_KEY_ID: ${S3_ACCESS_KEY_ID:-test}
99
AWS_SECRET_ACCESS_KEY: ${S3_SECRET_ACCESS_KEY:-test}
10-
restart: on-failure:3
11-
12-
aws:
13-
image: amazon/aws-cli
14-
environment:
15-
AWS_REGION: ${S3_REGION:-us-east-1}
16-
AWS_ACCESS_KEY_ID: ${S3_ACCESS_KEY_ID:-test}
17-
AWS_SECRET_ACCESS_KEY: ${S3_SECRET_ACCESS_KEY:-test}
18-
AWS_ENDPOINT_URL_S3: http://s3:4566
1910
S3_BUCKET_NAME: ${S3_BUCKET_NAME:-devdogs}
2011
volumes:
21-
- ./volumes/aws/:/scripts:ro
22-
depends_on:
23-
s3:
24-
condition: service_healthy
12+
- ./volumes/s3/init:/etc/localstack/init/ready.d:ro
13+
healthcheck:
14+
test:
15+
[
16+
"CMD",
17+
"awslocal",
18+
"s3api",
19+
"wait",
20+
"bucket-exists",
21+
"--bucket",
22+
"${S3_BUCKET_NAME:-devdogs}",
23+
]
24+
interval: 5s
25+
timeout: 5s
26+
retries: 5
27+
restart: on-failure:3
2528

2629
mysql:
2730
image: mysql:8.0
@@ -32,7 +35,7 @@ services:
3235
MYSQL_DATABASE: ${MYSQL_DATABASE:-devdogs}
3336
healthcheck:
3437
test: ["CMD", "mysqladmin", "ping", "-h", "localhost"]
35-
interval: 10s
38+
interval: 5s
3639
timeout: 5s
3740
retries: 5
3841
restart: on-failure:3
@@ -44,7 +47,7 @@ services:
4447
MYSQL_DATABASE: dev
4548
healthcheck:
4649
test: ["CMD", "mysqladmin", "ping", "-h", "localhost"]
47-
interval: 10s
50+
interval: 5s
4851
timeout: 5s
4952
retries: 5
5053
restart: on-failure:3

package.json

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,15 @@
77
"aws": "docker compose run --rm aws",
88
"build": "next build",
99
"check": "pnpm typecheck && pnpm lint:fix && pnpm prettier:fix",
10-
"db:generate": "pnpm drizzle-kit export > volumes/atlas/ddl.sql",
10+
"db:generate": "dotenv -- tsx node_modules/drizzle-kit/bin.cjs --config drizzle.config.ts export > volumes/atlas/ddl.sql",
1111
"db:migrate": "docker compose run --rm atlas schema apply --config file://migrations/atlas.hcl --env local",
12-
"db:push": "pnpm db:generate && pnpm db:migrate",
13-
"db:studio": "drizzle-kit studio",
14-
"s3:init": "docker compose run --rm --entrypoint=/bin/sh aws /scripts/init.sh",
12+
"db:push": "pnpm db:generate && pnpm db:migrate && dotenv -- tsx addTagsToDatabase.ts",
1513
"docker:build": "docker compose create --pull=always",
1614
"docker:ready": "docker compose up mysql mysql-dev s3 --build --wait",
1715
"docker:reset": "docker compose down -v --remove-orphans",
18-
"dev": "pnpm docker:ready && pnpm s3:init && pnpm db:push && turbo run Next.js Drizzle-Studio",
16+
"dev": "pnpm docker:ready && pnpm db:push && turbo run Next.js Drizzle-Studio",
1917
"Next.js": "next dev --turbo",
20-
"Drizzle-Studio": "drizzle-kit studio",
18+
"Drizzle-Studio": "dotenv -- tsx node_modules/drizzle-kit/bin.cjs --config drizzle.config.ts studio",
2119
"format:check": "prettier --check \\\"**/*.{ts,tsx,js,jsx,mdx}\\\" --cache",
2220
"format:write": "prettier --write \\\"**/*.{ts,tsx,js,jsx,mdx}\\\" --cache",
2321
"lint": "eslint src",
@@ -38,27 +36,33 @@
3836
"@fullcalendar/daygrid": "^6.1.19",
3937
"@fullcalendar/react": "^6.1.19",
4038
"@fullcalendar/timegrid": "^6.1.19",
41-
"@headlessui/react": "^2.2.9",
4239
"@paralleldrive/cuid2": "^3.3.0",
4340
"@radix-ui/react-avatar": "^1.1.10",
41+
"@radix-ui/react-collapsible": "^1.1.12",
4442
"@radix-ui/react-dialog": "^1.1.15",
4543
"@radix-ui/react-dropdown-menu": "^2.1.16",
44+
"@radix-ui/react-popover": "^1.1.15",
45+
"@radix-ui/react-select": "^2.2.6",
46+
"@radix-ui/react-tabs": "^1.1.13",
4647
"@radix-ui/react-toggle-group": "^1.1.11",
4748
"@t3-oss/env-nextjs": "^0.13.10",
4849
"@tailwindcss/typography": "^0.5.19",
4950
"@tippyjs/react": "^4.2.6",
5051
"date-fns": "^4.1.0",
51-
"drizzle-orm": "1.0.0-beta.11-05230d9",
52+
"drizzle-orm": "1.0.0-beta.17-67b1795",
5253
"mysql2": "^3.15.3",
5354
"next": "^16.1.6",
5455
"quill-delta": "^5.1.0",
5556
"quill-delta-to-html": "^0.12.1",
5657
"react": "^19.2.4",
58+
"react-day-picker": "^9.13.2",
5759
"react-dom": "^19.2.4",
5860
"react-icons": "^5.5.0",
5961
"react-quill-new": "^3.6.0",
62+
"rrule": "^2.8.1",
6063
"tippy.js": "^6.3.7",
6164
"ts-ics": "^2.4.0",
65+
"whatwg-mimetype": "^5.0.0",
6266
"zod": "4.1.8",
6367
"zod-form-data": "^3.0.1"
6468
},
@@ -68,7 +72,8 @@
6872
"@types/node": "^25.2.0",
6973
"@types/react": "^19.2.10",
7074
"@types/react-dom": "^19.2.2",
71-
"drizzle-kit": "1.0.0-beta.11-05230d9",
75+
"@types/whatwg-mimetype": "^5.0.0",
76+
"drizzle-kit": "1.0.0-beta.17-67b1795",
7277
"eslint": "^9.38.0",
7378
"eslint-config-next": "^15.5.11",
7479
"eslint-plugin-drizzle": "^0.2.3",

0 commit comments

Comments
 (0)