Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 19 additions & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,7 @@ tauri-plugin-local-stt = { path = "plugins/local-stt" }
tauri-plugin-membership = { path = "plugins/membership" }
tauri-plugin-misc = { path = "plugins/misc" }
tauri-plugin-notification = { path = "plugins/notification" }
tauri-plugin-obsidian = { path = "plugins/obsidian" }
tauri-plugin-sfx = { path = "plugins/sfx" }
tauri-plugin-sse = { path = "plugins/sse" }
tauri-plugin-store2 = { path = "plugins/store2" }
Expand Down
2 changes: 2 additions & 0 deletions apps/desktop/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
"@hypr/plugin-membership": "workspace:^",
"@hypr/plugin-misc": "workspace:^",
"@hypr/plugin-notification": "workspace:^",
"@hypr/plugin-obsidian": "workspace:^",
"@hypr/plugin-sfx": "workspace:^",
"@hypr/plugin-task": "workspace:^",
"@hypr/plugin-template": "workspace:^",
Expand Down Expand Up @@ -60,6 +61,7 @@
"@tauri-apps/plugin-clipboard-manager": "^2.3.0",
"@tauri-apps/plugin-dialog": "^2.3.0",
"@tauri-apps/plugin-fs": "^2.4.0",
"@tauri-apps/plugin-http": "^2.4.4",
"@tauri-apps/plugin-opener": "^2.4.0",
"@tauri-apps/plugin-os": "^2.3.0",
"@tauri-apps/plugin-process": "^2.3.0",
Expand Down
1 change: 1 addition & 0 deletions apps/desktop/src-tauri/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ tauri-plugin-machine-uid = { workspace = true }
tauri-plugin-membership = { workspace = true }
tauri-plugin-misc = { workspace = true }
tauri-plugin-notification = { workspace = true }
tauri-plugin-obsidian = { workspace = true }
tauri-plugin-opener = { workspace = true }
tauri-plugin-sfx = { workspace = true }
tauri-plugin-sse = { workspace = true }
Expand Down
10 changes: 6 additions & 4 deletions apps/desktop/src-tauri/capabilities/default.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,10 @@
"fs:default",
"task:default",
"membership:default",
"obsidian:default",
{
"identifier": "opener:allow-open-url",
"allow": [{ "url": "https://**" }]
"allow": [{ "url": "https://**" }, { "url": "mailto:*" }, { "url": "obsidian://**" }]
},
{
"identifier": "opener:allow-open-path",
Expand Down Expand Up @@ -81,9 +82,10 @@
{
"identifier": "http:default",
"allow": [
{ "url": "http://localhost:*" },
{ "url": "http://127.0.0.1:*" },
{ "url": "https://**" }
{ "url": "http://localhost:*/**" },
{ "url": "http://127.0.0.1:*/**" },
{ "url": "https://**" },
{ "url": "http://**" }
]
},
"dialog:allow-save"
Expand Down
1 change: 1 addition & 0 deletions apps/desktop/src-tauri/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ pub async fn main() {
.plugin(tauri_plugin_os::init())
.plugin(tauri_plugin_fs::init())
.plugin(tauri_plugin_opener::init())
.plugin(tauri_plugin_obsidian::init())
.plugin(tauri_plugin_sfx::init())
.plugin(tauri_plugin_updater::Builder::new().build())
.plugin(tauri_plugin_window_state::Builder::default().build())
Expand Down
3 changes: 3 additions & 0 deletions apps/desktop/src/components/settings/components/tab-icon.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import {
AudioLinesIcon,
BellIcon,
BlocksIcon,
CalendarIcon,
FlaskConicalIcon,
LayoutTemplateIcon,
Expand Down Expand Up @@ -29,6 +30,8 @@ export function TabIcon({ tab }: { tab: Tab }) {
return <CalendarIcon className="h-4 w-4" />;
case "templates":
return <LayoutTemplateIcon className="h-4 w-4" />;
case "integrations":
return <BlocksIcon className="h-4 w-4" />;
default:
return null;
}
Expand Down
12 changes: 11 additions & 1 deletion apps/desktop/src/components/settings/components/types.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,16 @@
import type { LucideIcon } from "lucide-react";
import { Bell, Calendar, LayoutTemplate, MessageSquare, Settings, Sparkles, Volume2 } from "lucide-react";

export type Tab = "general" | "calendar" | "ai" | "notifications" | "sound" | "templates" | "lab" | "feedback";
export type Tab =
| "general"
| "calendar"
| "ai"
| "notifications"
| "sound"
| "templates"
| "lab"
| "feedback"
| "integrations";

export const TABS: { name: Tab; icon: LucideIcon }[] = [
{ name: "general", icon: Settings },
Expand All @@ -12,4 +21,5 @@ export const TABS: { name: Tab; icon: LucideIcon }[] = [
{ name: "templates", icon: LayoutTemplate },
// { name: "lab", icon: FlaskConical },
{ name: "feedback", icon: MessageSquare },
{ name: "integrations", icon: MessageSquare },
];
1 change: 1 addition & 0 deletions apps/desktop/src/components/settings/views/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ export { default as Billing } from "./billing";
export { default as Calendar } from "./calendar";
export { default as Feedback } from "./feedback";
export { default as General } from "./general";
export { default as Integrations } from "./integrations";
export { default as Lab } from "./lab";
export { default as Notifications } from "./notifications";
export { default as Profile } from "./profile";
Expand Down
Loading
Loading