Merge pull request #56 from aldbr/main_multi-vo-login

Multi-vo login
DIRACGrid · Nov 30, 2023 · 2a16970 · 2a16970
2 parents fdb5393 + eecdfb2
commit 2a16970
Show file tree

Hide file tree

Showing 27 changed files with 745 additions and 161 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -34,6 +34,7 @@
   "devDependencies": {
     "@testing-library/jest-dom": "^6.1.4",
     "@testing-library/react": "^14.1.0",
+    "@testing-library/user-event": "^14.5.1",
     "@types/jest": "^29.5.6",
     "eslint": "^8.53.0",
     "eslint-config-next": "^14.0.1",

diff --git a/public/DIRAC-logo-minimal.png b/public/DIRAC-logo-minimal.png
diff --git a/src/app/auth/layout.tsx b/src/app/auth/layout.tsx
@@ -0,0 +1,9 @@
+import React from "react";
+
+export default function AuthLayout({
+  children,
+}: {
+  children: React.ReactNode;
+}) {
+  return <div>{children}</div>;
+}
diff --git a/src/app/auth/page.tsx b/src/app/auth/page.tsx
@@ -0,0 +1,5 @@
+import { LoginForm } from "@/components/applications/LoginForm";
+
+export default function Page() {
+  return <LoginForm />;
+}
diff --git a/src/app/dashboard/layout.tsx b/src/app/dashboard/layout.tsx
@@ -1,6 +1,6 @@
 import React from "react";
 import Dashboard from "@/components/layout/Dashboard";
-import { OIDCSecure } from "@/components/auth/OIDCUtils";
+import { OIDCSecure } from "@/components/layout/OIDCSecure";
 
 export default function DashboardLayout({
   children,

diff --git a/src/app/layout.tsx b/src/app/layout.tsx
@@ -1,5 +1,5 @@
 import { Inter } from "next/font/google";
-import { OIDCProvider } from "@/components/auth/OIDCUtils";
+import { OIDCConfigurationProvider } from "@/contexts/OIDCConfigurationProvider";
 import { ThemeProvider } from "@/contexts/ThemeProvider";
 
 const inter = Inter({ subsets: ["latin"] });
@@ -21,9 +21,9 @@ export default function RootLayout({
   return (
     <html lang="en">
       <body className={inter.className}>
-        <OIDCProvider>
+        <OIDCConfigurationProvider>
           <ThemeProvider>{children}</ThemeProvider>
-        </OIDCProvider>
+        </OIDCConfigurationProvider>
       </body>
     </html>
   );

diff --git a/src/app/page.tsx b/src/app/page.tsx
@@ -1,4 +1,4 @@
-import Showcase from "@/components/layout/Showcase";
+import Showcase from "@/components/applications/Showcase";
 
 export default function Page() {
   return <Showcase />;