Compare commits
No commits in common. "37ad1d1dc94d0ddef33addfa89599f9ba1942866" and "6506917ddbe1caeb2eb8293edd89e575b887823e" have entirely different histories.
37ad1d1dc9
...
6506917ddb
|
|
@ -1,4 +1,4 @@
|
|||
import { useMemo} from "react";
|
||||
import { useState } from "react";
|
||||
import { BaseRecord } from "@refinedev/core";
|
||||
import { useTable } from "@refinedev/react-table";
|
||||
import {
|
||||
|
|
@ -14,7 +14,6 @@ import {
|
|||
TableHeader,
|
||||
TableRow,
|
||||
} from "./ui/table"
|
||||
import { Skeleton } from "./ui/skeleton";
|
||||
import { DataTablePagination } from "./table-pagination"
|
||||
|
||||
interface DataTableProps<TData extends BaseRecord = BaseRecord, TValue = unknown> {
|
||||
|
|
@ -22,31 +21,22 @@ interface DataTableProps<TData extends BaseRecord = BaseRecord, TValue = unknown
|
|||
}
|
||||
|
||||
export function DataTable<TData extends BaseRecord, TValue>({
|
||||
columns,
|
||||
columns
|
||||
}: DataTableProps<TData, TValue>) {
|
||||
const [hoveredRowId, setHoveredRowId] = useState<string>("");
|
||||
|
||||
const table = useTable({
|
||||
columns,
|
||||
meta: {
|
||||
hoveredRowId,
|
||||
},
|
||||
refineCoreProps: {
|
||||
resource: "files"
|
||||
}
|
||||
})
|
||||
|
||||
const loadingRows = useMemo(() => Array(4).fill({}).map(() => ({
|
||||
getIsSelected: () => false,
|
||||
getVisibleCells: () => columns.map(() => ({
|
||||
column: {
|
||||
columnDef: {
|
||||
cell: <Skeleton className="h-4 w-full bg-primary-1/30" />,
|
||||
}
|
||||
},
|
||||
getContext: () => null
|
||||
})),
|
||||
})), [])
|
||||
|
||||
const rows = table.refineCore.tableQueryResult.isLoading ? loadingRows : table.getRowModel().rows
|
||||
|
||||
return (
|
||||
<>
|
||||
<div className="rounded-lg">
|
||||
<Table>
|
||||
<TableHeader>
|
||||
{table.getHeaderGroups().map((headerGroup) => (
|
||||
|
|
@ -67,12 +57,15 @@ export function DataTable<TData extends BaseRecord, TValue>({
|
|||
))}
|
||||
</TableHeader>
|
||||
<TableBody>
|
||||
{rows.length ? (
|
||||
rows.map((row) => (
|
||||
{table.getRowModel().rows?.length ? (
|
||||
table.getRowModel().rows.map((row) => (
|
||||
<TableRow
|
||||
key={row.id}
|
||||
data-state={row.getIsSelected() && "selected"}
|
||||
className="group"
|
||||
onMouseEnter={() => {
|
||||
console.log(hoveredRowId, row.id);
|
||||
setHoveredRowId(row.id)
|
||||
}}
|
||||
>
|
||||
{row.getVisibleCells().map((cell) => (
|
||||
<TableCell key={cell.id}>
|
||||
|
|
@ -91,6 +84,6 @@ export function DataTable<TData extends BaseRecord, TValue>({
|
|||
</TableBody>
|
||||
</Table>
|
||||
<DataTablePagination table={table} />
|
||||
</>
|
||||
</div>
|
||||
)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -108,7 +108,7 @@ export const GeneralLayout = ({ children }: React.PropsWithChildren<{}>) => {
|
|||
<DropdownMenuGroup>
|
||||
<DropdownMenuItem onClick={() => logout()}>
|
||||
<ExitIcon className="mr-2" />
|
||||
Logout
|
||||
Log Out
|
||||
</DropdownMenuItem>
|
||||
</DropdownMenuGroup>
|
||||
</DropdownMenuContent>
|
||||
|
|
|
|||
|
|
@ -1,18 +0,0 @@
|
|||
import React from "react";
|
||||
import {Sdk} from "@lumeweb/portal-sdk";
|
||||
|
||||
export const SdkContext = React.createContext<
|
||||
Partial<Sdk>
|
||||
>({});
|
||||
|
||||
export const SdkContextProvider: React.FC< {sdk: Sdk, children: React.ReactNode}> = ({sdk, children}) => {
|
||||
return (
|
||||
<SdkContext.Provider value={sdk}>
|
||||
{children}
|
||||
</SdkContext.Provider>
|
||||
);
|
||||
};
|
||||
|
||||
export function useSdk(): Partial<Sdk>{
|
||||
return React.useContext(SdkContext);
|
||||
}
|
||||
|
|
@ -1,63 +0,0 @@
|
|||
import Uppy, {BasePlugin, DefaultPluginOptions} from '@uppy/core';
|
||||
import {PROTOCOL_S5, Sdk} from "@lumeweb/portal-sdk";
|
||||
import {S5Client} from "@lumeweb/s5-js";
|
||||
import {AxiosProgressEvent} from "axios";
|
||||
|
||||
|
||||
interface UppyFileUploadOptions extends DefaultPluginOptions {
|
||||
sdk: Sdk;
|
||||
}
|
||||
|
||||
export default class UppyFileUpload extends BasePlugin {
|
||||
private _sdk: Sdk;
|
||||
|
||||
constructor(uppy: Uppy, opts?: UppyFileUploadOptions) {
|
||||
super(uppy, opts);
|
||||
this.id = opts?.id || 'file-upload';
|
||||
this.type = 'uploader';
|
||||
this._sdk = opts?.sdk as Sdk;
|
||||
}
|
||||
|
||||
install() {
|
||||
this.uppy.addUploader(this.handleUpload.bind(this));
|
||||
}
|
||||
|
||||
private async handleUpload(fileIDs: string[]) {
|
||||
for (const fileID of fileIDs) {
|
||||
const file = this.uppy.getFile(fileID);
|
||||
if (!file) {
|
||||
continue;
|
||||
}
|
||||
|
||||
// @ts-ignore
|
||||
if (file.uploader !== 'file') {
|
||||
continue;
|
||||
}
|
||||
|
||||
const uploadLimit = await this._sdk.account().uploadLimit();
|
||||
|
||||
let data = file.data;
|
||||
|
||||
if (file.data instanceof Blob) {
|
||||
data = new File([data], file.name, {type: file.type});
|
||||
}
|
||||
|
||||
try {
|
||||
await this._sdk.protocols().get<S5Client>(PROTOCOL_S5).getSdk().uploadFile(data as File, {
|
||||
largeFileSize: uploadLimit,
|
||||
onUploadProgress: (progressEvent: AxiosProgressEvent) => {
|
||||
this.uppy.emit('upload-progress', this.uppy.getFile(file.id), {
|
||||
uploader: this,
|
||||
bytesUploaded: progressEvent.loaded,
|
||||
bytesTotal: progressEvent.total,
|
||||
})
|
||||
}
|
||||
});
|
||||
|
||||
this.uppy.emit('upload-success', file, {uploadURL: null});
|
||||
} catch (err) {
|
||||
this.uppy.emit('upload-error', file, err);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,14 +1,17 @@
|
|||
import Uppy, {debugLogger, type State, UppyFile} from "@uppy/core"
|
||||
import Uppy, { type State, debugLogger } from "@uppy/core"
|
||||
|
||||
import Tus from "@uppy/tus"
|
||||
import toArray from "@uppy/utils/lib/toArray"
|
||||
|
||||
import {type ChangeEvent, useCallback, useEffect, useMemo, useRef, useState} from "react"
|
||||
import DropTarget, {type DropTargetOptions} from "./uppy-dropzone"
|
||||
import {useSdk} from "~/components/lib/sdk-context.js";
|
||||
import UppyFileUpload from "~/components/lib/uppy-file-upload.js";
|
||||
import {PROTOCOL_S5, Sdk} from "@lumeweb/portal-sdk";
|
||||
import {S5Client} from "@lumeweb/s5-js";
|
||||
import {
|
||||
type ChangeEvent,
|
||||
useCallback,
|
||||
useEffect,
|
||||
useMemo,
|
||||
useRef,
|
||||
useState
|
||||
} from "react"
|
||||
import DropTarget, { type DropTargetOptions } from "./uppy-dropzone"
|
||||
|
||||
const LISTENING_EVENTS = [
|
||||
"upload",
|
||||
|
|
@ -20,26 +23,12 @@ const LISTENING_EVENTS = [
|
|||
] as const
|
||||
|
||||
export function useUppy({
|
||||
uploader,
|
||||
endpoint
|
||||
}: {
|
||||
uploader: "tus"
|
||||
endpoint: string
|
||||
}) {
|
||||
const sdk = useSdk()
|
||||
|
||||
const [uploadLimit, setUploadLimit] = useState<number>(0)
|
||||
|
||||
useEffect(() => {
|
||||
async function getUploadLimit() {
|
||||
try {
|
||||
const limit = await sdk.account!().uploadLimit();
|
||||
setUploadLimit(limit);
|
||||
} catch (err) {
|
||||
console.log('Error occured while fetching upload limit', err);
|
||||
}
|
||||
}
|
||||
getUploadLimit();
|
||||
}, []);
|
||||
|
||||
const inputRef = useRef<HTMLInputElement>(null)
|
||||
const [targetRef, _setTargetRef] = useState<HTMLElement | null>(null)
|
||||
const uppyInstance = useRef<Uppy>()
|
||||
|
|
@ -93,29 +82,7 @@ export function useUppy({
|
|||
useEffect(() => {
|
||||
if (!targetRef) return
|
||||
|
||||
const tusPreprocessor = async (fileIDs: string[]) => {
|
||||
for(const fileID of fileIDs) {
|
||||
const file = uppyInstance.current?.getFile(fileID) as UppyFile
|
||||
// @ts-ignore
|
||||
if (file.uploader === "tus") {
|
||||
uppyInstance.current?.setFileState(fileID, {
|
||||
tus: await sdk.protocols!().get<S5Client>(PROTOCOL_S5).getSdk().getTusOptions(file.data as File)
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
const uppy = new Uppy({
|
||||
logger: debugLogger,
|
||||
onBeforeUpload: (files) => {
|
||||
for (const file of Object.entries(files)) {
|
||||
// @ts-ignore
|
||||
file[1].uploader = file[1].size > uploadLimit ? "tus" : "file";
|
||||
}
|
||||
|
||||
return true;
|
||||
},
|
||||
}).use(DropTarget, {
|
||||
const uppy = new Uppy({ logger: debugLogger }).use(DropTarget, {
|
||||
target: targetRef
|
||||
} as DropTargetOptions)
|
||||
|
||||
|
|
@ -130,25 +97,6 @@ export function useUppy({
|
|||
uppyInstance.current?.addFiles(files)
|
||||
}
|
||||
|
||||
uppy.iteratePlugins((plugin) => {
|
||||
uppy.removePlugin(plugin);
|
||||
});
|
||||
|
||||
uppy.use(UppyFileUpload, { sdk: sdk as Sdk })
|
||||
|
||||
let useTus = false;
|
||||
|
||||
uppyInstance.current?.getFiles().forEach((file) => {
|
||||
if (file.size > uploadLimit) {
|
||||
useTus = true;
|
||||
}
|
||||
})
|
||||
|
||||
if (useTus) {
|
||||
uppy.use(Tus, { endpoint: endpoint, limit: 6 })
|
||||
uppy.addPreProcessor(tusPreprocessor)
|
||||
}
|
||||
|
||||
// We clear the input after a file is selected, because otherwise
|
||||
// change event is not fired in Chrome and Safari when a file
|
||||
// with the same name is selected.
|
||||
|
|
@ -161,7 +109,12 @@ export function useUppy({
|
|||
}
|
||||
})
|
||||
|
||||
|
||||
switch (uploader) {
|
||||
case "tus":
|
||||
uppy.use(Tus, { endpoint: endpoint, limit: 6 })
|
||||
break
|
||||
default:
|
||||
}
|
||||
|
||||
uppy.on("complete", (result) => {
|
||||
if (result.failed.length === 0) {
|
||||
|
|
@ -195,7 +148,7 @@ export function useUppy({
|
|||
})
|
||||
}
|
||||
setState("idle")
|
||||
}, [targetRef, endpoint, uploadLimit])
|
||||
}, [targetRef, endpoint, uploader])
|
||||
|
||||
useEffect(() => {
|
||||
return () => {
|
||||
|
|
|
|||
|
|
@ -3,13 +3,12 @@ import { Avatar } from "./ui/avatar";
|
|||
import { Button } from "./ui/button";
|
||||
import { EditIcon, FingerPrintIcon } from "./icons";
|
||||
|
||||
const ManagementCardAvatar = ({ src, onClick }: { src?: string; onClick?: () => void }) => {
|
||||
const ManagementCardAvatar = ({ src }: { src?: string }) => {
|
||||
return (
|
||||
<div className="flex justify-center">
|
||||
<div className="relative w-fit h-fit">
|
||||
<Avatar className="border-2 border-ring h-28 w-28" />
|
||||
<Button
|
||||
onClick={onClick}
|
||||
variant="outline"
|
||||
className="absolute bottom-0 right-0 z-50 flex items-center w-10 h-10 p-0 border-white rounded-full justiyf-center hover:bg-secondary-2">
|
||||
<EditIcon />
|
||||
|
|
|
|||
|
|
@ -1,15 +0,0 @@
|
|||
import { cn } from "~/utils"
|
||||
|
||||
function Skeleton({
|
||||
className,
|
||||
...props
|
||||
}: React.HTMLAttributes<HTMLDivElement>) {
|
||||
return (
|
||||
<div
|
||||
className={cn("animate-pulse rounded-md bg-primary/10", className)}
|
||||
{...props}
|
||||
/>
|
||||
)
|
||||
}
|
||||
|
||||
export { Skeleton }
|
||||
|
|
@ -1,127 +0,0 @@
|
|||
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 "~/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}
|
||||
>
|
||||
<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 Toast>
|
||||
|
||||
type ToastActionElement = React.ReactElement<typeof ToastAction>
|
||||
|
||||
export {
|
||||
type ToastProps,
|
||||
type ToastActionElement,
|
||||
ToastProvider,
|
||||
ToastViewport,
|
||||
Toast,
|
||||
ToastTitle,
|
||||
ToastDescription,
|
||||
ToastClose,
|
||||
ToastAction,
|
||||
}
|
||||
|
|
@ -1,33 +0,0 @@
|
|||
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>
|
||||
)
|
||||
}
|
||||
|
|
@ -1,192 +0,0 @@
|
|||
// 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 }
|
||||
|
|
@ -33,8 +33,10 @@ export type Identity = {
|
|||
}
|
||||
|
||||
export class PortalAuthProvider implements RequiredAuthProvider {
|
||||
private sdk: Sdk;
|
||||
|
||||
constructor(apiUrl: string) {
|
||||
this._sdk = Sdk.create(apiUrl);
|
||||
this.sdk = Sdk.create(apiUrl);
|
||||
|
||||
const methods: Array<keyof AuthProvider> = [
|
||||
'login',
|
||||
|
|
@ -53,18 +55,9 @@ export class PortalAuthProvider implements RequiredAuthProvider {
|
|||
});
|
||||
}
|
||||
|
||||
private _sdk: Sdk;
|
||||
|
||||
get sdk(): Sdk {
|
||||
return this._sdk;
|
||||
}
|
||||
|
||||
public static create(apiUrl: string): AuthProvider {
|
||||
return new PortalAuthProvider(apiUrl);
|
||||
}
|
||||
|
||||
async login(params: AuthFormRequest): Promise<AuthActionResponse> {
|
||||
const ret = await this._sdk.account().login({
|
||||
const cookies = new Cookies();
|
||||
const ret = await this.sdk.account().login({
|
||||
email: params.email,
|
||||
password: params.password,
|
||||
})
|
||||
|
|
@ -72,11 +65,11 @@ export class PortalAuthProvider implements RequiredAuthProvider {
|
|||
let redirectTo: string | undefined;
|
||||
|
||||
if (ret) {
|
||||
cookies.set('jwt', this.sdk.account().jwtToken, {path: '/'});
|
||||
redirectTo = params.redirectTo;
|
||||
if (!redirectTo) {
|
||||
redirectTo = ret ? "/dashboard" : "/login";
|
||||
}
|
||||
this._sdk.setAuthToken(this._sdk.account().jwtToken);
|
||||
}
|
||||
|
||||
return {
|
||||
|
|
@ -86,25 +79,38 @@ export class PortalAuthProvider implements RequiredAuthProvider {
|
|||
}
|
||||
|
||||
async logout(params: any): Promise<AuthActionResponse> {
|
||||
let ret = await this._sdk.account().logout();
|
||||
let ret = await this.sdk.account().logout();
|
||||
if (ret) {
|
||||
const cookies = new Cookies();
|
||||
cookies.remove('jwt');
|
||||
}
|
||||
return {success: ret, redirectTo: "/login"};
|
||||
}
|
||||
|
||||
async check(params?: any): Promise<CheckResponse> {
|
||||
this.maybeSetupAuth();
|
||||
const cookies = new Cookies();
|
||||
|
||||
const ret = await this._sdk.account().ping();
|
||||
const jwtCookie = cookies.get('jwt');
|
||||
|
||||
if (jwtCookie) {
|
||||
this.sdk.setAuthToken(jwtCookie);
|
||||
}
|
||||
|
||||
const ret = await this.sdk.account().ping();
|
||||
|
||||
if (!ret) {
|
||||
cookies.remove('jwt');
|
||||
}
|
||||
|
||||
return {authenticated: ret, redirectTo: ret ? undefined : "/login"};
|
||||
}
|
||||
|
||||
async onError(error: any): Promise<OnErrorResponse> {
|
||||
const cookies = new Cookies();
|
||||
return {logout: true};
|
||||
}
|
||||
|
||||
async register(params: RegisterFormRequest): Promise<AuthActionResponse> {
|
||||
const ret = await this._sdk.account().register({
|
||||
const ret = await this.sdk.account().register({
|
||||
email: params.email,
|
||||
password: params.password,
|
||||
first_name: params.firstName,
|
||||
|
|
@ -126,8 +132,7 @@ export class PortalAuthProvider implements RequiredAuthProvider {
|
|||
}
|
||||
|
||||
async getIdentity(params?: Identity): Promise<IdentityResponse> {
|
||||
this.maybeSetupAuth();
|
||||
const ret = await this._sdk.account().info();
|
||||
const ret = await this.sdk.account().info();
|
||||
|
||||
if (!ret) {
|
||||
return {identity: null};
|
||||
|
|
@ -143,16 +148,12 @@ export class PortalAuthProvider implements RequiredAuthProvider {
|
|||
};
|
||||
}
|
||||
|
||||
maybeSetupAuth(): void {
|
||||
const cookies = new Cookies();
|
||||
const jwtCookie = cookies.get('auth_token');
|
||||
if (jwtCookie) {
|
||||
this._sdk.setAuthToken(jwtCookie);
|
||||
}
|
||||
public static create(apiUrl: string): AuthProvider {
|
||||
return new PortalAuthProvider(apiUrl);
|
||||
}
|
||||
}
|
||||
|
||||
export interface RequiredAuthProvider extends AuthProvider {
|
||||
interface RequiredAuthProvider extends AuthProvider {
|
||||
login: AuthProvider['login'];
|
||||
logout: AuthProvider['logout'];
|
||||
check: AuthProvider['check'];
|
||||
|
|
|
|||
|
|
@ -1,26 +0,0 @@
|
|||
import { NotificationProvider } from "@refinedev/core";
|
||||
import { ToastAction } from "~/components/ui/toast";
|
||||
import { toast } from "~/components/ui/use-toast";
|
||||
|
||||
export const notificationProvider = (): NotificationProvider => {
|
||||
|
||||
return {
|
||||
open: ({
|
||||
key,
|
||||
message,
|
||||
type,
|
||||
description,
|
||||
undoableTimeout,
|
||||
cancelMutation,
|
||||
}) => {
|
||||
toast({
|
||||
variant: type,
|
||||
key,
|
||||
title: message,
|
||||
description,
|
||||
duration: undoableTimeout,
|
||||
})
|
||||
},
|
||||
close: () => {}
|
||||
}
|
||||
};
|
||||
|
|
@ -1,55 +0,0 @@
|
|||
interface PinningStatus {
|
||||
id: string;
|
||||
progress: number;
|
||||
status: 'inprogress' | 'completed' | 'stale';
|
||||
}
|
||||
|
||||
// biome-ignore lint/complexity/noStaticOnlyClass: <explanation>
|
||||
class PinningProcess {
|
||||
private static instances: Map<string, PinningStatus> = new Map();
|
||||
|
||||
static async pin(id: string): Promise<{ success: boolean; message: string }> {
|
||||
if (PinningProcess.instances.has(id)) {
|
||||
return { success: false, message: "ID is already being processed" };
|
||||
}
|
||||
|
||||
const pinningStatus: PinningStatus = { id, progress: 0, status: 'inprogress' };
|
||||
PinningProcess.instances.set(id, pinningStatus);
|
||||
|
||||
// Simulate async progress
|
||||
(async () => {
|
||||
for (let progress = 1; progress <= 100; progress++) {
|
||||
await new Promise(resolve => setTimeout(resolve, Math.floor(Math.random() * (500 - 100 + 1)) + 100)); // Simulate time passing with random duration between 100 and 500
|
||||
pinningStatus.progress = progress;
|
||||
if (progress === 100) {
|
||||
pinningStatus.status = 'completed';
|
||||
}
|
||||
}
|
||||
})();
|
||||
|
||||
return { success: true, message: "Pinning process started" };
|
||||
}
|
||||
|
||||
static *pollProgress(id: string): Generator<PinningStatus | null, void, unknown> {
|
||||
let status = PinningProcess.instances.get(id);
|
||||
while (status && status.status !== 'completed') {
|
||||
yield status;
|
||||
status = PinningProcess.instances.get(id);
|
||||
}
|
||||
yield status ?? null; // Yield the final status, could be null if ID doesn't exist
|
||||
}
|
||||
}
|
||||
|
||||
// Example usage:
|
||||
// (async () => {
|
||||
// const { success, message } = await PinningProcess.pin("123");
|
||||
// console.log(message);
|
||||
// if (success) {
|
||||
// const progressGenerator = PinningProcess.pollProgress("123");
|
||||
// let result = progressGenerator.next();
|
||||
// while (!result.done) {
|
||||
// console.log(result.value); // Log the progress
|
||||
// result = progressGenerator.next();
|
||||
// }
|
||||
// }
|
||||
// })();
|
||||
17
app/root.tsx
17
app/root.tsx
|
|
@ -12,13 +12,9 @@ import type { LinksFunction } from "@remix-run/node";
|
|||
// Supports weights 200-800
|
||||
import '@fontsource-variable/manrope';
|
||||
import {Refine} from "@refinedev/core";
|
||||
import {PortalAuthProvider} from "~/data/auth-provider.js";
|
||||
import routerProvider from "@refinedev/remix-router";
|
||||
import { defaultProvider } from "~/data/file-provider";
|
||||
import {PortalAuthProvider} from "~/data/auth-provider";
|
||||
import { notificationProvider } from "~/data/notification-provider";
|
||||
import {SdkContextProvider} from "~/components/lib/sdk-context";
|
||||
import { Toaster } from "~/components/ui/toaster";
|
||||
|
||||
import { defaultProvider } from "./data/file-provider";
|
||||
|
||||
export const links: LinksFunction = () => [
|
||||
{ rel: "stylesheet", href: stylesheet },
|
||||
|
|
@ -35,7 +31,6 @@ export function Layout({children}: { children: React.ReactNode }) {
|
|||
</head>
|
||||
<body>
|
||||
{children}
|
||||
<Toaster />
|
||||
<ScrollRestoration/>
|
||||
<Scripts/>
|
||||
</body>
|
||||
|
|
@ -44,21 +39,17 @@ export function Layout({children}: { children: React.ReactNode }) {
|
|||
}
|
||||
|
||||
export default function App() {
|
||||
const auth = PortalAuthProvider.create("https://alpha.pinner.xyz")
|
||||
return (
|
||||
<Refine
|
||||
authProvider={auth}
|
||||
authProvider={PortalAuthProvider.create("https://alpha.pinner.xyz")}
|
||||
routerProvider={routerProvider}
|
||||
dataProvider={defaultProvider}
|
||||
notificationProvider={notificationProvider}
|
||||
resources={[
|
||||
{ name: 'files' },
|
||||
{ name: 'users' }
|
||||
]}
|
||||
>
|
||||
<SdkContextProvider sdk={(auth as PortalAuthProvider).sdk}>
|
||||
<Outlet/>
|
||||
</SdkContextProvider>
|
||||
<Outlet/>
|
||||
</Refine>
|
||||
);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,26 +1,12 @@
|
|||
import { getFormProps, useForm } from "@conform-to/react";
|
||||
import { getZodConstraint, parseWithZod } from "@conform-to/zod";
|
||||
import { DialogClose } from "@radix-ui/react-dialog";
|
||||
import { Cross2Icon } from "@radix-ui/react-icons";
|
||||
import {
|
||||
BaseKey,
|
||||
useGetIdentity,
|
||||
useUpdate,
|
||||
useUpdatePassword,
|
||||
} from "@refinedev/core";
|
||||
import { BaseKey, useGetIdentity, useUpdate, useUpdatePassword } from "@refinedev/core";
|
||||
import { useState } from "react";
|
||||
import { z } from "zod";
|
||||
import { Field } from "~/components/forms";
|
||||
import { GeneralLayout } from "~/components/general-layout";
|
||||
import { AddIcon, CloudCheckIcon, CloudIcon, CloudUploadIcon, CrownIcon, TrashIcon } from "~/components/icons";
|
||||
import { useUppy } from "~/components/lib/uppy";
|
||||
import {
|
||||
ManagementCard,
|
||||
ManagementCardAvatar,
|
||||
ManagementCardContent,
|
||||
ManagementCardFooter,
|
||||
ManagementCardTitle,
|
||||
} from "~/components/management-card";
|
||||
import { AddIcon, CloudIcon, CrownIcon } from "~/components/icons";
|
||||
import { ManagementCard, ManagementCardAvatar, ManagementCardContent, ManagementCardFooter, ManagementCardTitle } from "~/components/management-card";
|
||||
import { Button } from "~/components/ui/button";
|
||||
import {
|
||||
Dialog,
|
||||
|
|
@ -40,7 +26,6 @@ export default function MyAccount() {
|
|||
changeEmail: false,
|
||||
changePassword: false,
|
||||
setupTwoFactor: false,
|
||||
changeAvatar: false,
|
||||
});
|
||||
|
||||
return (
|
||||
|
|
@ -61,19 +46,15 @@ export default function MyAccount() {
|
|||
<h2 className="font-bold my-8">Account Management</h2>
|
||||
<div className="grid grid-cols-3 gap-x-8">
|
||||
<ManagementCard>
|
||||
<ManagementCardAvatar
|
||||
onClick={() => setModal({ ...openModal, changeAvatar: true })}
|
||||
/>
|
||||
<ManagementCardAvatar />
|
||||
</ManagementCard>
|
||||
<ManagementCard>
|
||||
<ManagementCardTitle>Email Address</ManagementCardTitle>
|
||||
<ManagementCardContent className="text-ring font-semibold">
|
||||
{identity?.email}
|
||||
{identity?.email}
|
||||
</ManagementCardContent>
|
||||
<ManagementCardFooter>
|
||||
<Button
|
||||
className="h-12 gap-x-2"
|
||||
onClick={() => setModal({ ...openModal, changeEmail: true })}>
|
||||
<Button className="h-12 gap-x-2" onClick={() => setModal({ ...openModal, changeEmail: true })}>
|
||||
<AddIcon />
|
||||
Change Email Address
|
||||
</Button>
|
||||
|
|
@ -82,8 +63,8 @@ export default function MyAccount() {
|
|||
<ManagementCard>
|
||||
<ManagementCardTitle>Account Type</ManagementCardTitle>
|
||||
<ManagementCardContent className="text-ring font-semibold flex gap-x-2">
|
||||
Lite Premium Account
|
||||
<CrownIcon />
|
||||
Lite Premium Account
|
||||
<CrownIcon />
|
||||
</ManagementCardContent>
|
||||
<ManagementCardFooter>
|
||||
<Button className="h-12 gap-x-2">
|
||||
|
|
@ -101,9 +82,7 @@ export default function MyAccount() {
|
|||
<PasswordDots className="mt-6" />
|
||||
</ManagementCardContent>
|
||||
<ManagementCardFooter>
|
||||
<Button
|
||||
className="h-12 gap-x-2"
|
||||
onClick={() => setModal({ ...openModal, changePassword: true })}>
|
||||
<Button className="h-12 gap-x-2" onClick={() => setModal({ ...openModal, changePassword: true })}>
|
||||
<AddIcon />
|
||||
Change Password
|
||||
</Button>
|
||||
|
|
@ -112,27 +91,35 @@ export default function MyAccount() {
|
|||
<ManagementCard>
|
||||
<ManagementCardTitle>Two-Factor Authentication</ManagementCardTitle>
|
||||
<ManagementCardContent>
|
||||
Improve security by enabling 2FA.
|
||||
Improve security by enabling 2FA.
|
||||
</ManagementCardContent>
|
||||
<ManagementCardFooter>
|
||||
<Button
|
||||
className="h-12 gap-x-2"
|
||||
onClick={() => setModal({ ...openModal, setupTwoFactor: true })}>
|
||||
<Button className="h-12 gap-x-2" onClick={() => setModal({ ...openModal, setupTwoFactor: true })}>
|
||||
<AddIcon />
|
||||
Enable Two-Factor Authorization
|
||||
</Button>
|
||||
</ManagementCardFooter>
|
||||
</ManagementCard>
|
||||
<ManagementCard>
|
||||
<ManagementCardTitle>Backup Key</ManagementCardTitle>
|
||||
<ManagementCardContent>
|
||||
Never share this code with anyone.
|
||||
</ManagementCardContent>
|
||||
<ManagementCardFooter>
|
||||
<Button className="h-12 gap-x-2">
|
||||
<AddIcon />
|
||||
Export Backup Key
|
||||
</Button>
|
||||
</ManagementCardFooter>
|
||||
</ManagementCard>
|
||||
</div>
|
||||
<h2 className="font-bold my-8">More</h2>
|
||||
<div className="grid grid-cols-3 gap-x-8">
|
||||
<ManagementCard variant="accent">
|
||||
<ManagementCardTitle>Invite a Friend</ManagementCardTitle>
|
||||
<ManagementCardContent>
|
||||
Get 1 GB per friend invited for free (max 5 GB).
|
||||
</ManagementCardContent>
|
||||
<ManagementCardContent>Get 1 GB per friend invited for free (max 5 GB).</ManagementCardContent>
|
||||
<ManagementCardFooter>
|
||||
<Button variant="accent" className="h-12 gap-x-2">
|
||||
<Button variant="accent" className="h-12 gap-x-2">
|
||||
<AddIcon />
|
||||
Send Invitation
|
||||
</Button>
|
||||
|
|
@ -140,9 +127,7 @@ export default function MyAccount() {
|
|||
</ManagementCard>
|
||||
<ManagementCard>
|
||||
<ManagementCardTitle>Read our Resources</ManagementCardTitle>
|
||||
<ManagementCardContent>
|
||||
Navigate helpful articles or get assistance.
|
||||
</ManagementCardContent>
|
||||
<ManagementCardContent>Navigate helpful articles or get assistance.</ManagementCardContent>
|
||||
<ManagementCardFooter>
|
||||
<Button className="h-12 gap-x-2">
|
||||
<AddIcon />
|
||||
|
|
@ -152,9 +137,7 @@ export default function MyAccount() {
|
|||
</ManagementCard>
|
||||
<ManagementCard>
|
||||
<ManagementCardTitle>Delete Account</ManagementCardTitle>
|
||||
<ManagementCardContent>
|
||||
Once initiated, this action cannot be undone.
|
||||
</ManagementCardContent>
|
||||
<ManagementCardContent>Once initiated, this action cannot be undone.</ManagementCardContent>
|
||||
<ManagementCardFooter>
|
||||
<Button className="h-12 gap-x-2" variant="destructive">
|
||||
<AddIcon />
|
||||
|
|
@ -164,12 +147,6 @@ export default function MyAccount() {
|
|||
</ManagementCard>
|
||||
</div>
|
||||
{/* Dialogs must be near to body as possible to open the modal, otherwise will be restricted to parent height-width */}
|
||||
<ChangeAvatarForm
|
||||
open={openModal.changeAvatar}
|
||||
setOpen={(value: boolean) =>
|
||||
setModal({ ...openModal, changeAvatar: value })
|
||||
}
|
||||
/>
|
||||
<ChangeEmailForm
|
||||
open={openModal.changeEmail}
|
||||
setOpen={(value: boolean) =>
|
||||
|
|
@ -193,22 +170,21 @@ export default function MyAccount() {
|
|||
);
|
||||
}
|
||||
|
||||
const ChangeEmailSchema = z
|
||||
.object({
|
||||
email: z.string().email(),
|
||||
password: z.string(),
|
||||
retypePassword: z.string(),
|
||||
})
|
||||
.superRefine((data, ctx) => {
|
||||
if (data.password !== data.retypePassword) {
|
||||
return ctx.addIssue({
|
||||
code: z.ZodIssueCode.custom,
|
||||
path: ["retypePassword"],
|
||||
message: "Passwords do not match",
|
||||
});
|
||||
}
|
||||
return true;
|
||||
});
|
||||
const ChangeEmailSchema = z.object({
|
||||
email: z.string().email(),
|
||||
password: z.string(),
|
||||
retypePassword: z.string(),
|
||||
})
|
||||
.superRefine((data, ctx) => {
|
||||
if (data.password !== data.retypePassword) {
|
||||
return ctx.addIssue({
|
||||
code: z.ZodIssueCode.custom,
|
||||
path: ["retypePassword"],
|
||||
message: "Passwords do not match",
|
||||
});
|
||||
}
|
||||
return true;
|
||||
});
|
||||
|
||||
const ChangeEmailForm = ({
|
||||
open,
|
||||
|
|
@ -219,7 +195,7 @@ const ChangeEmailForm = ({
|
|||
setOpen: (value: boolean) => void;
|
||||
currentValue: string;
|
||||
}) => {
|
||||
const { data: identity } = useGetIdentity<{ id: BaseKey }>();
|
||||
const{ data: identity } = useGetIdentity<{ id: BaseKey }>();
|
||||
const { mutate: updateEmail } = useUpdate();
|
||||
const [form, fields] = useForm({
|
||||
id: "login",
|
||||
|
|
@ -234,18 +210,18 @@ const ChangeEmailForm = ({
|
|||
const data = Object.fromEntries(new FormData(e.currentTarget).entries());
|
||||
console.log(identity);
|
||||
updateEmail({
|
||||
resource: "users",
|
||||
resource: 'users',
|
||||
id: identity?.id || "",
|
||||
values: {
|
||||
email: data.email.toString(),
|
||||
},
|
||||
});
|
||||
},
|
||||
email: data.email.toString()
|
||||
}
|
||||
})
|
||||
}
|
||||
});
|
||||
|
||||
return (
|
||||
<Dialog open={open} onOpenChange={setOpen}>
|
||||
<DialogContent className="p-8" forceMount>
|
||||
<DialogContent className="p-8">
|
||||
<DialogHeader>
|
||||
<DialogTitle className="mb-8">Change Email</DialogTitle>
|
||||
<div className="rounded-full px-4 py-2 w-fit text-sm bg-ring font-bold text-secondary-1">
|
||||
|
|
@ -279,22 +255,21 @@ const ChangeEmailForm = ({
|
|||
);
|
||||
};
|
||||
|
||||
const ChangePasswordSchema = z
|
||||
.object({
|
||||
currentPassword: z.string().email(),
|
||||
newPassword: z.string(),
|
||||
retypePassword: z.string(),
|
||||
})
|
||||
.superRefine((data, ctx) => {
|
||||
if (data.newPassword !== data.retypePassword) {
|
||||
return ctx.addIssue({
|
||||
code: z.ZodIssueCode.custom,
|
||||
path: ["retypePassword"],
|
||||
message: "Passwords do not match",
|
||||
});
|
||||
}
|
||||
return true;
|
||||
});
|
||||
const ChangePasswordSchema = z.object({
|
||||
currentPassword: z.string().email(),
|
||||
newPassword: z.string(),
|
||||
retypePassword: z.string(),
|
||||
})
|
||||
.superRefine((data, ctx) => {
|
||||
if (data.newPassword !== data.retypePassword) {
|
||||
return ctx.addIssue({
|
||||
code: z.ZodIssueCode.custom,
|
||||
path: ["retypePassword"],
|
||||
message: "Passwords do not match",
|
||||
});
|
||||
}
|
||||
return true;
|
||||
});
|
||||
|
||||
const ChangePasswordForm = ({
|
||||
open,
|
||||
|
|
@ -317,8 +292,9 @@ const ChangePasswordForm = ({
|
|||
const data = Object.fromEntries(new FormData(e.currentTarget).entries());
|
||||
|
||||
updatePassword({
|
||||
password: data.newPassword.toString(),
|
||||
password: data.newPassword.toString()
|
||||
});
|
||||
|
||||
},
|
||||
});
|
||||
|
||||
|
|
@ -411,109 +387,9 @@ const SetupTwoFactorDialog = ({
|
|||
);
|
||||
};
|
||||
|
||||
const ChangeAvatarForm = ({
|
||||
open,
|
||||
setOpen,
|
||||
}: {
|
||||
open: boolean;
|
||||
setOpen: (value: boolean) => void;
|
||||
}) => {
|
||||
const {
|
||||
getRootProps,
|
||||
getInputProps,
|
||||
getFiles,
|
||||
upload,
|
||||
state,
|
||||
removeFile,
|
||||
cancelAll,
|
||||
} = useUppy({
|
||||
uploader: "tus",
|
||||
endpoint: import.meta.env.VITE_PUBLIC_TUS_ENDPOINT,
|
||||
});
|
||||
|
||||
console.log({ state, files: getFiles() });
|
||||
|
||||
const isUploading = state === "uploading";
|
||||
const isCompleted = state === "completed";
|
||||
const hasStarted = state !== "idle" && state !== "initializing";
|
||||
|
||||
return (
|
||||
<Dialog
|
||||
open={open}
|
||||
onOpenChange={(value) => {
|
||||
setOpen(value);
|
||||
}}>
|
||||
<DialogContent className="p-8">
|
||||
<DialogHeader className="mb-6">
|
||||
<DialogTitle>Edit Avatar</DialogTitle>
|
||||
</DialogHeader>
|
||||
{!hasStarted && !getFiles().length ? (
|
||||
<div
|
||||
{...getRootProps()}
|
||||
className="border border-border rounded text-primary-2 bg-primary-dark h-48 flex flex-col items-center justify-center">
|
||||
<input
|
||||
hidden
|
||||
aria-hidden
|
||||
name="uppyFiles[]"
|
||||
key={new Date().toISOString()}
|
||||
multiple
|
||||
{...getInputProps()}
|
||||
/>
|
||||
<CloudUploadIcon className="w-24 h-24 stroke stroke-primary-dark" />
|
||||
<p>Drag & Drop Files or Browse</p>
|
||||
</div>
|
||||
) : null}
|
||||
|
||||
{(!hasStarted && getFiles().length > 0) && (
|
||||
<div className="border border-border rounded p-4 bg-primary-dark relative">
|
||||
<Button
|
||||
className="absolute top-4 right-4 rounded-full aspect-square bg-primary-dark hover:bg-primary p-2 text-sm"
|
||||
onClick={() => removeFile(getFiles()[0].id)}>
|
||||
<Cross2Icon />
|
||||
</Button>
|
||||
<img className="w-full h-48" src={URL.createObjectURL(getFiles()[0].data)} alt="New Avatar Preview" />
|
||||
</div>
|
||||
)}
|
||||
|
||||
{hasStarted ? (
|
||||
<div className="flex flex-col items-center gap-y-2 w-full text-primary-1">
|
||||
<CloudCheckIcon className="w-32 h-32" />
|
||||
{isCompleted
|
||||
? "Upload completed"
|
||||
: `0% completed`}
|
||||
</div>
|
||||
) : null}
|
||||
|
||||
{isUploading ? (
|
||||
<DialogClose asChild onClick={cancelAll}>
|
||||
<Button size={"lg"} className="mt-6">
|
||||
Cancel
|
||||
</Button>
|
||||
</DialogClose>
|
||||
) : null}
|
||||
|
||||
{isCompleted ? (
|
||||
<DialogClose asChild>
|
||||
<Button size={"lg"} className="mt-6">
|
||||
Close
|
||||
</Button>
|
||||
</DialogClose>
|
||||
) : null}
|
||||
|
||||
{!hasStarted && !isCompleted && !isUploading ? (
|
||||
<Button size={"lg"} className="mt-6" onClick={upload}>
|
||||
Upload
|
||||
</Button>
|
||||
) : null}
|
||||
</DialogContent>
|
||||
</Dialog>
|
||||
);
|
||||
};
|
||||
|
||||
const PasswordDots = ({ className }: { className?: string }) => {
|
||||
return (
|
||||
<svg
|
||||
aria-hidden="true"
|
||||
width="219"
|
||||
height="7"
|
||||
viewBox="0 0 219 7"
|
||||
|
|
|
|||
|
|
@ -3,7 +3,6 @@ import type { ColumnDef, RowData } from "@tanstack/react-table";
|
|||
import { FileIcon, MoreIcon } from "~/components/icons";
|
||||
import { Checkbox } from "~/components/ui/checkbox";
|
||||
import { DropdownMenu, DropdownMenuContent, DropdownMenuGroup, DropdownMenuItem, DropdownMenuSeparator, DropdownMenuTrigger } from "~/components/ui/dropdown-menu";
|
||||
import { cn } from "~/utils";
|
||||
|
||||
// This type is used to define the shape of our data.
|
||||
// You can use a Zod schema here if you want.
|
||||
|
|
@ -67,13 +66,12 @@ export const columns: ColumnDef<File>[] = [
|
|||
accessorKey: "createdOn",
|
||||
size: 200,
|
||||
header: "Created On",
|
||||
cell: ({ row }) => (
|
||||
cell: ({ row, table }) => (
|
||||
<div className="flex items-center justify-between">
|
||||
{row.getValue("createdOn")}
|
||||
{(row.getIsSelected() || table.options.meta?.hoveredRowId === row.id) && (
|
||||
<DropdownMenu>
|
||||
<DropdownMenuTrigger className={
|
||||
cn("hidden group-hover:block data-[state=open]:block", row.getIsSelected() && "block")
|
||||
}>
|
||||
<DropdownMenuTrigger>
|
||||
<MoreIcon />
|
||||
</DropdownMenuTrigger>
|
||||
<DropdownMenuContent align="end">
|
||||
|
|
@ -90,6 +88,7 @@ export const columns: ColumnDef<File>[] = [
|
|||
</DropdownMenuGroup>
|
||||
</DropdownMenuContent>
|
||||
</DropdownMenu>
|
||||
)}
|
||||
</div>
|
||||
)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ import { Field, FieldCheckbox } from "~/components/forms"
|
|||
import { getFormProps, useForm } from "@conform-to/react"
|
||||
import { z } from "zod"
|
||||
import { getZodConstraint, parseWithZod } from "@conform-to/zod"
|
||||
import {useLogin, useNotification, useRegister} from "@refinedev/core";
|
||||
import {useLogin, useRegister} from "@refinedev/core";
|
||||
import {AuthFormRequest, RegisterFormRequest} from "~/data/auth-provider.js";
|
||||
|
||||
export const meta: MetaFunction = () => {
|
||||
|
|
@ -43,9 +43,8 @@ const RegisterSchema = z
|
|||
});
|
||||
|
||||
export default function Register() {
|
||||
const register = useRegister<RegisterFormRequest>()
|
||||
const login = useLogin<AuthFormRequest>();
|
||||
const { open } = useNotification();
|
||||
const register = useRegister<RegisterFormRequest>()
|
||||
const login = useLogin<AuthFormRequest>();
|
||||
const [form, fields] = useForm({
|
||||
id: "register",
|
||||
constraint: getZodConstraint(RegisterSchema),
|
||||
|
|
@ -63,12 +62,6 @@ export default function Register() {
|
|||
lastName: data.lastName.toString(),
|
||||
}, {
|
||||
onSuccess: () => {
|
||||
open?.({
|
||||
type: "success",
|
||||
message: "Verify your Email",
|
||||
description: "An Email was sent to your email address. Please verify your email address to activate your account.",
|
||||
key: "register-success"
|
||||
})
|
||||
login.mutate({
|
||||
email: data.email.toString(),
|
||||
password: data.password.toString(),
|
||||
|
|
|
|||
|
|
@ -9,7 +9,6 @@ import { Field } from "~/components/forms";
|
|||
import { getFormProps, useForm } from "@conform-to/react";
|
||||
import { z } from "zod";
|
||||
import { getZodConstraint, parseWithZod } from "@conform-to/zod";
|
||||
import { useToast } from "~/components/ui/use-toast";
|
||||
|
||||
export const meta: MetaFunction = () => {
|
||||
return [{ title: "Sign Up" }];
|
||||
|
|
@ -19,23 +18,12 @@ const RecoverPasswordSchema = z.object({
|
|||
email: z.string().email(),
|
||||
});
|
||||
export default function RecoverPassword() {
|
||||
const { toast } = useToast();
|
||||
const [form, fields] = useForm({
|
||||
id: "sign-up",
|
||||
constraint: getZodConstraint(RecoverPasswordSchema),
|
||||
onValidate({ formData }) {
|
||||
return parseWithZod(formData, { schema: RecoverPasswordSchema });
|
||||
},
|
||||
onSubmit(e) {
|
||||
e.preventDefault();
|
||||
|
||||
toast({
|
||||
title: "Password reset email sent",
|
||||
description: "Check your email for a link to reset your password. If it doesn’t appear within a few minutes, check your spam folder.",
|
||||
variant: "success",
|
||||
key: "reset-password-email-sent",
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
// TODO: another detail is the reset password has no screen to either accept a new pass or
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
"@conform-to/react": "^1.0.2",
|
||||
"@conform-to/zod": "^1.0.2",
|
||||
"@fontsource-variable/manrope": "^5.0.19",
|
||||
"@lumeweb/portal-sdk": "0.0.0-20240318183202",
|
||||
"@lumeweb/portal-sdk": "0.0.0-20240314110748",
|
||||
"@radix-ui/react-avatar": "^1.0.4",
|
||||
"@radix-ui/react-checkbox": "^1.0.4",
|
||||
"@radix-ui/react-dialog": "^1.0.5",
|
||||
|
|
@ -24,7 +24,6 @@
|
|||
"@radix-ui/react-progress": "^1.0.3",
|
||||
"@radix-ui/react-select": "^2.0.0",
|
||||
"@radix-ui/react-slot": "^1.0.2",
|
||||
"@radix-ui/react-toast": "^1.1.5",
|
||||
"@refinedev/cli": "^2.16.1",
|
||||
"@refinedev/core": "https://gitpkg.now.sh/LumeWeb/refine/packages/core?remix",
|
||||
"@refinedev/devtools-internal": "https://gitpkg.now.sh/LumeWeb/refine/packages/devtools-internal?remix",
|
||||
|
|
@ -41,10 +40,10 @@
|
|||
"class-variance-authority": "^0.7.0",
|
||||
"clsx": "^2.1.0",
|
||||
"react": "^18.2.0",
|
||||
"react-cookie": "^7.1.0",
|
||||
"react-dom": "^18.2.0",
|
||||
"tailwind-merge": "^2.2.1",
|
||||
"tailwindcss-animate": "^1.0.7",
|
||||
"universal-cookie": "^7.1.0",
|
||||
"zod": "^3.22.4"
|
||||
},
|
||||
"devDependencies": {
|
||||
|
|
@ -63,7 +62,6 @@
|
|||
"tailwindcss": "^3.4.1",
|
||||
"typescript": "^5.1.6",
|
||||
"vite": "^5.1.0",
|
||||
"vite-plugin-node-polyfills": "^0.21.0",
|
||||
"vite-tsconfig-paths": "^4.2.1"
|
||||
},
|
||||
"engines": {
|
||||
|
|
|
|||
|
|
@ -1,13 +0,0 @@
|
|||
diff --git a/node_modules/@uppy/tus/lib/index.js b/node_modules/@uppy/tus/lib/index.js
|
||||
index 1e0a1bb..ba95bb5 100644
|
||||
--- a/node_modules/@uppy/tus/lib/index.js
|
||||
+++ b/node_modules/@uppy/tus/lib/index.js
|
||||
@@ -506,7 +506,7 @@ function _getCompanionClientArgs2(file) {
|
||||
}
|
||||
async function _uploadFiles2(files) {
|
||||
const filesFiltered = filterNonFailedFiles(files);
|
||||
- const filesToEmit = filterFilesToEmitUploadStarted(filesFiltered);
|
||||
+ const filesToEmit = filterFilesToEmitUploadStarted(filesFiltered).filter(file => file?.uploader == 'tus');
|
||||
this.uppy.emit('upload-start', filesToEmit);
|
||||
await Promise.allSettled(filesFiltered.map(file => {
|
||||
if (file.isRemote) {
|
||||
|
|
@ -1,32 +1,27 @@
|
|||
import {vitePlugin as remix} from "@remix-run/dev"
|
||||
import {defineConfig} from "vite"
|
||||
import { vitePlugin as remix } from "@remix-run/dev"
|
||||
import { defineConfig } from "vite"
|
||||
import tsconfigPaths from "vite-tsconfig-paths"
|
||||
import {nodePolyfills} from 'vite-plugin-node-polyfills'
|
||||
|
||||
export default defineConfig({
|
||||
plugins: [
|
||||
remix({
|
||||
ssr: false,
|
||||
ignoredRouteFiles: ["**/*.css"]
|
||||
}),
|
||||
tsconfigPaths(),
|
||||
nodePolyfills({protocolImports: false}),
|
||||
],
|
||||
build: {
|
||||
minify: false
|
||||
},
|
||||
server: {
|
||||
fs: {
|
||||
// Restrict files that could be served by Vite's dev server. Accessing
|
||||
// files outside this directory list that aren't imported from an allowed
|
||||
// file will result in a 403. Both directories and files can be provided.
|
||||
// If you're comfortable with Vite's dev server making any file within the
|
||||
// project root available, you can remove this option. See more:
|
||||
// https://vitejs.dev/config/server-options.html#server-fs-allow
|
||||
allow: [
|
||||
"app",
|
||||
"node_modules/@fontsource-variable/manrope",
|
||||
]
|
||||
}
|
||||
plugins: [
|
||||
remix({
|
||||
ssr: false,
|
||||
ignoredRouteFiles: ["**/*.css"]
|
||||
}),
|
||||
tsconfigPaths()
|
||||
],
|
||||
server: {
|
||||
fs: {
|
||||
// Restrict files that could be served by Vite's dev server. Accessing
|
||||
// files outside this directory list that aren't imported from an allowed
|
||||
// file will result in a 403. Both directories and files can be provided.
|
||||
// If you're comfortable with Vite's dev server making any file within the
|
||||
// project root available, you can remove this option. See more:
|
||||
// https://vitejs.dev/config/server-options.html#server-fs-allow
|
||||
allow: [
|
||||
"app",
|
||||
"node_modules/@fontsource-variable/manrope",
|
||||
]
|
||||
}
|
||||
}
|
||||
})
|
||||
|
|
|
|||
Loading…
Reference in New Issue