Merge branch 'v0/global/db0811' of https://github.com/thinc-org/ipix into v0/global/db0811

Author: FaiiFaiipuipui

apps/api/src/index.ts

@@ -12,27 +12,32 @@ import { spaceRouter } from "./modules/space/route.js";
 import { itemRouter } from "./modules/item/route.js";
 import cron from "@elysiajs/cron";
 import { createDb } from "./drizzle/client.js";
-import {sql} from 'drizzle-orm'
+import { sql } from "drizzle-orm";
 import { uploadRouter } from "./modules/image/upload-multipart.js";
 
 const db = createDb({ databaseUrl: process.env.DATABASE_URL });
 
 const app = new Elysia()
-.use(betterAuthMiddleware)
-.use(cron({
-  name: 'alphaRecalcQueueDelete',
-  pattern: '0 */4 * * *',
-  async run() {
-    await db.execute(sql`DELETE FROM item_effective_recalc_queue WHERE enqueued_at < now() - interval '2 days';`)
-  }
-}))
+  .use(betterAuthMiddleware)
+  .use(
+    cron({
+      name: "alphaRecalcQueueDelete",
+      pattern: "0 */4 * * *",
+      async run() {
+        await db.execute(
+          sql`DELETE FROM item_effective_recalc_queue WHERE enqueued_at < now() - interval '2 days';`
+        );
+      },
+    })
+  )
   .use(
     cors({
       origin: [
-        "http://localhost:3000",
-        "http://[::1]:3000",
-        "http://localhost:5173",
-        "http://localhost:5174",
+        // "http://localhost:3000",
+        // "http://[::1]:3000",
+        // "http://localhost:5173",
+        // "http://localhost:5174",
+        `${process.env.ACCESS_CONTROL_ALLOW_ORIGIN!}:80`,
       ],
       methods: ["GET", "POST", "PUT", "DELETE", "OPTIONS"],
       credentials: true,
@@ -58,4 +63,4 @@ console.log(
   `🦊 Elysia is running at http://${app.server?.hostname}:${app.server?.port}`
 );
 
-export type App = typeof app
+export type App = typeof app;

apps/api/src/modules/auth/route.ts

@@ -6,7 +6,7 @@ import { createAuthMiddleware, openAPI } from "better-auth/plugins";
 import { createDb } from "../../drizzle/client.js";
 import { authSchema, storageSchema } from "@repo/rdb/schema";
 
-const db = createDb({databaseUrl: process.env.DATABASE_URL,})
+const db = createDb({ databaseUrl: process.env.DATABASE_URL });
 
 export const auth = betterAuth({
   databaseHooks: {
@@ -41,13 +41,13 @@ export const auth = betterAuth({
                 itemType: "folder",
               })
               .returning();
-          })
-        }
-      }
-    }
+          });
+        },
+      },
+    },
   },
-  baseURL: "http://localhost:3000/auth",
-  trustedOrigins: ["http://localhost:3000", "http://[::1]:3000"],
+  baseURL: `${process.env.ACCESS_CONTROL_ALLOW_ORIGIN!}:80/auth`,
+  trustedOrigins: [`${process.env.ACCESS_CONTROL_ALLOW_ORIGIN!}:80`],
   advanced: {
     defaultCookieAttributes: {
       sameSite: "lax",
@@ -72,7 +72,7 @@ export const auth = betterAuth({
     {
       schema: authSchema,
       provider: "pg",
-      debugLogs: true
+      debugLogs: true,
     }
   ),
   emailAndPassword: {
@@ -83,7 +83,7 @@ export const auth = betterAuth({
       enabled: true,
       clientId: process.env.GOOGLE_CLIENT_ID as string,
       clientSecret: process.env.GOOGLE_CLIENT_SECRET as string,
-      redirectURI: "http://localhost:20257/api/auth/callback/google",
+      redirectURI: `${process.env.API_BASE_URL!}:20257/api/auth/callback/google`,
       accessType: "offline",
       prompt: "select_account",
     },
@@ -119,7 +119,7 @@ export const betterAuthMiddleware = new Elysia({ name: "better-auth" })
   .all("/api/auth/*", async (context: Context) => {
     if (["POST", "GET"].includes(context.request.method)) {
       const response = await auth.handler(context.request);
-  
+
       console.log(response);
       // If it's a redirect response, make sure to return it properly
       if (response && response.status >= 300 && response.status < 400) {
@@ -171,4 +171,4 @@ export const betterAuthMiddleware = new Elysia({ name: "better-auth" })
         };
       },
     }),
-  });
+  });

apps/web/src/components/base-component/sidebar.tsx

@@ -63,13 +63,15 @@ export function Sidebar({
                     <AvatarImage src={userInfo.imageProfile} />
                     <AvatarFallback>U</AvatarFallback>
                   </Avatar>
-                  <div className="max-sm:text-sm">
+                  <div className="text-xs">
                     {userInfo.email ?? (
                       <span className="inline-block h-4 w-28 animate-pulse rounded bg-slate-200 dark:bg-slate-700" />
                     )}
                   </div>
                 </div>
-                <SignOutButton />
+                <div className="absolute right-1 text-xs">
+                  <SignOutButton />
+                </div>
               </div>
 
               <nav className="space-y-2">

apps/web/src/components/base-component/sign-out-button.tsx

@@ -25,11 +25,7 @@ export function SignOutButton() {
   return (
     <Dialog open={open} onOpenChange={setOpen}>
       <DialogTrigger asChild>
-        <Button
-          variant="ghost"
-          size="sm"
-          className="text-gray-500 max-sm:text-xs p-0"
-        >
+        <Button variant="ghost" size="sm" className="text-gray-500 text-xs p-0">
           Log Out
         </Button>
       </DialogTrigger>

packages/s3/index.ts

@@ -9,7 +9,8 @@ const {
   SECRET_ACCESS_KEY,
   FORCE_PATH_STYLE,
   ACCESS_CONTROL_ALLOW_ORIGIN,
-  PRE_SIGNED_URL_EXPIRE_IN, // in seconds
+  PRE_SIGNED_URL_EXPIRE_IN,
+  REDIS_URL, // in seconds
 } = Bun.env;
 
 const requiredEnvVars = {
@@ -21,6 +22,7 @@ const requiredEnvVars = {
   FORCE_PATH_STYLE,
   ACCESS_CONTROL_ALLOW_ORIGIN,
   PRE_SIGNED_URL_EXPIRE_IN,
+  REDIS_URL,
 };
 
 for (const [key, value] of Object.entries(requiredEnvVars)) {
@@ -61,9 +63,9 @@ function createSTSClient(): STSClient {
 
 export const accessControlAllowOrigin = ACCESS_CONTROL_ALLOW_ORIGIN as string;
 export const expiresIn = Number(PRE_SIGNED_URL_EXPIRE_IN);
-export const s3Bucket = S3_BUCKET as string
-export const s3Region = S3_REGION as string
-export const s3Endpoint = S3_ENDPOINT as string
+export const s3Bucket = S3_BUCKET as string;
+export const s3Region = S3_REGION as string;
+export const s3Endpoint = S3_ENDPOINT as string;
 
 export const s3 = createS3Client();
 export const sts = createSTSClient();

packages/s3/src/worker-preview.ts

@@ -75,19 +75,18 @@ export type PreviewJob = {
 };
 
 // Env
-const {
-  REDIS_URL = "redis://127.0.0.1:6379",
-  DATABASE_URL,
-  S3_BUCKET,
-} = process.env as Record<string, string | undefined>;
+const { REDIS_URL, DATABASE_URL, S3_BUCKET } = process.env as Record<
+  string,
+  string | undefined
+>;
 
 if (!DATABASE_URL) {
   throw new Error("DATABASE_URL is required for preview worker");
 }
 
 // BullMQ workers use blocking Redis commands; ioredis must not retry requests.
 // See error: "BullMQ: Your redis options maxRetriesPerRequest must be null."
-const redis = new Redis(REDIS_URL, {
+const redis = new Redis(REDIS_URL!, {
   maxRetriesPerRequest: null,
 });
 export const PREVIEW_QUEUE_NAME = "preview.generate";