tauri -> desktop rename

This commit is contained in:
49lf
2024-07-23 21:12:37 -04:00
parent d49ecc4926
commit 0b454939b3
8 changed files with 17 additions and 10 deletions

View File

@ -19,7 +19,7 @@ import { mkdir, remove, rename, create } from '@tauri-apps/plugin-fs'
import { isDesktop } from 'lib/isDesktop' import { isDesktop } from 'lib/isDesktop'
import { join, sep } from '@tauri-apps/api/path' import { join, sep } from '@tauri-apps/api/path'
import { DEFAULT_FILE_NAME, FILE_EXT } from 'lib/constants' import { DEFAULT_FILE_NAME, FILE_EXT } from 'lib/constants'
import { getProjectInfo } from 'lib/tauri' import { getProjectInfo } from 'lib/desktop'
type MachineContext<T extends AnyStateMachine> = { type MachineContext<T extends AnyStateMachine> = {
state: StateFrom<T> state: StateFrom<T>

View File

@ -12,7 +12,7 @@ import { useLocation, useNavigate } from 'react-router-dom'
import { isDesktop } from 'lib/isDesktop' import { isDesktop } from 'lib/isDesktop'
import { ActionButton } from 'components/ActionButton' import { ActionButton } from 'components/ActionButton'
import { SettingsFieldInput } from './SettingsFieldInput' import { SettingsFieldInput } from './SettingsFieldInput'
import { getInitialDefaultDir, showInFolder } from 'lib/tauri' import { getInitialDefaultDir, showInFolder } from 'lib/desktop'
import toast from 'react-hot-toast' import toast from 'react-hot-toast'
import { APP_VERSION } from 'routes/Settings' import { APP_VERSION } from 'routes/Settings'
import { createAndOpenNewProject, getSettingsFolderPaths } from 'lib/tauriFS' import { createAndOpenNewProject, getSettingsFolderPaths } from 'lib/tauriFS'

View File

@ -3,7 +3,7 @@ import { BROWSER_FILE_NAME, BROWSER_PROJECT_NAME, FILE_EXT } from './constants'
import { isDesktop } from './isDesktop' import { isDesktop } from './isDesktop'
import { Configuration } from 'wasm-lib/kcl/bindings/Configuration' import { Configuration } from 'wasm-lib/kcl/bindings/Configuration'
import { ProjectRoute } from 'wasm-lib/kcl/bindings/ProjectRoute' 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 { parseProjectRoute as parseProjectRouteWasm } from 'lang/wasm'
import { readLocalStorageAppSettingsFile } from './settings/settingsUtils' import { readLocalStorageAppSettingsFile } from './settings/settingsUtils'
import { err } from 'lib/trap' import { err } from 'lib/trap'

View File

@ -18,7 +18,7 @@ import {
getProjectInfo, getProjectInfo,
initializeProjectDirectory, initializeProjectDirectory,
listProjects, listProjects,
} from './tauri' } from './desktop'
import { createSettings } from './settings/initialSettings' import { createSettings } from './settings/initialSettings'
// The root loader simply resolves the settings and any errors that // The root loader simply resolves the settings and any errors that

View File

@ -13,7 +13,7 @@ import {
createNewProjectDirectory, createNewProjectDirectory,
listProjects, listProjects,
readAppSettingsFile, readAppSettingsFile,
} from './tauri' } from './desktop'
import { engineCommandManager } from './singletons' import { engineCommandManager } from './singletons'
export const isHidden = (fileOrDir: FileEntry) => export const isHidden = (fileOrDir: FileEntry) =>

View File

@ -3,7 +3,7 @@ import { Models } from '@kittycad/lib'
import withBaseURL from '../lib/withBaseURL' import withBaseURL from '../lib/withBaseURL'
import { isDesktop } from 'lib/isDesktop' import { isDesktop } from 'lib/isDesktop'
import { VITE_KC_API_BASE_URL, VITE_KC_DEV_TOKEN } from 'env' 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 = const SKIP_AUTH =
import.meta.env.VITE_KC_SKIP_AUTH === 'true' && import.meta.env.DEV import.meta.env.VITE_KC_SKIP_AUTH === 'true' && import.meta.env.DEV

View File

@ -8,12 +8,19 @@ import { isDesktop } from 'lib/isDesktop'
import { useNavigate, useRouteLoaderData } from 'react-router-dom' import { useNavigate, useRouteLoaderData } from 'react-router-dom'
import { paths } from 'lib/paths' import { paths } from 'lib/paths'
import { codeManager, kclManager } from 'lib/singletons' 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 { useState } from 'react'
import { useLspContext } from 'components/LspProvider' import { createNewProjectDirectory, listProjects } from 'lib/desktop'
import { IndexLoaderData } from 'lib/types' import { IndexLoaderData } from 'lib/types'
import { paths } from 'lib/paths'
import { useFileContext } from 'hooks/useFileContext' 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 * Show either a welcome screen or a warning screen

View File

@ -5,7 +5,7 @@ import { Themes, getSystemTheme } from '../lib/theme'
import { paths } from 'lib/paths' import { paths } from 'lib/paths'
import { useSettingsAuthContext } from 'hooks/useSettingsAuthContext' import { useSettingsAuthContext } from 'hooks/useSettingsAuthContext'
import { APP_NAME } from 'lib/constants' import { APP_NAME } from 'lib/constants'
import { login } from 'lib/tauri' import { login } from 'lib/desktop'
const SignIn = () => { const SignIn = () => {
const { const {