From aa11e1a65e3ef6cbc19113e70b089a1dbe521d27 Mon Sep 17 00:00:00 2001 From: antelle Date: Sat, 3 Jul 2021 21:55:11 +0200 Subject: [PATCH] settings general pages --- .../general/settings-general-advanced.ts | 6 + .../general/settings-general-appearance.ts | 6 + .../general/settings-general-audit.ts | 6 + .../general/settings-general-function.ts | 6 + .../settings/general/settings-general-lock.ts | 6 + .../general/settings-general-storage.ts | 6 + .../general/settings-general-update.ts | 6 + app/scripts/ui/settings/settings-general.ts | 6 + .../settings-general-advanced-view.tsx | 5 + .../settings-general-appearance-view.tsx | 5 + .../general/settings-general-audit-view.tsx | 5 + .../settings-general-function-view.tsx | 5 + .../general/settings-general-lock-view.tsx | 5 + .../general/settings-general-storage-view.tsx | 5 + .../general/settings-general-update-view.tsx | 5 + .../views/settings/settings-general-view.tsx | 27 + app/scripts/views/settings/settings-view.tsx | 2 + app/templates/settings/settings-general.hbs | 684 +++++++++--------- 18 files changed, 452 insertions(+), 344 deletions(-) create mode 100644 app/scripts/ui/settings/general/settings-general-advanced.ts create mode 100644 app/scripts/ui/settings/general/settings-general-appearance.ts create mode 100644 app/scripts/ui/settings/general/settings-general-audit.ts create mode 100644 app/scripts/ui/settings/general/settings-general-function.ts create mode 100644 app/scripts/ui/settings/general/settings-general-lock.ts create mode 100644 app/scripts/ui/settings/general/settings-general-storage.ts create mode 100644 app/scripts/ui/settings/general/settings-general-update.ts create mode 100644 app/scripts/ui/settings/settings-general.ts create mode 100644 app/scripts/views/settings/general/settings-general-advanced-view.tsx create mode 100644 app/scripts/views/settings/general/settings-general-appearance-view.tsx create mode 100644 app/scripts/views/settings/general/settings-general-audit-view.tsx create mode 100644 app/scripts/views/settings/general/settings-general-function-view.tsx create mode 100644 app/scripts/views/settings/general/settings-general-lock-view.tsx create mode 100644 app/scripts/views/settings/general/settings-general-storage-view.tsx create mode 100644 app/scripts/views/settings/general/settings-general-update-view.tsx create mode 100644 app/scripts/views/settings/settings-general-view.tsx diff --git a/app/scripts/ui/settings/general/settings-general-advanced.ts b/app/scripts/ui/settings/general/settings-general-advanced.ts new file mode 100644 index 00000000..687b7e59 --- /dev/null +++ b/app/scripts/ui/settings/general/settings-general-advanced.ts @@ -0,0 +1,6 @@ +import { FunctionComponent, h } from 'preact'; +import { SettingsGeneralAdvancedView } from 'views/settings/general/settings-general-advanced-view'; + +export const SettingsGeneralAdvanced: FunctionComponent = () => { + return h(SettingsGeneralAdvancedView, null); +}; diff --git a/app/scripts/ui/settings/general/settings-general-appearance.ts b/app/scripts/ui/settings/general/settings-general-appearance.ts new file mode 100644 index 00000000..5ca92687 --- /dev/null +++ b/app/scripts/ui/settings/general/settings-general-appearance.ts @@ -0,0 +1,6 @@ +import { FunctionComponent, h } from 'preact'; +import { SettingsGeneralAppearanceView } from 'views/settings/general/settings-general-appearance-view'; + +export const SettingsGeneralAppearance: FunctionComponent = () => { + return h(SettingsGeneralAppearanceView, null); +}; diff --git a/app/scripts/ui/settings/general/settings-general-audit.ts b/app/scripts/ui/settings/general/settings-general-audit.ts new file mode 100644 index 00000000..3831e658 --- /dev/null +++ b/app/scripts/ui/settings/general/settings-general-audit.ts @@ -0,0 +1,6 @@ +import { FunctionComponent, h } from 'preact'; +import { SettingsGeneralAuditView } from 'views/settings/general/settings-general-audit-view'; + +export const SettingsGeneralAudit: FunctionComponent = () => { + return h(SettingsGeneralAuditView, null); +}; diff --git a/app/scripts/ui/settings/general/settings-general-function.ts b/app/scripts/ui/settings/general/settings-general-function.ts new file mode 100644 index 00000000..ad8251c8 --- /dev/null +++ b/app/scripts/ui/settings/general/settings-general-function.ts @@ -0,0 +1,6 @@ +import { FunctionComponent, h } from 'preact'; +import { SettingsGeneralFunctionView } from 'views/settings/general/settings-general-function-view'; + +export const SettingsGeneralFunction: FunctionComponent = () => { + return h(SettingsGeneralFunctionView, null); +}; diff --git a/app/scripts/ui/settings/general/settings-general-lock.ts b/app/scripts/ui/settings/general/settings-general-lock.ts new file mode 100644 index 00000000..e72fd62c --- /dev/null +++ b/app/scripts/ui/settings/general/settings-general-lock.ts @@ -0,0 +1,6 @@ +import { FunctionComponent, h } from 'preact'; +import { SettingsGeneralLockView } from 'views/settings/general/settings-general-lock-view'; + +export const SettingsGeneralLock: FunctionComponent = () => { + return h(SettingsGeneralLockView, null); +}; diff --git a/app/scripts/ui/settings/general/settings-general-storage.ts b/app/scripts/ui/settings/general/settings-general-storage.ts new file mode 100644 index 00000000..2e642074 --- /dev/null +++ b/app/scripts/ui/settings/general/settings-general-storage.ts @@ -0,0 +1,6 @@ +import { FunctionComponent, h } from 'preact'; +import { SettingsGeneralStorageView } from 'views/settings/general/settings-general-storage-view'; + +export const SettingsGeneralStorage: FunctionComponent = () => { + return h(SettingsGeneralStorageView, null); +}; diff --git a/app/scripts/ui/settings/general/settings-general-update.ts b/app/scripts/ui/settings/general/settings-general-update.ts new file mode 100644 index 00000000..fa63a24a --- /dev/null +++ b/app/scripts/ui/settings/general/settings-general-update.ts @@ -0,0 +1,6 @@ +import { FunctionComponent, h } from 'preact'; +import { SettingsGeneralUpdateView } from 'views/settings/general/settings-general-update-view'; + +export const SettingsGeneralUpdate: FunctionComponent = () => { + return h(SettingsGeneralUpdateView, null); +}; diff --git a/app/scripts/ui/settings/settings-general.ts b/app/scripts/ui/settings/settings-general.ts new file mode 100644 index 00000000..e4eaf8ec --- /dev/null +++ b/app/scripts/ui/settings/settings-general.ts @@ -0,0 +1,6 @@ +import { FunctionComponent, h } from 'preact'; +import { SettingsGeneralView } from 'views/settings/settings-general-view'; + +export const SettingsGeneral: FunctionComponent = () => { + return h(SettingsGeneralView, null); +}; diff --git a/app/scripts/views/settings/general/settings-general-advanced-view.tsx b/app/scripts/views/settings/general/settings-general-advanced-view.tsx new file mode 100644 index 00000000..b36895b2 --- /dev/null +++ b/app/scripts/views/settings/general/settings-general-advanced-view.tsx @@ -0,0 +1,5 @@ +import { FunctionComponent } from 'preact'; + +export const SettingsGeneralAdvancedView: FunctionComponent = () => { + return <>; +}; diff --git a/app/scripts/views/settings/general/settings-general-appearance-view.tsx b/app/scripts/views/settings/general/settings-general-appearance-view.tsx new file mode 100644 index 00000000..e15676ae --- /dev/null +++ b/app/scripts/views/settings/general/settings-general-appearance-view.tsx @@ -0,0 +1,5 @@ +import { FunctionComponent } from 'preact'; + +export const SettingsGeneralAppearanceView: FunctionComponent = () => { + return <>; +}; diff --git a/app/scripts/views/settings/general/settings-general-audit-view.tsx b/app/scripts/views/settings/general/settings-general-audit-view.tsx new file mode 100644 index 00000000..7bedde0d --- /dev/null +++ b/app/scripts/views/settings/general/settings-general-audit-view.tsx @@ -0,0 +1,5 @@ +import { FunctionComponent } from 'preact'; + +export const SettingsGeneralAuditView: FunctionComponent = () => { + return <>; +}; diff --git a/app/scripts/views/settings/general/settings-general-function-view.tsx b/app/scripts/views/settings/general/settings-general-function-view.tsx new file mode 100644 index 00000000..f77ef6f3 --- /dev/null +++ b/app/scripts/views/settings/general/settings-general-function-view.tsx @@ -0,0 +1,5 @@ +import { FunctionComponent } from 'preact'; + +export const SettingsGeneralFunctionView: FunctionComponent = () => { + return <>; +}; diff --git a/app/scripts/views/settings/general/settings-general-lock-view.tsx b/app/scripts/views/settings/general/settings-general-lock-view.tsx new file mode 100644 index 00000000..67e8b4ea --- /dev/null +++ b/app/scripts/views/settings/general/settings-general-lock-view.tsx @@ -0,0 +1,5 @@ +import { FunctionComponent } from 'preact'; + +export const SettingsGeneralLockView: FunctionComponent = () => { + return <>; +}; diff --git a/app/scripts/views/settings/general/settings-general-storage-view.tsx b/app/scripts/views/settings/general/settings-general-storage-view.tsx new file mode 100644 index 00000000..1387d1fc --- /dev/null +++ b/app/scripts/views/settings/general/settings-general-storage-view.tsx @@ -0,0 +1,5 @@ +import { FunctionComponent } from 'preact'; + +export const SettingsGeneralStorageView: FunctionComponent = () => { + return <>; +}; diff --git a/app/scripts/views/settings/general/settings-general-update-view.tsx b/app/scripts/views/settings/general/settings-general-update-view.tsx new file mode 100644 index 00000000..a3773ef4 --- /dev/null +++ b/app/scripts/views/settings/general/settings-general-update-view.tsx @@ -0,0 +1,5 @@ +import { FunctionComponent } from 'preact'; + +export const SettingsGeneralUpdateView: FunctionComponent = () => { + return <>; +}; diff --git a/app/scripts/views/settings/settings-general-view.tsx b/app/scripts/views/settings/settings-general-view.tsx new file mode 100644 index 00000000..745236ed --- /dev/null +++ b/app/scripts/views/settings/settings-general-view.tsx @@ -0,0 +1,27 @@ +import { FunctionComponent } from 'preact'; +import { Locale } from 'util/locale'; +import { SettingsGeneralUpdate } from 'ui/settings/general/settings-general-update'; +import { SettingsGeneralAppearance } from 'ui/settings/general/settings-general-appearance'; +import { SettingsGeneralFunction } from 'ui/settings/general/settings-general-function'; +import { SettingsGeneralAudit } from 'ui/settings/general/settings-general-audit'; +import { SettingsGeneralLock } from 'ui/settings/general/settings-general-lock'; +import { SettingsGeneralStorage } from 'ui/settings/general/settings-general-storage'; +import { SettingsGeneralAdvanced } from 'ui/settings/general/settings-general-advanced'; + +export const SettingsGeneralView: FunctionComponent = () => { + return ( +
+

+ {Locale.setGenTitle} +

+ + + + + + + + +
+ ); +}; diff --git a/app/scripts/views/settings/settings-view.tsx b/app/scripts/views/settings/settings-view.tsx index cb0c9658..2939aa4b 100644 --- a/app/scripts/views/settings/settings-view.tsx +++ b/app/scripts/views/settings/settings-view.tsx @@ -2,6 +2,7 @@ import { FunctionComponent } from 'preact'; import { SettingsPage } from 'models/workspace'; import { Scrollable } from 'views/components/scrollable'; import { Locale } from 'util/locale'; +import { SettingsGeneral } from 'ui/settings/settings-general'; import { SettingsAbout } from 'ui/settings/settings-about'; import { SettingsHelp } from 'ui/settings/settings-help'; @@ -17,6 +18,7 @@ export const SettingsView: FunctionComponent<{ {Locale.retToApp} + {page === 'general' ? : null} {page === 'about' ? : null} {page === 'help' ? : null} diff --git a/app/templates/settings/settings-general.hbs b/app/templates/settings/settings-general.hbs index b2895a45..9a4d97f9 100644 --- a/app/templates/settings/settings-general.hbs +++ b/app/templates/settings/settings-general.hbs @@ -1,349 +1,345 @@ -
-

{{res 'setGenTitle'}}

+{{#if updateWaitingReload}} +

{{res 'setGenUpdate'}}

+
{{res 'setGenNewVersion'}}. {{res 'setGenReleaseNotes'}}
+
+ +
+{{else if updateManual}} +

{{res 'setGenUpdate'}}

+
{{res 'setGenUpdateManual'}}
+
+ +
+{{/if}} +{{#if showUpdateBlock}} +

{{res 'setGenUpdate'}}

+
+ +
{{updateInfo}}
+ {{res 'setGenReleaseNotes'}} +
+
+ {{#if updateInProgress}} + + {{else}} + + {{/if}} + {{#if updateReady}}{{/if}} + {{#if updateFound}}{{/if}} +
+{{/if}} - {{#if updateWaitingReload}} -

{{res 'setGenUpdate'}}

-
{{res 'setGenNewVersion'}}. {{res 'setGenReleaseNotes'}}
-
- -
- {{else if updateManual}} -

{{res 'setGenUpdate'}}

-
{{res 'setGenUpdateManual'}}
-
- -
- {{/if}} - {{#if showUpdateBlock}} -

{{res 'setGenUpdate'}}

-
- -
{{updateInfo}}
- {{res 'setGenReleaseNotes'}} -
-
- {{#if updateInProgress}} - - {{else}} - - {{/if}} - {{#if updateReady}}{{/if}} - {{#if updateFound}}{{/if}} -
- {{/if}} - -

{{res 'setGenAppearance'}}

- {{#if locales}} -
- - -
- {{/if}} -
- -
- {{#each themes as |name key|}} -
-
{{name}}
- -
- {{/each}} -
-
{{res 'setGenMoreThemes'}}
- +

{{res 'setGenAppearance'}}

+{{#if locales}} +
+ + +
+{{/if}} +
+ +
+ {{#each themes as |name key|}} +
+
{{name}}
+
+ {{/each}} +
+
{{res 'setGenMoreThemes'}}
+
-
- - -
-
- - -
- {{#if supportsTitleBarStyles}} -
- - -
- {{/if}} -
- - -
- {{#if canSetTableView}} -
- - -
- {{/if}} -
- - -
- -

{{res 'setGenFunction'}}

- {{#if canAutoSaveOnClose}} -
- - -
- {{/if}} -
- - -
-
- - -
- {{#if canClearClipboard}} -
- - -
- {{/if}} - {{#if canMinimize}} -
- - -
-
- - -
- {{/if}} - {{#if canAutoType}} -
- - -
-
- - -
-
- - -
- {{/if}} -
- - -
-
- - -
- {{#if hasDeviceOwnerAuth}} -
- - -
- {{#if deviceOwnerAuth}} - - - {{/if}} - {{/if}} - -

{{res 'setGenAudit'}}

-
- - -
- -
- - -
- -
- - -
- -
- - - -
- {{~#res 'setGenHelpHIBP'~}} - {{res 'setGenHelpHIBPLink'}} - {{~/res~}} -
-
- -
- - -
- -

{{res 'setGenLock'}}

-
- - -
- {{#if canDetectMinimize}} -
- - -
- {{/if}} -
- - -
- {{#if canAutoType}} -
- - -
- {{/if}} - {{#if canDetectOsSleep}} -
- - -
- {{/if}} - -

{{res 'setGenStorage'}}

-
- - -
-
- - -
- - {{#each storageProviders as |prv|}} -

-
- {{#if prv.loggedIn}}{{/if}} - {{/each}} - -

{{res 'advanced'}}

- {{res 'setGenShowAdvanced'}} -
- {{#if devTools}} - - - {{/if}} - {{#if showReloadApp}} - - {{/if}} - -
+
+
+ + +
+
+ + +
+{{#if supportsTitleBarStyles}} +
+ + +
+{{/if}} +
+ + +
+{{#if canSetTableView}} +
+ + +
+{{/if}} +
+ + +
+ +

{{res 'setGenFunction'}}

+{{#if canAutoSaveOnClose}} +
+ + +
+{{/if}} +
+ + +
+
+ + +
+{{#if canClearClipboard}} +
+ + +
+{{/if}} +{{#if canMinimize}} +
+ + +
+
+ + +
+{{/if}} +{{#if canAutoType}} +
+ + +
+
+ + +
+
+ + +
+{{/if}} +
+ + +
+
+ + +
+{{#if hasDeviceOwnerAuth}} +
+ + +
+ {{#if deviceOwnerAuth}} + + + {{/if}} +{{/if}} + +

{{res 'setGenAudit'}}

+
+ + +
+ +
+ + +
+ +
+ + +
+ +
+ + + +
+ {{~#res 'setGenHelpHIBP'~}} + {{res 'setGenHelpHIBPLink'}} + {{~/res~}} +
+
+ +
+ + +
+ +

{{res 'setGenLock'}}

+
+ + +
+{{#if canDetectMinimize}} +
+ + +
+{{/if}} +
+ + +
+{{#if canAutoType}} +
+ + +
+{{/if}} +{{#if canDetectOsSleep}} +
+ + +
+{{/if}} + +

{{res 'setGenStorage'}}

+
+ + +
+
+ + +
+ +{{#each storageProviders as |prv|}} +

+
+{{#if prv.loggedIn}}{{/if}} +{{/each}} + +

{{res 'advanced'}}

+{{res 'setGenShowAdvanced'}} +
+ {{#if devTools}} + + + {{/if}} + {{#if showReloadApp}} + + {{/if}} +