diff --git a/keep-ui/app/(keep)/providers/page.client.tsx b/keep-ui/app/(keep)/providers/page.client.tsx index 99a1b7951..ede753034 100644 --- a/keep-ui/app/(keep)/providers/page.client.tsx +++ b/keep-ui/app/(keep)/providers/page.client.tsx @@ -7,6 +7,10 @@ import { useFilterContext } from "./filter-context"; import { toast } from "react-toastify"; import { useProviders } from "@/utils/hooks/useProviders"; import { showErrorToast } from "@/shared/ui"; +import { Link } from "@/components/ui"; + +const EXTERNAL_URL_DOCS_URL = + "https://docs.keephq.dev/development/external-url"; export const useFetchProviders = () => { const [providers, setProviders] = useState([]); @@ -25,8 +29,14 @@ export const useFetchProviders = () => {
Webhooks are disabled because Keep is not accessible from the internet.
-
- Click for Keep docs on how to enabled it 📚 + + Read docs + {" "} + to learn how to enable it.
); @@ -38,11 +48,7 @@ export const useFetchProviders = () => { type: "info", position: toast.POSITION.TOP_CENTER, autoClose: 10000, - onClick: () => - window.open( - "https://docs.keephq.dev/development/external-url", - "_blank" - ), + onClick: () => window.open(EXTERNAL_URL_DOCS_URL, "_blank"), style: { width: "250%", // Set width marginLeft: "-75%", // Adjust starting position to left diff --git a/keep-ui/app/(signin)/layout.tsx b/keep-ui/app/(signin)/layout.tsx index c535b8c48..75a3a11ce 100644 --- a/keep-ui/app/(signin)/layout.tsx +++ b/keep-ui/app/(signin)/layout.tsx @@ -1,3 +1,6 @@ +import { Card, Text } from "@tremor/react"; +import Image from "next/image"; + export const metadata = { title: "Keep", description: "The open-source alert management and AIOps platform", @@ -9,8 +12,33 @@ export default function RootLayout({ children: React.ReactNode; }) { return ( - - {children} + + +
+
+
+ Keep Logo + + Keep + +
+ + {children} + +
+
+ ); } diff --git a/keep-ui/app/(signin)/signin/SignInForm.tsx b/keep-ui/app/(signin)/signin/SignInForm.tsx index e5a4ef1f4..faf6d1553 100644 --- a/keep-ui/app/(signin)/signin/SignInForm.tsx +++ b/keep-ui/app/(signin)/signin/SignInForm.tsx @@ -1,13 +1,12 @@ "use client"; import { signIn, getProviders } from "next-auth/react"; -import { Text, TextInput, Button, Card } from "@tremor/react"; -import Image from "next/image"; +import { Text, TextInput, Button } from "@tremor/react"; import { useEffect, useState } from "react"; import { useForm } from "react-hook-form"; -import "../../globals.css"; import { authenticate, revalidateAfterAuth } from "@/app/actions/authactions"; import { useRouter } from "next/navigation"; +import "../../globals.css"; export interface Provider { id: string; @@ -109,129 +108,92 @@ export default function SignInForm({ params }: { params?: { amt: string } }) { // Show loading state during redirect if (isRedirecting) { return ( -
- -
-
- Keep Logo -
- - Authentication successful, redirecting... - -
- -
+ + Authentication successful, redirecting... + ); } if (providers?.credentials) { return ( -
- -
-
- Keep Logo + <> + + Log in to your account + + +
+ {errors.root && ( +
+ + {errors.root.message} +
- - - Sign in to Keep + )} +
+ + Username + + {errors.username && ( + + {errors.username.message} + + )} +
- -
- - Username - - - {errors.username && ( - - {errors.username.message} - - )} -
- -
- - Password - - - {errors.password && ( - - {errors.password.message} - - )} -
- - - - {errors.root && ( -
- - {errors.root.message} - -
- )} - +
+ + Password + + + {errors.password && ( + + {errors.password.message} + + )}
- -
+ + + + ); } - return <>Redirecting to authentication...; + return ( + + Redirecting to authentication... + + ); } diff --git a/keep-ui/features/incident-list/ui/incident-list-error.tsx b/keep-ui/features/incident-list/ui/incident-list-error.tsx index 2d91c42cc..b8bb6f455 100644 --- a/keep-ui/features/incident-list/ui/incident-list-error.tsx +++ b/keep-ui/features/incident-list/ui/incident-list-error.tsx @@ -19,7 +19,11 @@ export const IncidentListError = ({
Failed to load incidents - Please try again. If the issue persists, contact us + Error: {incidentError.message} + + + {incidentError.proposedResolution || + "Please try again. If the issue persists, contact us"}