diff --git a/apps/app/.gitignore b/apps/app/.gitignore
index 4f185cf..79602bc 100644
--- a/apps/app/.gitignore
+++ b/apps/app/.gitignore
@@ -27,4 +27,7 @@ logs
 .vercel
 
 # Shelve config
-.shelve
\ No newline at end of file
+.shelve
+
+# Nitro
+.nitro/
diff --git a/apps/app/app.config.ts b/apps/app/app/app.config.ts
similarity index 100%
rename from apps/app/app.config.ts
rename to apps/app/app/app.config.ts
diff --git a/apps/app/app.vue b/apps/app/app/app.vue
similarity index 97%
rename from apps/app/app.vue
rename to apps/app/app/app.vue
index a93d1e6..cf19860 100644
--- a/apps/app/app.vue
+++ b/apps/app/app/app.vue
@@ -29,7 +29,7 @@ const reduceMotion = useCookie<boolean>('reduceMotion', {
 if (import.meta.client) setPrefersReducedMotion(reduceMotion.value)
 
 
-await useSession().refresh()
+useSession().refresh()
 </script>
 
 <template>
diff --git a/apps/app/assets/style/animations.css b/apps/app/app/assets/style/animations.css
similarity index 100%
rename from apps/app/assets/style/animations.css
rename to apps/app/app/assets/style/animations.css
diff --git a/apps/app/assets/style/main.css b/apps/app/app/assets/style/main.css
similarity index 100%
rename from apps/app/assets/style/main.css
rename to apps/app/app/assets/style/main.css
diff --git a/apps/app/components/DropdownMenu.vue b/apps/app/app/components/DropdownMenu.vue
similarity index 100%
rename from apps/app/components/DropdownMenu.vue
rename to apps/app/app/components/DropdownMenu.vue
diff --git a/apps/app/components/Loader.vue b/apps/app/app/components/Loader.vue
similarity index 100%
rename from apps/app/components/Loader.vue
rename to apps/app/app/components/Loader.vue
diff --git a/apps/app/components/OTP.vue b/apps/app/app/components/OTP.vue
similarity index 100%
rename from apps/app/components/OTP.vue
rename to apps/app/app/components/OTP.vue
diff --git a/apps/app/components/Release.vue b/apps/app/app/components/Release.vue
similarity index 100%
rename from apps/app/components/Release.vue
rename to apps/app/app/components/Release.vue
diff --git a/apps/app/components/Status.vue b/apps/app/app/components/Status.vue
similarity index 100%
rename from apps/app/components/Status.vue
rename to apps/app/app/components/Status.vue
diff --git a/apps/app/components/auth/Session.vue b/apps/app/app/components/auth/Session.vue
similarity index 100%
rename from apps/app/components/auth/Session.vue
rename to apps/app/app/components/auth/Session.vue
diff --git a/apps/app/components/form/Group.vue b/apps/app/app/components/form/Group.vue
similarity index 100%
rename from apps/app/components/form/Group.vue
rename to apps/app/app/components/form/Group.vue
diff --git a/apps/app/components/landing/Faq.vue b/apps/app/app/components/landing/Faq.vue
similarity index 100%
rename from apps/app/components/landing/Faq.vue
rename to apps/app/app/components/landing/Faq.vue
diff --git a/apps/app/components/landing/Features.vue b/apps/app/app/components/landing/Features.vue
similarity index 100%
rename from apps/app/components/landing/Features.vue
rename to apps/app/app/components/landing/Features.vue
diff --git a/apps/app/components/landing/GithubStar.vue b/apps/app/app/components/landing/GithubStar.vue
similarity index 94%
rename from apps/app/components/landing/GithubStar.vue
rename to apps/app/app/components/landing/GithubStar.vue
index 4b19c8d..de096ec 100644
--- a/apps/app/components/landing/GithubStar.vue
+++ b/apps/app/app/components/landing/GithubStar.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-type repoType = {
+type RepoType = {
   name: string
   stars: number
   watchers: number
@@ -14,7 +14,7 @@ if (!githubStars.value) {
 
 async function fetchRepo() {
   try {
-    const res = await $fetch('https://ungh.cc/repos/hugorcd/shelve') as { repo: repoType }
+    const res = await $fetch('https://ungh.cc/repos/hugorcd/shelve') as { repo: RepoType }
     githubStars.value = res.repo.stars.toString()
   } catch (e) { /* empty */ }
 }
diff --git a/apps/app/components/landing/Hero.vue b/apps/app/app/components/landing/Hero.vue
similarity index 100%
rename from apps/app/components/landing/Hero.vue
rename to apps/app/app/components/landing/Hero.vue
diff --git a/apps/app/components/landing/ScrambleText.vue b/apps/app/app/components/landing/ScrambleText.vue
similarity index 100%
rename from apps/app/components/landing/ScrambleText.vue
rename to apps/app/app/components/landing/ScrambleText.vue
diff --git a/apps/app/components/landing/Sparkles.client.vue b/apps/app/app/components/landing/Sparkles.client.vue
similarity index 100%
rename from apps/app/components/landing/Sparkles.client.vue
rename to apps/app/app/components/landing/Sparkles.client.vue
diff --git a/apps/app/components/layout/AuthFooter.vue b/apps/app/app/components/layout/AuthFooter.vue
similarity index 100%
rename from apps/app/components/layout/AuthFooter.vue
rename to apps/app/app/components/layout/AuthFooter.vue
diff --git a/apps/app/components/layout/Divider.vue b/apps/app/app/components/layout/Divider.vue
similarity index 100%
rename from apps/app/components/layout/Divider.vue
rename to apps/app/app/components/layout/Divider.vue
diff --git a/apps/app/components/layout/Footer.vue b/apps/app/app/components/layout/Footer.vue
similarity index 100%
rename from apps/app/components/layout/Footer.vue
rename to apps/app/app/components/layout/Footer.vue
diff --git a/apps/app/components/layout/NavItem.vue b/apps/app/app/components/layout/NavItem.vue
similarity index 100%
rename from apps/app/components/layout/NavItem.vue
rename to apps/app/app/components/layout/NavItem.vue
diff --git a/apps/app/components/layout/Navbar.vue b/apps/app/app/components/layout/Navbar.vue
similarity index 100%
rename from apps/app/components/layout/Navbar.vue
rename to apps/app/app/components/layout/Navbar.vue
diff --git a/apps/app/components/layout/SectionWrapper.vue b/apps/app/app/components/layout/SectionWrapper.vue
similarity index 100%
rename from apps/app/components/layout/SectionWrapper.vue
rename to apps/app/app/components/layout/SectionWrapper.vue
diff --git a/apps/app/components/layout/Sidebar.vue b/apps/app/app/components/layout/Sidebar.vue
similarity index 100%
rename from apps/app/components/layout/Sidebar.vue
rename to apps/app/app/components/layout/Sidebar.vue
diff --git a/apps/app/components/project/Create.vue b/apps/app/app/components/project/Create.vue
similarity index 100%
rename from apps/app/components/project/Create.vue
rename to apps/app/app/components/project/Create.vue
diff --git a/apps/app/components/project/CreateVariables.vue b/apps/app/app/components/project/CreateVariables.vue
similarity index 99%
rename from apps/app/components/project/CreateVariables.vue
rename to apps/app/app/components/project/CreateVariables.vue
index c3e8128..e919f30 100644
--- a/apps/app/components/project/CreateVariables.vue
+++ b/apps/app/app/components/project/CreateVariables.vue
@@ -79,7 +79,7 @@ const items = [
 
 onMounted(() => {
   document.addEventListener('paste', (e) => {
-    const clipboardData = e.clipboardData
+    const { clipboardData } = e
     if (!clipboardData) return
     const pastedData = clipboardData.getData('text')
     if (!e.target?.closest('#varCreation')) return
diff --git a/apps/app/components/project/MainSection.vue b/apps/app/app/components/project/MainSection.vue
similarity index 100%
rename from apps/app/components/project/MainSection.vue
rename to apps/app/app/components/project/MainSection.vue
diff --git a/apps/app/components/project/TeamAssign.vue b/apps/app/app/components/project/TeamAssign.vue
similarity index 100%
rename from apps/app/components/project/TeamAssign.vue
rename to apps/app/app/components/project/TeamAssign.vue
diff --git a/apps/app/components/project/VarPrefix.vue b/apps/app/app/components/project/VarPrefix.vue
similarity index 100%
rename from apps/app/components/project/VarPrefix.vue
rename to apps/app/app/components/project/VarPrefix.vue
diff --git a/apps/app/components/project/VariableItem.vue b/apps/app/app/components/project/VariableItem.vue
similarity index 100%
rename from apps/app/components/project/VariableItem.vue
rename to apps/app/app/components/project/VariableItem.vue
diff --git a/apps/app/components/setting/ThemeToggle.vue b/apps/app/app/components/setting/ThemeToggle.vue
similarity index 100%
rename from apps/app/components/setting/ThemeToggle.vue
rename to apps/app/app/components/setting/ThemeToggle.vue
diff --git a/apps/app/components/team/Create.vue b/apps/app/app/components/team/Create.vue
similarity index 100%
rename from apps/app/components/team/Create.vue
rename to apps/app/app/components/team/Create.vue
diff --git a/apps/app/components/team/Member.vue b/apps/app/app/components/team/Member.vue
similarity index 100%
rename from apps/app/components/team/Member.vue
rename to apps/app/app/components/team/Member.vue
diff --git a/apps/app/components/team/Members.vue b/apps/app/app/components/team/Members.vue
similarity index 100%
rename from apps/app/components/team/Members.vue
rename to apps/app/app/components/team/Members.vue
diff --git a/apps/app/composables/useClipboard.ts b/apps/app/app/composables/useClipboard.ts
similarity index 100%
rename from apps/app/composables/useClipboard.ts
rename to apps/app/app/composables/useClipboard.ts
diff --git a/apps/app/composables/useDOM.ts b/apps/app/app/composables/useDOM.ts
similarity index 100%
rename from apps/app/composables/useDOM.ts
rename to apps/app/app/composables/useDOM.ts
diff --git a/apps/app/composables/useProjects.ts b/apps/app/app/composables/useProjects.ts
similarity index 100%
rename from apps/app/composables/useProjects.ts
rename to apps/app/app/composables/useProjects.ts
diff --git a/apps/app/composables/useSession.ts b/apps/app/app/composables/useSession.ts
similarity index 100%
rename from apps/app/composables/useSession.ts
rename to apps/app/app/composables/useSession.ts
diff --git a/apps/app/composables/useString.ts b/apps/app/app/composables/useString.ts
similarity index 100%
rename from apps/app/composables/useString.ts
rename to apps/app/app/composables/useString.ts
diff --git a/apps/app/composables/useTeams.ts b/apps/app/app/composables/useTeams.ts
similarity index 100%
rename from apps/app/composables/useTeams.ts
rename to apps/app/app/composables/useTeams.ts
diff --git a/apps/app/composables/useVariables.ts b/apps/app/app/composables/useVariables.ts
similarity index 100%
rename from apps/app/composables/useVariables.ts
rename to apps/app/app/composables/useVariables.ts
diff --git a/apps/app/error.vue b/apps/app/app/error.vue
similarity index 100%
rename from apps/app/error.vue
rename to apps/app/app/error.vue
diff --git a/apps/app/layouts/app.vue b/apps/app/app/layouts/app.vue
similarity index 100%
rename from apps/app/layouts/app.vue
rename to apps/app/app/layouts/app.vue
diff --git a/apps/app/layouts/auth.vue b/apps/app/app/layouts/auth.vue
similarity index 100%
rename from apps/app/layouts/auth.vue
rename to apps/app/app/layouts/auth.vue
diff --git a/apps/app/layouts/default.vue b/apps/app/app/layouts/default.vue
similarity index 100%
rename from apps/app/layouts/default.vue
rename to apps/app/app/layouts/default.vue
diff --git a/apps/app/middleware/admin.ts b/apps/app/app/middleware/admin.ts
similarity index 100%
rename from apps/app/middleware/admin.ts
rename to apps/app/app/middleware/admin.ts
diff --git a/apps/app/middleware/guest-only.ts b/apps/app/app/middleware/guest-only.ts
similarity index 100%
rename from apps/app/middleware/guest-only.ts
rename to apps/app/app/middleware/guest-only.ts
diff --git a/apps/app/middleware/project-redirect.ts b/apps/app/app/middleware/project-redirect.ts
similarity index 100%
rename from apps/app/middleware/project-redirect.ts
rename to apps/app/app/middleware/project-redirect.ts
diff --git a/apps/app/middleware/protected.ts b/apps/app/app/middleware/protected.ts
similarity index 100%
rename from apps/app/middleware/protected.ts
rename to apps/app/app/middleware/protected.ts
diff --git a/apps/app/middleware/set-current-project.global.ts b/apps/app/app/middleware/set-current-project.global.ts
similarity index 100%
rename from apps/app/middleware/set-current-project.global.ts
rename to apps/app/app/middleware/set-current-project.global.ts
diff --git a/apps/app/pages/app.vue b/apps/app/app/pages/app.vue
similarity index 100%
rename from apps/app/pages/app.vue
rename to apps/app/app/pages/app.vue
diff --git a/apps/app/pages/app/admin.vue b/apps/app/app/pages/app/admin.vue
similarity index 100%
rename from apps/app/pages/app/admin.vue
rename to apps/app/app/pages/app/admin.vue
diff --git a/apps/app/pages/app/admin/users.vue b/apps/app/app/pages/app/admin/users.vue
similarity index 100%
rename from apps/app/pages/app/admin/users.vue
rename to apps/app/app/pages/app/admin/users.vue
diff --git a/apps/app/pages/app/profile.vue b/apps/app/app/pages/app/profile.vue
similarity index 99%
rename from apps/app/pages/app/profile.vue
rename to apps/app/app/pages/app/profile.vue
index 405cd3f..715f319 100644
--- a/apps/app/pages/app/profile.vue
+++ b/apps/app/app/pages/app/profile.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-const user = useSession().user
+const { user } = useSession()
 
 const usePassword = useCookie('usePassword')
 
diff --git a/apps/app/pages/app/project/[projectId]/index.vue b/apps/app/app/pages/app/project/[projectId]/index.vue
similarity index 100%
rename from apps/app/pages/app/project/[projectId]/index.vue
rename to apps/app/app/pages/app/project/[projectId]/index.vue
diff --git a/apps/app/pages/app/project/[projectId]/index/files.vue b/apps/app/app/pages/app/project/[projectId]/index/files.vue
similarity index 100%
rename from apps/app/pages/app/project/[projectId]/index/files.vue
rename to apps/app/app/pages/app/project/[projectId]/index/files.vue
diff --git a/apps/app/pages/app/project/[projectId]/index/keys.vue b/apps/app/app/pages/app/project/[projectId]/index/keys.vue
similarity index 100%
rename from apps/app/pages/app/project/[projectId]/index/keys.vue
rename to apps/app/app/pages/app/project/[projectId]/index/keys.vue
diff --git a/apps/app/pages/app/project/[projectId]/index/settings.vue b/apps/app/app/pages/app/project/[projectId]/index/settings.vue
similarity index 100%
rename from apps/app/pages/app/project/[projectId]/index/settings.vue
rename to apps/app/app/pages/app/project/[projectId]/index/settings.vue
diff --git a/apps/app/pages/app/project/[projectId]/index/variables.vue b/apps/app/app/pages/app/project/[projectId]/index/variables.vue
similarity index 100%
rename from apps/app/pages/app/project/[projectId]/index/variables.vue
rename to apps/app/app/pages/app/project/[projectId]/index/variables.vue
diff --git a/apps/app/pages/app/projects.vue b/apps/app/app/pages/app/projects.vue
similarity index 96%
rename from apps/app/pages/app/projects.vue
rename to apps/app/app/pages/app/projects.vue
index e788168..a6952fe 100644
--- a/apps/app/pages/app/projects.vue
+++ b/apps/app/app/pages/app/projects.vue
@@ -1,6 +1,4 @@
 <script setup lang="ts">
-import { isMounted } from '~/composables/useDOM'
-
 const {
   projects,
   loading,
diff --git a/apps/app/pages/app/settings.vue b/apps/app/app/pages/app/settings.vue
similarity index 100%
rename from apps/app/pages/app/settings.vue
rename to apps/app/app/pages/app/settings.vue
diff --git a/apps/app/pages/app/teams.vue b/apps/app/app/pages/app/teams.vue
similarity index 100%
rename from apps/app/pages/app/teams.vue
rename to apps/app/app/pages/app/teams.vue
diff --git a/apps/app/pages/changelog.vue b/apps/app/app/pages/changelog.vue
similarity index 100%
rename from apps/app/pages/changelog.vue
rename to apps/app/app/pages/changelog.vue
diff --git a/apps/app/pages/docs.vue b/apps/app/app/pages/docs.vue
similarity index 100%
rename from apps/app/pages/docs.vue
rename to apps/app/app/pages/docs.vue
diff --git a/apps/app/pages/index.vue b/apps/app/app/pages/index.vue
similarity index 96%
rename from apps/app/pages/index.vue
rename to apps/app/app/pages/index.vue
index c6894a1..92e7b50 100644
--- a/apps/app/pages/index.vue
+++ b/apps/app/app/pages/index.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 const copy = ref(false)
-function copy_to_clipboard(text: string) {
+function copyToClipboard(text: string) {
   copyToClipboard(text, 'Copied to clipboard')
   copy.value = true
   setTimeout(() => {
@@ -29,7 +29,7 @@ function copy_to_clipboard(text: string) {
           <div class="absolute bottom-16 z-20 flex w-full items-center justify-center [mask-image:linear-gradient(to_bottom,white,transparent)]">
             <div
               class="flex items-center justify-center gap-4 rounded-md bg-white/5 px-4 py-2 backdrop-blur-lg"
-              @click="copy_to_clipboard('npm install -g @shelve/cli')"
+              @click="copyToClipboard('npm install -g @shelve/cli')"
             >
               <div class="flex cursor-pointer items-center justify-center gap-2 text-sm text-gray-300">
                 <span>
diff --git a/apps/app/pages/login.vue b/apps/app/app/pages/login.vue
similarity index 91%
rename from apps/app/pages/login.vue
rename to apps/app/app/pages/login.vue
index bc176e8..f037826 100644
--- a/apps/app/pages/login.vue
+++ b/apps/app/app/pages/login.vue
@@ -60,7 +60,7 @@ const sendOtp = async () => {
 }
 
 const login = async () => {
-  if (!otp.value) {
+  if (!otp.value && !password.value) {
     toast.error('Please fill in all required fields.')
     return
   }
@@ -115,7 +115,10 @@ onMounted(() => {
             required
             placeholder="password"
           />
-          <UButton type="submit" class="flex w-full items-center justify-center gap-2 rounded-md bg-black px-4 py-2 text-sm text-white transition-colors duration-300 hover:bg-gray-800 dark:bg-white dark:text-black dark:hover:bg-gray-100">
+          <UButton
+            :disabled="passwordMode ? verifyStatus === 'pending' : status === 'pending'"
+            type="submit"
+            class="flex w-full items-center justify-center gap-2 rounded-md bg-black px-4 py-2 text-sm text-white transition-colors duration-300 hover:bg-gray-800 dark:bg-white dark:text-black dark:hover:bg-gray-100">
             {{ passwordMode ? "Login" : "Send me a magic link" }}
             <Loader v-if="passwordMode ? verifyStatus === 'pending' : status === 'pending'" />
           </UButton>
diff --git a/apps/app/pages/roadmap.vue b/apps/app/app/pages/roadmap.vue
similarity index 100%
rename from apps/app/pages/roadmap.vue
rename to apps/app/app/pages/roadmap.vue
diff --git a/apps/app/plugins/sonner.client.ts b/apps/app/app/plugins/sonner.client.ts
similarity index 100%
rename from apps/app/plugins/sonner.client.ts
rename to apps/app/app/plugins/sonner.client.ts
diff --git a/apps/app/utils/env.ts b/apps/app/app/utils/env.ts
similarity index 100%
rename from apps/app/utils/env.ts
rename to apps/app/app/utils/env.ts
diff --git a/apps/app/utils/navigation.ts b/apps/app/app/utils/navigation.ts
similarity index 100%
rename from apps/app/utils/navigation.ts
rename to apps/app/app/utils/navigation.ts
diff --git a/apps/app/emails/verify-otp.vue b/apps/app/emails/verify-otp.vue
deleted file mode 100644
index 74e5a75..0000000
--- a/apps/app/emails/verify-otp.vue
+++ /dev/null
@@ -1,59 +0,0 @@
-<script setup lang="ts">
-defineProps({
-  otp: {
-    type: String,
-    required: true
-  },
-  redirectUrl: {
-    type: String,
-    required: true
-  }
-})
-</script>
-
-<template>
-  <ETailwind>
-    <EHtml>
-      <EHead />
-      <EPreview>
-        Here is your code to access Shelve
-      </EPreview>
-      <EBody class="m-auto bg-white font-sans">
-        <EContainer class="mx-auto my-[40px] max-w-[465px] rounded border border-solid border-[#eaeaea] p-[20px] md:p-7">
-          <EHeading class="mb-4 text-center text-2xl font-bold text-[#000000] md:text-3xl">
-            Welcome to Shelve
-          </EHeading>
-          <EText class="mb-4 text-center text-[#000000]">
-            Your OTP is:
-          </EText>
-          <EText class="mb-4 text-center text-[36px] font-bold text-[#000000]">
-            <span class="text-[#2C3BF5]">{{ otp }}</span>
-          </EText>
-          <EText class="mb-4 text-center text-[#000000]">
-            Use this OTP to verify your account
-          </EText>
-          <ESection class="my-[32px] text-center">
-            <EButton px="20" py="12" class="rounded bg-[#000000] text-center text-[12px] font-semibold text-white no-underline" :href="redirectUrl">
-              Go to Shelve
-            </EButton>
-          </ESection>
-          <EText class="text-[14px] leading-[24px] text-black">
-            or copy and paste this URL into your browser:
-            <ELink :href="redirectUrl" class="text-[#2C3BF5]">
-              {{ redirectUrl }}
-            </ELink>
-          </EText>
-          <EHr class="mx-0 my-[26px] w-full border border-solid border-[#eaeaea]" />
-          <EText class="text-[12px] leading-[24px] text-[#666666]">
-            If you were not expecting this invitation, you can ignore this email. If you are concerned about your account's safety, please reply to this email to get in touch
-            with us.
-          </EText>
-        </EContainer>
-      </EBody>
-    </EHtml>
-  </ETailwind>
-</template>
-
-<style scoped>
-
-</style>
diff --git a/apps/app/nuxt.config.ts b/apps/app/nuxt.config.ts
index 995efbb..934b313 100644
--- a/apps/app/nuxt.config.ts
+++ b/apps/app/nuxt.config.ts
@@ -1,4 +1,5 @@
 import { getIconCollections } from '@egoist/tailwindcss-icons'
+import vue from '@vitejs/plugin-vue'
 
 export default defineNuxtConfig({
   app: {
@@ -14,6 +15,10 @@ export default defineNuxtConfig({
     },
   },
 
+  future: {
+    compatibilityVersion: 4,
+  },
+
   experimental: {
     componentIslands: true,
   },
@@ -25,9 +30,8 @@ export default defineNuxtConfig({
   },
 
   nitro: {
-    prerender: {
-      crawlLinks: true,
-      routes: ['/'],
+    rollupConfig: {
+      plugins: [vue()]
     },
   },
 
@@ -38,15 +42,14 @@ export default defineNuxtConfig({
     private: {
       resendApiKey: process.env.NUXT_PRIVATE_RESEND_API_KEY,
       authSecret: process.env.NUXT_PRIVATE_AUTH_SECRET,
-      secret_encryption_key: process.env.NUXT_PRIVATE_SECRET_ENCRYPTION_KEY,
-      secret_encryption_iterations: process.env.NUXT_PRIVATE_SECRET_ENCRYPTION_ITERATIONS,
+      secretEncryptionKey: process.env.NUXT_PRIVATE_SECRET_ENCRYPTION_KEY,
+      secretEncryptionIterations: process.env.NUXT_PRIVATE_SECRET_ENCRYPTION_ITERATIONS,
     },
   },
 
   modules: [
     '@nuxt/content',
     '@nuxt/image',
-    '@vue-email/nuxt',
     '@nuxt/ui',
     '@nuxt/fonts',
     '@vueuse/nuxt',
@@ -55,10 +58,6 @@ export default defineNuxtConfig({
 
   css: ['~/assets/style/main.css'],
 
-  vueEmail: {
-    autoImport: true,
-  },
-
   devtools: {
     enabled: true,
 
diff --git a/apps/app/package.json b/apps/app/package.json
index 745408e..13fad82 100644
--- a/apps/app/package.json
+++ b/apps/app/package.json
@@ -9,6 +9,7 @@
     "dev": "nuxt dev",
     "generate": "nuxt generate",
     "preview": "nuxt preview",
+    "start": "node .output/server/index.mjs",
     "postinstall": "nuxt prepare && npm run prisma:generate --no-engine",
     "lint": "eslint .",
     "lint:fix": "eslint --fix .",
@@ -23,9 +24,8 @@
     "schema": "server/database/schema.prisma"
   },
   "devDependencies": {
-    "@hrcd/eslint-config": "^1.1.5",
+    "@hrcd/eslint-config": "^2.0.0",
     "@iconify-json/lucide": "^1.1.194",
-    "@linear/sdk": "^22.0.0",
     "@nuxt/content": "^2.13.0",
     "@nuxt/fonts": "latest",
     "@nuxt/image": "latest",
@@ -38,17 +38,16 @@
     "@tsparticles/slim": "^3.4.0",
     "@types/bcryptjs": "^2.4.6",
     "@types/ua-parser-js": "^0.7.39",
-    "@vercel/analytics": "^1.3.1",
-    "@vue-email/nuxt": "^0.8.19",
+    "@vitejs/plugin-vue": "^5.0.5",
+    "@vue-email/components": "^0.0.17",
+    "@vue-email/render": "^0.0.9",
     "@vueuse/core": "^10.11.0",
     "@vueuse/nuxt": "^10.11.0",
     "bcryptjs": "^2.4.3",
     "eslint": "^9.5.0",
     "jsonwebtoken": "^9.0.2",
-    "nuxt": "latest",
+    "nuxt": "^3.12.2",
     "nuxt-build-cache": "latest",
-    "octokit": "^4.0.2",
-    "openai": "^4.52.0",
     "prisma": "^5.15.1",
     "resend": "^3.3.0",
     "ua-parser-js": "^1.0.38",
diff --git a/apps/app/plugins/analytics.client.ts b/apps/app/plugins/analytics.client.ts
deleted file mode 100644
index 21b84f3..0000000
--- a/apps/app/plugins/analytics.client.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import { inject } from '@vercel/analytics'
-
-export default defineNuxtPlugin(() => {
-  inject({
-    beforeSend: (event) => {
-      if (event.url.includes('localhost')) {
-        return null
-      }
-      return event
-    },
-    debug: false,
-  })
-})
diff --git a/apps/app/public/fonts/CabinetGrotesk-Variable.ttf b/apps/app/public/fonts/CabinetGrotesk-Variable.ttf
deleted file mode 100644
index 29cffe0..0000000
Binary files a/apps/app/public/fonts/CabinetGrotesk-Variable.ttf and /dev/null differ
diff --git a/apps/app/public/fonts/GeistVariableVF.ttf b/apps/app/public/fonts/Geist.ttf
similarity index 100%
rename from apps/app/public/fonts/GeistVariableVF.ttf
rename to apps/app/public/fonts/Geist.ttf
diff --git a/apps/app/public/fonts/Newsreader_60pt-MediumItalic.ttf b/apps/app/public/fonts/Newsreader_60pt-MediumItalic.ttf
deleted file mode 100644
index 6ccda7c..0000000
Binary files a/apps/app/public/fonts/Newsreader_60pt-MediumItalic.ttf and /dev/null differ
diff --git a/apps/app/server/api/admin/users/[userId].delete.ts b/apps/app/server/api/admin/users/[userId].delete.ts
index 549c821..211c3d4 100644
--- a/apps/app/server/api/admin/users/[userId].delete.ts
+++ b/apps/app/server/api/admin/users/[userId].delete.ts
@@ -1,8 +1,8 @@
 import { H3Event } from 'h3'
-import { deleteUser } from '~/server/app/userService'
+import { deleteUser } from '~~/server/app/userService'
 
 export default eventHandler(async (event: H3Event) => {
-  const user = event.context.user
+  const { user } = event.context
   const id = getRouterParam(event, 'userId') as string
   if (!id) throw createError({ statusCode: 400, statusMessage: 'missing params' })
   if (user.id === parseInt(id)) throw createError({ statusCode: 400, statusMessage: 'you can\'t delete your own account' })
diff --git a/apps/app/server/api/admin/users/[userId].put.ts b/apps/app/server/api/admin/users/[userId].put.ts
index f58c6d3..342ed58 100644
--- a/apps/app/server/api/admin/users/[userId].put.ts
+++ b/apps/app/server/api/admin/users/[userId].put.ts
@@ -1,8 +1,8 @@
 import { H3Event } from 'h3'
-import prisma from '~/server/database/client'
+import prisma from '~~/server/database/client'
 
 export default eventHandler(async (event: H3Event) => {
-  const user = event.context.user
+  const { user } = event.context
   const body = await readBody(event)
   const id = getRouterParam(event, 'userId') as string
 
diff --git a/apps/app/server/api/admin/users/index.get.ts b/apps/app/server/api/admin/users/index.get.ts
index 03056e1..4c53be6 100644
--- a/apps/app/server/api/admin/users/index.get.ts
+++ b/apps/app/server/api/admin/users/index.get.ts
@@ -1,4 +1,4 @@
-import prisma, { formatUser } from '~/server/database/client'
+import prisma, { formatUser } from '~~/server/database/client'
 
 export default eventHandler(async () => {
   const users = await prisma.user.findMany()
diff --git a/apps/app/server/api/auth/currentUser.get.ts b/apps/app/server/api/auth/currentUser.get.ts
index ef936f4..745c99a 100644
--- a/apps/app/server/api/auth/currentUser.get.ts
+++ b/apps/app/server/api/auth/currentUser.get.ts
@@ -1,5 +1,5 @@
 import { H3Event } from 'h3'
-import { getUserByAuthToken, verifyUserToken } from '~/server/app/userService'
+import { getUserByAuthToken, verifyUserToken } from '~~/server/app/userService'
 
 export default eventHandler(async (event: H3Event) => {
   const authToken = getCookie(event, 'authToken')
diff --git a/apps/app/server/api/auth/login.post.ts b/apps/app/server/api/auth/login.post.ts
index de835ed..733bf72 100644
--- a/apps/app/server/api/auth/login.post.ts
+++ b/apps/app/server/api/auth/login.post.ts
@@ -1,11 +1,11 @@
 import { H3Event } from 'h3'
-import { formatUser } from '~/server/database/client'
-import { login } from '~/server/app/authService'
+import { formatUser } from '~~/server/database/client'
+import { login } from '~~/server/app/authService'
 
 export default eventHandler(async (event: H3Event) => {
   const body = await readBody(event)
   body.authToken = getCookie(event, 'authToken') || ''
-  const { user, authToken} = await login(body)
+  const { user, authToken } = await login(body)
   setCookie(event, 'authToken', authToken, {
     httpOnly: true,
     secure: true,
diff --git a/apps/app/server/api/auth/logout.post.ts b/apps/app/server/api/auth/logout.post.ts
index 1f07fa2..1c28260 100644
--- a/apps/app/server/api/auth/logout.post.ts
+++ b/apps/app/server/api/auth/logout.post.ts
@@ -1,8 +1,8 @@
 import { H3Event } from 'h3'
-import { deleteSession } from '~/server/app/sessionService'
+import { deleteSession } from '~~/server/app/sessionService'
 
 export default eventHandler(async (event: H3Event) => {
-  const authToken = event.context.authToken
+  const { authToken } = event.context
   deleteCookie(event, 'authToken')
   if (!authToken) {
     return {
diff --git a/apps/app/server/api/auth/send-code.post.ts b/apps/app/server/api/auth/send-code.post.ts
index e4e9537..6861783 100644
--- a/apps/app/server/api/auth/send-code.post.ts
+++ b/apps/app/server/api/auth/send-code.post.ts
@@ -1,6 +1,6 @@
 import type { CreateUserInput } from '@shelve/types'
 import { H3Event } from 'h3'
-import { upsertUser } from '~/server/app/userService'
+import { upsertUser } from '~~/server/app/userService'
 
 export default eventHandler(async (event: H3Event) => {
   const body = await readBody(event) as CreateUserInput
diff --git a/apps/app/server/api/project/[id]/index.delete.ts b/apps/app/server/api/project/[id]/index.delete.ts
index d15d343..c2676ef 100644
--- a/apps/app/server/api/project/[id]/index.delete.ts
+++ b/apps/app/server/api/project/[id]/index.delete.ts
@@ -1,8 +1,8 @@
 import { H3Event } from 'h3'
-import { deleteProject } from '~/server/app/projectService'
+import { deleteProject } from '~~/server/app/projectService'
 
 export default eventHandler(async (event: H3Event) => {
-  const user = event.context.user
+  const { user } = event.context
   const id = getRouterParam(event, 'id') as string
   if (!id) throw createError({ statusCode: 400, statusMessage: 'Missing params' })
   await deleteProject(id, user.id)
diff --git a/apps/app/server/api/project/[id]/index.get.ts b/apps/app/server/api/project/[id]/index.get.ts
index 40fddf7..5348720 100644
--- a/apps/app/server/api/project/[id]/index.get.ts
+++ b/apps/app/server/api/project/[id]/index.get.ts
@@ -1,5 +1,5 @@
 import { H3Event } from 'h3'
-import { getProjectById } from '~/server/app/projectService'
+import { getProjectById } from '~~/server/app/projectService'
 
 export default eventHandler(async (event: H3Event) => {
   const id = getRouterParam(event, 'id') as string
diff --git a/apps/app/server/api/project/[id]/index.put.ts b/apps/app/server/api/project/[id]/index.put.ts
index 0149eb0..2ce0f91 100644
--- a/apps/app/server/api/project/[id]/index.put.ts
+++ b/apps/app/server/api/project/[id]/index.put.ts
@@ -1,8 +1,8 @@
 import { H3Event } from 'h3'
-import { updateProject } from '~/server/app/projectService'
+import { updateProject } from '~~/server/app/projectService'
 
 export default eventHandler(async (event: H3Event) => {
-  const user = event.context.user
+  const { user } = event.context
   const id = getRouterParam(event, 'id') as string
   if (!id) throw createError({ statusCode: 400, statusMessage: 'Missing params' })
   const projectUpdateInput = await readBody(event)
diff --git a/apps/app/server/api/project/[id]/team/[teamId].delete.ts b/apps/app/server/api/project/[id]/team/[teamId].delete.ts
index ca44686..bb5483d 100644
--- a/apps/app/server/api/project/[id]/team/[teamId].delete.ts
+++ b/apps/app/server/api/project/[id]/team/[teamId].delete.ts
@@ -1,5 +1,5 @@
 import { H3Event } from 'h3'
-import { removeTeamFromProject } from '~/server/app/projectService'
+import { removeTeamFromProject } from '~~/server/app/projectService'
 
 export default defineEventHandler(async (event: H3Event) => {
   const id = getRouterParam(event, 'id') as string
diff --git a/apps/app/server/api/project/[id]/team/[teamId].post.ts b/apps/app/server/api/project/[id]/team/[teamId].post.ts
index 73bdfdf..193e7e9 100644
--- a/apps/app/server/api/project/[id]/team/[teamId].post.ts
+++ b/apps/app/server/api/project/[id]/team/[teamId].post.ts
@@ -1,5 +1,5 @@
 import { H3Event } from 'h3'
-import { addTeamToProject } from '~/server/app/projectService'
+import { addTeamToProject } from '~~/server/app/projectService'
 
 export default defineEventHandler(async (event: H3Event) => {
   const id = getRouterParam(event, 'id') as string
diff --git a/apps/app/server/api/project/index.get.ts b/apps/app/server/api/project/index.get.ts
index 238956d..e264792 100644
--- a/apps/app/server/api/project/index.get.ts
+++ b/apps/app/server/api/project/index.get.ts
@@ -1,7 +1,7 @@
 import { H3Event } from 'h3'
-import { getProjectsByUserId } from '~/server/app/projectService'
+import { getProjectsByUserId } from '~~/server/app/projectService'
 
 export default eventHandler(async (event: H3Event) => {
-  const user = event.context.user
+  const { user } = event.context
   return await getProjectsByUserId(user.id)
 })
diff --git a/apps/app/server/api/project/index.post.ts b/apps/app/server/api/project/index.post.ts
index e1cb976..d1a904d 100644
--- a/apps/app/server/api/project/index.post.ts
+++ b/apps/app/server/api/project/index.post.ts
@@ -1,8 +1,8 @@
 import { H3Event } from 'h3'
-import { createProject } from '~/server/app/projectService'
+import { createProject } from '~~/server/app/projectService'
 
 export default eventHandler(async (event: H3Event) => {
-  const user = event.context.user
+  const { user } = event.context
   const projectCreateInput = await readBody(event)
   delete projectCreateInput.variables
   projectCreateInput.name = projectCreateInput.name.trim()
diff --git a/apps/app/server/api/project/name/[name].get.ts b/apps/app/server/api/project/name/[name].get.ts
index 3c33e86..ed16dc6 100644
--- a/apps/app/server/api/project/name/[name].get.ts
+++ b/apps/app/server/api/project/name/[name].get.ts
@@ -1,5 +1,5 @@
 import { H3Event } from 'h3'
-import prisma from '~/server/database/client'
+import prisma from '~~/server/database/client'
 
 export default eventHandler(async (event: H3Event) => {
   const paramName = getRouterParam(event, 'name')
diff --git a/apps/app/server/api/teams/[teamId]/index.delete.ts b/apps/app/server/api/teams/[teamId]/index.delete.ts
index 4060abb..8f08042 100644
--- a/apps/app/server/api/teams/[teamId]/index.delete.ts
+++ b/apps/app/server/api/teams/[teamId]/index.delete.ts
@@ -1,8 +1,8 @@
 import { H3Event } from 'h3'
-import { deleteTeam } from '~/server/app/teamsService'
+import { deleteTeam } from '~~/server/app/teamsService'
 
 export default eventHandler(async (event: H3Event) => {
-  const user = event.context.user
+  const { user } = event.context
   const id = getRouterParam(event, 'teamId') as string
   if (!id) throw createError({ statusCode: 400, statusMessage: 'Missing params' })
   await deleteTeam(parseInt(id), user.id)
diff --git a/apps/app/server/api/teams/[teamId]/members/[id].delete.ts b/apps/app/server/api/teams/[teamId]/members/[id].delete.ts
index 3fe8c8d..aed52b5 100644
--- a/apps/app/server/api/teams/[teamId]/members/[id].delete.ts
+++ b/apps/app/server/api/teams/[teamId]/members/[id].delete.ts
@@ -1,8 +1,8 @@
 import { H3Event } from 'h3'
-import { removeMember } from '~/server/app/teamsService'
+import { removeMember } from '~~/server/app/teamsService'
 
 export default eventHandler(async (event: H3Event) => {
-  const user = event.context.user
+  const { user } = event.context
   const teamId = getRouterParam(event, 'teamId') as string
   const memberId = getRouterParam(event, 'id') as string
   if (!teamId || !memberId) throw createError({ statusCode: 400, statusMessage: 'Missing params' })
diff --git a/apps/app/server/api/teams/[teamId]/members/index.post.ts b/apps/app/server/api/teams/[teamId]/members/index.post.ts
index e0e37b4..739cc39 100644
--- a/apps/app/server/api/teams/[teamId]/members/index.post.ts
+++ b/apps/app/server/api/teams/[teamId]/members/index.post.ts
@@ -1,8 +1,8 @@
 import { H3Event } from 'h3'
-import { upsertMember } from '~/server/app/teamsService'
+import { upsertMember } from '~~/server/app/teamsService'
 
 export default eventHandler(async (event: H3Event) => {
-  const user = event.context.user
+  const { user } = event.context
   const teamId = getRouterParam(event, 'teamId') as string
   if (!teamId) throw createError({ statusCode: 400, statusMessage: 'Missing params' })
   const addMemberInput = await readBody(event)
diff --git a/apps/app/server/api/teams/index.get.ts b/apps/app/server/api/teams/index.get.ts
index 5786313..23e50a6 100644
--- a/apps/app/server/api/teams/index.get.ts
+++ b/apps/app/server/api/teams/index.get.ts
@@ -1,8 +1,8 @@
 import { H3Event } from 'h3'
-import prisma from '~/server/database/client'
+import prisma from '~~/server/database/client'
 
 export default eventHandler(async (event: H3Event) => {
-  const user = event.context.user
+  const { user } = event.context
   return await prisma.team.findMany({
     where: {
       members: {
diff --git a/apps/app/server/api/teams/index.post.ts b/apps/app/server/api/teams/index.post.ts
index 4f1fe90..bef0d45 100644
--- a/apps/app/server/api/teams/index.post.ts
+++ b/apps/app/server/api/teams/index.post.ts
@@ -1,9 +1,9 @@
 import { H3Event } from 'h3'
 import { CreateTeamInput } from '@shelve/types'
-import { createTeam } from '~/server/app/teamsService'
+import { createTeam } from '~~/server/app/teamsService'
 
 export default eventHandler(async (event: H3Event) => {
-  const user = event.context.user
+  const { user } = event.context
   const createTeamInput = await readBody(event) as CreateTeamInput
   createTeamInput.name = createTeamInput.name.trim()
   return await createTeam(createTeamInput, user.id)
diff --git a/apps/app/server/api/user/index.delete.ts b/apps/app/server/api/user/index.delete.ts
index d01c012..a3f3aa5 100644
--- a/apps/app/server/api/user/index.delete.ts
+++ b/apps/app/server/api/user/index.delete.ts
@@ -1,8 +1,8 @@
 import { H3Event } from 'h3'
-import { deleteUser } from '~/server/app/userService'
+import { deleteUser } from '~~/server/app/userService'
 
 export default eventHandler(async (event: H3Event) => {
-  const user = event.context.user
+  const { user } = event.context
   await deleteUser(user.id)
   return {
     statusCode: 200,
diff --git a/apps/app/server/api/user/index.put.ts b/apps/app/server/api/user/index.put.ts
index de5bd0f..517670a 100644
--- a/apps/app/server/api/user/index.put.ts
+++ b/apps/app/server/api/user/index.put.ts
@@ -1,10 +1,10 @@
 import { H3Event } from 'h3'
 import { UpdateUserInput } from '@shelve/types'
-import { updateUser } from '~/server/app/userService'
+import { updateUser } from '~~/server/app/userService'
 
 export default eventHandler(async (event: H3Event) => {
-  const user = event.context.user
-  const authToken = event.context.authToken
+  const { user } = event.context
+  const { authToken } = event.context
   const updateUserInput = await readBody(event) as UpdateUserInput
   updateUserInput.username = updateUserInput.username?.trim()
   updateUserInput.email = updateUserInput.email?.trim()
diff --git a/apps/app/server/api/user/session/[id].delete.ts b/apps/app/server/api/user/session/[id].delete.ts
index a8fad52..a067e26 100644
--- a/apps/app/server/api/user/session/[id].delete.ts
+++ b/apps/app/server/api/user/session/[id].delete.ts
@@ -1,9 +1,9 @@
 import { H3Event } from 'h3'
-import prisma from '~/server/database/client'
-import { removeCachedUserToken } from '~/server/app/userService'
+import prisma from '~~/server/database/client'
+import { removeCachedUserToken } from '~~/server/app/userService'
 
 export default eventHandler(async (event: H3Event) => {
-  const user = event.context.user
+  const { user } = event.context
   const id = getRouterParam(event, 'id') as string
   if (!id) throw createError({ statusCode: 400, statusMessage: 'missing params' })
   const deletedSession = await prisma.session.delete({
diff --git a/apps/app/server/api/user/session/index.delete.ts b/apps/app/server/api/user/session/index.delete.ts
index 834a9ca..afaa49e 100644
--- a/apps/app/server/api/user/session/index.delete.ts
+++ b/apps/app/server/api/user/session/index.delete.ts
@@ -1,9 +1,9 @@
 import { H3Event } from 'h3'
-import { deleteSessions } from '~/server/app/sessionService'
+import { deleteSessions } from '~~/server/app/sessionService'
 
 export default eventHandler(async (event: H3Event) => {
-  const authToken = event.context.authToken
-  const user = event.context.user
+  const { authToken } = event.context
+  const { user } = event.context
   await deleteSessions(user.id, authToken)
   return {
     statusCode: 200,
diff --git a/apps/app/server/api/user/session/index.get.ts b/apps/app/server/api/user/session/index.get.ts
index a40d40e..4d94119 100644
--- a/apps/app/server/api/user/session/index.get.ts
+++ b/apps/app/server/api/user/session/index.get.ts
@@ -1,8 +1,8 @@
 import { H3Event } from 'h3'
-import { getSessions } from '~/server/app/sessionService'
+import { getSessions } from '~~/server/app/sessionService'
 
 export default eventHandler(async (event: H3Event) => {
-  const authToken = event.context.authToken
-  const user = event.context.user
+  const { authToken } = event.context
+  const { user } = event.context
   return await getSessions(user.id, authToken) || []
 })
diff --git a/apps/app/server/api/variable/[id]/[env].delete.ts b/apps/app/server/api/variable/[id]/[env].delete.ts
index 11d5fb1..53f61e4 100644
--- a/apps/app/server/api/variable/[id]/[env].delete.ts
+++ b/apps/app/server/api/variable/[id]/[env].delete.ts
@@ -1,5 +1,5 @@
 import { H3Event } from 'h3'
-import { deleteVariable } from '~/server/app/variableService'
+import { deleteVariable } from '~~/server/app/variableService'
 
 export default eventHandler(async (event: H3Event) => {
   const id = getRouterParam(event, 'id') as string
diff --git a/apps/app/server/api/variable/[id]/[env].get.ts b/apps/app/server/api/variable/[id]/[env].get.ts
index c022f85..283e35a 100644
--- a/apps/app/server/api/variable/[id]/[env].get.ts
+++ b/apps/app/server/api/variable/[id]/[env].get.ts
@@ -1,6 +1,6 @@
 import { Environment } from '@shelve/types'
 import { H3Event } from 'h3'
-import { getVariablesByProjectId } from '~/server/app/variableService'
+import { getVariablesByProjectId } from '~~/server/app/variableService'
 
 export default eventHandler(async (event: H3Event) => {
   const id = getRouterParam(event, 'id') as string
diff --git a/apps/app/server/api/variable/index.delete.ts b/apps/app/server/api/variable/index.delete.ts
index 56d24fc..13817b5 100644
--- a/apps/app/server/api/variable/index.delete.ts
+++ b/apps/app/server/api/variable/index.delete.ts
@@ -1,8 +1,8 @@
 import { H3Event } from 'h3'
-import { deleteVariables } from '~/server/app/variableService'
+import { deleteVariables } from '~~/server/app/variableService'
 
 export default defineEventHandler(async (event: H3Event) => {
-  const user = event.context.user
+  const { user } = event.context
   const body = await readBody(event)
   const variablesId = body.variables
   await deleteVariables(variablesId, user)
diff --git a/apps/app/server/api/variable/index.post.ts b/apps/app/server/api/variable/index.post.ts
index 14cb930..43ba670 100644
--- a/apps/app/server/api/variable/index.post.ts
+++ b/apps/app/server/api/variable/index.post.ts
@@ -1,7 +1,7 @@
 import { type VariablesCreateInput } from '@shelve/types'
 import { H3Event } from 'h3'
-import { upsertVariable } from '~/server/app/variableService'
-import { getProjectById } from '~/server/app/projectService'
+import { upsertVariable } from '~~/server/app/variableService'
+import { getProjectById } from '~~/server/app/projectService'
 
 export default eventHandler(async (event: H3Event) => {
   const variablesCreateInput = await readBody(event) as VariablesCreateInput
diff --git a/apps/app/server/api/variable/project/[projectId].get.ts b/apps/app/server/api/variable/project/[projectId].get.ts
index 4e95b2a..2146682 100644
--- a/apps/app/server/api/variable/project/[projectId].get.ts
+++ b/apps/app/server/api/variable/project/[projectId].get.ts
@@ -1,5 +1,5 @@
 import { H3Event } from 'h3'
-import { getVariablesByProjectId } from '~/server/app/variableService'
+import { getVariablesByProjectId } from '~~/server/app/variableService'
 
 export default eventHandler(async (event: H3Event) => {
   const id = getRouterParam(event, 'projectId') as string
diff --git a/apps/app/server/app/authService.ts b/apps/app/server/app/authService.ts
index b8d7545..b840c76 100644
--- a/apps/app/server/app/authService.ts
+++ b/apps/app/server/app/authService.ts
@@ -1,8 +1,8 @@
 import type { CreateSessionInput, User } from '@shelve/types'
 import bcrypt from 'bcryptjs'
-import { createSession } from '~/server/app/sessionService'
-import { getUserByEmail } from '~/server/app/userService'
-import prisma from '~/server/database/client'
+import { createSession } from '~~/server/app/sessionService'
+import { getUserByEmail } from '~~/server/app/userService'
+import prisma from '~~/server/database/client'
 
 export async function login(createSessionDto: CreateSessionInput): Promise<{ user: User; authToken: string }> {
   const user = await getUserByEmail(createSessionDto.email.trim())
diff --git a/apps/app/server/app/projectService.ts b/apps/app/server/app/projectService.ts
index b255ded..1c1e2d7 100644
--- a/apps/app/server/app/projectService.ts
+++ b/apps/app/server/app/projectService.ts
@@ -1,5 +1,5 @@
 import type { CreateProjectInput, ProjectUpdateInput, Team } from '@shelve/types'
-import prisma from '~/server/database/client'
+import prisma from '~~/server/database/client'
 
 type CreateProjectInputWithAll = CreateProjectInput & { ownerId: number, team?: { connect: { id: number } } }
 
diff --git a/apps/app/server/app/resendService.ts b/apps/app/server/app/resendService.ts
index 67f9856..31fa6d6 100644
--- a/apps/app/server/app/resendService.ts
+++ b/apps/app/server/app/resendService.ts
@@ -1,21 +1,21 @@
 import { Resend } from 'resend'
-import { useCompiler } from '#vue-email'
+import { render } from '@vue-email/render'
+import verifyOtp from '../emails/verifyOtp.vue'
 
-const resend = new Resend(process.env.NUXT_PRIVATE_RESEND_API_KEY)
+const runtimeConfig = useRuntimeConfig()
+
+const resend = new Resend(runtimeConfig.private.resendApiKey)
 
 export async function sendOtp(email: string, otp: string) {
-  const runtimeConfig = useRuntimeConfig()
-  const siteUrl = runtimeConfig.public.siteUrl
-  let template = { html: '' }
+  const { siteUrl } = runtimeConfig.public
+  let template
   try {
-    template = await useCompiler('verify-otp.vue', {
-      props: {
-        otp,
-        redirectUrl: `${siteUrl}/login?email=${email}&otp=${otp}`,
-      }
+    template = await render(verifyOtp, {
+      otp,
+      redirectUrl: `${siteUrl}/login?email=${email}&otp=${otp}`,
     })
   } catch (error) {
-    template.html = `<h1>OTP: ${otp}</h1>`
+    template = `<h1>OTP: ${otp}</h1>`
   }
 
   try {
@@ -23,7 +23,11 @@ export async function sendOtp(email: string, otp: string) {
       from: 'HugoRCD <contact@hrcd.fr>',
       to: [email],
       subject: 'Welcome to Shelve!',
-      html: template.html,
+      html: template,
+    }).then((response) => {
+      console.log('Email sent: ', response)
     })
-  } catch (error) { /* empty */ }
+  } catch (error) {
+    console.log('Error sending email: ', error)
+  }
 }
diff --git a/apps/app/server/app/sessionService.ts b/apps/app/server/app/sessionService.ts
index 21a31c8..221d9f5 100644
--- a/apps/app/server/app/sessionService.ts
+++ b/apps/app/server/app/sessionService.ts
@@ -1,7 +1,7 @@
 import type { User, SessionWithCurrent, CreateSessionInput } from '@shelve/types'
 import jwt from 'jsonwebtoken'
-import prisma from '~/server/database/client'
-import { removeCachedUserToken } from '~/server/app/userService'
+import prisma from '~~/server/database/client'
+import { removeCachedUserToken } from '~~/server/app/userService'
 
 const runtimeConfig = useRuntimeConfig().private
 
diff --git a/apps/app/server/app/teamsService.ts b/apps/app/server/app/teamsService.ts
index 72c20b1..0f64503 100644
--- a/apps/app/server/app/teamsService.ts
+++ b/apps/app/server/app/teamsService.ts
@@ -1,5 +1,5 @@
 import { CreateTeamInput, TeamRole } from '@shelve/types'
-import prisma from '~/server/database/client'
+import prisma from '~~/server/database/client'
 
 export async function createTeam(createTeamInput: CreateTeamInput, userId: number) {
   return await prisma.team.create({
diff --git a/apps/app/server/app/userService.ts b/apps/app/server/app/userService.ts
index c6fb38a..265a7af 100644
--- a/apps/app/server/app/userService.ts
+++ b/apps/app/server/app/userService.ts
@@ -2,12 +2,12 @@ import type { publicUser, User, CreateUserInput, UpdateUserInput } from '@shelve
 import { Role } from '@shelve/types'
 import jwt from 'jsonwebtoken'
 import bcrypt from 'bcryptjs'
-import { deleteSession } from '~/server/app/sessionService'
-import prisma, { formatUser } from '~/server/database/client'
-import { generateOtp } from '~/server/app/authService'
-import { sendOtp } from '~/server/app/resendService'
+import { deleteSession } from '~~/server/app/sessionService'
+import prisma, { formatUser } from '~~/server/database/client'
+import { generateOtp } from '~~/server/app/authService'
+import { sendOtp } from '~~/server/app/resendService'
 
-type jwtPayload = {
+type JwtPayload = {
   id: number;
   role: Role;
   username: string;
@@ -18,7 +18,7 @@ const runtimeConfig = useRuntimeConfig().private
 
 export async function upsertUser(createUserInput: CreateUserInput) {
   const { otp, encryptedOtp } = await generateOtp()
-  let password = createUserInput.password
+  let { password } = createUserInput
   if (password) password = await bcrypt.hash(password, 10)
   const user = await prisma.user.upsert({
     where: {
@@ -75,7 +75,7 @@ export const getUserByAuthToken = cachedFunction(async (authToken: string): Prom
 
 export async function verifyUserToken(token: string, user: User): Promise<boolean> {
   try {
-    const decoded = jwt.verify(token, runtimeConfig.authSecret) as jwtPayload
+    const decoded = jwt.verify(token, runtimeConfig.authSecret) as JwtPayload
     if (decoded.id !== user.id) return false
     return true
   } catch (error) {
diff --git a/apps/app/server/app/variableService.ts b/apps/app/server/app/variableService.ts
index ab51d6b..19e7313 100644
--- a/apps/app/server/app/variableService.ts
+++ b/apps/app/server/app/variableService.ts
@@ -1,6 +1,6 @@
 import { Environment, User, Variable, type VariablesCreateInput } from '@shelve/types'
 import { decrypt, encrypt } from '@shelve/utils'
-import prisma from '~/server/database/client'
+import prisma from '~~/server/database/client'
 
 const varAssociation = {
   production: 'production',
@@ -15,13 +15,13 @@ function getEnvString(env: string) {
 }
 
 export async function upsertVariable(variablesCreateInput: VariablesCreateInput) {
-  const { secret_encryption_key, secret_encryption_iterations } = useRuntimeConfig().private
+  const { secretEncryptionKey, secretEncryptionIterations } = useRuntimeConfig().private
 
   const encryptVariables = (variables: VariablesCreateInput['variables']) => {
     return variables.map((variable) => {
-      const encryptedValue = encrypt(variable.value, secret_encryption_key, parseInt(secret_encryption_iterations))
+      const encryptedValue = encrypt(variable.value, secretEncryptionKey, parseInt(secretEncryptionIterations))
       variable.environment = getEnvString(variable.environment)
-       
+
       const { index, ...rest } = variable
       return { ...rest, value: encryptedValue }
     })
@@ -41,7 +41,6 @@ export async function upsertVariable(variablesCreateInput: VariablesCreateInput)
     data: encryptedVariables,
     skipDuplicates: true,
   })
-
 }
 
 export async function getVariablesByProjectId(projectId: number, environment?: Environment): Promise<Variable[]> {
@@ -54,7 +53,7 @@ export async function getVariablesByProjectId(projectId: number, environment?: E
   } : { projectId }
   const variables = await prisma.variables.findMany({ where: options, orderBy: { updatedAt: 'desc' } })
   return variables.map((variable) => {
-    const decryptedValue = decrypt(variable.value, runtimeConfig.secret_encryption_key, parseInt(runtimeConfig.secret_encryption_iterations))
+    const decryptedValue = decrypt(variable.value, runtimeConfig.secretEncryptionKey, parseInt(runtimeConfig.secretEncryptionIterations))
     return {
       ...variable,
       value: decryptedValue,
diff --git a/apps/app/server/emails/verifyOtp.vue b/apps/app/server/emails/verifyOtp.vue
new file mode 100644
index 0000000..63c0115
--- /dev/null
+++ b/apps/app/server/emails/verifyOtp.vue
@@ -0,0 +1,74 @@
+<script setup lang="ts">
+import {
+  Tailwind,
+  Container,
+  Text,
+  Preview,
+  Heading,
+  Button,
+  Html,
+  Body,
+  Link,
+  Section,
+  Head,
+  Hr
+} from '@vue-email/components'
+
+defineProps({
+  otp: {
+    type: String,
+    required: true
+  },
+  redirectUrl: {
+    type: String,
+    required: true
+  }
+})
+</script>
+
+<template>
+  <Tailwind>
+    <Html>
+      <Head />
+      <Preview>
+        Here is your code to access Shelve
+      </Preview>
+      <Body class="m-auto bg-white font-sans">
+        <Container class="mx-auto my-[40px] max-w-[465px] rounded border border-solid border-[#eaeaea] p-[20px] md:p-7">
+          <Heading class="mb-4 text-center text-2xl font-bold text-[#000000] md:text-3xl">
+            Welcome to Shelve
+          </Heading>
+          <Text class="mb-4 text-center text-[#000000]">
+            Your code is:
+          </Text>
+          <Text class="mb-4 text-center text-[36px] font-bold text-[#000000]">
+            <span class="text-[#2C3BF5]">{{ otp }}</span>
+          </Text>
+          <Text class="mb-4 text-center text-[#000000]">
+            Use this code to login to Shelve
+          </Text>
+          <Section class="my-[32px] text-center">
+            <Button class="rounded bg-[#000000] px-8 py-3 text-center text-[12px] font-semibold text-white no-underline" :href="redirectUrl">
+              Go to Shelve
+            </Button>
+          </Section>
+          <Text class="text-[14px] leading-[24px] text-black">
+            or copy and paste this URL into your browser:
+            <Link :href="redirectUrl" class="text-[#2C3BF5]">
+              {{ redirectUrl }}
+            </Link>
+          </Text>
+          <Hr class="mx-0 my-[26px] w-full border border-solid border-[#eaeaea]" />
+          <Text class="text-[12px] leading-[24px] text-[#666666]">
+            If you were not expecting this invitation, you can safely ignore this email. If you are concerned about your account's safety,
+            please send an email to contact@hrcd.fr
+          </Text>
+        </Container>
+      </Body>
+    </Html>
+  </Tailwind>
+</template>
+
+<style scoped>
+
+</style>
diff --git a/apps/app/server/middleware/1.serverAuth.ts b/apps/app/server/middleware/1.serverAuth.ts
index ec34e26..7b52903 100644
--- a/apps/app/server/middleware/1.serverAuth.ts
+++ b/apps/app/server/middleware/1.serverAuth.ts
@@ -1,5 +1,5 @@
 import { H3Event } from 'h3'
-import { getUserByAuthToken, verifyUserToken } from '~/server/app/userService'
+import { getUserByAuthToken, verifyUserToken } from '~~/server/app/userService'
 
 export default defineEventHandler(async (event: H3Event) => {
   const protectedRoutes = [
diff --git a/apps/app/server/middleware/2.serverAdmin.ts b/apps/app/server/middleware/2.serverAdmin.ts
index 63961df..ff23b31 100644
--- a/apps/app/server/middleware/2.serverAdmin.ts
+++ b/apps/app/server/middleware/2.serverAdmin.ts
@@ -4,7 +4,7 @@ import { H3Event } from 'h3'
 export default defineEventHandler((event: H3Event) => {
   const protectedRoutes = ['/api/admin']
 
-  const user = event.context.user
+  const { user } = event.context
 
   if (protectedRoutes.some((route) => event.path?.startsWith(route)) && (!user || user.role !== Role.ADMIN)) {
     return sendError(
diff --git a/bun.lockb b/bun.lockb
index e19c996..b2711c6 100755
Binary files a/bun.lockb and b/bun.lockb differ
diff --git a/package.json b/package.json
index b15c21e..2d46e16 100644
--- a/package.json
+++ b/package.json
@@ -16,7 +16,7 @@
   "devDependencies": {
     "changelogen": "^0.5.5",
     "eslint": "^9.5.0",
-    "turbo": "latest",
+    "turbo": "^2.0.5",
     "typescript": "5.5.2"
   },
   "engines": {
diff --git a/turbo.json b/turbo.json
index c5a673c..c01e08e 100644
--- a/turbo.json
+++ b/turbo.json
@@ -1,7 +1,7 @@
 {
   "$schema": "https://turbo.build/schema.json",
   "globalDependencies": ["**/.env.*local"],
-  "pipeline": {
+  "tasks": {
     "build": {
       "dependsOn": ["^build"],
       "outputs": [