more mobile compatible

This commit is contained in:
2025-02-17 21:17:49 +01:00
parent 9684a18046
commit 308bd35ce8
13 changed files with 656 additions and 54 deletions
-44
View File
@@ -40,47 +40,3 @@ export async function POST(req: NextRequest) {
{ status: 200 }
);
}
// Account login
// Email exists
// Password is valid
export async function GET(req: NextRequest) {
const { email, password } = await req.json();
if (typeof email !== 'string' || typeof password !== 'string')
return NextResponse.json(
{
message:
"Invalid structure, body requires 'email: string' and 'password: string'",
},
{ status: 400 }
);
const user = await database.users.findOne({ email });
if (!user)
return NextResponse.json(
{
message: 'Invalid email',
},
{ status: 400 }
);
if (user.password !== password)
return NextResponse.json(
{
message: 'Invalid password',
},
{ status: 400 }
);
const sessionId = (await database.sessions.insertOne({ email })).insertedId;
return NextResponse.json(
{
message: 'ok',
sessionId,
},
{ status: 200 }
);
}
+44
View File
@@ -46,3 +46,47 @@ export async function GET(req: NextRequest) {
{ status: 200 }
);
}
// Account login
// Email exists
// Password is valid
export async function POST(req: NextRequest) {
const { email, password } = await req.json();
if (typeof email !== 'string' || typeof password !== 'string')
return NextResponse.json(
{
message:
"Invalid structure, body requires 'email: string' and 'password: string'",
},
{ status: 400 }
);
const user = await database.users.findOne({ email });
if (!user)
return NextResponse.json(
{
message: 'Invalid email',
},
{ status: 401 }
);
if (user.password !== password)
return NextResponse.json(
{
message: 'Invalid password',
},
{ status: 401 }
);
const sessionId = (await database.sessions.insertOne({ email })).insertedId;
return NextResponse.json(
{
message: 'ok',
sessionId,
},
{ status: 200 }
);
}
+2
View File
@@ -2,6 +2,7 @@ import type { Metadata } from 'next';
import { cn } from '@/lib/utils';
import './globals.css';
import { ThemeProvider } from './ThemeProvider';
import { Toaster } from '@/components/ui/toaster';
export const metadata: Metadata = {
title: 'Create Next App',
@@ -28,6 +29,7 @@ export default function RootLayout({
disableTransitionOnChange
>
{children}
<Toaster />
</ThemeProvider>
</body>
</html>
+38 -3
View File
@@ -3,11 +3,20 @@
import { Button } from '@/components/ui/button';
import { Input } from '@/components/ui/input';
import { Label } from '@/components/ui/label';
import { useToast } from '@/hooks/use-toast';
import axios from 'axios';
import Link from 'next/link';
import { useState } from 'react';
import cookies from 'js-cookie';
import { useRouter } from 'next/navigation';
export default function Login() {
const { toast } = useToast();
const router = useRouter();
const [email, setEmail] = useState('');
const [password, setPassword] = useState('');
return (
// <div className="bg-white dark:bg-black w-[46%] h-screen ml-auto">
<div className="bg-white dark:bg-black w-full h-screen flex justify-center items-center">
<div className="text-center">
<div className="pb-5">
@@ -19,15 +28,42 @@ export default function Login() {
className="w-80 mt-5 mx-auto"
type="email"
placeholder="[email protected]"
onChange={(event) => setEmail(event.target.value)}
/>
<Input
className="w-80 mt-5 mx-auto"
type="password"
placeholder="Your password"
onChange={(event) => setPassword(event.target.value)}
/>
<Button className="mt-5 w-80 mx-auto">Log in</Button>
<Button
className="mt-5 w-80 mx-auto"
onClick={async () => {
try {
const { sessionId } = (
await axios.post('/api/session/', {
email,
password,
})
).data;
cookies.set('session_id', sessionId);
router.replace('/dashboard');
} catch (err: any) {
toast({
title: 'Uh oh! Something went wrong.',
description: err.response
? err.response.data.message
: String(err),
});
}
}}
>
Log in
</Button>
</div>
<div className="w-72 mx-auto">
<Label className="mt-3 text-sm text-muted-foreground break-words">
@@ -44,6 +80,5 @@ export default function Login() {
</div>
</div>
</div>
// </div>
);
}
+97 -6
View File
@@ -1,3 +1,22 @@
'use client';
import * as React from 'react';
import { Menu, ChevronDown, ChevronRight } from 'lucide-react';
import { Button } from '@/components/ui/button';
import {
Sheet,
SheetContent,
SheetFooter,
SheetTitle,
SheetTrigger,
} from '@/components/ui/sheet';
import {
Collapsible,
CollapsibleContent,
CollapsibleTrigger,
} from '@/components/ui/collapsible';
import { cn } from '@/lib/utils';
import {
SidebarContent,
SidebarProvider,
@@ -7,12 +26,12 @@ import {
SidebarGroupContent,
SidebarMenu,
SidebarMenuItem,
SidebarMenuButton,
SidebarFooter,
} from '@/components/ui/sidebar';
import { Calendar, LayoutDashboardIcon, Settings } from 'lucide-react';
import Link from 'next/link';
import useSmallScreen from '@/hooks/is-small';
// Menu items.
const items = [
@@ -36,18 +55,90 @@ const footer = [
},
];
export default function App({ children }: { children?: any }) {
export function HamburgerMenu() {
const [open, setOpen] = React.useState(false);
return (
<Sheet open={open} onOpenChange={setOpen}>
<SheetTitle className="hidden">Menu</SheetTitle>
<SheetTrigger asChild>
<Button variant="ghost" size="icon" className="md:hidden">
<Menu className="h-10 w-5" />
<span className="sr-only">Toggle menu</span>
</Button>
</SheetTrigger>
<SheetContent side="left" className="w-28 flex flex-col">
{items.map((item, i) => (
<div key={i} className="w-16 mx-auto">
<Link href={item.url}>
<item.icon className="!size-full p-4 hover:bg-foreground hover:text-background rounded-2xl" />
</Link>
</div>
))}
<div className="flex-grow" />
<SheetFooter className="mt-auto">
{footer.map((item, i) => (
<Link href={item.url} key={i}>
<item.icon className="!size-full p-4 hover:bg-foreground hover:text-background rounded-2xl" />
</Link>
))}
</SheetFooter>
</SheetContent>
</Sheet>
);
}
export default function App({ children }: { children?: any }) {
const isSmall = useSmallScreen();
return isSmall ? (
<div className="flex flex-col">
<div className="flex flex-row w-max mx-auto gap-2 items-center">
<div className="flex flex-row w-max gap-2">
{items.map((item, i) => (
<div key={i} className="w-12 mx-auto">
<Link href={item.url}>
<item.icon className="!size-full p-2 hover:bg-foreground hover:text-background rounded-2xl" />
</Link>
</div>
))}
</div>
<div className="flex flex-row w-max gap-2">
{footer.map((item, i) => (
<div key={i} className="w-12 mx-auto">
<Link href={item.url}>
<item.icon className="!size-full p-2 hover:bg-foreground hover:text-background rounded-2xl" />
</Link>
</div>
))}
</div>
{/* {items.map((item, i) => (
<div key={i} className="w-12 mx-auto">
<Link href={item.url}>
<item.icon className="!size-full p-2 hover:bg-foreground hover:text-background rounded-2xl" />
</Link>
</div>
))} */}
</div>
{children}
</div>
) : (
<div className="flex w-full">
<div className='md:w-28'>
<SidebarProvider>
<div className="md:w-28">
<SidebarProvider
open={true}
defaultOpen={true}
>
<Sidebar className="w-28">
<SidebarContent>
<SidebarGroup>
<SidebarGroupLabel>
Klayrion v0.0.1-alpha.0
</SidebarGroupLabel>
<SidebarGroupContent>
<SidebarGroupContent className="mt-14">
<SidebarMenu>
{items.map((item, i) => (
<SidebarMenuItem
@@ -63,7 +154,7 @@ export default function App({ children }: { children?: any }) {
</SidebarGroupContent>
</SidebarGroup>
</SidebarContent>
<SidebarFooter className='mb-4'>
<SidebarFooter className="mb-4">
<SidebarMenu>
{footer.map((item, i) => (
<SidebarMenuItem
+1 -1
View File
@@ -42,7 +42,7 @@ export default function Engagement({
<CardContent>
<ChartContainer
config={chartConfig}
className="w-full xl:w-[680px] lg:h-[270px]"
className="w-full xl:w-[680px] lg:h-[270px] 2xl:w-[880px]"
>
<AreaChart
accessibilityLayer
+11
View File
@@ -0,0 +1,11 @@
"use client"
import * as CollapsiblePrimitive from "@radix-ui/react-collapsible"
const Collapsible = CollapsiblePrimitive.Root
const CollapsibleTrigger = CollapsiblePrimitive.CollapsibleTrigger
const CollapsibleContent = CollapsiblePrimitive.CollapsibleContent
export { Collapsible, CollapsibleTrigger, CollapsibleContent }
+129
View File
@@ -0,0 +1,129 @@
"use client"
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-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 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 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}
>
<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 [&+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 Toast>
type ToastActionElement = React.ReactElement<typeof ToastAction>
export {
type ToastProps,
type ToastActionElement,
ToastProvider,
ToastViewport,
Toast,
ToastTitle,
ToastDescription,
ToastClose,
ToastAction,
}
+35
View File
@@ -0,0 +1,35 @@
"use client"
import { useToast } from "@/hooks/use-toast"
import {
Toast,
ToastClose,
ToastDescription,
ToastProvider,
ToastTitle,
ToastViewport,
} from "@/components/ui/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>
)
}
+17
View File
@@ -0,0 +1,17 @@
import { useEffect, useState } from 'react';
export default function useSmallScreen() {
const [isSmall, setIsSmall] = useState(false);
useEffect(() => {
const mediaQuery = window.matchMedia('(max-width: 768px)');
setIsSmall(mediaQuery.matches);
const handler = (e: MediaQueryListEvent) => setIsSmall(e.matches);
mediaQuery.addEventListener('change', handler);
return () => mediaQuery.removeEventListener('change', handler);
}, []);
return isSmall;
};
+194
View File
@@ -0,0 +1,194 @@
"use client"
// Inspired by react-hot-toast library
import * as React from "react"
import type {
ToastActionElement,
ToastProps,
} from "@/components/ui/toast"
const TOAST_LIMIT = 1
const TOAST_REMOVE_DELAY = 1000000
type ToasterToast = ToastProps & {
id: string
title?: React.ReactNode
description?: React.ReactNode
action?: ToastActionElement
}
const actionTypes = {
ADD_TOAST: "ADD_TOAST",
UPDATE_TOAST: "UPDATE_TOAST",
DISMISS_TOAST: "DISMISS_TOAST",
REMOVE_TOAST: "REMOVE_TOAST",
} as const
let count = 0
function genId() {
count = (count + 1) % Number.MAX_SAFE_INTEGER
return count.toString()
}
type ActionType = typeof actionTypes
type Action =
| {
type: ActionType["ADD_TOAST"]
toast: ToasterToast
}
| {
type: ActionType["UPDATE_TOAST"]
toast: Partial<ToasterToast>
}
| {
type: ActionType["DISMISS_TOAST"]
toastId?: ToasterToast["id"]
}
| {
type: ActionType["REMOVE_TOAST"]
toastId?: ToasterToast["id"]
}
interface State {
toasts: ToasterToast[]
}
const toastTimeouts = new Map<string, ReturnType<typeof setTimeout>>()
const addToRemoveQueue = (toastId: string) => {
if (toastTimeouts.has(toastId)) {
return
}
const timeout = setTimeout(() => {
toastTimeouts.delete(toastId)
dispatch({
type: "REMOVE_TOAST",
toastId: toastId,
})
}, TOAST_REMOVE_DELAY)
toastTimeouts.set(toastId, timeout)
}
export const reducer = (state: State, action: Action): State => {
switch (action.type) {
case "ADD_TOAST":
return {
...state,
toasts: [action.toast, ...state.toasts].slice(0, TOAST_LIMIT),
}
case "UPDATE_TOAST":
return {
...state,
toasts: state.toasts.map((t) =>
t.id === action.toast.id ? { ...t, ...action.toast } : t
),
}
case "DISMISS_TOAST": {
const { toastId } = action
// ! Side effects ! - This could be extracted into a dismissToast() action,
// but I'll keep it here for simplicity
if (toastId) {
addToRemoveQueue(toastId)
} else {
state.toasts.forEach((toast) => {
addToRemoveQueue(toast.id)
})
}
return {
...state,
toasts: state.toasts.map((t) =>
t.id === toastId || toastId === undefined
? {
...t,
open: false,
}
: t
),
}
}
case "REMOVE_TOAST":
if (action.toastId === undefined) {
return {
...state,
toasts: [],
}
}
return {
...state,
toasts: state.toasts.filter((t) => t.id !== action.toastId),
}
}
}
const listeners: Array<(state: State) => void> = []
let memoryState: State = { toasts: [] }
function dispatch(action: Action) {
memoryState = reducer(memoryState, action)
listeners.forEach((listener) => {
listener(memoryState)
})
}
type Toast = Omit<ToasterToast, "id">
function toast({ ...props }: Toast) {
const id = genId()
const update = (props: ToasterToast) =>
dispatch({
type: "UPDATE_TOAST",
toast: { ...props, id },
})
const dismiss = () => dispatch({ type: "DISMISS_TOAST", toastId: id })
dispatch({
type: "ADD_TOAST",
toast: {
...props,
id,
open: true,
onOpenChange: (open) => {
if (!open) dismiss()
},
},
})
return {
id: id,
dismiss,
update,
}
}
function useToast() {
const [state, setState] = React.useState<State>(memoryState)
React.useEffect(() => {
listeners.push(setState)
return () => {
const index = listeners.indexOf(setState)
if (index > -1) {
listeners.splice(index, 1)
}
}
}, [state])
return {
...state,
toast,
dismiss: (toastId?: string) => dispatch({ type: "DISMISS_TOAST", toastId }),
}
}
export { useToast, toast }