Skip to content

Commit

Permalink
Added notifications and fixed some styling
Browse files Browse the repository at this point in the history
  • Loading branch information
lryanle committed Dec 2, 2023
1 parent 8a75981 commit 7689b05
Show file tree
Hide file tree
Showing 7 changed files with 479 additions and 39 deletions.
78 changes: 39 additions & 39 deletions frontend/app/settings/profile-form.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,16 @@ import {
} from "@/components/ui/form";
import { Input } from "@/components/ui/input";
import {
Dialog,
DialogClose,
DialogContent,
DialogDescription,
DialogFooter,
DialogHeader,
DialogTitle,
DialogTrigger,
} from "@/components/ui/dialog";
AlertDialog,
AlertDialogAction,
AlertDialogCancel,
AlertDialogContent,
AlertDialogDescription,
AlertDialogFooter,
AlertDialogHeader,
AlertDialogTitle,
AlertDialogTrigger,
} from "@/components/ui/alert-dialog";
import { toast } from "@/components/ui/use-toast";
import { getProviders, getSession, signIn } from "next-auth/react";
import { useEffect, useState } from "react";
Expand Down Expand Up @@ -216,14 +217,16 @@ export function ProfileForm() {
Connected Accounts
</FormLabel>
<FormDescription className={cn(index !== 0 && "sr-only")}>
Add links to your website, blog, or social media profiles.
Connect your account to other authentication providers. This
only works if you are logging into a provider using the same
email as your current account.
</FormDescription>
<FormControl>
{!isDataReady ? (
<Skeleton key={provfield.type} className="h-9 w-36" />
) : (
<Dialog>
<DialogTrigger asChild>
<AlertDialog>
<AlertDialogTrigger asChild>
<Button
variant={
field.value === provfield.type
Expand Down Expand Up @@ -251,41 +254,38 @@ export function ProfileForm() {
)}
</span>
</Button>
</DialogTrigger>
<DialogContent className="sm:max-w-[425px]">
<DialogHeader>
<DialogTitle>
</AlertDialogTrigger>
<AlertDialogContent className="sm:max-w-[425px]">
<AlertDialogHeader>
<AlertDialogTitle>
Continue to{" "}
{provfield.type.charAt(0).toUpperCase() +
provfield.type.slice(1)}
?
</DialogTitle>
<DialogDescription>
</AlertDialogTitle>
<AlertDialogDescription>
Any unsaved changes will be lost. Are you sure you
want to continue?
</DialogDescription>
</DialogHeader>
<DialogFooter>
</AlertDialogDescription>
</AlertDialogHeader>
<AlertDialogFooter>
<div className="flex flex-row justify-between items-center w-full">
<Button
type="submit"
variant="secondary"
onClick={() => {
signIn(provfield.type);
}}
>
Connect to{" "}
{provfield.type.charAt(0).toUpperCase() +
provfield.type.slice(1)}
</Button>

<DialogClose asChild>
<Button type="submit">Go back</Button>
</DialogClose>
<AlertDialogCancel>
Go back
</AlertDialogCancel>
<AlertDialogAction
onClick={() => {
signIn(provfield.type);
}}
>
Connect to{" "}
{provfield.type.charAt(0).toUpperCase() +
provfield.type.slice(1)}
</AlertDialogAction>
</div>
</DialogFooter>
</DialogContent>
</Dialog>
</AlertDialogFooter>
</AlertDialogContent>
</AlertDialog>
)}
</FormControl>
<FormMessage />
Expand Down
12 changes: 12 additions & 0 deletions frontend/components/layout/navbar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,14 @@ import Link from "next/link";
import { useSignInModal } from "./sign-in-modal";
import UserDropdown from "./user-dropdown";

import {
Popover,
PopoverContent,
PopoverTrigger,
} from "@/components/ui/popover"
import { Bell } from "lucide-react";
import { Notifications } from "../notifications/notifications";

export default function NavBar({ session }: { session: Session | null }) {
const { SignInModal, setShowSignInModal } = useSignInModal();
const scrolled = useScroll(50);
Expand Down Expand Up @@ -44,6 +52,10 @@ export default function NavBar({ session }: { session: Session | null }) {
>
Dashboard
</Link>
<Popover>
<PopoverTrigger><Bell size={16} /></PopoverTrigger>
<PopoverContent><Notifications /></PopoverContent>
</Popover>
<>
{session ? (
<UserDropdown session={session} />
Expand Down
53 changes: 53 additions & 0 deletions frontend/components/notifications/notifications.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
import { BellIcon, EyeNoneIcon, PersonIcon } from "@radix-ui/react-icons"

import {
Card,
CardContent,
CardDescription,
CardHeader,
CardTitle,
} from "@/components/ui/card"
import { BellDot } from "lucide-react";
import Link from "next/link";
import { Separator } from "@/components/ui/separator"
import { Avatar, AvatarFallback, AvatarImage } from "@/components/ui/avatar";

const NotiLists = [{ type: "facebook", car: "Honda Accord 2010", date: "2023-12-01", time: "10:27AM CST" },
{ type: "craigslist", car: "Toyota Camry 2006", date: "2023-11-30", time: "10:26AM CST" }]

export function Notifications() {
return (
<>
<CardHeader className="p-1 pb-3">
<CardTitle>Notifications</CardTitle>
</CardHeader>
<Separator />
<div className="space-y-2 py-2">
{NotiLists.map((noti) => (
(<div className="flex items-center space-x-4" key={`${noti.type}-${noti.car}-${noti.date}`}>
<Avatar className=" h-8 w-8">
<AvatarImage className="h-fit" src={`/logos/${noti.type}.png`} alt={`${noti.type} listing`} />
<AvatarFallback>FB</AvatarFallback>
</Avatar>
<div>
<p className="text-sm font-medium leading-none">New Flagged Listing</p>
<p className="text-sm text-muted-foreground">{`${noti.date} ${noti.time}`}</p>
</div>
</div>)
))}
</div>
<Separator />
<CardContent className="grid gap-1 p-1 pb-0">
<Link href="/settings/notifications" className="-mx-2 flex items-start space-x-4 rounded-md p-2 transition-all hover:bg-accent hover:text-accent-foreground">
<BellDot size={16} />
<div className="space-y-1">
<p className="text-sm font-medium leading-none">Notification Preferences</p>
<p className="text-sm text-muted-foreground">
Edit notification settings
</p>
</div>
</Link>
</CardContent>
</>
)
}
142 changes: 142 additions & 0 deletions frontend/components/ui/alert-dialog.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,142 @@
/* eslint-disable react/prop-types */
"use client"

import * as React from "react"
import * as AlertDialogPrimitive from "@radix-ui/react-alert-dialog"

import { cn } from "@/lib/utils"
import { buttonVariants } from "@/components/ui/button"

const AlertDialog = AlertDialogPrimitive.Root

const AlertDialogTrigger = AlertDialogPrimitive.Trigger

const AlertDialogPortal = AlertDialogPrimitive.Portal

const AlertDialogOverlay = React.forwardRef<
React.ElementRef<typeof AlertDialogPrimitive.Overlay>,
React.ComponentPropsWithoutRef<typeof AlertDialogPrimitive.Overlay>
>(({ className, ...props }, ref) => (
<AlertDialogPrimitive.Overlay
className={cn(
"fixed inset-0 z-50 bg-background/80 backdrop-blur-sm data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0",
className
)}
{...props}
ref={ref}
/>
))
AlertDialogOverlay.displayName = AlertDialogPrimitive.Overlay.displayName

const AlertDialogContent = React.forwardRef<
React.ElementRef<typeof AlertDialogPrimitive.Content>,
React.ComponentPropsWithoutRef<typeof AlertDialogPrimitive.Content>
>(({ className, ...props }, ref) => (
<AlertDialogPortal>
<AlertDialogOverlay />
<AlertDialogPrimitive.Content
ref={ref}
className={cn(
"fixed left-[50%] top-[50%] z-50 grid w-full max-w-lg translate-x-[-50%] translate-y-[-50%] gap-4 border bg-background p-6 shadow-lg duration-200 data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[state=closed]:slide-out-to-left-1/2 data-[state=closed]:slide-out-to-top-[48%] data-[state=open]:slide-in-from-left-1/2 data-[state=open]:slide-in-from-top-[48%] sm:rounded-lg",
className
)}
{...props}
/>
</AlertDialogPortal>
))
AlertDialogContent.displayName = AlertDialogPrimitive.Content.displayName

const AlertDialogHeader = ({
className,
...props
}: React.HTMLAttributes<HTMLDivElement>) => (
<div
className={cn(
"flex flex-col space-y-2 text-center sm:text-left",
className
)}
{...props}
/>
)
AlertDialogHeader.displayName = "AlertDialogHeader"

const AlertDialogFooter = ({
className,
...props
}: React.HTMLAttributes<HTMLDivElement>) => (
<div
className={cn(
"flex flex-col-reverse sm:flex-row sm:justify-end sm:space-x-2",
className
)}
{...props}
/>
)
AlertDialogFooter.displayName = "AlertDialogFooter"

const AlertDialogTitle = React.forwardRef<
React.ElementRef<typeof AlertDialogPrimitive.Title>,
React.ComponentPropsWithoutRef<typeof AlertDialogPrimitive.Title>
>(({ className, ...props }, ref) => (
<AlertDialogPrimitive.Title
ref={ref}
className={cn("text-lg font-semibold", className)}
{...props}
/>
))
AlertDialogTitle.displayName = AlertDialogPrimitive.Title.displayName

const AlertDialogDescription = React.forwardRef<
React.ElementRef<typeof AlertDialogPrimitive.Description>,
React.ComponentPropsWithoutRef<typeof AlertDialogPrimitive.Description>
>(({ className, ...props }, ref) => (
<AlertDialogPrimitive.Description
ref={ref}
className={cn("text-sm text-muted-foreground", className)}
{...props}
/>
))
AlertDialogDescription.displayName =
AlertDialogPrimitive.Description.displayName

const AlertDialogAction = React.forwardRef<
React.ElementRef<typeof AlertDialogPrimitive.Action>,
React.ComponentPropsWithoutRef<typeof AlertDialogPrimitive.Action>
>(({ className, ...props }, ref) => (
<AlertDialogPrimitive.Action
ref={ref}
className={cn(buttonVariants(), className)}
{...props}
/>
))
AlertDialogAction.displayName = AlertDialogPrimitive.Action.displayName

const AlertDialogCancel = React.forwardRef<
React.ElementRef<typeof AlertDialogPrimitive.Cancel>,
React.ComponentPropsWithoutRef<typeof AlertDialogPrimitive.Cancel>
>(({ className, ...props }, ref) => (
<AlertDialogPrimitive.Cancel
ref={ref}
className={cn(
buttonVariants({ variant: "outline" }),
"mt-2 sm:mt-0",
className
)}
{...props}
/>
))
AlertDialogCancel.displayName = AlertDialogPrimitive.Cancel.displayName

export {
AlertDialog,
AlertDialogPortal,
AlertDialogOverlay,
AlertDialogTrigger,
AlertDialogContent,
AlertDialogHeader,
AlertDialogFooter,
AlertDialogTitle,
AlertDialogDescription,
AlertDialogAction,
AlertDialogCancel,
}
Loading

1 comment on commit 7689b05

@vercel
Copy link

@vercel vercel bot commented on 7689b05 Dec 2, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Successfully deployed to the following URLs:

seniordesign – ./

seniordesign-lryanle.vercel.app
smare.lryanle.com
smare.vercel.app
seniordesign-git-main-lryanle.vercel.app

Please sign in to comment.