Merge branch 'dev' into feat/oidc

# Conflicts:
#	portabase.config.ts
#	src/env.mjs

app/(customer)/dashboard/(admin)/notifications/channels/page.tsx

@@ -35,12 +35,10 @@ export default async function RoutePage(props: PageParams<{}>) {
             <PageHeader>
                 <PageTitle>Notification channels</PageTitle>
                 <PageActions>
-                    {/*<NotifierAddEditModal adminView={false}/>*/}
                     <ChannelAddEditModal kind="notification" adminView={false}/>
                 </PageActions>
             </PageHeader>
             <PageContent>
-                {/*<NotificationChannelsSection organizations={organizations} notificationChannels={notificationChannels}/>*/}
                 <ChannelsSection kind="notification" organizations={organizations}
                                  channels={notificationChannels}/>
             </PageContent>

app/api/tus/hooks/route.ts

@@ -1,6 +1,7 @@
 import {NextResponse} from "next/server";
 import fs from "fs";
 import path from "path";
+import {env} from "@/env.mjs";
 
 
 export async function POST(request: Request) {
@@ -29,7 +30,8 @@ export async function POST(request: Request) {
                 }
 
 
-                const uploadDir = path.join(process.cwd(), "/private/uploads/");
+                // const uploadDir = path.join(process.cwd(), "/private/uploads/");
+                const uploadDir = path.join(env.PRIVATE_PATH, "/uploads/");
 
                 const oldFilePath = path.join(uploadDir, "tmp", id);
                 const newFilePath = path.join(uploadDir, filePath);