Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions apps/client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,22 +9,22 @@
"preview": "vite preview"
},
"dependencies": {
"@clerk/vue": "2.0.8",
"@clerk/vue": "2.0.11",
"@headlessui/vue": "1.7.23",
"@iconify-json/lucide": "1.2.101",
"@tanstack/vue-query": "5.96.2",
"arktype": "catalog:",
"date-fns": "4.1.0",
"hono": "catalog:",
"share": "workspace:*",
"unocss": "66.6.7",
"unocss": "66.6.8",
"vue": "3.5.32",
"vue-router": "5.0.4"
},
"devDependencies": {
"@types/bun": "latest",
"@vitejs/plugin-vue": "6.0.5",
"@vue/tsconfig": "0.9.1",
"vite": "8.0.3"
"vite": "8.0.7"
}
}
2 changes: 1 addition & 1 deletion apps/client/public/_headers
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
Content-Security-Policy: default-src 'self'; script-src 'self' 'unsafe-inline' https://*.clerk.accounts.dev https://accounts.omu-aikido.com https://clerk.omu-aikido.com https://static.cloudflareinsights.com; connect-src 'self' https://*.clerk.accounts.dev https://accounts.omu-aikido.com https://clerk.omu-aikido.com https://cloudflareinsights.com; img-src 'self' https://img.clerk.com data:; worker-src 'self' blob:; style-src 'self' 'unsafe-inline'
Content-Security-Policy: default-src 'self'; script-src 'self' 'unsafe-inline' https://*.clerk.accounts.dev https://accounts.omu-aikido.com https://clerk.omu-aikido.com https://static.cloudflareinsights.com https://challenges.cloudflare.com; connect-src 'self' https://*.clerk.accounts.dev https://accounts.omu-aikido.com https://clerk.omu-aikido.com https://cloudflareinsights.com https://challenges.cloudflare.com; frame-src 'self' https://challenges.cloudflare.com; img-src 'self' https://img.clerk.com data:; worker-src 'self' blob:; style-src 'self' 'unsafe-inline'
X-Frame-Options: DENY
X-Content-Type-Options: nosniff
Referrer-Policy: strict-origin-when-cross-origin
Expand Down
2 changes: 1 addition & 1 deletion apps/client/src/components/account/UserHeader.vue
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
</div>
<div class="min-w-0">
<h2 class="text-lg font-bold text my-0 truncate">{{ user?.lastName }} {{ user?.firstName }}</h2>
<p class="text-base text-subtext my-0 truncate">@{{ user?.username }}</p>
<p class="text-base text-subtext my-0 truncate">{{ user?.username }}</p>
</div>
</div>
<button type="button" class="btn-secondary px-3 py-1.5 text-sm" @click="isEditing = true">編集</button>
Expand Down
6 changes: 4 additions & 2 deletions apps/client/src/components/signup/SignUpStepProfile.vue
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
id="year"
:value="formValues.year"
:disabled="isSignUpCreated"
class="rounded-md border-overlay1 bg-base px-3 py-2 text-base text focus:ring-blue-500 h-fit w-full border transition-shadow duration-200 outline-none focus:ring-2 disabled:cursor-not-allowed disabled:opacity-50"
class="rounded-md border-overlay1 bg-base px-3 py-2 input-base text focus:ring-blue-500 h-fit w-full border transition-shadow duration-200 outline-none focus:ring-2 disabled:cursor-not-allowed disabled:opacity-50"
@change="onUpdate('year', ($event.target as HTMLSelectElement).value)">
<option v-for="y in yearOptions" :key="y.year" :value="y.year">
{{ y.name }}
Expand All @@ -23,7 +23,7 @@
id="grade"
:value="formValues.grade"
:disabled="isSignUpCreated"
class="rounded-md border-overlay1 bg-base px-3 py-2 text-base text focus:ring-blue-500 h-fit w-full border transition-shadow duration-200 outline-none focus:ring-2 disabled:cursor-not-allowed disabled:opacity-50"
class="rounded-md border-overlay1 bg-base px-3 py-2 input-base text focus:ring-blue-500 h-fit w-full border transition-shadow duration-200 outline-none focus:ring-2 disabled:cursor-not-allowed disabled:opacity-50"
@change="onUpdate('grade', Number(($event.target as HTMLSelectElement).value))">
<option v-for="g in gradeOptions" :key="g.grade" :value="g.grade">
{{ g.name }}
Expand Down Expand Up @@ -67,6 +67,8 @@
{{ formErrors.legalAccepted }}
</p>

<div id="clerk-captcha" />

<div class="pt-2 flex justify-between">
<button type="button" class="btn-secondary" :disabled="isSignUpCreated" @click="prevStep">戻る</button>
<button type="submit" class="btn-primary" :disabled="!canSubmit">
Expand Down
16 changes: 6 additions & 10 deletions apps/client/src/pages/SignUp.vue
Original file line number Diff line number Diff line change
Expand Up @@ -7,38 +7,34 @@
<div class="p-6 pt-0">
<ProgressIndicator :step="step" />
<form @submit.prevent="handleSubmit">
<div :class="step === 'basic' ? '' : 'hidden'">
<template v-if="step === 'basic'">
<SignUpStepBasic
:form-values="formValues"
:form-errors="formErrors"
:is-sign-up-created="isSignUpCreated"
:handle-next="handleNext"
@update:form-value="setFormValue" />
</div>
</template>

<div :class="step === 'personal' ? '' : 'hidden'">
<template v-if="step === 'personal'">
<SignUpStepPersonal
:form-values="formValues"
:form-errors="formErrors"
:is-sign-up-created="isSignUpCreated"
:handle-next="handleNext"
:prev-step="prevStep"
@update:form-value="setFormValue" />
</div>
</template>

<div :class="step === 'profile' ? '' : 'hidden'">
<template v-if="step === 'profile'">
<SignUpStepProfile
:form-values="formValues"
:form-errors="formErrors"
:is-sign-up-created="isSignUpCreated"
:can-submit="!isSignUpCreated"
:prev-step="prevStep"
@update:form-value="setFormValue" />
</div>

<div class="my-4 col-span-3">
<div id="clerk-captcha" />
</div>
</template>
</form>

<div v-if="formErrors.general" class="mt-4 text-base text-red-500">
Expand Down
8 changes: 4 additions & 4 deletions apps/server/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
"dev": "wrangler dev"
},
"dependencies": {
"@clerk/backend": "3.2.4",
"@clerk/backend": "3.2.8",
"@hono/arktype-validator": "2.0.1",
"@hono/clerk-auth": "3.1.0",
"@hono/clerk-auth": "3.1.1",
"@libsql/client": "0.17.2",
"arktype": "catalog:",
"drizzle-orm": "1.0.0-beta.20",
Expand All @@ -23,9 +23,9 @@
"svix": "1.90.0"
},
"devDependencies": {
"@cloudflare/workers-types": "4.20260329.1",
"@cloudflare/workers-types": "4.20260405.1",
"@types/node": "24.12.0",
"drizzle-kit": "1.0.0-beta.9-e89174b",
"wrangler": "4.80.0"
"wrangler": "4.81.0"
}
}
Loading
Loading