-
+
+
Welcome to AdEx GPT
+
+
+ Before you can start using AdEx GPT you have to sign in using your AdEx
+ account. After a successful sign in you will be redirected to the chat.
+
+
+ {session.status === "authenticated" ? (
+
+
+
+ ) : (
+
+ )}
);
}
From c77bedf43273e9d5947d9061ab6e7e180eeda24b Mon Sep 17 00:00:00 2001
From: JuliusMoehring <44407680+JuliusMoehring@users.noreply.github.com>
Date: Tue, 7 Nov 2023 18:44:30 +0100
Subject: [PATCH 4/6] Add auto login
---
app/components/home.tsx | 15 +++++++------
app/login/login.module.scss | 25 ---------------------
app/login/page.tsx | 45 +++++++++----------------------------
3 files changed, 19 insertions(+), 66 deletions(-)
delete mode 100644 app/login/login.module.scss
diff --git a/app/components/home.tsx b/app/components/home.tsx
index 811cbdf51..5e4f0c6b9 100644
--- a/app/components/home.tsx
+++ b/app/components/home.tsx
@@ -2,7 +2,7 @@
require("../polyfill");
-import { useState, useEffect } from "react";
+import { useEffect, useState } from "react";
import styles from "./home.module.scss";
@@ -18,17 +18,17 @@ import { ErrorBoundary } from "./error";
import { getISOLang, getLang } from "../locales";
import {
+ Route,
HashRouter as Router,
Routes,
- Route,
useLocation,
} from "react-router-dom";
-import { SideBar } from "./sidebar";
+import { api } from "../client/api";
+import { getClientConfig } from "../config/client";
+import { useAccessStore } from "../store";
import { useAppConfig } from "../store/config";
import { AuthPage } from "./auth";
-import { getClientConfig } from "../config/client";
-import { api } from "../client/api";
-import { useAccessStore } from "../store";
+import { SideBar } from "./sidebar";
export function Loading(props: { noLogo?: boolean }) {
return (
@@ -128,7 +128,8 @@ function Screen() {
const isHome = location.pathname === Path.Home;
const isAuth = location.pathname === Path.Auth;
const isMobileScreen = useMobileScreen();
- const shouldTightBorder = getClientConfig()?.isApp || (config.tightBorder && !isMobileScreen);
+ const shouldTightBorder =
+ getClientConfig()?.isApp || (config.tightBorder && !isMobileScreen);
useEffect(() => {
loadAsyncGoogleFont();
diff --git a/app/login/login.module.scss b/app/login/login.module.scss
deleted file mode 100644
index db51c8e58..000000000
--- a/app/login/login.module.scss
+++ /dev/null
@@ -1,25 +0,0 @@
-.container {
- display: flex;
- flex-direction: column;
- align-items: center;
- justify-content: center;
- height: 100%;
- gap: 16px;
- width: 100%;
- max-width: 560px;
- padding: 16px;
-}
-
-.headline {
- text-align: center;
-}
-
-.subline {
- text-align: center;
-}
-
-.sign-in-button {
- width: 100%;
- max-width: 260px;
- text-decoration: none;
-}
diff --git a/app/login/page.tsx b/app/login/page.tsx
index edb3660f3..b0ab88a4c 100644
--- a/app/login/page.tsx
+++ b/app/login/page.tsx
@@ -1,45 +1,22 @@
"use client";
import { signIn, useSession } from "next-auth/react";
-import Link from "next/link";
-import { IconButton } from "../components/button";
-import styles from "./login.module.scss";
+import { useEffect } from "react";
+import { Loading } from "../components/home";
export default function Login() {
const session = useSession();
- const handleLogin = async () => {
- signIn("azure-ad", {
- callbackUrl: "/",
- });
- };
+ useEffect(() => {
+ const handleLogin = async () => {
+ signIn("azure-ad", {
+ callbackUrl: "/",
+ });
+ };
- return (
-
-
Welcome to AdEx GPT
+ handleLogin();
+ }, []);
-
- Before you can start using AdEx GPT you have to sign in using your AdEx
- account. After a successful sign in you will be redirected to the chat.
-
-
- {session.status === "authenticated" ? (
-
-
-
- ) : (
-
- )}
-
- );
+ return
;
}
From d8b38b61715af4f02520286d96a369669fc756e6 Mon Sep 17 00:00:00 2001
From: JuliusMoehring <44407680+JuliusMoehring@users.noreply.github.com>
Date: Wed, 8 Nov 2023 13:18:27 +0100
Subject: [PATCH 5/6] Update middleware to allow access of serviceworker files
---
middleware.ts | 16 +++++++++++++++-
1 file changed, 15 insertions(+), 1 deletion(-)
diff --git a/middleware.ts b/middleware.ts
index 3dc3e0425..5c43855d0 100644
--- a/middleware.ts
+++ b/middleware.ts
@@ -1,5 +1,19 @@
export { default } from "next-auth/middleware";
export const config = {
- matcher: ["/((?!login).*)"],
+ matcher: [
+ /*
+ * Match all request paths except for the ones starting with:
+ * - login (login route)
+ * - _next/static (static files)
+ * - _next/image (image optimization files)
+ * - favicon.ico (favicon file)
+ * - prompts.json (prompts file)
+ * - redirect.json (redirect file)
+ * - serviceWorker.js (service worker file)
+ * - serviceWorkerRegister.js (service worker register file)
+ * - site.webmanifest (manifest file)
+ */
+ "/((?!api|_next/static|_next/image|favicon.ico|prompts.json|redirect.json|serviceWorker.js|serviceWorkerRegister.js|site.webmanifest).*)",
+ ],
};
From e1d65b24d5f78b345d9fc2fb3d04ae61c83c33c7 Mon Sep 17 00:00:00 2001
From: JuliusMoehring <44407680+JuliusMoehring@users.noreply.github.com>
Date: Wed, 8 Nov 2023 13:47:49 +0100
Subject: [PATCH 6/6] Fix matcher
---
middleware.ts | 16 +---------------
1 file changed, 1 insertion(+), 15 deletions(-)
diff --git a/middleware.ts b/middleware.ts
index 5c43855d0..45cb950c5 100644
--- a/middleware.ts
+++ b/middleware.ts
@@ -1,19 +1,5 @@
export { default } from "next-auth/middleware";
export const config = {
- matcher: [
- /*
- * Match all request paths except for the ones starting with:
- * - login (login route)
- * - _next/static (static files)
- * - _next/image (image optimization files)
- * - favicon.ico (favicon file)
- * - prompts.json (prompts file)
- * - redirect.json (redirect file)
- * - serviceWorker.js (service worker file)
- * - serviceWorkerRegister.js (service worker register file)
- * - site.webmanifest (manifest file)
- */
- "/((?!api|_next/static|_next/image|favicon.ico|prompts.json|redirect.json|serviceWorker.js|serviceWorkerRegister.js|site.webmanifest).*)",
- ],
+ matcher: "/((?!login|static|.*\\..*|_next).*)",
};
+