Update local space to use shared components

src/cloud/components/organisms/Onboarding/UsagePage.tsx

@@ -10,10 +10,10 @@ import {
 } from '@mdi/js'
 import Flexbox from '../../atoms/Flexbox'
 import Button from '../../atoms/Button'
-import Spinner from '../../../../components/atoms/Spinner'
-import Icon from '../../../../components/atoms/Icon'
 import { useRouter } from '../../../lib/router'
 import { usingElectron, sendToHost } from '../../../lib/stores/electron'
+import Spinner from '../../../../shared/components/atoms/Spinner'
+import Icon from '../../atoms/Icon'
 
 interface UsagePageProps {
   onUsage: (val: 'personal' | 'team') => void

src/cloud/components/organisms/Subscription/SubscriptionManagement.tsx

@@ -1,7 +1,6 @@
 import { mdiGiftOff, mdiOpenInNew } from '@mdi/js'
 import React, { useCallback, useMemo, useState } from 'react'
-import Icon from '../../../../components/atoms/Icon'
-import Spinner from '../../../../components/atoms/Spinner'
+import Spinner from '../../../../shared/components/atoms/Spinner'
 import { useToast } from '../../../../shared/lib/stores/toast'
 import { cancelSubscription } from '../../../api/teams/subscription'
 import { getTeamPortalUrl } from '../../../api/teams/subscription/invoices'
@@ -24,6 +23,7 @@ import {
   newUserStandardCouponId,
 } from '../../../lib/consts'
 import { useElectron } from '../../../lib/stores/electron'
+import Icon from '../../../../shared/components/atoms/Icon'
 
 interface SubscriptionManagementProps {
   subscription: SerializedSubscription

src/cloud/lib/hooks/useCloudResourceModals.tsx

@@ -248,7 +248,7 @@ export function useCloudResourceModals() {
     ) => {
       messageBox({
         title: `Delete ${title}`,
-        message: `Are you sure to remove for good this content?`,
+        message: `Are you sure you want to remove this permanently?`,
         iconType: DialogIconTypes.Warning,
         buttons: [
           {

src/cloud/lib/i18n/enUS.ts

@@ -6,7 +6,7 @@ const enTranslation: TranslationSource = {
   'general.cancel': 'Cancel',
   'general.update': 'Update',
   'general.attachments': 'Attachments',
-  'general.trash': 'Trash',
+  'general.archive': 'Archive',
   'general.allnote': 'All Notes',
   'general.signin': 'Sign In',
   'general.signinCheck': 'Signing in...',

src/cloud/lib/i18n/types.ts

@@ -3,7 +3,7 @@ export type TranslationSource = {
   'general.cancel': string
   'general.update': string
   'general.attachments': string
-  'general.trash': string
+  'general.archive': string
   'general.allnote': string
   'general.signin': string
   'general.signinCheck': string

src/components/App.tsx

@@ -1,19 +1,14 @@
-import React, { useState, useEffect, useCallback } from 'react'
+import React, { useState, useEffect, useCallback, useMemo } from 'react'
 import Router from './Router'
-import GlobalStyle from './GlobalStyle'
 import { ThemeProvider } from 'styled-components'
-import { selectTheme } from '../themes'
-import Dialog from './organisms/Dialog'
 import { useDb } from '../lib/db'
 import PreferencesModal from './PreferencesModal/PreferencesModal'
 import { usePreferences } from '../lib/preferences'
 import '../lib/i18n'
 import '../lib/analytics'
 import CodeMirrorStyle from './CodeMirrorStyle'
-import ToastList from './Toast'
 import styled from '../lib/styled'
 import { useEffectOnce } from 'react-use'
-import AppNavigator from './organisms/AppNavigator'
 import { useRouter } from '../lib/router'
 import { values, keys } from '../lib/db/utils'
 import {
@@ -51,8 +46,16 @@ import { useCreateWorkspaceModal } from '../lib/createWorkspaceModal'
 import CreateWorkspaceModal from './organisms/CreateWorkspaceModal'
 import { useStorageRouter } from '../lib/storageRouter'
 import ExternalStyle from './ExternalStyle'
-import { useDialog, DialogIconTypes } from '../lib/dialog'
 import { selectV2Theme } from '../shared/lib/styled/styleFunctions'
+import Modal from '../shared/components/organisms/Modal'
+import GlobalStyle from '../shared/components/atoms/GlobalStyle'
+import { DialogIconTypes, useDialog } from '../shared/lib/stores/dialog'
+import Dialog from '../shared/components/organisms/Dialog/Dialog'
+import ContextMenu from '../shared/components/molecules/ContextMenu'
+import { useCloudIntroModal } from '../lib/cloudIntroModal'
+import CloudIntroModal from './organisms/CloudIntroModal'
+import AppNavigator from './organisms/AppNavigator'
+import Toast from '../shared/components/organisms/Toast'
 
 const LoadingText = styled.div`
   margin: 30px;
@@ -119,25 +122,31 @@ const App = () => {
         messageBox({
           title: 'Sign In',
           message: 'Your cloud access token has been expired.',
-          buttons: ['Sign In Again', 'Cancel'],
-          defaultButtonIndex: 0,
+          buttons: [
+            {
+              label: 'Sign In Again',
+              defaultButton: true,
+              onClick: () => {
+                push(`/app/boosthub/login`)
+                setTimeout(() => {
+                  boostHubLoginRequestEventEmitter.dispatch()
+                }, 1000)
+              },
+            },
+            {
+              label: 'Cancel',
+              cancelButton: true,
+              onClick: () => {
+                setPreferences({
+                  'cloud.user': undefined,
+                })
+                setGeneralStatus({
+                  boostHubTeams: [],
+                })
+              },
+            },
+          ],
           iconType: DialogIconTypes.Warning,
-          onClose: (value: number | null) => {
-            if (value === 0) {
-              push(`/app/boosthub/login`)
-              setTimeout(() => {
-                boostHubLoginRequestEventEmitter.dispatch()
-              }, 1000)
-              return
-            }
-
-            setPreferences({
-              'cloud.user': undefined,
-            })
-            setGeneralStatus({
-              boostHubTeams: [],
-            })
-          },
         })
         return
       }
@@ -419,35 +428,57 @@ const App = () => {
     toggleShowCreateWorkspaceModal,
   } = useCreateWorkspaceModal()
 
+  const { showingCloudIntroModal } = useCloudIntroModal()
+
+  const activeBoostHubTeamDomain = useMemo<string | null>(() => {
+    if (routeParams.name !== 'boosthub.teams.show') {
+      return null
+    }
+    return routeParams.domain
+  }, [routeParams])
+
+  const boosthubTeam =
+    activeBoostHubTeamDomain != null
+      ? generalStatus.boostHubTeams.find(
+          (team) => team.domain === activeBoostHubTeamDomain
+        )
+      : null
+
   return (
-    <ThemeProvider theme={selectTheme(preferences['general.theme'])}>
-      <ThemeProvider theme={selectV2Theme(preferences['general.theme'] as any)}>
-        <AppContainer
-          onDrop={(event: React.DragEvent) => {
-            event.preventDefault()
-          }}
-        >
-          {initialized ? (
-            <>
+    <ThemeProvider theme={selectV2Theme(preferences['general.theme'] as any)}>
+      <AppContainer
+        onDrop={(event: React.DragEvent) => {
+          event.preventDefault()
+        }}
+      >
+        {initialized ? (
+          <>
+            {boosthubTeam != null ? (
               <AppNavigator />
-              <Router />
-              {showCreateWorkspaceModal && (
-                <CreateWorkspaceModal
-                  closeModal={toggleShowCreateWorkspaceModal}
-                />
-              )}
-            </>
-          ) : (
-            <LoadingText>Loading Data...</LoadingText>
-          )}
-          <GlobalStyle />
-          <Dialog />
-          <PreferencesModal />
-          <ToastList />
-          <CodeMirrorStyle />
-          <ExternalStyle />
-        </AppContainer>
-      </ThemeProvider>
+            ) : (
+              showingCloudIntroModal && <CloudIntroModal />
+            )}
+            <Router />
+            {showCreateWorkspaceModal && (
+              <CreateWorkspaceModal
+                closeModal={toggleShowCreateWorkspaceModal}
+              />
+            )}
+          </>
+        ) : (
+          <LoadingText>Loading Data...</LoadingText>
+        )}
+        <GlobalStyle />
+        <CodeMirrorStyle />
+        <ExternalStyle />
+
+        <Toast />
+        <PreferencesModal />
+        <ContextMenu />
+
+        <Dialog />
+        <Modal />
+      </AppContainer>
     </ThemeProvider>
   )
 }