Merge branch 'master' of https://github.com/blueprintFramework/web-rewrite

Author: 0x7d8

apps/frontend/nuxt.config.ts

@@ -17,6 +17,7 @@ export default defineNuxtConfig({
     '@vueuse/nuxt',
     'nuxt-og-image',
     'nuxt-site-config',
+    '@nuxt/scripts',
   ],
   css: ['~/assets/css/main.css'],
   app: {
@@ -47,13 +48,6 @@ export default defineNuxtConfig({
   },
   vite: {
     plugins: [tailwindcss()],
-    server: {
-      proxy: {
-        '/api': 'http://localhost:8000',
-        '/browse/sitemap.xml': 'http://localhost:8000',
-        '/yay': 'https://blueprint.zip',
-      },
-    },
     optimizeDeps: {
       include: ['debug'],
     },
@@ -100,6 +94,11 @@ export default defineNuxtConfig({
     name: 'Blueprint',
   },
   nitro: {
+    devProxy: {
+      '/api': 'http://localhost:8000/api',
+      '/browse/sitemap.xml': 'http://localhost:8000/browse/sitemap.xml',
+      '/yay': 'https://blueprint.zip/yay',
+    },
     routeRules: {
       '/api/**': {
         prerender: false,

apps/frontend/package.json

@@ -12,34 +12,34 @@
   },
   "dependencies": {
     "@igorkowalczyk/is-browser": "^5.1.0",
-    "@nuxt/content": "^3.7.1",
+    "@nuxt/content": "^3.8.0",
     "@nuxt/fonts": "^0.11.4",
-    "@nuxt/icon": "^2.0.0",
+    "@nuxt/icon": "^2.1.0",
     "@nuxt/image": "^1.11.0",
     "@nuxt/scripts": "^0.12.2",
     "@nuxtjs/mdc": "^0.17.4",
     "@nuxtjs/plausible": "2.0.1",
     "@nuxtjs/sitemap": "^7.4.7",
     "@nuxtjs/turnstile": "1.1.1",
-    "@tailwindcss/vite": "^4.1.14",
+    "@tailwindcss/vite": "^4.1.16",
     "@types/file-saver": "^2.0.7",
-    "@types/qrcode": "^1.5.5",
+    "@types/qrcode": "^1.5.6",
     "@unhead/vue": "^2.0.19",
     "@vueuse/core": "^13.9.0",
     "@vueuse/nuxt": "^14.0.0",
     "better-sqlite3": "^12.4.1",
     "debug": "^4.4.3",
     "file-saver": "^2.0.5",
-    "nuxt": "^4.1.2",
+    "nuxt": "^4.2.0",
     "nuxt-marquee": "1.0.4",
     "nuxt-og-image": "5.1.12",
     "nuxt-site-config": "^3.2.11",
     "qrcode": "^1.5.4",
-    "tailwindcss": "^4.1.14",
+    "tailwindcss": "^4.1.16",
     "ufo": "^1.6.1",
-    "unstorage": "^1.17.1",
+    "unstorage": "^1.17.2",
     "vue": "^3.5.22",
-    "vue-router": "^4.5.1"
+    "vue-router": "^4.6.3"
   },
   "devDependencies": {
     "@iconify-json/lucide": "^1.2.71",

apps/frontend/pnpm-lock.yaml

@@ -106,10 +106,10 @@
       <p class="mb-5">
         We need to know if you're human. Please complete the captcha below.
       </p>
-      <div
-        class="flex flex-col items-center rounded-2xl border border-neutral-700 bg-neutral-900 py-4"
-      >
-        <NuxtTurnstile v-model="accountForm.captcha" ref="turnstile" />
+      <div class="rounded-2xl border border-neutral-700 bg-neutral-900 py-4">
+        <div class="flex min-h-[65px] flex-col items-center">
+          <NuxtTurnstile v-model="accountForm.captcha" ref="turnstile" />
+        </div>
       </div>
     </template>
 

apps/frontend/src/components/ui/app/user/Profile.vue

@@ -68,7 +68,7 @@
                 :name="determineDeviceIcon(session.user_agent)"
                 :size="18"
               />
-              <span>
+              <span class="transition-all hover:blur-none md:blur-[6px]">
                 {{ session.ip }}
               </span>
             </div>

apps/frontend/src/components/ui/app/user/Sessions.vue

@@ -31,9 +31,9 @@
     </div>
   </client-only>
 
-  <client-only>
-    <div class="flex">
-      <div class="fixed z-50 flex md:static">
+  <div class="flex">
+    <div class="fixed z-50 flex md:static">
+      <client-only>
         <div class="md:w-76">
           <Transition
             enter-active-class="transition-all duration-300 ease-out"
@@ -154,19 +154,19 @@
             </div>
           </Transition>
         </div>
-        <div class="hidden md:block">
-          <div
-            class="bg-linear-to-b fixed h-full w-[1px] from-neutral-800 via-neutral-500 to-neutral-800"
-          />
-        </div>
-      </div>
-      <div
-        class="max-w-200 container space-y-12 overflow-hidden px-4 pb-12 pt-16 md:pt-12"
-      >
-        <slot />
+      </client-only>
+      <div class="hidden md:block">
+        <div
+          class="bg-linear-to-b fixed h-full w-[1px] from-neutral-800 via-neutral-500 to-neutral-800"
+        />
       </div>
     </div>
-  </client-only>
+    <div
+      class="max-w-200 container space-y-12 overflow-hidden px-4 pb-12 pt-16 md:pt-12"
+    >
+      <slot />
+    </div>
+  </div>
 
   <div
     class="fixed inset-0 top-0 -z-10 h-[50vh] w-full bg-[linear-gradient(to_right,var(--color-neutral-800)_1px,transparent_1px),linear-gradient(to_bottom,var(--color-neutral-800)_1px,transparent_1px)] bg-[size:30px_30px] bg-[position:-5px_-5px]"

apps/frontend/src/layouts/docs.vue

@@ -1,7 +1,7 @@
 export default defineNuxtRouteMiddleware(async (to) => {
   if (import.meta.server) return
 
-  const { isAuthenticated, isFetched } = useAuth()
+  const { user, isAuthenticated, isFetched } = useAuth()
 
   if (!isFetched.value) {
     await new Promise((resolve) => {
@@ -18,7 +18,8 @@ export default defineNuxtRouteMiddleware(async (to) => {
     })
   }
 
-  if (!isAuthenticated.value) {
+  // isAuthenticated is a bit funky here
+  if (!user?.value?.id) {
     return navigateTo('/auth')
   }
 })

apps/frontend/src/middleware/user.ts

@@ -79,9 +79,11 @@ definePageMeta({
 const route = useRoute()
 const { rules: validationRules } = useFormValidation()
 
-if (!route.query.token || route.query.token.length != 96) {
-  await navigateTo('/auth/forgot')
-}
+onMounted(async () => {
+  if (!route.query.token || route.query.token.length != 96) {
+    await navigateTo('/auth/forgot')
+  }
+})
 
 const loading = ref(false)
 const error = ref(false)

apps/frontend/src/pages/auth/reset.vue

@@ -55,7 +55,8 @@
       <NuxtLink class="group outline-0" tabindex="0">
         <button
           :disabled="loading"
-          @mousedown.prevent="handleResend"
+          @mousedown.prevent
+          @click="modalOpen.turnstile = true"
           type="button"
           tabindex="-1"
           class="text-default-font group-focus:text-brand-50 hover:text-brand-50 w-full cursor-pointer text-nowrap bg-neutral-950 px-4 py-3 text-left text-xl font-semibold transition-colors hover:bg-neutral-900 group-focus:bg-neutral-900 md:w-auto"
@@ -65,6 +66,33 @@
       </NuxtLink>
     </div>
   </form>
+
+  <ElementsModal
+    :is-open="modalOpen.turnstile"
+    :closable="true"
+    title="Captcha"
+    @close="modalOpen.turnstile = false"
+  >
+    <template #default>
+      <p class="mb-5">
+        We need to know if you're human. Please complete the captcha below.
+      </p>
+      <div class="rounded-2xl border border-neutral-700 bg-neutral-900 py-4">
+        <div class="flex min-h-[65px] flex-col items-center">
+          <NuxtTurnstile v-model="captchaToken" ref="turnstile" />
+        </div>
+      </div>
+    </template>
+
+    <template #footer>
+      <ElementsButton
+        label="Continue"
+        class="order-first w-full md:order-[unset] md:w-auto"
+        :disabled="loading"
+        @click="handleResend"
+      />
+    </template>
+  </ElementsModal>
 </template>
 
 <script setup lang="ts">
@@ -76,12 +104,17 @@ definePageMeta({
 const { user, initializeAuth } = useAuth()
 const { rules: validationRules } = useFormValidation()
 
+const turnstile = useTemplateRef('turnstile')
+const captchaToken = ref()
 const loading = ref(false)
+const fieldValidation = ref<Record<string, boolean>>({})
 const errors = ref({
   incorrect: false,
   resendError: false,
 })
-const fieldValidation = ref<Record<string, boolean>>({})
+const modalOpen = ref({
+  turnstile: false,
+})
 const form = ref({
   token: '',
 })
@@ -120,9 +153,10 @@ const handleResend = async () => {
       method: 'PATCH',
       body: {
         email: user.value?.email_pending,
-        captcha: null,
+        captcha: captchaToken.value,
       },
     })
+    modalOpen.value.turnstile = false
   } catch (error) {
     console.error(error)
     errors.value.resendError = true