Skip to content

Commit

Permalink
adds forgot-password pages
Browse files Browse the repository at this point in the history
  • Loading branch information
agnlez committed Oct 9, 2024
1 parent c42e1cc commit 6e42eaa
Show file tree
Hide file tree
Showing 15 changed files with 999 additions and 5 deletions.
2 changes: 2 additions & 0 deletions client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,12 @@
},
"dependencies": {
"@hookform/resolvers": "3.9.0",
"@lukemorales/query-key-factory": "1.3.4",
"@radix-ui/react-icons": "1.3.0",
"@radix-ui/react-label": "2.1.0",
"@radix-ui/react-separator": "1.1.0",
"@radix-ui/react-slot": "1.1.0",
"@radix-ui/react-toast": "1.2.2",
"@tanstack/react-query": "5.59.0",
"@ts-rest/react-query": "3.51.0",
"class-variance-authority": "0.7.0",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
import NewPasswordForm from "@/containers/auth/forgot-password/new-password-form";

export default function NewPasswordPage() {
return <NewPasswordForm />;
}
14 changes: 14 additions & 0 deletions client/src/app/auth/(password)/forgot-password/layout.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
import { PropsWithChildren } from "react";

import type { Metadata } from "next";

export const metadata: Metadata = {
title: "Forgot password",
description: "Forgot password | Blue Carbon Cost Tool",
};

export default function ForgotPasswordLayout({ children }: PropsWithChildren) {
return (
<div className="flex h-full items-center justify-center">{children}</div>
);
}
5 changes: 5 additions & 0 deletions client/src/app/auth/(password)/forgot-password/page.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
import ForgotPasswordEmailForm from "@/containers/auth/forgot-password/email-form";

export default function ForgotPasswordPage() {
return <ForgotPasswordEmailForm />;
}
2 changes: 1 addition & 1 deletion client/src/app/auth/api/[...nextauth]/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import { getServerSession, NextAuthOptions } from "next-auth";
import { JWT } from "next-auth/jwt";
import Credentials from "next-auth/providers/credentials";

import { client } from "@/lib/queryClient";
import { client } from "@/lib/query-client";

declare module "next-auth" {
interface Session {
Expand Down
2 changes: 1 addition & 1 deletion client/src/app/providers.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import {
import { Session } from "next-auth";
import { SessionProvider } from "next-auth/react";

import { makeQueryClient } from "@/lib/queryClient";
import { makeQueryClient } from "@/lib/query-client";

let browserQueryClient: QueryClient | undefined = undefined;

Expand Down
130 changes: 130 additions & 0 deletions client/src/components/ui/toast/index.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,130 @@
"use client";

import * as React from "react";

import { Cross2Icon } from "@radix-ui/react-icons";
import * as ToastPrimitives from "@radix-ui/react-toast";
import { cva, type VariantProps } from "class-variance-authority";

import { cn } from "@/lib/utils";

const ToastProvider = ToastPrimitives.Provider;

const ToastViewport = React.forwardRef<
React.ElementRef<typeof ToastPrimitives.Viewport>,
React.ComponentPropsWithoutRef<typeof ToastPrimitives.Viewport>
>(({ className, ...props }, ref) => (
<ToastPrimitives.Viewport
ref={ref}
className={cn(
"fixed top-0 z-[100] flex max-h-screen w-full flex-col-reverse p-4 sm:bottom-0 sm:right-0 sm:top-auto sm:flex-col md:max-w-[420px]",
className,
)}
{...props}
/>
));
ToastViewport.displayName = ToastPrimitives.Viewport.displayName;

const toastVariants = cva(
"group pointer-events-auto relative flex w-full items-center justify-between space-x-2 overflow-hidden rounded-md border p-4 pr-6 shadow-lg transition-all data-[swipe=cancel]:translate-x-0 data-[swipe=end]:translate-x-[var(--radix-toast-swipe-end-x)] data-[swipe=move]:translate-x-[var(--radix-toast-swipe-move-x)] data-[swipe=move]:transition-none data-[state=open]:animate-in data-[state=closed]:animate-out data-[swipe=end]:animate-out data-[state=closed]:fade-out-80 data-[state=closed]:slide-out-to-right-full data-[state=open]:slide-in-from-top-full data-[state=open]:sm:slide-in-from-bottom-full",
{
variants: {
variant: {
default: "border bg-background text-foreground",
destructive:
"destructive group border-destructive bg-destructive text-destructive-foreground",
},
},
defaultVariants: {
variant: "default",
},
},
);

const Index = React.forwardRef<
React.ElementRef<typeof ToastPrimitives.Root>,
React.ComponentPropsWithoutRef<typeof ToastPrimitives.Root> &
VariantProps<typeof toastVariants>
>(({ className, variant, ...props }, ref) => {
return (
<ToastPrimitives.Root
ref={ref}
className={cn(toastVariants({ variant }), className)}
{...props}
/>
);
});
Index.displayName = ToastPrimitives.Root.displayName;

const ToastAction = React.forwardRef<
React.ElementRef<typeof ToastPrimitives.Action>,
React.ComponentPropsWithoutRef<typeof ToastPrimitives.Action>
>(({ className, ...props }, ref) => (
<ToastPrimitives.Action
ref={ref}
className={cn(
"inline-flex h-8 shrink-0 items-center justify-center rounded-md border bg-transparent px-3 text-sm font-medium transition-colors hover:bg-secondary focus:outline-none focus:ring-1 focus:ring-ring disabled:pointer-events-none disabled:opacity-50 group-[.destructive]:border-muted/40 group-[.destructive]:hover:border-destructive/30 group-[.destructive]:hover:bg-destructive group-[.destructive]:hover:text-destructive-foreground group-[.destructive]:focus:ring-destructive",
className,
)}
{...props}
/>
));
ToastAction.displayName = ToastPrimitives.Action.displayName;

const ToastClose = React.forwardRef<
React.ElementRef<typeof ToastPrimitives.Close>,
React.ComponentPropsWithoutRef<typeof ToastPrimitives.Close>
>(({ className, ...props }, ref) => (
<ToastPrimitives.Close
ref={ref}
className={cn(
"absolute right-1 top-1 rounded-md p-1 text-foreground/50 opacity-0 transition-opacity hover:text-foreground focus:opacity-100 focus:outline-none focus:ring-1 group-hover:opacity-100 group-[.destructive]:text-red-300 group-[.destructive]:hover:text-red-50 group-[.destructive]:focus:ring-red-400 group-[.destructive]:focus:ring-offset-red-600",
className,
)}
toast-close=""
{...props}
>
<Cross2Icon className="h-4 w-4" />
</ToastPrimitives.Close>
));
ToastClose.displayName = ToastPrimitives.Close.displayName;

const ToastTitle = React.forwardRef<
React.ElementRef<typeof ToastPrimitives.Title>,
React.ComponentPropsWithoutRef<typeof ToastPrimitives.Title>
>(({ className, ...props }, ref) => (
<ToastPrimitives.Title
ref={ref}
className={cn("text-sm font-semibold [&+div]:text-xs", className)}
{...props}
/>
));
ToastTitle.displayName = ToastPrimitives.Title.displayName;

const ToastDescription = React.forwardRef<
React.ElementRef<typeof ToastPrimitives.Description>,
React.ComponentPropsWithoutRef<typeof ToastPrimitives.Description>
>(({ className, ...props }, ref) => (
<ToastPrimitives.Description
ref={ref}
className={cn("text-sm opacity-90", className)}
{...props}
/>
));
ToastDescription.displayName = ToastPrimitives.Description.displayName;

type ToastProps = React.ComponentPropsWithoutRef<typeof Index>;

type ToastActionElement = React.ReactElement<typeof ToastAction>;

export {
type ToastProps,
type ToastActionElement,
ToastProvider,
ToastViewport,
Index,
ToastTitle,
ToastDescription,
ToastClose,
ToastAction,
};
35 changes: 35 additions & 0 deletions client/src/components/ui/toast/toaster.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
"use client";

import {
Index,
ToastClose,
ToastDescription,
ToastProvider,
ToastTitle,
ToastViewport,
} from "@/components/ui/toast";
import { useToast } from "@/components/ui/toast/use-toast";

export function Toaster() {
const { toasts } = useToast();

return (
<ToastProvider>
{toasts.map(function ({ id, title, description, action, ...props }) {
return (
<Index key={id} {...props}>
<div className="grid gap-1">
{title && <ToastTitle>{title}</ToastTitle>}
{description && (
<ToastDescription>{description}</ToastDescription>
)}
</div>
{action}
<ToastClose />
</Index>
);
})}
<ToastViewport />
</ToastProvider>
);
}
47 changes: 47 additions & 0 deletions client/src/components/ui/toast/use-api-response-toast.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
import { JSONAPIErrorOptions } from "@shared/dtos/json-api.error";

import { useToast } from "@/components/ui/toast/use-toast";

export const useApiResponseToast = () => {
const { toast } = useToast();

const apiResponseToast = (
response: {
status: number;
body?: { errors?: JSONAPIErrorOptions[] } | unknown;
},
options: { successMessage: string; customErrorMessage?: string },
) => {
if (response.status >= 200 && response.status < 300) {
toast({ description: options.successMessage });
return;
}

if (response.status >= 400 && response.status < 500) {
if (options.customErrorMessage) {
toast({
variant: "destructive",
description: options.customErrorMessage,
});
} else if (
response.body &&
typeof response.body === "object" &&
"errors" in response.body
) {
(response.body as { errors: JSONAPIErrorOptions[] }).errors?.forEach(
(error) => {
toast({ description: error.title });
},
);
}
return;
}

toast({
variant: "destructive",
description: "Something went wrong. Please try again.",
});
};

return { apiResponseToast, toast };
};
Loading

0 comments on commit 6e42eaa

Please sign in to comment.