Skip to content

Commit

Permalink
better clipboard handling + fix input blur
Browse files Browse the repository at this point in the history
  • Loading branch information
Brendonovich committed Dec 18, 2024
1 parent c893ec8 commit 91c7721
Show file tree
Hide file tree
Showing 20 changed files with 1,612 additions and 1,148 deletions.
425 changes: 421 additions & 4 deletions Cargo.lock

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion apps/desktop/src-tauri/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ edition = "2021"
tauri-build = { version = "1.3", features = [] }

[dependencies]
tauri = { version = "1.3.0", features = [
tauri = { version = "1.3.0", features = [ "clipboard-all",
"shell-all",
"devtools",
"dialog-all",
Expand Down
149 changes: 76 additions & 73 deletions apps/desktop/src-tauri/tauri.conf.json
Original file line number Diff line number Diff line change
@@ -1,75 +1,78 @@
{
"build": {
"beforeDevCommand": "pnpm dev",
"beforeBuildCommand": "pnpm build",
"devPath": "http://localhost:3000",
"distDir": "../.output/public",
"withGlobalTauri": false
},
"package": {
"productName": "MacroGraph"
},
"tauri": {
"allowlist": {
"all": false,
"shell": {
"all": true,
"execute": true,
"sidecar": true,
"open": true
},
"dialog": {
"all": true
},
"path": {
"all": true
},
"fs": {
"all": true,
"scope": ["**"]
},
"protocol": {
"all": true,
"asset": true,
"assetScope": ["**"]
},
"http": {
"all": true,
"scope": ["https://**"]
}
},
"bundle": {
"active": true,
"icon": [
"icons/32x32.png",
"icons/128x128.png",
"icons/128x128@2x.png",
"icons/icon.icns",
"icons/icon.ico"
],
"identifier": "macrograph.brendonovich.dev",
"targets": "all"
},
"security": {
"csp": "asset: https://asset.localhost;"
},
"updater": {
"active": true,
"endpoints": [
"https://cdn.crabnebula.app/update/macrograph/macrograph/{{target}}-{{arch}}/{{current_version}}"
],
"dialog": true,
"pubkey": "dW50cnVzdGVkIGNvbW1lbnQ6IG1pbmlzaWduIHB1YmxpYyBrZXk6IEQzOEQ2NzBDN0FFQkE1NzEKUldSeHBldDZER2VOMHlhUG5vaUNKVHV0L0RnT3Ardnd5RmJiQWNtZUhyd3I2QVVlYnZFVVM4Q1gK"
},
"windows": [
{
"fullscreen": false,
"resizable": true,
"title": "MacroGraph",
"width": 800,
"height": 600,
"userAgent": "Macrograph/0.0"
}
]
}
"build": {
"beforeDevCommand": "pnpm dev",
"beforeBuildCommand": "pnpm build",
"devPath": "http://localhost:3000",
"distDir": "../.output/public",
"withGlobalTauri": false
},
"package": {
"productName": "MacroGraph"
},
"tauri": {
"allowlist": {
"all": false,
"clipboard": {
"all": true
},
"shell": {
"all": true,
"execute": true,
"sidecar": true,
"open": true
},
"dialog": {
"all": true
},
"path": {
"all": true
},
"fs": {
"all": true,
"scope": ["**"]
},
"protocol": {
"all": true,
"asset": true,
"assetScope": ["**"]
},
"http": {
"all": true,
"scope": ["https://**"]
}
},
"bundle": {
"active": true,
"icon": [
"icons/32x32.png",
"icons/128x128.png",
"icons/128x128@2x.png",
"icons/icon.icns",
"icons/icon.ico"
],
"identifier": "macrograph.brendonovich.dev",
"targets": "all"
},
"security": {
"csp": "asset: https://asset.localhost;"
},
"updater": {
"active": true,
"endpoints": [
"https://cdn.crabnebula.app/update/macrograph/macrograph/{{target}}-{{arch}}/{{current_version}}"
],
"dialog": true,
"pubkey": "dW50cnVzdGVkIGNvbW1lbnQ6IG1pbmlzaWduIHB1YmxpYyBrZXk6IEQzOEQ2NzBDN0FFQkE1NzEKUldSeHBldDZER2VOMHlhUG5vaUNKVHV0L0RnT3Ardnd5RmJiQWNtZUhyd3I2QVVlYnZFVVM4Q1gK"
},
"windows": [
{
"fullscreen": false,
"resizable": true,
"title": "MacroGraph",
"width": 800,
"height": 600,
"userAgent": "Macrograph/0.0"
}
]
}
}
29 changes: 15 additions & 14 deletions apps/desktop/src/app.tsx
Original file line number Diff line number Diff line change
@@ -1,23 +1,24 @@
import "@macrograph/ui/global.css";
import { Router } from "@solidjs/router";
import { FileRoutes } from "@solidjs/start/router";

import { Suspense } from "solid-js";
import { Toaster } from "solid-sonner";
import "./app.css";

import { client, queryClient, rspc } from "./rspc";

import "./app.css";

export default function App() {
return (
<Router
root={(props) => (
<rspc.Provider client={client} queryClient={queryClient}>
<Suspense>{props.children}</Suspense>
<Toaster />
</rspc.Provider>
)}
>
<FileRoutes />
</Router>
);
return (
<Router
root={(props) => (
<rspc.Provider client={client} queryClient={queryClient}>
<Suspense>{props.children}</Suspense>
<Toaster />
</rspc.Provider>
)}
>
<FileRoutes />
</Router>
);
}
Loading

0 comments on commit 91c7721

Please sign in to comment.