From a36a30e317908ef53a03e154c75410f6aac6eeec Mon Sep 17 00:00:00 2001 From: Jamie Pine Date: Thu, 20 Oct 2022 21:55:39 -0700 Subject: [PATCH] merge --- apps/desktop/src/index.html | 2 +- apps/web/src/index.html | 2 +- package.json | 2 +- packages/interface/src/AppLayout.tsx | 105 ++------------ packages/interface/src/ErrorFallback.tsx | 4 +- packages/interface/src/NotFound.tsx | 4 +- .../src/components/device/Device.tsx | 4 +- .../src/components/explorer/Explorer.tsx | 2 +- .../src/components/layout/Sidebar.tsx | 27 ++-- .../src/components/primitive/Toasts.tsx | 75 ++++++++++ packages/interface/src/style.scss | 10 +- packages/ui/src/Typography.tsx | 2 +- packages/ui/style/colors.scss | 67 +++++++++ packages/ui/style/style.scss | 2 + packages/ui/style/tailwind.js | 128 ++++++++++-------- 15 files changed, 253 insertions(+), 183 deletions(-) create mode 100644 packages/interface/src/components/primitive/Toasts.tsx create mode 100644 packages/ui/style/colors.scss diff --git a/apps/desktop/src/index.html b/apps/desktop/src/index.html index 324b0663a..519e2dd14 100644 --- a/apps/desktop/src/index.html +++ b/apps/desktop/src/index.html @@ -1,5 +1,5 @@ - + diff --git a/apps/web/src/index.html b/apps/web/src/index.html index 2ca3b4c6f..d6c4e1b07 100644 --- a/apps/web/src/index.html +++ b/apps/web/src/index.html @@ -1,5 +1,5 @@ - + Spacedrive diff --git a/package.json b/package.json index 9f42f9f42..5a2015cd3 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,7 @@ "desktop": "pnpm --filter @sd/desktop --", "web": "pnpm --filter @sd/web -- ", "mobile": "pnpm --filter @sd/mobile --", - "server": "pnpm --filter @sd/server -- ", + "core": "pnpm --filter @sd/server -- ", "landing": "pnpm --filter @sd/landing -- ", "ui": "pnpm --filter @sd/ui -- ", "interface": "pnpm --filter @sd/interface -- ", diff --git a/packages/interface/src/AppLayout.tsx b/packages/interface/src/AppLayout.tsx index 2e701d320..6e21274c7 100644 --- a/packages/interface/src/AppLayout.tsx +++ b/packages/interface/src/AppLayout.tsx @@ -1,12 +1,11 @@ -import * as ToastPrimitive from '@radix-ui/react-toast'; import { useCurrentLibrary } from '@sd/client'; import clsx from 'clsx'; -import { Suspense, useEffect, useState } from 'react'; +import { Suspense } from 'react'; import { Outlet } from 'react-router-dom'; import { Sidebar } from './components/layout/Sidebar'; +import { Toasts } from './components/primitive/Toasts'; import { useOperatingSystem } from './hooks/useOperatingSystem'; -import { useToasts } from './hooks/useToasts'; export function AppLayout() { const { libraries } = useCurrentLibrary(); @@ -19,19 +18,20 @@ export function AppLayout() { return (
{ // TODO: allow this on some UI text at least / disable default browser context menu e.preventDefault(); return false; }} - className={clsx( - 'flex flex-row h-screen overflow-hidden text-gray-900 select-none dark:text-white cursor-default', - os === 'macOS' && 'rounded-xl', - os !== 'browser' && os !== 'windows' && 'border border-gray-200 dark:border-gray-500' - )} > -
+
@@ -40,90 +40,3 @@ export function AppLayout() {
); } - -function Toasts() { - const { toasts, addToast, removeToast } = useToasts(); - - // useEffect(() => { - // setTimeout(() => { - // addToast({ - // title: 'Spacedrop', - // subtitle: 'Someone tried to send you a file. Accept it?', - // actionButton: { - // text: 'Accept', - // onClick: () => { - // console.log('Bruh'); - // } - // } - // }); - // }, 2000); - // }, []); - - return ( -
- - <> - {toasts.map((toast) => ( - removeToast(toast)} - duration={toast.duration || 3000} - className={clsx( - 'w-80 m-4 shadow-lg rounded-lg', - 'bg-gray-800/20 backdrop-blur', - 'radix-state-open:animate-toast-slide-in-bottom md:radix-state-open:animate-toast-slide-in-right', - 'radix-state-closed:animate-toast-hide', - 'radix-swipe-end:animate-toast-swipe-out', - 'translate-x-radix-toast-swipe-move-x', - 'radix-swipe-cancel:translate-x-0 radix-swipe-cancel:duration-200 radix-swipe-cancel:ease-[ease]', - 'focus:outline-none focus-visible:ring focus-visible:ring-primary focus-visible:ring-opacity-75 border-white/10 border-2 shadow-2xl' - )} - > -
-
-
- - {toast.title} - - {toast.subtitle && ( - - {toast.subtitle} - - )} -
-
-
-
-
- {toast.actionButton && ( - { - e.preventDefault(); - toast.actionButton?.onClick(); - removeToast(toast); - }} - > - {toast.actionButton.text || 'Open'} - - )} -
-
- - Dismiss - -
-
-
-
- - ))} - - - - -
- ); -} diff --git a/packages/interface/src/ErrorFallback.tsx b/packages/interface/src/ErrorFallback.tsx index f8fd96765..f249254a6 100644 --- a/packages/interface/src/ErrorFallback.tsx +++ b/packages/interface/src/ErrorFallback.tsx @@ -12,9 +12,9 @@ export function ErrorFallback({ error, resetErrorBoundary }: FallbackProps) {
-

APP CRASHED

+

APP CRASHED

We're past the event horizon...

Error: {error.message}
diff --git a/packages/interface/src/NotFound.tsx b/packages/interface/src/NotFound.tsx index ad732dac1..17a2264cf 100644 --- a/packages/interface/src/NotFound.tsx +++ b/packages/interface/src/NotFound.tsx @@ -7,9 +7,9 @@ export default function NotFound() {
-

Error: 404

+

Error: 404

You chose nothingness.