Zammad docker and Link structure updates

2023-07-10 10:13:06 +00:00 · 2023-07-10 10:13:06 +00:00 · 60b82f6fb4
commit 60b82f6fb4
parent 2a37297ae1
39 changed files with 94 additions and 36 deletions
--- a/apps/link/app/(login)/login/_components/Login.tsx
+++ b/apps/link/app/(login)/login/_components/Login.tsx
@ -47,7 +47,7 @@ export const Login: FC<LoginProps> = ({ session }) => {
                    sx={buttonStyles}
                    onClick={() =>
                      signIn("google", {
-                        callbackUrl: `${origin}/proxy/zammad/auth/sso`,
+                        callbackUrl: `${origin}/setup`,
                      })
                    }
                  >
--- a/apps/link/app/(login)/login/page.tsx
+++ b/apps/link/app/(login)/login/page.tsx
--- a/apps/link/app/(main)/_components/Home.tsx
+++ b/apps/link/app/(main)/_components/Home.tsx
@ -1,6 +1,6 @@
 "use client";

 import { FC } from "react";
-import { ZammadWrapper } from "@/app/_components/ZammadWrapper";
+import { ZammadWrapper } from "./ZammadWrapper";

 export const Home: FC = () => <ZammadWrapper path="/#dashboard" hideSidebar />;
--- a/apps/link/app/(main)/_components/InternalLayout.tsx
+++ b/apps/link/app/(main)/_components/InternalLayout.tsx
--- a/apps/link/app/(main)/_components/Sidebar.tsx
+++ b/apps/link/app/(main)/_components/Sidebar.tsx
--- a/apps/link/app/(main)/_components/StyledDataGrid.tsx
+++ b/apps/link/app/(main)/_components/StyledDataGrid.tsx
--- a/apps/link/app/(main)/_components/ZammadWrapper.tsx
+++ b/apps/link/app/(main)/_components/ZammadWrapper.tsx
--- a/apps/link/app/(main)/admin/label-studio/_components/LabelStudioWrapper.tsx
+++ b/apps/link/app/(main)/admin/label-studio/_components/LabelStudioWrapper.tsx
--- a/apps/link/app/(main)/admin/label-studio/page.tsx
+++ b/apps/link/app/(main)/admin/label-studio/page.tsx
--- a/apps/link/app/(main)/admin/metamigo/[...path]/_components/MetamigoWrapper.tsx
+++ b/apps/link/app/(main)/admin/metamigo/[...path]/_components/MetamigoWrapper.tsx
--- a/apps/link/app/(main)/admin/metamigo/[...path]/page.tsx
+++ b/apps/link/app/(main)/admin/metamigo/[...path]/page.tsx
--- a/apps/link/app/(main)/admin/zammad/page.tsx
+++ b/apps/link/app/(main)/admin/zammad/page.tsx
@ -1,5 +1,5 @@
 import { Metadata } from "next";
-import { ZammadWrapper } from "@/app/_components/ZammadWrapper";
+import { ZammadWrapper } from "@/app/(main)/_components/ZammadWrapper";

 export const metadata: Metadata = {
  title: "Zammad",
--- a/apps/link/app/(main)/api/auth/[...nextauth]/route.ts
+++ b/apps/link/app/(main)/api/auth/[...nextauth]/route.ts
--- a/apps/link/app/(main)/api/v1/users/route.ts
+++ b/apps/link/app/(main)/api/v1/users/route.ts
--- a/apps/link/app/(main)/knowledge/page.tsx
+++ b/apps/link/app/(main)/knowledge/page.tsx
@ -1,5 +1,5 @@
 import { Metadata } from "next";
-import { ZammadWrapper } from "@/app/_components/ZammadWrapper";
+import { ZammadWrapper } from "@/app/(main)/_components/ZammadWrapper";

 export const metadata: Metadata = {
  title: "Knowledge Base",
--- a/apps/link/app/(main)/layout.tsx
+++ b/apps/link/app/(main)/layout.tsx
@ -0,0 +1,15 @@
+import { ReactNode } from "react";
+import { Metadata } from "next";
+import { InternalLayout } from "./_components/InternalLayout";
+
+export const metadata: Metadata = {
+  title: "Link",
+};
+
+type LayoutProps = {
+  children: ReactNode;
+};
+
+export default function Layout({ children }: LayoutProps) {
+  return <InternalLayout>{children}</InternalLayout>;
+}
--- a/apps/link/app/(main)/leafcutter/[view]/_components/LeafcutterWrapper.tsx
+++ b/apps/link/app/(main)/leafcutter/[view]/_components/LeafcutterWrapper.tsx
--- a/apps/link/app/(main)/leafcutter/[view]/page.tsx
+++ b/apps/link/app/(main)/leafcutter/[view]/page.tsx
--- a/apps/link/app/(main)/leafcutter/page.tsx
+++ b/apps/link/app/(main)/leafcutter/page.tsx
--- a/apps/link/app/(main)/overview/[overview]/_components/TicketList.tsx
+++ b/apps/link/app/(main)/overview/[overview]/_components/TicketList.tsx
--- a/apps/link/app/(main)/overview/[overview]/_components/ZammadOverview.tsx
+++ b/apps/link/app/(main)/overview/[overview]/_components/ZammadOverview.tsx
--- a/apps/link/app/(main)/overview/[overview]/error.tsx
+++ b/apps/link/app/(main)/overview/[overview]/error.tsx
--- a/apps/link/app/(main)/overview/[overview]/page.tsx
+++ b/apps/link/app/(main)/overview/[overview]/page.tsx
--- a/apps/link/app/(main)/page.tsx
+++ b/apps/link/app/(main)/page.tsx
@ -1,5 +1,5 @@
 import { Metadata } from "next";
-import { Home } from "@/app/_components/Home";
+import { Home } from "./_components/Home";

 export const metadata: Metadata = {
  title: "Link",
--- a/apps/link/app/(main)/profile/page.tsx
+++ b/apps/link/app/(main)/profile/page.tsx
@ -1,5 +1,5 @@
 import { Metadata } from "next";
-import { ZammadWrapper } from "@/app/_components/ZammadWrapper";
+import { ZammadWrapper } from "@/app/(main)/_components/ZammadWrapper";

 export const metadata: Metadata = {
  title: "Profile",
--- a/apps/link/app/(main)/setup/_components/Setup.tsx
+++ b/apps/link/app/(main)/setup/_components/Setup.tsx
@ -0,0 +1,14 @@
+"use client";
+
+import { FC, useLayoutEffect } from "react";
+import { useRouter } from "next/navigation";
+import { ZammadWrapper } from "app/(main)/_components/ZammadWrapper";
+
+export const Setup: FC = () => {
+  const router = useRouter();
+  useLayoutEffect(() => {
+    setTimeout(() => router.push("/"), 4000);
+  }, [router]);
+
+  return <ZammadWrapper path="/auth/sso" hideSidebar={false} />;
+};
--- a/apps/link/app/(main)/setup/page.tsx
+++ b/apps/link/app/(main)/setup/page.tsx
@ -0,0 +1,10 @@
+import { Metadata } from "next";
+import { Setup } from "./_components/Setup";
+
+export const metadata: Metadata = {
+  title: "Link",
+};
+
+export default function Page() {
+  return <Setup />;
+}
--- a/apps/link/app/(main)/tickets/[id]/@detail/_components/ArticleCreateDialog.tsx
+++ b/apps/link/app/(main)/tickets/[id]/@detail/_components/ArticleCreateDialog.tsx
--- a/apps/link/app/(main)/tickets/[id]/@detail/_components/TicketDetail.tsx
+++ b/apps/link/app/(main)/tickets/[id]/@detail/_components/TicketDetail.tsx
--- a/apps/link/app/(main)/tickets/[id]/@detail/page.tsx
+++ b/apps/link/app/(main)/tickets/[id]/@detail/page.tsx
--- a/apps/link/app/(main)/tickets/[id]/@edit/_components/TicketEdit.tsx
+++ b/apps/link/app/(main)/tickets/[id]/@edit/_components/TicketEdit.tsx
--- a/apps/link/app/(main)/tickets/[id]/@edit/page.tsx
+++ b/apps/link/app/(main)/tickets/[id]/@edit/page.tsx
--- a/apps/link/app/(main)/tickets/[id]/error.tsx
+++ b/apps/link/app/(main)/tickets/[id]/error.tsx
--- a/apps/link/app/(main)/tickets/[id]/layout.tsx
+++ b/apps/link/app/(main)/tickets/[id]/layout.tsx
--- a/apps/link/app/(main)/tickets/[id]/not-found.tsx
+++ b/apps/link/app/(main)/tickets/[id]/not-found.tsx
--- a/apps/link/app/(main)/tickets/[id]/notpage.tsx
+++ b/apps/link/app/(main)/tickets/[id]/notpage.tsx
--- a/apps/link/app/layout.tsx
+++ b/apps/link/app/layout.tsx
@ -9,7 +9,6 @@ import "@fontsource/playfair-display/900.css";
 // import getConfig from "next/config";
 // import { LicenseInfo } from "@mui/x-data-grid-pro";
 import { MultiProvider } from "./_components/MultiProvider";
-import { InternalLayout } from "./_components/InternalLayout";

 export const metadata: Metadata = {
  title: "Link",
@ -26,9 +25,7 @@ export default function Layout({ children }: LayoutProps) {
  return (
    <html lang="en">
      <body>
-        <MultiProvider>
-          <InternalLayout>{children}</InternalLayout>
-        </MultiProvider>
+        <MultiProvider>{children}</MultiProvider>
      </body>
    </html>
  );