diff --git a/nym-connect/CHANGELOG.md b/nym-connect/CHANGELOG.md index 7c67f24f36..af8596e845 100644 --- a/nym-connect/CHANGELOG.md +++ b/nym-connect/CHANGELOG.md @@ -2,6 +2,10 @@ ## UNRELEASED +## [nym-connect-v1.1.10](https://github.com/nymtech/nym/tree/nym-connect-v1.1.10) (2023-02-21) + +- Allow opening and closing of logs within the app + ## [nym-connect-v1.1.9](https://github.com/nymtech/nym/tree/nym-connect-v1.1.9) (2023-02-14) - Button animations ([#2949]) diff --git a/nym-connect/src-tauri/src/main.rs b/nym-connect/src-tauri/src/main.rs index ec36c252d4..3110f0c17d 100644 --- a/nym-connect/src-tauri/src/main.rs +++ b/nym-connect/src-tauri/src/main.rs @@ -6,10 +6,9 @@ use std::sync::Arc; use config_common::defaults::setup_env; -use tauri::{Manager, Menu}; +use tauri::Manager; use tokio::sync::RwLock; -use crate::menu::AddDefaultSubmenus; use crate::menu::{create_tray_menu, tray_menu_event_handler}; use crate::state::State; use crate::window::window_toggle; @@ -64,7 +63,6 @@ fn main() { crate::operations::growth::test_and_earn::growth_tne_toggle_window, crate::operations::help::log::help_log_toggle_window, ]) - .menu(Menu::os_default(&context.package_info().name).add_default_app_submenus()) .on_menu_event(|event| { if event.menu_item_id() == menu::SHOW_LOG_WINDOW { let _r = crate::operations::help::log::help_log_toggle_window( diff --git a/nym-connect/src/pages/menu/Settings.tsx b/nym-connect/src/pages/menu/settings/GatewaySettings.tsx similarity index 98% rename from nym-connect/src/pages/menu/Settings.tsx rename to nym-connect/src/pages/menu/settings/GatewaySettings.tsx index bc3716d20e..c273a8a007 100644 --- a/nym-connect/src/pages/menu/Settings.tsx +++ b/nym-connect/src/pages/menu/settings/GatewaySettings.tsx @@ -5,7 +5,7 @@ import { useClientContext } from 'src/context/main'; import { ConnectionStatusKind } from 'src/types'; import { AppVersion } from 'src/components/AppVersion'; -export const Settings = () => { +export const GatewaySettings = () => { const { userDefinedGateway, setUserDefinedGateway } = useClientContext(); const [gatewayKey, setGatewayKey] = useState(userDefinedGateway?.gateway); diff --git a/nym-connect/src/pages/menu/settings/index.tsx b/nym-connect/src/pages/menu/settings/index.tsx new file mode 100644 index 0000000000..b5c3988136 --- /dev/null +++ b/nym-connect/src/pages/menu/settings/index.tsx @@ -0,0 +1,29 @@ +import React from 'react'; +import { Link as RouterLink } from 'react-router-dom'; +import { Link, List, ListItem, ListItemButton, ListItemText, Stack } from '@mui/material'; +import { AppVersion } from 'src/components/AppVersion'; +import { toggle_log_viewer } from 'src/utils'; + +const menuSchema = [{ title: 'Select your gateway', path: 'gateway' }]; + +export const SettingsMenu = () => ( + + + {menuSchema.map((item) => ( + + + + {item.title} + + + + ))} + + + Logs + + + + + +); diff --git a/nym-connect/src/routes/index.tsx b/nym-connect/src/routes/index.tsx index ec24080c6c..2c7e94236a 100644 --- a/nym-connect/src/routes/index.tsx +++ b/nym-connect/src/routes/index.tsx @@ -1,10 +1,11 @@ -import React from 'react'; +import React, { useEffect } from 'react'; import { Routes, Route } from 'react-router-dom'; import { ConnectionPage } from 'src/pages/connection'; import { Menu } from 'src/pages/menu'; import { CompatibleApps } from 'src/pages/menu/Apps'; import { HelpGuide } from 'src/pages/menu/Guide'; -import { Settings } from 'src/pages/menu/Settings'; +import { SettingsMenu } from 'src/pages/menu/settings'; +import { GatewaySettings } from 'src/pages/menu/settings/GatewaySettings'; export const AppRoutes = () => ( @@ -13,7 +14,10 @@ export const AppRoutes = () => ( } /> } /> } /> - } /> + + } /> + } /> + ); diff --git a/nym-connect/src/utils/index.ts b/nym-connect/src/utils/index.ts index 9dc9fd09e3..1665f1207f 100644 --- a/nym-connect/src/utils/index.ts +++ b/nym-connect/src/utils/index.ts @@ -1,5 +1,6 @@ import { useEffect, useRef } from 'react'; import { EventName, listen, UnlistenFn, EventCallback } from '@tauri-apps/api/event'; +import { invoke } from '@tauri-apps/api'; export const useTauriEvents = (event: EventName, handler: EventCallback) => { const unlisten = useRef(); @@ -17,3 +18,7 @@ export const useTauriEvents = (event: EventName, handler: EventCallback) = }; }, []); }; + +export const toggle_log_viewer = async () => { + await invoke('help_log_toggle_window'); +};