Skip to content

Commit

Permalink
replace alert and remove mui components
Browse files Browse the repository at this point in the history
  • Loading branch information
osorionicolas committed Jan 22, 2024
1 parent f1bf88e commit 9e85c2c
Show file tree
Hide file tree
Showing 11 changed files with 592 additions and 217 deletions.
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
"@radix-ui/react-scroll-area": "^1.0.5",
"@radix-ui/react-separator": "^1.0.3",
"@radix-ui/react-slot": "^1.0.2",
"@radix-ui/react-toast": "^1.1.5",
"@serwist/next": "^8.4.3",
"@serwist/precaching": "^8.4.3",
"@serwist/sw": "^8.4.3",
Expand Down
36 changes: 19 additions & 17 deletions src/app/layout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import { Metadata } from "next";
import { ThemeProvider } from "@/components/theme-provider";
import { DownloadableFilesProvider } from "@/hooks/useDownloadableFiles";
import { TextProvider } from "@/hooks/useText";
import { Toaster } from "@/components/ui/toaster";

const APP_NAME = "Delen"
const APP_DESCRIPTION = "A file and text syncronization app"
Expand Down Expand Up @@ -41,22 +42,23 @@ export default function RootLayout({
children: React.ReactNode;
}) {
return (
<html lang="en">
<body>
<ThemeProvider
attribute="class"
defaultTheme="dark"
enableSystem
disableTransitionOnChange
>
<DownloadableFilesProvider>
<TextProvider>
<Navbar />
{children}
</TextProvider>
</DownloadableFilesProvider>
</ThemeProvider>
</body>
</html>
<html lang="en">
<body>
<ThemeProvider
attribute="class"
defaultTheme="dark"
enableSystem
disableTransitionOnChange
>
<DownloadableFilesProvider>
<TextProvider>
<Navbar />
{children}
<Toaster />
</TextProvider>
</DownloadableFilesProvider>
</ThemeProvider>
</body>
</html>
)
}
4 changes: 3 additions & 1 deletion src/app/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@ import Tiptap from "@/components/tiptap"
const HomePage = () => {

return (
<main className="flex justify-center items-center h-[calc(100dvh-48px)]">
<main
className="py-[calc(25dvh-48px)] px-[1rem] md:p-[8.4rem]"
>
<Tiptap />
</main>
)
Expand Down
40 changes: 13 additions & 27 deletions src/components/copy-button.tsx
Original file line number Diff line number Diff line change
@@ -1,16 +1,18 @@
import { Files } from "lucide-react";
import copy from "copy-to-clipboard"
import { Files } from "lucide-react"
import { Button } from "./ui/button"
import { Snackbar, Alert } from "@mui/material";
import { useState } from "react";
import copy from "copy-to-clipboard";
import { useToast } from "@/components/ui/use-toast"

const CopyButton = ({ text }: {text: string}) => {
const [snackOpen, setSnackOpen] = useState(false)
const CopyButton = ({ text }: { text: string }) => {
const { toast } = useToast()

const onCopy = (event) => {
event.stopPropagation()
copy(extractContent(text))
setSnackOpen(true)
toast({
description: "Text copied to clipboard!",
variant: "success",
})
}

const extractContent = (html) => {
Expand All @@ -20,26 +22,10 @@ const CopyButton = ({ text }: {text: string}) => {
}

return (
<>
<Button variant="ghost" onClick={onCopy} className="px-3">
<Files />
</Button>
<Snackbar
open={snackOpen}
autoHideDuration={3000}
onClose={() => setSnackOpen(false)}
>
<Alert
elevation={6}
variant="filled"
severity="success"
sx={{ width: "100%" }}
>
Text copied to clipboard!
</Alert>
</Snackbar>
</>
<Button variant="ghost" onClick={onCopy} className="px-3">
<Files />
</Button>
)
}

export default CopyButton
export default CopyButton
10 changes: 4 additions & 6 deletions src/components/navbar.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
"use client"
import React, { useEffect, useState } from "react"
import { Toolbar } from "@mui/material"
import React, { useState } from "react"
import DownloadDialog from "./download-dialog"
import UploadDialog from "./upload-dialog"
import { ProgressBar } from "react-loader-spinner"
Expand All @@ -14,17 +13,16 @@ const Navbar = () => {

return (
<header className="text-white shadow">
<Toolbar
variant="dense"
className="flex justify-between bg-[#009980]"
<nav
className="flex justify-between bg-[#009980] min-h-12 items-center px-6"
>
<span className="text-xl py-2 px-3">Delen</span>
<div className="flex justify-around grow-[0.1]">
<CopyButton text={text} />
<UploadDialog />
<DownloadDialog setLoading={setLoading} />
</div>
</Toolbar>
</nav>
{loading && (
<div className={styles.loaderBackground}>
<ProgressBar
Expand Down
5 changes: 1 addition & 4 deletions src/components/tiptap.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
"use client"

import { useEditor, EditorContent } from "@tiptap/react"
import StarterKit from "@tiptap/starter-kit"
import Link from "@tiptap/extension-link"
Expand Down Expand Up @@ -33,7 +31,7 @@ const Tiptap = () => {
content: "",
editorProps: {
attributes: {
class: "bg-[#202124] max-w-screen-xl h-[57vh] text-lg w-[1280px] border-solid border-2 border-[#99C8FF] rounded-md p-3",
class: "bg-[#202124] h-[57vh] text-lg border-solid border-2 border-[#99C8FF] rounded-md p-3",
},
},
onUpdate: ({ editor }) => {
Expand All @@ -48,7 +46,6 @@ const Tiptap = () => {
if (editor?.isEmpty) {
editor.commands.insertContent(text)
}

// eslint-disable-next-line react-hooks/exhaustive-deps
}, [text])

Expand Down
129 changes: 129 additions & 0 deletions src/components/ui/toast.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,129 @@
import * as React from "react"
import * as ToastPrimitives from "@radix-ui/react-toast"
import { cva, type VariantProps } from "class-variance-authority"
import { X } from "lucide-react"

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-4 overflow-hidden rounded-md border p-6 pr-8 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",
success:
"destructive group border-destructive bg-destructive text-destructive-foreground",
},
},
defaultVariants: {
variant: "default",
},
}
)

const Toast = 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}
/>
)
})
Toast.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 ring-offset-background transition-colors hover:bg-secondary focus:outline-none focus:ring-2 focus:ring-ring focus:ring-offset-2 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-2 top-2 rounded-md p-1 text-foreground/50 opacity-0 transition-opacity hover:text-foreground focus:opacity-100 focus:outline-none focus:ring-2 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}
>
<X 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", 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 Toast>

type ToastActionElement = React.ReactElement<typeof ToastAction>

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

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

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

return (
<ToastProvider>
{toasts.map(function ({ id, title, description, action, ...props }) {
return (
<Toast key={id} {...props}>
<div className="grid gap-1">
{title && <ToastTitle>{title}</ToastTitle>}
{description && (
<ToastDescription>{description}</ToastDescription>
)}
</div>
{action}
<ToastClose />
</Toast>
)
})}
<ToastViewport />
</ToastProvider>
)
}
Loading

0 comments on commit 9e85c2c

Please sign in to comment.