Merge pull request #12 from brklntmhwk/dev

chore(docker): 🤖 remove the volume for the whole project

.dockerignore

@@ -1,8 +1,7 @@
-node_modules/
-Dockerfile*
-docker-compose*
-.dockerignore
 dist/
-.git/
-.gitignore
-README.md
+node_modules/
+# Dockerfile*
+# docker-compose*
+# .dockerignore
+# .git/
+# .gitignore

.gitignore

@@ -19,3 +19,6 @@ node_modules/
 
 # Wrangler
 .wrangler/
+
+# VSCode
+.vscode/

.husky/_/pre-commit

@@ -0,0 +1,60 @@
+#!/bin/sh
+
+if [ "$LEFTHOOK_VERBOSE" = "1" -o "$LEFTHOOK_VERBOSE" = "true" ]; then
+  set -x
+fi
+
+if [ "$LEFTHOOK" = "0" ]; then
+  exit 0
+fi
+
+call_lefthook()
+{
+  if test -n "$LEFTHOOK_BIN"
+  then
+    "$LEFTHOOK_BIN" "$@"
+  elif lefthook -h >/dev/null 2>&1
+  then
+    lefthook "$@"
+  else
+    dir="$(git rev-parse --show-toplevel)"
+    osArch=$(uname | tr '[:upper:]' '[:lower:]')
+    cpuArch=$(uname -m | sed 's/aarch64/arm64/;s/x86_64/x64/')
+    if test -f "$dir/node_modules/lefthook-${osArch}-${cpuArch}/bin/lefthook"
+    then
+      "$dir/node_modules/lefthook-${osArch}-${cpuArch}/bin/lefthook" "$@"
+    elif test -f "$dir/node_modules/@evilmartians/lefthook/bin/lefthook-${osArch}-${cpuArch}/lefthook"
+    then
+      "$dir/node_modules/@evilmartians/lefthook/bin/lefthook-${osArch}-${cpuArch}/lefthook" "$@"
+    elif test -f "$dir/node_modules/@evilmartians/lefthook-installer/bin/lefthook"
+    then
+      "$dir/node_modules/@evilmartians/lefthook-installer/bin/lefthook" "$@"
+    elif test -f "$dir/node_modules/lefthook/bin/index.js"
+    then
+      "$dir/node_modules/lefthook/bin/index.js" "$@"
+
+    elif bundle exec lefthook -h >/dev/null 2>&1
+    then
+      bundle exec lefthook "$@"
+    elif yarn lefthook -h >/dev/null 2>&1
+    then
+      yarn lefthook "$@"
+    elif pnpm lefthook -h >/dev/null 2>&1
+    then
+      pnpm lefthook "$@"
+    elif swift package plugin lefthook >/dev/null 2>&1
+    then
+      swift package --disable-sandbox plugin lefthook "$@"
+    elif command -v mint >/dev/null 2>&1
+    then
+      mint run csjones/lefthook-plugin "$@"
+    elif command -v npx >/dev/null 2>&1
+    then
+      npx lefthook "$@"
+    else
+      echo "Can't find lefthook in PATH"
+    fi
+  fi
+}
+
+call_lefthook run "pre-commit" "$@"

.husky/_/prepare-commit-msg

@@ -0,0 +1,60 @@
+#!/bin/sh
+
+if [ "$LEFTHOOK_VERBOSE" = "1" -o "$LEFTHOOK_VERBOSE" = "true" ]; then
+  set -x
+fi
+
+if [ "$LEFTHOOK" = "0" ]; then
+  exit 0
+fi
+
+call_lefthook()
+{
+  if test -n "$LEFTHOOK_BIN"
+  then
+    "$LEFTHOOK_BIN" "$@"
+  elif lefthook -h >/dev/null 2>&1
+  then
+    lefthook "$@"
+  else
+    dir="$(git rev-parse --show-toplevel)"
+    osArch=$(uname | tr '[:upper:]' '[:lower:]')
+    cpuArch=$(uname -m | sed 's/aarch64/arm64/;s/x86_64/x64/')
+    if test -f "$dir/node_modules/lefthook-${osArch}-${cpuArch}/bin/lefthook"
+    then
+      "$dir/node_modules/lefthook-${osArch}-${cpuArch}/bin/lefthook" "$@"
+    elif test -f "$dir/node_modules/@evilmartians/lefthook/bin/lefthook-${osArch}-${cpuArch}/lefthook"
+    then
+      "$dir/node_modules/@evilmartians/lefthook/bin/lefthook-${osArch}-${cpuArch}/lefthook" "$@"
+    elif test -f "$dir/node_modules/@evilmartians/lefthook-installer/bin/lefthook"
+    then
+      "$dir/node_modules/@evilmartians/lefthook-installer/bin/lefthook" "$@"
+    elif test -f "$dir/node_modules/lefthook/bin/index.js"
+    then
+      "$dir/node_modules/lefthook/bin/index.js" "$@"
+
+    elif bundle exec lefthook -h >/dev/null 2>&1
+    then
+      bundle exec lefthook "$@"
+    elif yarn lefthook -h >/dev/null 2>&1
+    then
+      yarn lefthook "$@"
+    elif pnpm lefthook -h >/dev/null 2>&1
+    then
+      pnpm lefthook "$@"
+    elif swift package plugin lefthook >/dev/null 2>&1
+    then
+      swift package --disable-sandbox plugin lefthook "$@"
+    elif command -v mint >/dev/null 2>&1
+    then
+      mint run csjones/lefthook-plugin "$@"
+    elif command -v npx >/dev/null 2>&1
+    then
+      npx lefthook "$@"
+    else
+      echo "Can't find lefthook in PATH"
+    fi
+  fi
+}
+
+call_lefthook run "prepare-commit-msg" "$@"

.vscode/extensions.json

@@ -0,0 +1,4 @@
+{
+  "recommendations": ["astro-build.astro-vscode", "unifiedjs.vscode-mdx"],
+  "unwantedRecommendations": []
+}

.vscode/launch.json

@@ -0,0 +1,11 @@
+{
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "command": "./node_modules/.bin/astro dev",
+      "name": "Development server",
+      "request": "launch",
+      "type": "node-terminal"
+    }
+  ]
+}

changelog.config.cjs

@@ -19,34 +19,34 @@ module.exports = {
   scopes: ['api', "cms", 'config', 'contents', 'db', 'deps', 'docker', 'i18n', 'none', 'ui', "utils"],
   types: {
     chore: {
-      description: 'Build process or auxiliary tool changes',
-      emoji: '🤖',
-      value: 'chore',
+      description: "Build process or auxiliary tool changes",
+      emoji: "🤖",
+      value: "chore",
     },
     ci: {
-      description: 'CI related changes',
-      emoji: '🎡',
-      value: 'ci',
+      description: "CI related changes",
+      emoji: "🎡",
+      value: "ci",
     },
     docs: {
-      description: 'Doc or article tweaks only',
-      emoji: '📖',
-      value: 'docs',
+      description: "Doc or article tweaks only",
+      emoji: "📖",
+      value: "docs",
     },
     feat: {
-      description: 'A new feature',
-      emoji: '🆕',
-      value: 'feat',
+      description: "A new feature",
+      emoji: "🆕",
+      value: "feat",
     },
     fix: {
-      description: 'A bug fix',
-      emoji: '🐛',
-      value: 'fix',
+      description: "A bug fix",
+      emoji: "🐛",
+      value: "fix",
     },
     perf: {
-      description: 'A code tweak for performance enhancement',
-      emoji: '⚡️',
-      value: 'perf',
+      description: "A code tweak for performance enhancement",
+      emoji: "⚡️",
+      value: "perf",
     },
     refactor: {
       description: 'A code tweak that neither fixes a bug or adds a new feature(rename a variable etc...)',
@@ -59,19 +59,20 @@ module.exports = {
       value: 'revert',
     },
     style: {
-      description: 'Formatting tweaks(Markup, white-space, missing semi-colons etc...)',
-      emoji: '💄',
-      value: 'style',
+      description:
+        "Formatting tweaks(Markup, white-space, missing semi-colons etc...)",
+      emoji: "💄",
+      value: "style",
     },
     test: {
-      description: 'Tweaks for tests',
-      emoji: '✒️',
-      value: 'test',
+      description: "Tweaks for tests",
+      emoji: "✒️",
+      value: "test",
     },
     package: {
-      description: 'Package changes(install, update, remove etc...)',
-      emoji: '📦',
-      value: 'package',
+      description: "Package changes(install, update, remove etc...)",
+      emoji: "📦",
+      value: "package",
     },
   },
 };

docker-compose.yml

@@ -13,9 +13,9 @@ services:
     environment:
       - COMPOSE_PROJECT_NAME=app
     working_dir: /workspace
-    volumes:
-      - .:/workspace:cached
-      # - node-modules-data:/workspace/node_modules
+    # volumes:
+    #   - .:/workspace:cached
+    # - node-modules-data:/workspace/node_modules
     user: dev
 # volumes:
 #   node-modules-data:

package.json

@@ -23,8 +23,7 @@
     "db:generate": "drizzle-kit generate",
     "db:studio:prod": "drizzle-kit studio",
     "db:migrate:local": "wrangler d1 migrations apply younagi_dev_db --local",
-    "db:migrate:prod": "wrangler d1 migrations apply younagi_dev_db",
-    "prepare": "lefthook install"
+    "db:migrate:prod": "wrangler d1 migrations apply younagi_dev_db"
   },
   "dependencies": {
     "@astrojs/check": "^0.5.10",
@@ -43,6 +42,7 @@
     "astro": "^4.12.2",
     "astro-purgecss": "4.1.0",
     "drizzle-orm": "^0.31.1",
+    "nodemailer": "^6.9.14",
     "purgecss": "5.0.0",
     "solid-js": "^1.8.17",
     "solid-motionone": "^1.0.0",

src/components/Icon/types.ts

@@ -1,27 +1,27 @@
 export type IconName =
-  | 'bmc'
-  | 'check'
-  | 'failure'
-  | 'github'
-  | 'hand-heart-filled'
-  | 'hand-heart'
-  | 'info'
-  | 'language'
-  | 'left-arrow'
-  | 'link'
+  | 'unsplash'
   | 'magnifier'
+  | 'publish'
   | 'mail'
   | 'moon'
-  | 'new'
-  | 'pencil'
-  | 'point'
-  | 'publish'
-  | 'question'
   | 'quote'
+  | 'point'
+  | 'bmc'
   | 'right-arrow'
-  | 'rss'
-  | 'sun'
+  | 'pencil'
+  | 'warning'
   | 'toc'
-  | 'unsplash'
+  | 'failure'
+  | 'hand-heart-filled'
+  | 'github'
+  | 'info'
+  | 'new'
+  | 'hand-heart'
   | 'update'
-  | 'warning';
+  | 'left-arrow'
+  | 'language'
+  | 'rss'
+  | 'sun'
+  | 'link'
+  | 'check'
+  | 'question';

src/pages/[locale]/api/form.ts

@@ -82,11 +82,6 @@ export const POST: APIRoute = async ({
     ),
     confirmation: pipe(
       boolean(),
-      // string(),
-      // check(
-      //   (input) => input === 'on',
-      //   t.data.contact_form.confirmation.required
-      // )
       check(
         (input) => input === true,
         t.data.contact_form.confirmation.required,
@@ -161,7 +156,7 @@ export const POST: APIRoute = async ({
   if (!response.ok) {
     return new Response(
       JSON.stringify({
-        message: `Form submission failed: ${response.status} ${response.statusText}`,
+        message: `Failed to submit form data: ${response.status} ${response.statusText}`,
       }),
       { status: 500 },
     );

src/pages/api/form.ts

@@ -143,7 +143,7 @@ export const POST: APIRoute = async ({
   if (!response.ok) {
     return new Response(
       JSON.stringify({
-        message: `Form submission failed: ${response.status} ${response.statusText}`,
+        message: `Failed to submit form data: ${response.status} ${response.statusText} ${response.url}`,
       }),
       { status: 500 },
     );

tsconfig.json

@@ -15,6 +15,7 @@
   },
   "exclude": [
     "./dist",
-    "./node_modules"
+    "./node_modules",
+    "src/functions"
   ]
 }

worker-configuration.d.ts

@@ -1,16 +1,16 @@
-// Generated by Wrangler on Tue Jun 25 2024 10:03:22 GMT+0900 (日本標準時)
+// Generated by Wrangler on Fri Aug 02 2024 06:25:18 GMT+0000 (Coordinated Universal Time)
 // by running `wrangler types`
 
 interface Env {
-  UNSPLASH_API_ACCESS_KEY: string
-  TURNSTILE_SITE_KEY: string
-  PUBLIC_TURNSTILE_SITE_KEY: string
-  TURNSTILE_SECRET_KEY: string
-  BREVO_API_KEY: string
-  MY_CUSTOM_EMAIL_ADDRESS: string
-  CLOUDFLARE_ACCOUNT_ID: string
-  D1_DB_ID: string
-  D1_DB_API_TOKEN: string
-  LOCAL_DB_PATH: string
-  DB: D1Database
+	UNSPLASH_API_ACCESS_KEY: string;
+	TURNSTILE_SITE_KEY: string;
+	PUBLIC_TURNSTILE_SITE_KEY: string;
+	TURNSTILE_SECRET_KEY: string;
+	BREVO_API_KEY: string;
+	MY_CUSTOM_EMAIL_ADDRESS: string;
+	CLOUDFLARE_ACCOUNT_ID: string;
+	D1_DB_ID: string;
+	D1_DB_API_TOKEN: string;
+	LOCAL_DB_PATH: string;
+	DB: D1Database;
 }