Merge pull request #1 from HeapDog/dev

fix deploy

Author: parthokr

.github/workflows/deploy-dev.yml

@@ -0,0 +1,43 @@
+name: Deploy to Dev VM
+
+on:
+  push:
+    branches: ["dev"]
+  workflow_dispatch: {}
+
+concurrency:
+  group: deploy-to-vm
+  cancel-in-progress: true
+
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repo (optional)
+        uses: actions/checkout@v4
+
+      # Start Tailscale on the runner using the official GitHub Action.
+      # The action reads the client id / secret from env here (you said you already put them as secrets).
+      - name: Start Tailscale
+        uses: tailscale/github-action@v4
+        with:
+          oauth-client-id: ${{ secrets.TS_OAUTH_CLIENT_ID }}
+          oauth-secret: ${{ secrets.TS_OAUTH_SECRET }}
+          tags: tag:ci 
+
+      - name: SSH to VM and deploy
+        run: |
+          ssh -o "StrictHostKeyChecking no" ${{ secrets.INSTANCE_USER}}@${{ secrets.DEV_INSTANCE_TS_IP}} "
+            cd ${{ secrets.PROJECT_PATH }}/frontend
+            git checkout dev
+            git fetch origin dev
+            git reset --hard origin/dev
+            docker compose -f compose.dev.yml stop frontend-dev
+            docker compose -f compose.dev.yml rm -f frontend-dev
+            docker compose -f compose.dev.yml build frontend-dev
+            docker compose -f compose.dev.yml up -d --force-recreate frontend-dev
+            docker image prune -af
+            docker container prune -f
+            docker system prune -f
+          "
+

.github/workflows/deploy-via-ts.yml .github/workflows/deploy.yml.github/workflows/deploy-via-ts.yml renamed to .github/workflows/deploy.yml

@@ -1,4 +1,4 @@
-name: Deploy to VM via Tailscale
+name: Deploy to Prod VM
 
 on:
   push:
@@ -27,8 +27,9 @@ jobs:
 
       - name: SSH to VM and deploy
         run: |
-          ssh -o "StrictHostKeyChecking no" ${{ secrets.EC2_USER }}@${{ secrets.EC2_IP }} "
+          ssh -o "StrictHostKeyChecking no" ${{ secrets.INSTANCE_USER}}@${{ secrets.PROD_INSTANCE_TS_IP}} "
             cd ${{ secrets.PROJECT_PATH }}/frontend
+            git checkout main
             git fetch origin main
             git reset --hard origin/main
             docker compose stop frontend

src/app/layout.tsx

@@ -10,6 +10,8 @@ import { getCurrentUser } from "@/lib/auth";
 import { Toaster } from "@/components/ui/sonner";
 import { getNotifications, getUnreadCount } from "@/lib/notifications";
 
+export const dynamic = "force-dynamic";
+
 const geistSans = Geist({
     variable: "--font-geist-sans",
     subsets: ["latin"],

src/app/organizations/[slug]/members/invitations/page.tsx

@@ -4,6 +4,7 @@ import { OrganizationInvitation } from "@/lib/types/organization";
 import { PaginatedData } from "@/lib/types/api";
 import { InvitationsView } from "./invitations-view";
 import { cookies } from "next/headers";
+import { Suspense } from "react";
 
 async function getInvitations(slug: string, page: number, size: number) {
   try {
@@ -56,5 +57,9 @@ export default async function InvitationsPage({ params, searchParams }: PageProp
 
   const data = await getInvitations(slug, page, size);
 
-  return <InvitationsView organizationSlug={slug} initialData={data} currentUserRole={role} />;
+  return (
+    <Suspense fallback={<div>Loading invitations...</div>}>
+      <InvitationsView organizationSlug={slug} initialData={data} currentUserRole={role} />
+    </Suspense>
+  );
 }

src/app/organizations/[slug]/members/page.tsx

@@ -4,6 +4,7 @@ import { OrganizationMember } from "@/lib/types/organization";
 import { PaginatedData } from "@/lib/types/api";
 import { MembersView } from "./members-view";
 import { cookies } from "next/headers";
+import { Suspense } from "react";
 
 async function getMembers(slug: string, page: number, size: number) {
   try {
@@ -61,5 +62,9 @@ export default async function MembersPage({ params, searchParams }: PageProps) {
       )
   }
 
-  return <MembersView data={data} />;
+  return (
+    <Suspense fallback={<div>Loading members...</div>}>
+      <MembersView data={data} />
+    </Suspense>
+  );
 }

src/app/signin/page.tsx

@@ -2,6 +2,7 @@ import { getCurrentUser } from "@/lib/auth";
 import { redirect } from "next/navigation";
 import SigninPage from "./signin-page";
 import { Metadata } from "next";
+import { Suspense } from "react";
 
 export const metadata: Metadata = {
   title: "Sign In | HeapDog",
@@ -20,5 +21,9 @@ export default async function Page(props: {
     redirect(redirectUrl);
   }
 
-  return <SigninPage />;
+  return (
+    <Suspense fallback={<div>Loading...</div>}>
+      <SigninPage />
+    </Suspense>
+  );
 }

src/app/verify/page.tsx

@@ -2,6 +2,7 @@ import { getCurrentUser } from "@/lib/auth";
 import { redirect } from "next/navigation";
 import VerifyPage from "./verify-page";
 import { Metadata } from "next";
+import { Suspense } from "react";
 
 export const metadata: Metadata = {
   title: "Verify Email | HeapDog",
@@ -15,6 +16,10 @@ export default async function Page() {
     redirect("/");
   }
 
-  return <VerifyPage />;
+  return (
+    <Suspense fallback={<div>Loading...</div>}>
+      <VerifyPage />
+    </Suspense>
+  );
 }