From 96ee17b8cc860c3de073ccc274670a1b2e5d7ba1 Mon Sep 17 00:00:00 2001 From: Giuseppe Date: Thu, 26 Nov 2020 21:19:36 +0100 Subject: [PATCH] Moved date-format.js to comp/util/ --- app/scripts/comp/format/kdbx-to-html.js | 2 +- app/scripts/{util/formatting => comp/util}/date-format.js | 0 app/scripts/models/app-model.js | 2 +- app/scripts/presenters/entry-presenter.js | 2 +- app/scripts/views/details/details-fields.js | 2 +- app/scripts/views/details/details-history-view.js | 2 +- app/scripts/views/fields/field-view-date.js | 2 +- app/scripts/views/settings/settings-file-view.js | 2 +- app/scripts/views/settings/settings-general-view.js | 2 +- app/scripts/views/settings/settings-plugins-view.js | 2 +- test/src/util/formatting/date-format.js | 2 +- 11 files changed, 10 insertions(+), 10 deletions(-) rename app/scripts/{util/formatting => comp/util}/date-format.js (100%) diff --git a/app/scripts/comp/format/kdbx-to-html.js b/app/scripts/comp/format/kdbx-to-html.js index 3214be26..4be9dd7b 100644 --- a/app/scripts/comp/format/kdbx-to-html.js +++ b/app/scripts/comp/format/kdbx-to-html.js @@ -2,7 +2,7 @@ import kdbxweb from 'kdbxweb'; import { RuntimeInfo } from 'const/runtime-info'; import { Links } from 'const/links'; -import { DateFormat } from 'util/formatting/date-format'; +import { DateFormat } from 'comp/util/date-format'; import { StringFormat } from 'util/formatting/string-format'; import { Locale } from 'util/locale'; diff --git a/app/scripts/util/formatting/date-format.js b/app/scripts/comp/util/date-format.js similarity index 100% rename from app/scripts/util/formatting/date-format.js rename to app/scripts/comp/util/date-format.js diff --git a/app/scripts/models/app-model.js b/app/scripts/models/app-model.js index c37dc4e4..a4822982 100644 --- a/app/scripts/models/app-model.js +++ b/app/scripts/models/app-model.js @@ -16,7 +16,7 @@ import { YubiKeyOtpModel } from 'models/external/yubikey-otp-model'; import { MenuModel } from 'models/menu/menu-model'; import { PluginManager } from 'plugins/plugin-manager'; import { Features } from 'util/features'; -import { DateFormat } from 'util/formatting/date-format'; +import { DateFormat } from 'comp/util/date-format'; import { UrlFormat } from 'util/formatting/url-format'; import { IdGenerator } from 'util/generators/id-generator'; import { Locale } from 'util/locale'; diff --git a/app/scripts/presenters/entry-presenter.js b/app/scripts/presenters/entry-presenter.js index d1028138..bb554e48 100644 --- a/app/scripts/presenters/entry-presenter.js +++ b/app/scripts/presenters/entry-presenter.js @@ -1,4 +1,4 @@ -import { DateFormat } from 'util/formatting/date-format'; +import { DateFormat } from 'comp/util/date-format'; import { Locale } from 'util/locale'; const EntryPresenter = function (descField, noColor, activeEntryId) { diff --git a/app/scripts/views/details/details-fields.js b/app/scripts/views/details/details-fields.js index 365a44c2..211f7b65 100644 --- a/app/scripts/views/details/details-fields.js +++ b/app/scripts/views/details/details-fields.js @@ -1,6 +1,6 @@ import { Locale } from 'util/locale'; import { StringFormat } from 'util/formatting/string-format'; -import { DateFormat } from 'util/formatting/date-format'; +import { DateFormat } from 'comp/util/date-format'; import { AppModel } from 'models/app-model'; import { FieldViewReadOnly } from 'views/fields/field-view-read-only'; import { FieldViewOtp } from 'views/fields/field-view-otp'; diff --git a/app/scripts/views/details/details-history-view.js b/app/scripts/views/details/details-history-view.js index 0109ab17..5f4e5cec 100644 --- a/app/scripts/views/details/details-history-view.js +++ b/app/scripts/views/details/details-history-view.js @@ -1,7 +1,7 @@ import { View } from 'framework/views/view'; import { Alerts } from 'comp/ui/alerts'; import { Keys } from 'const/keys'; -import { DateFormat } from 'util/formatting/date-format'; +import { DateFormat } from 'comp/util/date-format'; import { StringFormat } from 'util/formatting/string-format'; import { Locale } from 'util/locale'; import { Copyable } from 'framework/views/copyable'; diff --git a/app/scripts/views/fields/field-view-date.js b/app/scripts/views/fields/field-view-date.js index e0cfcf45..034e515c 100644 --- a/app/scripts/views/fields/field-view-date.js +++ b/app/scripts/views/fields/field-view-date.js @@ -1,5 +1,5 @@ import Pikaday from 'pikaday'; -import { DateFormat } from 'util/formatting/date-format'; +import { DateFormat } from 'comp/util/date-format'; import { FieldViewText } from 'views/fields/field-view-text'; class FieldViewDate extends FieldViewText { diff --git a/app/scripts/views/settings/settings-file-view.js b/app/scripts/views/settings/settings-file-view.js index 1a100b7d..a5cea10a 100644 --- a/app/scripts/views/settings/settings-file-view.js +++ b/app/scripts/views/settings/settings-file-view.js @@ -8,7 +8,7 @@ import { YubiKey } from 'comp/app/yubikey'; import { UsbListener } from 'comp/app/usb-listener'; import { Links } from 'const/links'; import { AppSettingsModel } from 'models/app-settings-model'; -import { DateFormat } from 'util/formatting/date-format'; +import { DateFormat } from 'comp/util/date-format'; import { UrlFormat } from 'util/formatting/url-format'; import { PasswordPresenter } from 'util/formatting/password-presenter'; import { Locale } from 'util/locale'; diff --git a/app/scripts/views/settings/settings-general-view.js b/app/scripts/views/settings/settings-general-view.js index dc0ec473..ed013ae1 100644 --- a/app/scripts/views/settings/settings-general-view.js +++ b/app/scripts/views/settings/settings-general-view.js @@ -12,7 +12,7 @@ import { AppSettingsModel } from 'models/app-settings-model'; import { UpdateModel } from 'models/update-model'; import { SemVer } from 'util/data/semver'; import { Features } from 'util/features'; -import { DateFormat } from 'util/formatting/date-format'; +import { DateFormat } from 'comp/util/date-format'; import { Locale } from 'util/locale'; import { SettingsLogsView } from 'views/settings/settings-logs-view'; import { SettingsPrvView } from 'views/settings/settings-prv-view'; diff --git a/app/scripts/views/settings/settings-plugins-view.js b/app/scripts/views/settings/settings-plugins-view.js index 2e4f8e99..0f64eef2 100644 --- a/app/scripts/views/settings/settings-plugins-view.js +++ b/app/scripts/views/settings/settings-plugins-view.js @@ -10,7 +10,7 @@ import { PluginManager } from 'plugins/plugin-manager'; import { Comparators } from 'util/data/comparators'; import { SemVer } from 'util/data/semver'; import { Features } from 'util/features'; -import { DateFormat } from 'util/formatting/date-format'; +import { DateFormat } from 'comp/util/date-format'; import { Locale } from 'util/locale'; import template from 'templates/settings/settings-plugins.hbs'; diff --git a/test/src/util/formatting/date-format.js b/test/src/util/formatting/date-format.js index 8634f9ea..51ff9b20 100644 --- a/test/src/util/formatting/date-format.js +++ b/test/src/util/formatting/date-format.js @@ -1,5 +1,5 @@ import { expect } from 'chai'; -import { DateFormat } from 'util/formatting/date-format'; +import { DateFormat } from 'comp/util/date-format'; describe('DateFormat', () => { const dt = new Date.UTC(2020, 0, 2, 3, 4, 5, 6);