From 0b454939b3fd3bc46f088d118070a53cf003ec4c Mon Sep 17 00:00:00 2001 From: 49lf Date: Tue, 23 Jul 2024 21:12:37 -0400 Subject: [PATCH] tauri -> desktop rename --- src/components/FileMachineProvider.tsx | 2 +- src/components/Settings/AllSettingsFields.tsx | 2 +- src/lib/paths.ts | 2 +- src/lib/routeLoaders.ts | 2 +- src/lib/tauriFS.ts | 2 +- src/machines/authMachine.ts | 2 +- src/routes/Onboarding/Introduction.tsx | 13 ++++++++++--- src/routes/SignIn.tsx | 2 +- 8 files changed, 17 insertions(+), 10 deletions(-) diff --git a/src/components/FileMachineProvider.tsx b/src/components/FileMachineProvider.tsx index 009f36731..07e09f565 100644 --- a/src/components/FileMachineProvider.tsx +++ b/src/components/FileMachineProvider.tsx @@ -19,7 +19,7 @@ import { mkdir, remove, rename, create } from '@tauri-apps/plugin-fs' import { isDesktop } from 'lib/isDesktop' import { join, sep } from '@tauri-apps/api/path' import { DEFAULT_FILE_NAME, FILE_EXT } from 'lib/constants' -import { getProjectInfo } from 'lib/tauri' +import { getProjectInfo } from 'lib/desktop' type MachineContext = { state: StateFrom diff --git a/src/components/Settings/AllSettingsFields.tsx b/src/components/Settings/AllSettingsFields.tsx index a1ab86dd3..9b9d1348a 100644 --- a/src/components/Settings/AllSettingsFields.tsx +++ b/src/components/Settings/AllSettingsFields.tsx @@ -12,7 +12,7 @@ import { useLocation, useNavigate } from 'react-router-dom' import { isDesktop } from 'lib/isDesktop' import { ActionButton } from 'components/ActionButton' import { SettingsFieldInput } from './SettingsFieldInput' -import { getInitialDefaultDir, showInFolder } from 'lib/tauri' +import { getInitialDefaultDir, showInFolder } from 'lib/desktop' import toast from 'react-hot-toast' import { APP_VERSION } from 'routes/Settings' import { createAndOpenNewProject, getSettingsFolderPaths } from 'lib/tauriFS' diff --git a/src/lib/paths.ts b/src/lib/paths.ts index 9f99ec779..d6152aafb 100644 --- a/src/lib/paths.ts +++ b/src/lib/paths.ts @@ -3,7 +3,7 @@ import { BROWSER_FILE_NAME, BROWSER_PROJECT_NAME, FILE_EXT } from './constants' import { isDesktop } from './isDesktop' import { Configuration } from 'wasm-lib/kcl/bindings/Configuration' import { ProjectRoute } from 'wasm-lib/kcl/bindings/ProjectRoute' -import { parseProjectRoute, readAppSettingsFile } from './tauri' +import { parseProjectRoute, readAppSettingsFile } from './desktop' import { parseProjectRoute as parseProjectRouteWasm } from 'lang/wasm' import { readLocalStorageAppSettingsFile } from './settings/settingsUtils' import { err } from 'lib/trap' diff --git a/src/lib/routeLoaders.ts b/src/lib/routeLoaders.ts index 16c8dd608..5ce7cddca 100644 --- a/src/lib/routeLoaders.ts +++ b/src/lib/routeLoaders.ts @@ -18,7 +18,7 @@ import { getProjectInfo, initializeProjectDirectory, listProjects, -} from './tauri' +} from './desktop' import { createSettings } from './settings/initialSettings' // The root loader simply resolves the settings and any errors that diff --git a/src/lib/tauriFS.ts b/src/lib/tauriFS.ts index 5bec3fb39..e502b2b56 100644 --- a/src/lib/tauriFS.ts +++ b/src/lib/tauriFS.ts @@ -13,7 +13,7 @@ import { createNewProjectDirectory, listProjects, readAppSettingsFile, -} from './tauri' +} from './desktop' import { engineCommandManager } from './singletons' export const isHidden = (fileOrDir: FileEntry) => diff --git a/src/machines/authMachine.ts b/src/machines/authMachine.ts index eb6150ed1..c66cbdfaa 100644 --- a/src/machines/authMachine.ts +++ b/src/machines/authMachine.ts @@ -3,7 +3,7 @@ import { Models } from '@kittycad/lib' import withBaseURL from '../lib/withBaseURL' import { isDesktop } from 'lib/isDesktop' import { VITE_KC_API_BASE_URL, VITE_KC_DEV_TOKEN } from 'env' -import { getUser as getUserTauri } from 'lib/tauri' +import { getUser as getUserTauri } from 'lib/desktop' const SKIP_AUTH = import.meta.env.VITE_KC_SKIP_AUTH === 'true' && import.meta.env.DEV diff --git a/src/routes/Onboarding/Introduction.tsx b/src/routes/Onboarding/Introduction.tsx index 372d2e596..7bb8d2c93 100644 --- a/src/routes/Onboarding/Introduction.tsx +++ b/src/routes/Onboarding/Introduction.tsx @@ -8,12 +8,19 @@ import { isDesktop } from 'lib/isDesktop' import { useNavigate, useRouteLoaderData } from 'react-router-dom' import { paths } from 'lib/paths' import { codeManager, kclManager } from 'lib/singletons' -import { APP_NAME } from 'lib/constants' +import { join } from '@tauri-apps/api/path' +import { + APP_NAME, + ONBOARDING_PROJECT_NAME, + PROJECT_ENTRYPOINT, +} from 'lib/constants' import { useState } from 'react' -import { useLspContext } from 'components/LspProvider' +import { createNewProjectDirectory, listProjects } from 'lib/desktop' import { IndexLoaderData } from 'lib/types' -import { paths } from 'lib/paths' import { useFileContext } from 'hooks/useFileContext' +import { paths } from 'lib/paths' +import { useLspContext } from 'components/LspProvider' +import { useState } from 'react' /** * Show either a welcome screen or a warning screen diff --git a/src/routes/SignIn.tsx b/src/routes/SignIn.tsx index 1c4d246f3..236a80d6e 100644 --- a/src/routes/SignIn.tsx +++ b/src/routes/SignIn.tsx @@ -5,7 +5,7 @@ import { Themes, getSystemTheme } from '../lib/theme' import { paths } from 'lib/paths' import { useSettingsAuthContext } from 'hooks/useSettingsAuthContext' import { APP_NAME } from 'lib/constants' -import { login } from 'lib/tauri' +import { login } from 'lib/desktop' const SignIn = () => { const {