From d041cfe5c59f5dfb28edaa9e559703a1be3e8db6 Mon Sep 17 00:00:00 2001 From: pierre Date: Fri, 5 Jan 2024 16:55:33 +0100 Subject: [PATCH] disalbe settings not implemented yet --- nym-vpn/ui/package.json | 2 +- nym-vpn/ui/src/pages/settings/Settings.tsx | 17 ++++++++++++----- nym-vpn/ui/src/pages/settings/SettingsGroup.tsx | 7 ++++++- .../ui/src/pages/settings/display/Display.tsx | 10 ++++++++-- .../ui/src/pages/settings/display/UiScaler.tsx | 9 ++++++++- nym-vpn/ui/tailwind.config.ts | 2 +- 6 files changed, 36 insertions(+), 11 deletions(-) diff --git a/nym-vpn/ui/package.json b/nym-vpn/ui/package.json index 800a1efcb5..56bac218b8 100644 --- a/nym-vpn/ui/package.json +++ b/nym-vpn/ui/package.json @@ -1,7 +1,7 @@ { "name": "nym-vpn-ui", "private": true, - "version": "0.0.0", + "version": "0.0.1", "type": "module", "scripts": { "dev": "vite", diff --git a/nym-vpn/ui/src/pages/settings/Settings.tsx b/nym-vpn/ui/src/pages/settings/Settings.tsx index 9166ddcdb5..14f6acdc5e 100644 --- a/nym-vpn/ui/src/pages/settings/Settings.tsx +++ b/nym-vpn/ui/src/pages/settings/Settings.tsx @@ -59,6 +59,7 @@ function Settings() { title: t('auto-connect.title'), desc: t('auto-connect.desc'), leadingIcon: 'hdr_auto', + disabled: true, trailing: ( { navigate(routes.logs); }, - trailing: ( -
- arrow_right -
- ), + trailing:
arrow_right
, + disabled: true, }, ]} /> @@ -150,11 +151,13 @@ function Settings() { arrow_right ), + disabled: true, }, { title: t('error-reporting.title'), desc: t('error-reporting.desc'), leadingIcon: 'error', + disabled: true, trailing: ( launch ), @@ -191,6 +196,7 @@ function Settings() { onClick: () => { navigate(routes.legal); }, + disabled: true, trailing: (
arrow_right @@ -206,6 +212,7 @@ function Settings() { onClick: () => { //TODO shutdown gracefully }, + disabled: true, }, ]} /> diff --git a/nym-vpn/ui/src/pages/settings/SettingsGroup.tsx b/nym-vpn/ui/src/pages/settings/SettingsGroup.tsx index e1bd46a30f..3cbdf5c8c5 100644 --- a/nym-vpn/ui/src/pages/settings/SettingsGroup.tsx +++ b/nym-vpn/ui/src/pages/settings/SettingsGroup.tsx @@ -8,6 +8,7 @@ type Setting = { desc?: string; onClick?: () => void; trailing?: ReactNode; + disabled?: boolean; }; interface Props { @@ -33,9 +34,13 @@ function SettingsGroup({ settings }: Props) { 'border-y border-mercury-mist', index === settings.length - 1 && 'rounded-b-lg', setting.desc === undefined && 'py-4', + setting.disabled && 'opacity-50 pointer-events-none', ])} > -
+
{setting.leadingIcon && ( {setting.leadingIcon} )} diff --git a/nym-vpn/ui/src/pages/settings/display/Display.tsx b/nym-vpn/ui/src/pages/settings/display/Display.tsx index a783161baf..3c35280a6d 100644 --- a/nym-vpn/ui/src/pages/settings/display/Display.tsx +++ b/nym-vpn/ui/src/pages/settings/display/Display.tsx @@ -32,8 +32,14 @@ function Display() { }; return ( -
-
+
+

Dark Mode

diff --git a/nym-vpn/ui/src/pages/settings/display/UiScaler.tsx b/nym-vpn/ui/src/pages/settings/display/UiScaler.tsx index 3d9734b25e..154efb3d59 100644 --- a/nym-vpn/ui/src/pages/settings/display/UiScaler.tsx +++ b/nym-vpn/ui/src/pages/settings/display/UiScaler.tsx @@ -1,5 +1,6 @@ import { ChangeEvent, useEffect, useState } from 'react'; import { invoke } from '@tauri-apps/api'; +import clsx from 'clsx'; import { useMainDispatch, useMainState } from '../../../contexts'; import { CmdError, StateDispatch } from '../../../types'; @@ -26,7 +27,13 @@ function UiScaler() { }; return ( -
+

{`Zoom level: ${slideValue}`}

diff --git a/nym-vpn/ui/tailwind.config.ts b/nym-vpn/ui/tailwind.config.ts index 247a3df63c..41680e6295 100644 --- a/nym-vpn/ui/tailwind.config.ts +++ b/nym-vpn/ui/tailwind.config.ts @@ -11,7 +11,7 @@ export default { 'baltic-sea': { // [D] bg for top-bar nav // [D] bg for network modes - jaguar: '#2A2831', + jaguar: '#2B2831', // [L] status-line title text + icon // [L] connection timer text // [L] "Connecting" status text