From 06aa06c31c08aaef4908ec474205bddefec10ebb Mon Sep 17 00:00:00 2001 From: Jamie Pine Date: Wed, 20 Apr 2022 18:57:41 -0700 Subject: [PATCH] icon importing, landing page updates, vite config --- .vscode/settings.json | 1 - apps/desktop/package.json | 4 +- apps/desktop/vite.config.ts | 5 +- apps/landing/package.json | 10 +- apps/landing/src/App.tsx | 66 ++-- apps/landing/src/assets/apple.svg | 12 + apps/landing/src/assets/windows.svg | 46 +++ apps/web/package.json | 4 +- apps/web/vite.config.ts | 8 +- packages/interface/package.json | 8 +- .../interface/scripts/generateSvgImports.mjs | 43 +++ .../interface/src/assets/icons/file_light.svg | 1 - .../src/assets/icons/folder_light_open.svg | 3 - .../icons/{go_package.svg => gopackage.svg} | 0 packages/interface/src/assets/icons/icons.ts | 348 ++++++++++++++++++ packages/interface/src/assets/icons/index.ts | 348 ++++++++++++++++++ ...editorconfig.svg => lighteditorconfig.svg} | 0 .../src/components/file/FileItem.tsx | 21 +- .../src/components/file/FileThumb.tsx | 3 +- packages/interface/src/screens/Overview.tsx | 7 +- .../src/screens/settings/GeneralSettings.tsx | 4 + packages/interface/src/types.d.ts | 7 + packages/interface/tsconfig.json | 3 +- pnpm-lock.yaml | Bin 185804 -> 185643 bytes 24 files changed, 889 insertions(+), 63 deletions(-) create mode 100644 apps/landing/src/assets/apple.svg create mode 100644 apps/landing/src/assets/windows.svg create mode 100644 packages/interface/scripts/generateSvgImports.mjs delete mode 100644 packages/interface/src/assets/icons/file_light.svg delete mode 100644 packages/interface/src/assets/icons/folder_light_open.svg rename packages/interface/src/assets/icons/{go_package.svg => gopackage.svg} (100%) create mode 100644 packages/interface/src/assets/icons/icons.ts create mode 100644 packages/interface/src/assets/icons/index.ts rename packages/interface/src/assets/icons/{light_editorconfig.svg => lighteditorconfig.svg} (100%) create mode 100644 packages/interface/src/types.d.ts diff --git a/.vscode/settings.json b/.vscode/settings.json index e5cb9394b..1dbe20c96 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -2,7 +2,6 @@ "cSpell.words": [ "bpfrpt", "creationdate", - "honkhonk", "ipfs", "Keepsafe", "pathctx", diff --git a/apps/desktop/package.json b/apps/desktop/package.json index 0ebe60c66..4d155ee33 100644 --- a/apps/desktop/package.json +++ b/apps/desktop/package.json @@ -23,7 +23,6 @@ "react-dom": "^18.0.0" }, "devDependencies": { - "@honkhonk/vite-plugin-svgr": "^1.1.0", "@tauri-apps/cli": "^1.0.0-rc.8", "@types/babel-core": "^6.25.7", "@types/byte-size": "^8.1.0", @@ -38,9 +37,10 @@ "prettier": "^2.6.2", "sass": "^1.50.0", "typescript": "^4.6.3", - "vite": "^2.9.1", + "vite": "^2.9.5", "vite-plugin-filter-replace": "^0.1.9", "vite-plugin-react-svg": "^0.2.0", + "vite-plugin-svgr": "^1.1.0", "vite-tsconfig-paths": "^3.4.1" } } diff --git a/apps/desktop/vite.config.ts b/apps/desktop/vite.config.ts index 2bc86c870..8dfe3cf2e 100644 --- a/apps/desktop/vite.config.ts +++ b/apps/desktop/vite.config.ts @@ -2,7 +2,7 @@ import { defineConfig } from 'vite'; import react from '@vitejs/plugin-react'; import { name, version } from './package.json'; import * as path from 'path'; -import svgr from '@honkhonk/vite-plugin-svgr'; +import svg from 'vite-plugin-svgr'; // https://vitejs.dev/config/ export default defineConfig({ @@ -10,10 +10,11 @@ export default defineConfig({ port: 8001 }, plugins: [ + //@ts-ignore react({ jsxRuntime: 'classic' }), - svgr() + svg({ svgrOptions: { icon: true } }) ], root: 'src', publicDir: '../../packages/interface/src/assets', diff --git a/apps/landing/package.json b/apps/landing/package.json index be19c1deb..1e265e716 100644 --- a/apps/landing/package.json +++ b/apps/landing/package.json @@ -8,7 +8,6 @@ "preview": "vite preview" }, "dependencies": { - "@honkhonk/vite-plugin-svgr": "^1.1.0", "@sd/client": "workspace:*", "@sd/core": "workspace:*", "@sd/interface": "workspace:*", @@ -17,18 +16,17 @@ "react": "^18.0.0", "react-dom": "^18.0.0", "react-tsparticles": "^2.0.6", - "tsparticles": "^2.0.6", - "vite-plugin-react-svg": "^0.2.0", - "vite-plugin-svgr": "^1.1.0" + "tsparticles": "^2.0.6" }, "devDependencies": { "@types/react": "^18.0.0", "@types/react-dom": "^18.0.0", - "@vitejs/plugin-react": "^1.3.1", "autoprefixer": "^10.4.4", "postcss": "^8.4.12", "tailwind": "^4.0.0", "typescript": "^4.6.3", - "vite": "^2.9.5" + "vite": "^2.9.5", + "vite-plugin-svgr": "^1.1.0", + "@vitejs/plugin-react": "^1.3.1" } } diff --git a/apps/landing/src/App.tsx b/apps/landing/src/App.tsx index 72b933411..026470c0f 100644 --- a/apps/landing/src/App.tsx +++ b/apps/landing/src/App.tsx @@ -3,32 +3,54 @@ import { Bubbles } from './Bubbles'; import './index.css'; import { ReactComponent as GithubLogo } from './assets/github.svg'; +import { ReactComponent as AppleLogo } from './assets/apple.svg'; function App() { return ( -
- -

The file explorer from the future

-

- Spacedrive is the first file explorer that puts the full power of the cloud in your hands. -

-
- - -
+
+
+ +

The file explorer from the future

+

+ Spacedrive is the first file explorer that puts the full power of the cloud in your hands. +

+
+ {/* */} + + +
+

+ Available on macOS (Intel & Apple Silicon), Windows and Linux. +
+ Coming soon to iOS & Android. +

-