breaking: Switch from Prisma to Drizzle ORM (#319)

Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
HugoRCD · Nov 20, 2024 · c27dadc · c27dadc
1 parent a3a31bb
commit c27dadc
Show file tree

Hide file tree

Showing 139 changed files with 3,422 additions and 2,308 deletions.
diff --git a/.gitignore b/.gitignore
@@ -131,7 +131,7 @@ dist
 .pnp.*
 
 # Turbo
-.turbo
+.turbo/*
 
 # Intellij
 .idea

diff --git a/apps/lp/.config/shelve.config.json b/apps/lp/.config/shelve.config.json
@@ -1,4 +1,4 @@
 {
-  "$schema": "https://raw.githubusercontent.com/HugoRCD/shelve/main/packages/types/shelveConfigSchema.json",
+  "$schema": "https://raw.githubusercontent.com/HugoRCD/shelve/main/packages/types/shelve-config-schema.json",
   "project": "shelve-lp"
 }
diff --git a/apps/lp/app/app.vue b/apps/lp/app/app.vue
@@ -19,7 +19,7 @@ useSeoMeta({
   title,
   description,
   author: 'Hugo Richard',
-  twitter: '@HugoRCD__',
+  twitterCreator: '@HugoRCD__',
   twitterTitle: title,
   twitterDescription: description,
   twitterCard: 'summary_large_image',
@@ -34,7 +34,7 @@ useSeoMeta({
 
 <template>
   <Html lang="en">
-    <Body class="selection:bg-primary font-geist relative overflow-x-hidden bg-white text-black selection:text-inverted dark:bg-neutral-950 dark:text-white">
+    <Body class="overscroll-y-none selection:bg-primary font-geist relative overflow-x-hidden bg-white text-black selection:text-inverted dark:bg-neutral-950 dark:text-white">
       <UApp :tooltip="{ delayDuration: 0 }">
         <NuxtLayout>
           <NuxtPage />

diff --git a/apps/lp/app/assets/style/main.css b/apps/lp/app/assets/style/main.css
@@ -1,13 +1,6 @@
 @import "tailwindcss";
 @import "@nuxt/ui";
 
-/* Global styles, css resets, etc. */
-html, body, #__nuxt, #__layout {
-    width: 100%;
-    height: 100%;
-    overscroll-behavior: none;
-}
-
 ::-webkit-scrollbar {
     width: 5px;
     height: 2px;
@@ -18,6 +11,10 @@ html, body, #__nuxt, #__layout {
     border-radius: 5px;
 }
 
+:root {
+  --ui-radius: var(--radius-sm);
+}
+
 @theme {
   --font-newsreader: 'Newsreader', serif;
   --font-inter: 'Inter', sans-serif;

diff --git a/apps/lp/app/components/UDivider.vue b/apps/lp/app/components/UDivider.vue
diff --git a/apps/lp/app/components/layout/Navbar.vue b/apps/lp/app/components/layout/Navbar.vue
@@ -8,6 +8,10 @@ const items = navigation.map((item) => ({
   slot: item.name.toLowerCase(),
 }))
 
+type RepoType = {
+  stars: number
+}
+
 const githubStars = ref('0')
 async function fetchRepo() {
   try {

diff --git a/apps/lp/app/components/vault/Decrypt.vue b/apps/lp/app/components/vault/Decrypt.vue
@@ -19,7 +19,7 @@ async function decryptEnvFile() {
     readsLeft.value = reads
     timeLeft.value = ttl
     toast.success('Your secret(s) has been decrypted')
-  } catch (error) {
+  } catch (error: any) {
     if (error.statusCode === 400) {
       toast.error(error.statusMessage)
     } else {

diff --git a/apps/lp/app/pages/index.vue b/apps/lp/app/pages/index.vue
@@ -21,10 +21,10 @@ function useClipboard(text: string) {
 
 <template>
   <div class="flex flex-col gap-4">
-    <div class="flex h-full flex-col items-center justify-center gap-3 p-5">
+    <div class="flex h-full flex-col items-center justify-center gap-3 p-5 mb-10">
       <LandingHero class="h-64" />
     </div>
-    <div class="mx-auto mt-16 flex max-w-6xl flex-col gap-16 px-8 sm:flex-row sm:gap-8 sm:px-16">
+    <div class="mx-auto h-64 flex max-w-6xl flex-col gap-16 px-8 sm:flex-row sm:gap-8 sm:px-16">
       <div class="flex w-fit flex-col gap-2">
         <NuxtLink
           class="mb-4"
@@ -61,7 +61,7 @@ function useClipboard(text: string) {
           </div>
         </div>
 
-        <div class="relative -top-12 py-20">
+        <div class="relative -top-12 py-28">
           <div class="absolute inset-0 flex items-center justify-center [mask-image:linear-gradient(to_bottom,white,transparent)]">
             <div class="bg-white/2.5 absolute size-96 rounded-full shadow-xl" />
 
@@ -80,7 +80,7 @@ function useClipboard(text: string) {
         </div>
       </div>
     </div>
-    <div class="flex flex-col gap-16 p-5">
+    <div class="flex flex-col max-sm:mt-64 gap-16 p-5">
       <div>
         <LandingFeatures />
       </div>

diff --git a/apps/lp/package.json b/apps/lp/package.json
@@ -21,14 +21,14 @@
     "vue-sonner": "^1.2.5",
     "@shelve/types": "*",
     "@shelve/crypto": "*",
-    "@tsparticles/engine": "^3.5.0",
-    "@tsparticles/slim": "^3.5.0",
+    "@tsparticles/engine": "^3.6.0",
+    "@tsparticles/slim": "^3.6.0",
     "@nuxt/image": "^1.8.1",
     "@nuxt/scripts": "^0.9.5",
-    "@nuxt/ui": "https://pkg.pr.new/@nuxt/ui@845f85a",
+    "@nuxt/ui": "https://pkg.pr.new/@nuxt/ui@25091ba",
     "@nuxtjs/seo": "^2.0.0-rc.23",
     "@iconify-json/heroicons": "^1.2.1",
-    "@iconify-json/lucide": "^1.2.12",
+    "@iconify-json/lucide": "^1.2.15",
     "@iconify-json/simple-icons": "^1.2.11",
     "@nuxt/content": "^2.13.4"
   }

diff --git a/apps/lp/server/api/vault.ts b/apps/lp/server/api/vault.ts
@@ -1,7 +1,6 @@
-import type { H3Event } from 'h3'
 import { VaultService } from '~~/server/services/vault.service'
 
-export default defineEventHandler(async (event: H3Event) => {
+export default defineEventHandler(async (event) => {
   const vault = new VaultService()
   const { id } = await getQuery(event)
 

diff --git a/apps/shelve/.config/shelve.config.json b/apps/shelve/.config/shelve.config.json
@@ -1,4 +1,4 @@
 {
-  "$schema": "https://raw.githubusercontent.com/HugoRCD/shelve/main/packages/types/shelveConfigSchema.json",
+  "$schema": "https://raw.githubusercontent.com/HugoRCD/shelve/main/packages/types/shelve-config-schema.json",
   "project": "shelve"
 }
diff --git a/apps/shelve/Dockerfile b/apps/shelve/Dockerfile
@@ -1,11 +1,9 @@
 # Stage 1: Build Stage
 FROM oven/bun:latest AS build
 
-ARG DATABASE_URL
 ARG TURBO_TEAM
 ARG TURBO_TOKEN
 
-ENV DATABASE_URL=$DATABASE_URL
 ENV TURBO_TEAM=$TURBO_TEAM
 ENV TURBO_TOKEN=$TURBO_TOKEN
 ENV NODE_ENV=production
@@ -29,7 +27,6 @@ FROM oven/bun:latest
 WORKDIR /app
 
 COPY --from=build /app/apps/shelve/.output .output
-COPY --from=build /app/apps/shelve/prisma ./prisma
 
 RUN apt-get update && apt-get install -y curl && rm -rf /var/lib/apt/lists/*
 

diff --git a/apps/shelve/app/app.vue b/apps/shelve/app/app.vue
@@ -12,7 +12,7 @@ useSeoMeta({
   title,
   description,
   author: 'Hugo Richard',
-  twitter: '@HugoRCD__',
+  twitterCreator: '@HugoRCD__',
   twitterTitle: title,
   twitterDescription: description,
   twitterCard: 'summary_large_image',
@@ -37,11 +37,31 @@ const reduceMotion = useCookie<boolean>('reduceMotion', {
 })
 
 if (import.meta.client) setPrefersReducedMotion(reduceMotion.value)
+
+const { fetchTeams } = useTeams()
+
+defineShortcuts({
+  'p': () => {
+    navigateTo('/')
+  },
+  'm': () => {
+    navigateTo('/members')
+  },
+  't': () => {
+    navigateTo('/tokens')
+  },
+  's': () => {
+    navigateTo('/settings')
+  },
+})
+
+if (!fetchTeams())
+  await fetchTeams()
 </script>
 
 <template>
   <Html lang="en">
-    <Body class="selection:bg-primary font-geist relative overflow-x-hidden bg-white text-black selection:text-inverted dark:bg-neutral-950 dark:text-white">
+    <Body class="overscroll-y-none selection:bg-primary font-geist relative overflow-x-hidden bg-white text-black selection:text-inverted dark:bg-neutral-950 dark:text-white">
       <UApp :tooltip="{ delayDuration: 0 }">
         <NuxtLayout>
           <NuxtPage />

diff --git a/apps/shelve/app/assets/style/main.css b/apps/shelve/app/assets/style/main.css
@@ -2,13 +2,6 @@
 @import "@nuxt/ui";
 @import "./animations.css";
 
-/* Global styles, css resets, etc. */
-html, body, #__nuxt, #__layout {
-    width: 100%;
-    height: 100%;
-    overscroll-behavior: none;
-}
-
 ::-webkit-scrollbar {
     width: 5px;
     height: 2px;

diff --git a/apps/shelve/app/components/UDivider.vue b/apps/shelve/app/components/UDivider.vue
diff --git a/apps/shelve/app/components/UserDropdown.vue b/apps/shelve/app/components/UserDropdown.vue
@@ -1,24 +1,6 @@
 <script setup lang="ts">
 import { Role } from '@shelve/types'
 
-const navigations = getNavigation('app')
-const navItem = navigations.map((nav) => {
-  return {
-    label: nav.name,
-    icon: nav.icon,
-    to: nav.path,
-  }
-})
-
-const adminNavigations = getNavigation('admin')
-const adminNavItem = adminNavigations.map((nav) => {
-  return {
-    label: nav.name,
-    icon: nav.icon,
-    to: nav.path,
-  }
-})
-
 const { loggedIn, user, clear } = useUserSession()
 
 const items = [
@@ -29,8 +11,6 @@ const items = [
       disabled: true
     }
   ],
-  navItem,
-  ...(user.value?.role === Role.ADMIN ? [adminNavItem] : []),
   [
     {
       label: 'Sign out',
@@ -49,7 +29,11 @@ const items = [
     <UDropdownMenu
       v-if="loggedIn"
       :items
-      :popper="{ placement: 'bottom-start' }"
+      :content="{
+        align: 'start',
+        side: 'right',
+        sideOffset: 8
+      }"
     >
       <UAvatar :src="user.avatar" :alt="user.username" class="cursor-pointer" />
 

diff --git a/.../shelve/app/components/layout/Sidebar.vue → ...app/components/layout/Sidebar/Content.vue b/.../shelve/app/components/layout/Sidebar.vue → ...app/components/layout/Sidebar/Content.vue
@@ -2,7 +2,8 @@
 import { Role } from '@shelve/types'
 
 const { user } = useUserSession()
-const navigations = getNavigation('app')
+const teamNavigations = getNavigation('team')
+const userNavigations = getNavigation('user')
 const adminNavigations = getNavigation('admin')
 
 const route = useRoute()
@@ -15,16 +16,16 @@ const handleProjectNavigation = () => {
     name: 'Project Details',
   }
   if (isCryptoRoute) {
-    const indexToReplace = navigations.findIndex((item) => item.path.includes('/project/'))
+    const indexToReplace = teamNavigations.findIndex((item) => item.path.includes('/project/'))
     if (indexToReplace !== -1) {
-      navigations.splice(indexToReplace, 1, projectNavigation)
+      teamNavigations.splice(indexToReplace, 1, projectNavigation)
     } else {
-      navigations.unshift(projectNavigation)
+      teamNavigations.unshift(projectNavigation)
     }
   } else {
-    const indexToRemove = navigations.findIndex((item) => item.path.includes('/project/'))
+    const indexToRemove = teamNavigations.findIndex((item) => item.path.includes('/project/'))
     if (indexToRemove !== -1) {
-      navigations.splice(indexToRemove, 1)
+      teamNavigations.splice(indexToRemove, 1)
     }
   }
 }
@@ -33,25 +34,44 @@ watch(() => route.path, handleProjectNavigation, { immediate: true })
 </script>
 
 <template>
-  <div class="flex flex-col gap-4 p-4 sm:w-[250px]">
-    <div class="mb-4">
+  <div class="flex h-full flex-col gap-4 p-4 sm:w-[250px]">
+    <div class="mb-2 flex items-center justify-between gap-2">
       <NuxtLink to="/" class="font-newsreader text-2xl font-light italic">
         Shelve
       </NuxtLink>
     </div>
+
+    <div>
+      <TeamManager />
+    </div>
+
+    <!-- Team -->
     <div class="flex flex-col gap-2">
-      <TransitionGroup name="bezier" tag="ul" class="flex flex-col gap-2" mode="out-in">
-        <LayoutNavItem v-for="nav in navigations" :key="nav.name" :active="nav.path === $route.path" :nav-item="nav" />
-      </TransitionGroup>
+      <div class="text-xs font-medium text-neutral-500 dark:text-neutral-400">
+        Team
+      </div>
+      <div class="flex flex-col gap-2">
+        <TransitionGroup name="bezier" tag="ul" class="flex flex-col gap-2" mode="out-in">
+          <LayoutNavItem v-for="nav in teamNavigations" :key="nav.name" :active="nav.path === route.path" :nav-item="nav" />
+        </TransitionGroup>
+      </div>
+    </div>
+
+    <div v-if="user" class="flex flex-col gap-2">
+      <USeparator class="my-3" />
+      <div class="text-xs font-medium text-neutral-500 dark:text-neutral-400">
+        User
+      </div>
+      <LayoutNavItem v-for="nav in userNavigations" :key="nav.name" :active="nav.path === route.path" :nav-item="nav" />
     </div>
 
     <!-- Admin -->
     <div v-if="user && user.role === Role.ADMIN" class="flex flex-col gap-2">
-      <UDivider class="my-3" />
+      <USeparator class="my-3" />
       <div class="text-xs font-medium text-neutral-500 dark:text-neutral-400">
         Admin
       </div>
-      <LayoutNavItem v-for="nav in adminNavigations" :key="nav.name" :active="nav.path === $route.path" :nav-item="nav" />
+      <LayoutNavItem v-for="nav in adminNavigations" :key="nav.name" :active="nav.path === route.path" :nav-item="nav" />
     </div>
 
     <div class="flex-1" />