diff --git a/app/scripts/app.js b/app/scripts/app.js index fb83fc83..52357766 100644 --- a/app/scripts/app.js +++ b/app/scripts/app.js @@ -5,20 +5,20 @@ const AppSettingsModel = require('./models/app-settings-model'); const UpdateModel = require('./models/update-model'); const RuntimeDataModel = require('./models/runtime-data-model'); const FileInfoCollection = require('./collections/file-info-collection'); -const KeyHandler = require('./comp/key-handler'); -const IdleTracker = require('./comp/idle-tracker'); -const PopupNotifier = require('./comp/popup-notifier'); -const SingleInstanceChecker = require('./comp/single-instance-checker'); -const AppRightsChecker = require('./comp/app-rights-checker'); -const Alerts = require('./comp/alerts'); -const Updater = require('./comp/updater'); -const AuthReceiver = require('./comp/auth-receiver'); -const ExportApi = require('./comp/export-api'); -const SettingsManager = require('./comp/settings-manager'); +const KeyHandler = require('./comp/browser/key-handler'); +const IdleTracker = require('./comp/browser/idle-tracker'); +const PopupNotifier = require('./comp/browser/popup-notifier'); +const SingleInstanceChecker = require('./comp/app/single-instance-checker'); +const AppRightsChecker = require('./comp/app/app-rights-checker'); +const Alerts = require('./comp/ui/alerts'); +const Updater = require('./comp/app/updater'); +const AuthReceiver = require('./comp/browser/auth-receiver'); +const ExportApi = require('./comp/app/export-api'); +const SettingsManager = require('./comp/settings/settings-manager'); const PluginManager = require('./plugins/plugin-manager'); const Launcher = require('./comp/launcher'); -const FeatureTester = require('./comp/feature-tester'); -const FocusDetector = require('./comp/focus-detector'); +const FeatureTester = require('./comp/browser/feature-tester'); +const FocusDetector = require('./comp/browser/focus-detector'); const Timeouts = require('./const/timeouts'); const Features = require('./util/features'); const KdbxwebInit = require('./util/kdbxweb/kdbxweb-init'); diff --git a/app/scripts/auto-type/index.js b/app/scripts/auto-type/index.js index 05ba1215..2356e801 100644 --- a/app/scripts/auto-type/index.js +++ b/app/scripts/auto-type/index.js @@ -3,7 +3,7 @@ const AutoTypeParser = require('./auto-type-parser'); const AutoTypeFilter = require('./auto-type-filter'); const AutoTypeHelperFactory = require('./auto-type-helper-factory'); const Launcher = require('../comp/launcher'); -const Alerts = require('../comp/alerts'); +const Alerts = require('../comp/ui/alerts'); const AutoTypeSelectView = require('../views/auto-type/auto-type-select-view'); const Logger = require('../util/logger'); const Locale = require('../util/locale'); diff --git a/app/scripts/collections/file-info-collection.js b/app/scripts/collections/file-info-collection.js index d030ea0f..0a37af74 100644 --- a/app/scripts/collections/file-info-collection.js +++ b/app/scripts/collections/file-info-collection.js @@ -1,6 +1,6 @@ const Backbone = require('backbone'); const FileInfoModel = require('../models/file-info-model'); -const SettingsStore = require('../comp/settings-store'); +const SettingsStore = require('../comp/settings/settings-store'); const FileInfoCollection = Backbone.Collection.extend({ model: FileInfoModel, diff --git a/app/scripts/comp/app-rights-checker.js b/app/scripts/comp/app/app-rights-checker.js similarity index 89% rename from app/scripts/comp/app-rights-checker.js rename to app/scripts/comp/app/app-rights-checker.js index 3a047c4c..414d69a5 100644 --- a/app/scripts/comp/app-rights-checker.js +++ b/app/scripts/comp/app/app-rights-checker.js @@ -1,8 +1,8 @@ -const Features = require('../util/features'); -const Alerts = require('../comp/alerts'); -const AppSettingsModel = require('../models/app-settings-model'); -const Launcher = require('./launcher'); -const Locale = require('../util/locale'); +const Features = require('../../util/features'); +const Alerts = require('../ui/alerts'); +const AppSettingsModel = require('../../models/app-settings-model'); +const Launcher = require('../launcher'); +const Locale = require('../../util/locale'); const AppRightsChecker = { AppPath: '/Applications/KeeWeb.app', diff --git a/app/scripts/comp/drag-drop-info.js b/app/scripts/comp/app/drag-drop-info.js similarity index 100% rename from app/scripts/comp/drag-drop-info.js rename to app/scripts/comp/app/drag-drop-info.js diff --git a/app/scripts/comp/dropbox-chooser.js b/app/scripts/comp/app/dropbox-chooser.js similarity index 97% rename from app/scripts/comp/dropbox-chooser.js rename to app/scripts/comp/app/dropbox-chooser.js index 5f8d7859..177444ef 100644 --- a/app/scripts/comp/dropbox-chooser.js +++ b/app/scripts/comp/app/dropbox-chooser.js @@ -1,4 +1,4 @@ -const AppSettingsModel = require('../models/app-settings-model'); +const AppSettingsModel = require('../../models/app-settings-model'); const ChooserAppKey = 'qp7ctun6qt5n9d6'; diff --git a/app/scripts/comp/export-api.js b/app/scripts/comp/app/export-api.js similarity index 84% rename from app/scripts/comp/export-api.js rename to app/scripts/comp/app/export-api.js index 48c5bd51..b2d1b79c 100644 --- a/app/scripts/comp/export-api.js +++ b/app/scripts/comp/app/export-api.js @@ -1,4 +1,4 @@ -const AppSettingsModel = require('../models/app-settings-model'); +const AppSettingsModel = require('../../models/app-settings-model'); const ExportApi = { settings: { diff --git a/app/scripts/comp/generator-presets.js b/app/scripts/comp/app/generator-presets.js similarity index 97% rename from app/scripts/comp/generator-presets.js rename to app/scripts/comp/app/generator-presets.js index 7f96580e..0595ff2c 100644 --- a/app/scripts/comp/generator-presets.js +++ b/app/scripts/comp/app/generator-presets.js @@ -1,5 +1,5 @@ -const AppSettingsModel = require('../models/app-settings-model'); -const Locale = require('../util/locale'); +const AppSettingsModel = require('../../models/app-settings-model'); +const Locale = require('../../util/locale'); const GeneratorPresets = { get defaultPreset() { diff --git a/app/scripts/comp/runtime-info.js b/app/scripts/comp/app/runtime-info.js similarity index 84% rename from app/scripts/comp/runtime-info.js rename to app/scripts/comp/app/runtime-info.js index dbf5b2c8..3341bb63 100644 --- a/app/scripts/comp/runtime-info.js +++ b/app/scripts/comp/app/runtime-info.js @@ -1,4 +1,4 @@ -const Launcher = require('../comp/launcher'); +const Launcher = require('../launcher'); const RuntimeInfo = { version: '@@VERSION', diff --git a/app/scripts/comp/shortcuts.js b/app/scripts/comp/app/shortcuts.js similarity index 93% rename from app/scripts/comp/shortcuts.js rename to app/scripts/comp/app/shortcuts.js index 8340e201..e29f8cd9 100644 --- a/app/scripts/comp/shortcuts.js +++ b/app/scripts/comp/app/shortcuts.js @@ -1,8 +1,8 @@ -const Features = require('../util/features'); -const Keys = require('../const/keys'); -const StringFormat = require('../util/formatting/string-format'); -const AppSettingsModel = require('../models/app-settings-model'); -const Launcher = require('./launcher'); +const Features = require('../../util/features'); +const Keys = require('../../const/keys'); +const StringFormat = require('../../util/formatting/string-format'); +const AppSettingsModel = require('../../models/app-settings-model'); +const Launcher = require('../launcher'); let allowedKeys; diff --git a/app/scripts/comp/single-instance-checker.js b/app/scripts/comp/app/single-instance-checker.js similarity index 96% rename from app/scripts/comp/single-instance-checker.js rename to app/scripts/comp/app/single-instance-checker.js index af6903ec..079d199e 100644 --- a/app/scripts/comp/single-instance-checker.js +++ b/app/scripts/comp/app/single-instance-checker.js @@ -1,5 +1,5 @@ const Backbone = require('backbone'); -const Launcher = require('./launcher'); +const Launcher = require('../launcher'); const LocalStorageKeyName = 'instanceCheck'; const LocalStorageResponseKeyName = 'instanceMaster'; diff --git a/app/scripts/comp/updater.js b/app/scripts/comp/app/updater.js similarity index 96% rename from app/scripts/comp/updater.js rename to app/scripts/comp/app/updater.js index ad86986d..8361e77b 100644 --- a/app/scripts/comp/updater.js +++ b/app/scripts/comp/app/updater.js @@ -1,12 +1,12 @@ const Backbone = require('backbone'); -const RuntimeInfo = require('./runtime-info'); -const Links = require('../const/links'); -const Launcher = require('../comp/launcher'); -const AppSettingsModel = require('../models/app-settings-model'); -const UpdateModel = require('../models/update-model'); -const Transport = require('../comp/transport'); -const Logger = require('../util/logger'); -const SemVer = require('../util/data/semver'); +const RuntimeInfo = require('../app/runtime-info'); +const Links = require('../../const/links'); +const Launcher = require('../launcher'); +const AppSettingsModel = require('../../models/app-settings-model'); +const UpdateModel = require('../../models/update-model'); +const Transport = require('../browser/transport'); +const Logger = require('../../util/logger'); +const SemVer = require('../../util/data/semver'); const publicKey = require('public-key.pem').default; const logger = new Logger('updater'); diff --git a/app/scripts/comp/auth-receiver.js b/app/scripts/comp/browser/auth-receiver.js similarity index 92% rename from app/scripts/comp/auth-receiver.js rename to app/scripts/comp/browser/auth-receiver.js index 58fc2f40..27d51f9e 100644 --- a/app/scripts/comp/auth-receiver.js +++ b/app/scripts/comp/browser/auth-receiver.js @@ -1,5 +1,5 @@ -const Features = require('../util/features'); -const Storage = require('../storage'); +const Features = require('../../util/features'); +const Storage = require('../../storage'); const AuthReceiver = { receive() { diff --git a/app/scripts/comp/copy-paste.js b/app/scripts/comp/browser/copy-paste.js similarity index 95% rename from app/scripts/comp/copy-paste.js rename to app/scripts/comp/browser/copy-paste.js index 355285b2..0c911082 100644 --- a/app/scripts/comp/copy-paste.js +++ b/app/scripts/comp/browser/copy-paste.js @@ -1,6 +1,6 @@ const Backbone = require('backbone'); -const Launcher = require('./launcher'); -const AppSettingsModel = require('../models/app-settings-model'); +const Launcher = require('../launcher'); +const AppSettingsModel = require('../../models/app-settings-model'); const CopyPaste = { simpleCopy: !!(Launcher && Launcher.clipboardSupported), diff --git a/app/scripts/comp/feature-tester.js b/app/scripts/comp/browser/feature-tester.js similarity index 97% rename from app/scripts/comp/feature-tester.js rename to app/scripts/comp/browser/feature-tester.js index 817842df..4af0af07 100644 --- a/app/scripts/comp/feature-tester.js +++ b/app/scripts/comp/browser/feature-tester.js @@ -1,5 +1,5 @@ const kdbxweb = require('kdbxweb'); -const Features = require('../util/features'); +const Features = require('../../util/features'); const FeatureTester = { test() { diff --git a/app/scripts/comp/focus-detector.js b/app/scripts/comp/browser/focus-detector.js similarity index 91% rename from app/scripts/comp/focus-detector.js rename to app/scripts/comp/browser/focus-detector.js index 06412e2b..a1a71c49 100644 --- a/app/scripts/comp/focus-detector.js +++ b/app/scripts/comp/browser/focus-detector.js @@ -1,6 +1,6 @@ const Backbone = require('backbone'); -const Features = require('../util/features'); -const Launcher = require('../comp/launcher'); +const Features = require('../../util/features'); +const Launcher = require('../launcher'); const FocusDetector = { init() { diff --git a/app/scripts/comp/idle-tracker.js b/app/scripts/comp/browser/idle-tracker.js similarity index 90% rename from app/scripts/comp/idle-tracker.js rename to app/scripts/comp/browser/idle-tracker.js index 7ef25db5..b10a8a8b 100644 --- a/app/scripts/comp/idle-tracker.js +++ b/app/scripts/comp/browser/idle-tracker.js @@ -1,5 +1,5 @@ const Backbone = require('backbone'); -const AppSettingsModel = require('../models/app-settings-model'); +const AppSettingsModel = require('../../models/app-settings-model'); const IdleTracker = { actionTime: Date.now(), diff --git a/app/scripts/comp/key-handler.js b/app/scripts/comp/browser/key-handler.js similarity index 97% rename from app/scripts/comp/key-handler.js rename to app/scripts/comp/browser/key-handler.js index d86e20d6..e93baeaf 100644 --- a/app/scripts/comp/key-handler.js +++ b/app/scripts/comp/browser/key-handler.js @@ -1,6 +1,6 @@ const Backbone = require('backbone'); -const Keys = require('../const/keys'); -const IdleTracker = require('../comp/idle-tracker'); +const Keys = require('../../const/keys'); +const IdleTracker = require('./idle-tracker'); const shortcutKeyProp = navigator.platform.indexOf('Mac') >= 0 ? 'metaKey' : 'ctrlKey'; diff --git a/app/scripts/comp/popup-notifier.js b/app/scripts/comp/browser/popup-notifier.js similarity index 94% rename from app/scripts/comp/popup-notifier.js rename to app/scripts/comp/browser/popup-notifier.js index de08d565..80dd7bdd 100644 --- a/app/scripts/comp/popup-notifier.js +++ b/app/scripts/comp/browser/popup-notifier.js @@ -1,11 +1,11 @@ const Backbone = require('backbone'); -const Alerts = require('./alerts'); -const Launcher = require('./launcher'); +const Alerts = require('../ui/alerts'); +const Launcher = require('../launcher'); const AuthReceiver = require('./auth-receiver'); -const Links = require('../const/links'); -const Timeouts = require('../const/timeouts'); -const Locale = require('../util/locale'); -const Logger = require('../util/logger'); +const Links = require('../../const/links'); +const Timeouts = require('../../const/timeouts'); +const Locale = require('../../util/locale'); +const Logger = require('../../util/logger'); const PopupNotifier = { logger: null, diff --git a/app/scripts/comp/secure-input.js b/app/scripts/comp/browser/secure-input.js similarity index 100% rename from app/scripts/comp/secure-input.js rename to app/scripts/comp/browser/secure-input.js diff --git a/app/scripts/comp/transport.js b/app/scripts/comp/browser/transport.js similarity index 97% rename from app/scripts/comp/transport.js rename to app/scripts/comp/browser/transport.js index 4cbf8dc7..bc1ce2df 100644 --- a/app/scripts/comp/transport.js +++ b/app/scripts/comp/browser/transport.js @@ -1,5 +1,5 @@ -const Launcher = require('./launcher'); -const Logger = require('../util/logger'); +const Launcher = require('../launcher'); +const Logger = require('../../util/logger'); const logger = new Logger('transport'); diff --git a/app/scripts/comp/kdbx-to-html.js b/app/scripts/comp/format/kdbx-to-html.js similarity index 91% rename from app/scripts/comp/kdbx-to-html.js rename to app/scripts/comp/format/kdbx-to-html.js index 61789b67..22540ea7 100644 --- a/app/scripts/comp/kdbx-to-html.js +++ b/app/scripts/comp/format/kdbx-to-html.js @@ -1,10 +1,10 @@ const kdbxweb = require('kdbxweb'); -const StringFormat = require('../util/formatting/string-format'); -const DateFormat = require('../util/formatting/date-format'); -const Locale = require('../util/locale'); -const MdToHtml = require('../util/formatting/md-to-html'); -const Links = require('../const/links'); -const RuntimeInfo = require('./runtime-info'); +const StringFormat = require('../../util/formatting/string-format'); +const DateFormat = require('../../util/formatting/date-format'); +const Locale = require('../../util/locale'); +const MdToHtml = require('../../util/formatting/md-to-html'); +const Links = require('../../const/links'); +const RuntimeInfo = require('../app/runtime-info'); const Templates = { db: require('templates/export/db.hbs'), diff --git a/app/scripts/comp/otp-qr-reader.js b/app/scripts/comp/format/otp-qr-reader.js similarity index 95% rename from app/scripts/comp/otp-qr-reader.js rename to app/scripts/comp/format/otp-qr-reader.js index 3991438d..f457ff72 100644 --- a/app/scripts/comp/otp-qr-reader.js +++ b/app/scripts/comp/format/otp-qr-reader.js @@ -1,10 +1,10 @@ const Backbone = require('backbone'); -const Alerts = require('./alerts'); -const Locale = require('../util/locale'); -const Logger = require('../util/logger'); -const Features = require('../util/features'); -const Shortcuts = require('../comp/shortcuts'); -const Otp = require('../util/data/otp'); +const Alerts = require('../ui/alerts'); +const Locale = require('../../util/locale'); +const Logger = require('../../util/logger'); +const Features = require('../../util/features'); +const Shortcuts = require('../../comp/app/shortcuts'); +const Otp = require('../../util/data/otp'); const QrCode = require('jsqrcode'); const logger = new Logger('otp-qr-reader'); diff --git a/app/scripts/comp/launcher.js b/app/scripts/comp/launcher/index.js similarity index 100% rename from app/scripts/comp/launcher.js rename to app/scripts/comp/launcher/index.js diff --git a/app/scripts/comp/launcher-cordova.js b/app/scripts/comp/launcher/launcher-cordova.js similarity index 100% rename from app/scripts/comp/launcher-cordova.js rename to app/scripts/comp/launcher/launcher-cordova.js diff --git a/app/scripts/comp/launcher-electron.js b/app/scripts/comp/launcher/launcher-electron.js similarity index 100% rename from app/scripts/comp/launcher-electron.js rename to app/scripts/comp/launcher/launcher-electron.js diff --git a/app/scripts/comp/settings-manager.js b/app/scripts/comp/settings/settings-manager.js similarity index 96% rename from app/scripts/comp/settings-manager.js rename to app/scripts/comp/settings/settings-manager.js index 58020517..b6e20408 100644 --- a/app/scripts/comp/settings-manager.js +++ b/app/scripts/comp/settings/settings-manager.js @@ -1,6 +1,6 @@ const Backbone = require('backbone'); -const Locale = require('./../util/locale'); -const Features = require('../util/features'); +const Locale = require('../../util/locale'); +const Features = require('../../util/features'); const appleThemes = { macdark: 'setGenThemeMacDark' diff --git a/app/scripts/comp/settings-store.js b/app/scripts/comp/settings/settings-store.js similarity index 92% rename from app/scripts/comp/settings-store.js rename to app/scripts/comp/settings/settings-store.js index d88412f7..78cebbe1 100644 --- a/app/scripts/comp/settings-store.js +++ b/app/scripts/comp/settings/settings-store.js @@ -1,6 +1,6 @@ -const Launcher = require('./launcher'); -const StringFormat = require('../util/formatting/string-format'); -const Logger = require('../util/logger'); +const Launcher = require('../launcher'); +const StringFormat = require('../../util/formatting/string-format'); +const Logger = require('../../util/logger'); const logger = new Logger('settings'); diff --git a/app/scripts/comp/alerts.js b/app/scripts/comp/ui/alerts.js similarity index 96% rename from app/scripts/comp/alerts.js rename to app/scripts/comp/ui/alerts.js index 119d8cd7..389a58d7 100644 --- a/app/scripts/comp/alerts.js +++ b/app/scripts/comp/ui/alerts.js @@ -1,5 +1,5 @@ -const ModalView = require('../views/modal-view'); -const Locale = require('../util/locale'); +const ModalView = require('../../views/modal-view'); +const Locale = require('../../util/locale'); const Alerts = { alertDisplayed: false, diff --git a/app/scripts/models/app-model.js b/app/scripts/models/app-model.js index 9de0191d..30d663bb 100644 --- a/app/scripts/models/app-model.js +++ b/app/scripts/models/app-model.js @@ -17,7 +17,7 @@ const DateFormat = require('../util/formatting/date-format'); const UrlFormat = require('../util/formatting/url-format'); const AutoType = require('../auto-type'); const Launcher = require('../comp/launcher'); -const RuntimeInfo = require('../comp/runtime-info'); +const RuntimeInfo = require('../comp/app/runtime-info'); const PluginManager = require('../plugins/plugin-manager'); const Locale = require('../util/locale'); diff --git a/app/scripts/models/app-settings-model.js b/app/scripts/models/app-settings-model.js index 44c74103..fceb5183 100644 --- a/app/scripts/models/app-settings-model.js +++ b/app/scripts/models/app-settings-model.js @@ -1,5 +1,5 @@ const Backbone = require('backbone'); -const SettingsStore = require('../comp/settings-store'); +const SettingsStore = require('../comp/settings/settings-store'); const AppSettingsModel = Backbone.Model.extend({ defaults: { diff --git a/app/scripts/models/entry-model.js b/app/scripts/models/entry-model.js index 751d6148..791c89d8 100644 --- a/app/scripts/models/entry-model.js +++ b/app/scripts/models/entry-model.js @@ -6,7 +6,7 @@ const IconUrlFormat = require('../util/formatting/icon-url-format'); const Otp = require('../util/data/otp'); const kdbxweb = require('kdbxweb'); const Ranking = require('../util/data/ranking'); -const KdbxToHtml = require('../comp/kdbx-to-html'); +const KdbxToHtml = require('../comp/format/kdbx-to-html'); const EntryModel = Backbone.Model.extend({ defaults: {}, diff --git a/app/scripts/models/file-model.js b/app/scripts/models/file-model.js index f763025a..d59a64c1 100644 --- a/app/scripts/models/file-model.js +++ b/app/scripts/models/file-model.js @@ -3,7 +3,7 @@ const GroupCollection = require('../collections/group-collection'); const GroupModel = require('./group-model'); const IconUrlFormat = require('../util/formatting/icon-url-format'); const Logger = require('../util/logger'); -const KdbxToHtml = require('../comp/kdbx-to-html'); +const KdbxToHtml = require('../comp/format/kdbx-to-html'); const kdbxweb = require('kdbxweb'); const demoFileData = require('demo.kdbx'); diff --git a/app/scripts/models/runtime-data-model.js b/app/scripts/models/runtime-data-model.js index 2c7c805c..86702244 100644 --- a/app/scripts/models/runtime-data-model.js +++ b/app/scripts/models/runtime-data-model.js @@ -1,5 +1,5 @@ const Backbone = require('backbone'); -const SettingsStore = require('../comp/settings-store'); +const SettingsStore = require('../comp/settings/settings-store'); const RuntimeDataModel = Backbone.Model.extend({ defaults: {}, diff --git a/app/scripts/models/update-model.js b/app/scripts/models/update-model.js index a820a76e..352abecd 100644 --- a/app/scripts/models/update-model.js +++ b/app/scripts/models/update-model.js @@ -1,5 +1,5 @@ const Backbone = require('backbone'); -const SettingsStore = require('../comp/settings-store'); +const SettingsStore = require('../comp/settings/settings-store'); const UpdateModel = Backbone.Model.extend({ defaults: { diff --git a/app/scripts/plugins/plugin-gallery.js b/app/scripts/plugins/plugin-gallery.js index e946c0be..27f496bf 100644 --- a/app/scripts/plugins/plugin-gallery.js +++ b/app/scripts/plugins/plugin-gallery.js @@ -3,7 +3,7 @@ const kdbxweb = require('kdbxweb'); const Links = require('../const/links'); const SignatureVerifier = require('../util/data/signature-verifier'); const Logger = require('../util/logger'); -const SettingsStore = require('../comp/settings-store'); +const SettingsStore = require('../comp/settings/settings-store'); const PluginGallery = { logger: new Logger('plugin-gallery'), diff --git a/app/scripts/plugins/plugin-manager.js b/app/scripts/plugins/plugin-manager.js index d089eead..e4c62d9a 100644 --- a/app/scripts/plugins/plugin-manager.js +++ b/app/scripts/plugins/plugin-manager.js @@ -2,8 +2,8 @@ const Backbone = require('backbone'); const Plugin = require('./plugin'); const PluginCollection = require('./plugin-collection'); const PluginGallery = require('./plugin-gallery'); -const SettingsStore = require('../comp/settings-store'); -const RuntimeInfo = require('../comp/runtime-info'); +const SettingsStore = require('../comp/settings/settings-store'); +const RuntimeInfo = require('../comp/app/runtime-info'); const SignatureVerifier = require('../util/data/signature-verifier'); const Logger = require('../util/logger'); diff --git a/app/scripts/plugins/plugin.js b/app/scripts/plugins/plugin.js index 22f680d5..045c9371 100644 --- a/app/scripts/plugins/plugin.js +++ b/app/scripts/plugins/plugin.js @@ -3,13 +3,13 @@ const Backbone = require('backbone'); const PluginApi = require('./plugin-api'); const ThemeVars = require('./theme-vars'); const Logger = require('../util/logger'); -const SettingsManager = require('../comp/settings-manager'); +const SettingsManager = require('../comp/settings/settings-manager'); const IoCache = require('../storage/io-cache'); const AppSettingsModel = require('../models/app-settings-model'); const BaseLocale = require('../locales/base.json'); const SignatureVerifier = require('../util/data/signature-verifier'); const SemVer = require('../util/data/semver'); -const RuntimeInfo = require('../comp/runtime-info'); +const RuntimeInfo = require('../comp/app/runtime-info'); const commonLogger = new Logger('plugin'); const io = new IoCache({ diff --git a/app/scripts/views/app-view.js b/app/scripts/views/app-view.js index 78b8fe76..a93611ca 100644 --- a/app/scripts/views/app-view.js +++ b/app/scripts/views/app-view.js @@ -12,13 +12,13 @@ const OpenView = require('../views/open-view'); const SettingsView = require('../views/settings/settings-view'); const KeyChangeView = require('../views/key-change-view'); const DropdownView = require('../views/dropdown-view'); -const Alerts = require('../comp/alerts'); +const Alerts = require('../comp/ui/alerts'); const Keys = require('../const/keys'); const Timeouts = require('../const/timeouts'); -const KeyHandler = require('../comp/key-handler'); -const IdleTracker = require('../comp/idle-tracker'); +const KeyHandler = require('../comp/browser/key-handler'); +const IdleTracker = require('../comp/browser/idle-tracker'); const Launcher = require('../comp/launcher'); -const SettingsManager = require('../comp/settings-manager'); +const SettingsManager = require('../comp/settings/settings-manager'); const Locale = require('../util/locale'); const Features = require('../util/features'); const UpdateModel = require('../models/update-model'); diff --git a/app/scripts/views/auto-type/auto-type-select-view.js b/app/scripts/views/auto-type/auto-type-select-view.js index c60622c6..f65ce255 100644 --- a/app/scripts/views/auto-type/auto-type-select-view.js +++ b/app/scripts/views/auto-type/auto-type-select-view.js @@ -1,11 +1,11 @@ const Backbone = require('backbone'); const Keys = require('../../const/keys'); -const KeyHandler = require('../../comp/key-handler'); +const KeyHandler = require('../../comp/browser/key-handler'); const Locale = require('../../util/locale'); const AppSettingsModel = require('../../models/app-settings-model'); const EntryPresenter = require('../../presenters/entry-presenter'); const Scrollable = require('../../mixins/scrollable'); -const Shortcuts = require('../../comp/shortcuts'); +const Shortcuts = require('../../comp/app/shortcuts'); const DropdownView = require('../dropdown-view'); const StringFormat = require('../../util/formatting/string-format'); diff --git a/app/scripts/views/details/details-attachment-view.js b/app/scripts/views/details/details-attachment-view.js index e2d8ac75..59f18ee2 100644 --- a/app/scripts/views/details/details-attachment-view.js +++ b/app/scripts/views/details/details-attachment-view.js @@ -1,5 +1,5 @@ const Backbone = require('backbone'); -const Shortcuts = require('../../comp/shortcuts'); +const Shortcuts = require('../../comp/app/shortcuts'); const DetailsAttachmentView = Backbone.View.extend({ template: require('templates/details/details-attachment.hbs'), diff --git a/app/scripts/views/details/details-auto-type-view.js b/app/scripts/views/details/details-auto-type-view.js index 1d90d986..8ad7fbfb 100644 --- a/app/scripts/views/details/details-auto-type-view.js +++ b/app/scripts/views/details/details-auto-type-view.js @@ -1,7 +1,7 @@ const Backbone = require('backbone'); const AutoTypeHintView = require('../auto-type-hint-view'); const Locale = require('../../util/locale'); -const Shortcuts = require('../../comp/shortcuts'); +const Shortcuts = require('../../comp/app/shortcuts'); const AutoType = require('../../auto-type'); const DetailsAutoTypeView = Backbone.View.extend({ diff --git a/app/scripts/views/details/details-history-view.js b/app/scripts/views/details/details-history-view.js index 181f4c1f..abc5b0e2 100644 --- a/app/scripts/views/details/details-history-view.js +++ b/app/scripts/views/details/details-history-view.js @@ -1,10 +1,10 @@ const Backbone = require('backbone'); -const KeyHandler = require('../../comp/key-handler'); +const KeyHandler = require('../../comp/browser/key-handler'); const Keys = require('../../const/keys'); const DateFormat = require('../../util/formatting/date-format'); const StringFormat = require('../../util/formatting/string-format'); const Locale = require('../../util/locale'); -const Alerts = require('../../comp/alerts'); +const Alerts = require('../../comp/ui/alerts'); const FieldViewReadOnly = require('../fields/field-view-read-only'); const FieldViewReadOnlyRaw = require('../fields/field-view-read-only-raw'); const Copyable = require('../../mixins/copyable'); diff --git a/app/scripts/views/details/details-view.js b/app/scripts/views/details/details-view.js index 98799f58..6e591860 100644 --- a/app/scripts/views/details/details-view.js +++ b/app/scripts/views/details/details-view.js @@ -20,10 +20,10 @@ const DetailsAddFieldView = require('./details-add-field-view'); const DetailsAutoTypeView = require('./details-auto-type-view'); const DropdownView = require('../../views/dropdown-view'); const Keys = require('../../const/keys'); -const KeyHandler = require('../../comp/key-handler'); -const Alerts = require('../../comp/alerts'); -const CopyPaste = require('../../comp/copy-paste'); -const OtpQrReader = require('../../comp/otp-qr-reader'); +const KeyHandler = require('../../comp/browser/key-handler'); +const Alerts = require('../../comp/ui/alerts'); +const CopyPaste = require('../../comp/browser/copy-paste'); +const OtpQrReader = require('../../comp/format/otp-qr-reader'); const AutoType = require('../../auto-type'); const StringFormat = require('../../util/formatting/string-format'); const DateFormat = require('../../util/formatting/date-format'); diff --git a/app/scripts/views/dropdown-view.js b/app/scripts/views/dropdown-view.js index e0902f67..efa82491 100644 --- a/app/scripts/views/dropdown-view.js +++ b/app/scripts/views/dropdown-view.js @@ -1,6 +1,6 @@ const Backbone = require('backbone'); const Keys = require('../const/keys'); -const KeyHandler = require('../comp/key-handler'); +const KeyHandler = require('../comp/browser/key-handler'); const DropdownView = Backbone.View.extend({ template: require('templates/dropdown.hbs'), diff --git a/app/scripts/views/fields/field-view-text.js b/app/scripts/views/fields/field-view-text.js index 1d101fe6..452d3800 100644 --- a/app/scripts/views/fields/field-view-text.js +++ b/app/scripts/views/fields/field-view-text.js @@ -2,7 +2,7 @@ const Backbone = require('backbone'); const kdbxweb = require('kdbxweb'); const FieldView = require('./field-view'); const GeneratorView = require('../generator-view'); -const KeyHandler = require('../../comp/key-handler'); +const KeyHandler = require('../../comp/browser/key-handler'); const Keys = require('../../const/keys'); const PasswordGenerator = require('../../util/generators/password-generator'); const Features = require('../../util/features'); diff --git a/app/scripts/views/fields/field-view.js b/app/scripts/views/fields/field-view.js index e24b53a0..25727ab0 100644 --- a/app/scripts/views/fields/field-view.js +++ b/app/scripts/views/fields/field-view.js @@ -1,5 +1,5 @@ const Backbone = require('backbone'); -const CopyPaste = require('../../comp/copy-paste'); +const CopyPaste = require('../../comp/browser/copy-paste'); const Tip = require('../../util/ui/tip'); const FieldView = Backbone.View.extend({ diff --git a/app/scripts/views/footer-view.js b/app/scripts/views/footer-view.js index 80037037..91ed5296 100644 --- a/app/scripts/views/footer-view.js +++ b/app/scripts/views/footer-view.js @@ -1,6 +1,6 @@ const Backbone = require('backbone'); const Keys = require('../const/keys'); -const KeyHandler = require('../comp/key-handler'); +const KeyHandler = require('../comp/browser/key-handler'); const GeneratorView = require('./generator-view'); const UpdateModel = require('../models/update-model'); diff --git a/app/scripts/views/generator-presets-view.js b/app/scripts/views/generator-presets-view.js index 5470e153..0d524c2d 100644 --- a/app/scripts/views/generator-presets-view.js +++ b/app/scripts/views/generator-presets-view.js @@ -1,7 +1,7 @@ const Backbone = require('backbone'); const Scrollable = require('../mixins/scrollable'); const Locale = require('../util/locale'); -const GeneratorPresets = require('../comp/generator-presets'); +const GeneratorPresets = require('../comp/app/generator-presets'); const PasswordGenerator = require('../util/generators/password-generator'); const GeneratorPresetsView = Backbone.View.extend({ diff --git a/app/scripts/views/generator-view.js b/app/scripts/views/generator-view.js index 411fe801..ae754432 100644 --- a/app/scripts/views/generator-view.js +++ b/app/scripts/views/generator-view.js @@ -1,8 +1,8 @@ const Backbone = require('backbone'); const PasswordGenerator = require('../util/generators/password-generator'); -const CopyPaste = require('../comp/copy-paste'); +const CopyPaste = require('../comp/browser/copy-paste'); const AppSettingsModel = require('../models/app-settings-model'); -const GeneratorPresets = require('../comp/generator-presets'); +const GeneratorPresets = require('../comp/app/generator-presets'); const Locale = require('../util/locale'); const Tip = require('../util/ui/tip'); diff --git a/app/scripts/views/key-change-view.js b/app/scripts/views/key-change-view.js index 203cf125..301ac74e 100644 --- a/app/scripts/views/key-change-view.js +++ b/app/scripts/views/key-change-view.js @@ -1,6 +1,6 @@ const Backbone = require('backbone'); -const SecureInput = require('../comp/secure-input'); -const Alerts = require('../comp/alerts'); +const SecureInput = require('../comp/browser/secure-input'); +const Alerts = require('../comp/ui/alerts'); const Locale = require('../util/locale'); const InputFx = require('../util/ui/input-fx'); const Keys = require('../const/keys'); diff --git a/app/scripts/views/list-search-view.js b/app/scripts/views/list-search-view.js index 9aa8f97f..d770ab16 100644 --- a/app/scripts/views/list-search-view.js +++ b/app/scripts/views/list-search-view.js @@ -1,9 +1,9 @@ const Backbone = require('backbone'); const Keys = require('../const/keys'); -const KeyHandler = require('../comp/key-handler'); +const KeyHandler = require('../comp/browser/key-handler'); const DropdownView = require('./dropdown-view'); const Features = require('../util/features'); -const Shortcuts = require('../comp/shortcuts'); +const Shortcuts = require('../comp/app/shortcuts'); const StringFormat = require('../util/formatting/string-format'); const Locale = require('../util/locale'); const Comparators = require('../util/data/comparators'); diff --git a/app/scripts/views/list-view.js b/app/scripts/views/list-view.js index 48837b6b..c38dfe5f 100644 --- a/app/scripts/views/list-view.js +++ b/app/scripts/views/list-view.js @@ -5,11 +5,11 @@ const Scrollable = require('../mixins/scrollable'); const ListSearchView = require('./list-search-view'); const DropdownView = require('./dropdown-view'); const EntryPresenter = require('../presenters/entry-presenter'); -const DragDropInfo = require('../comp/drag-drop-info'); +const DragDropInfo = require('../comp/app/drag-drop-info'); const AppSettingsModel = require('../models/app-settings-model'); const Locale = require('../util/locale'); const StringFormat = require('../util/formatting/string-format'); -const Alerts = require('../comp/alerts'); +const Alerts = require('../comp/ui/alerts'); const ListView = Backbone.View.extend({ template: require('templates/list.hbs'), diff --git a/app/scripts/views/menu/menu-item-view.js b/app/scripts/views/menu/menu-item-view.js index e51876ac..037275e3 100644 --- a/app/scripts/views/menu/menu-item-view.js +++ b/app/scripts/views/menu/menu-item-view.js @@ -1,8 +1,8 @@ const Backbone = require('backbone'); -const KeyHandler = require('../../comp/key-handler'); +const KeyHandler = require('../../comp/browser/key-handler'); const Keys = require('../../const/keys'); -const Alerts = require('../../comp/alerts'); -const DragDropInfo = require('../../comp/drag-drop-info'); +const Alerts = require('../../comp/ui/alerts'); +const DragDropInfo = require('../../comp/app/drag-drop-info'); const Locale = require('../../util/locale'); const MenuItemView = Backbone.View.extend({ diff --git a/app/scripts/views/menu/menu-view.js b/app/scripts/views/menu/menu-view.js index 05367f60..0259f693 100644 --- a/app/scripts/views/menu/menu-view.js +++ b/app/scripts/views/menu/menu-view.js @@ -1,6 +1,6 @@ const Backbone = require('backbone'); const Keys = require('../../const/keys'); -const KeyHandler = require('../../comp/key-handler'); +const KeyHandler = require('../../comp/browser/key-handler'); const Resizable = require('../../mixins/resizable'); const MenuSectionView = require('./menu-section-view'); const DragView = require('../drag-view'); diff --git a/app/scripts/views/modal-view.js b/app/scripts/views/modal-view.js index 35d5b2e4..38ff2aa5 100644 --- a/app/scripts/views/modal-view.js +++ b/app/scripts/views/modal-view.js @@ -1,6 +1,6 @@ const Backbone = require('backbone'); const Keys = require('../const/keys'); -const KeyHandler = require('../comp/key-handler'); +const KeyHandler = require('../comp/browser/key-handler'); const ModalView = Backbone.View.extend({ el: 'body', diff --git a/app/scripts/views/open-view.js b/app/scripts/views/open-view.js index 969faccf..2e8d34c0 100644 --- a/app/scripts/views/open-view.js +++ b/app/scripts/views/open-view.js @@ -2,10 +2,10 @@ const Backbone = require('backbone'); const kdbxweb = require('kdbxweb'); const OpenConfigView = require('./open-config-view'); const Keys = require('../const/keys'); -const Alerts = require('../comp/alerts'); -const SecureInput = require('../comp/secure-input'); -const DropboxChooser = require('../comp/dropbox-chooser'); -const KeyHandler = require('../comp/key-handler'); +const Alerts = require('../comp/ui/alerts'); +const SecureInput = require('../comp/browser/secure-input'); +const DropboxChooser = require('../comp/app/dropbox-chooser'); +const KeyHandler = require('../comp/browser/key-handler'); const StorageFileListView = require('../views/storage-file-list-view'); const Logger = require('../util/logger'); const Locale = require('../util/locale'); @@ -14,7 +14,7 @@ const InputFx = require('../util/ui/input-fx'); const Comparators = require('../util/data/comparators'); const Storage = require('../storage'); const Launcher = require('../comp/launcher'); -const FocusDetector = require('../comp/focus-detector'); +const FocusDetector = require('../comp/browser/focus-detector'); const Features = require('../util/features'); const logger = new Logger('open-view'); diff --git a/app/scripts/views/settings/settings-about-view.js b/app/scripts/views/settings/settings-about-view.js index 848d218c..beaa83dc 100644 --- a/app/scripts/views/settings/settings-about-view.js +++ b/app/scripts/views/settings/settings-about-view.js @@ -1,5 +1,5 @@ const Backbone = require('backbone'); -const RuntimeInfo = require('../../comp/runtime-info'); +const RuntimeInfo = require('../../comp/app/runtime-info'); const Links = require('../../const/links'); const SettingsAboutView = Backbone.View.extend({ diff --git a/app/scripts/views/settings/settings-file-view.js b/app/scripts/views/settings/settings-file-view.js index 0fd8d061..699d8d54 100644 --- a/app/scripts/views/settings/settings-file-view.js +++ b/app/scripts/views/settings/settings-file-view.js @@ -1,8 +1,8 @@ const Backbone = require('backbone'); const OpenConfigView = require('../open-config-view'); -const Shortcuts = require('../../comp/shortcuts'); +const Shortcuts = require('../../comp/app/shortcuts'); const PasswordGenerator = require('../../util/generators/password-generator'); -const Alerts = require('../../comp/alerts'); +const Alerts = require('../../comp/ui/alerts'); const Launcher = require('../../comp/launcher'); const Storage = require('../../storage'); const Links = require('../../const/links'); diff --git a/app/scripts/views/settings/settings-general-view.js b/app/scripts/views/settings/settings-general-view.js index a12a2a92..1594843d 100644 --- a/app/scripts/views/settings/settings-general-view.js +++ b/app/scripts/views/settings/settings-general-view.js @@ -2,13 +2,13 @@ const Backbone = require('backbone'); const SettingsPrvView = require('./settings-prv-view'); const SettingsLogsView = require('./settings-logs-view'); const Launcher = require('../../comp/launcher'); -const Updater = require('../../comp/updater'); +const Updater = require('../../comp/app/updater'); const DateFormat = require('../../util/formatting/date-format'); const AppSettingsModel = require('../../models/app-settings-model'); const UpdateModel = require('../../models/update-model'); -const RuntimeInfo = require('../../comp/runtime-info'); -const Alerts = require('../../comp/alerts'); -const SettingsManager = require('../../comp/settings-manager'); +const RuntimeInfo = require('../../comp/app/runtime-info'); +const Alerts = require('../../comp/ui/alerts'); +const SettingsManager = require('../../comp/settings/settings-manager'); const Storage = require('../../storage'); const Features = require('../../util/features'); const Locale = require('../../util/locale'); diff --git a/app/scripts/views/settings/settings-help-view.js b/app/scripts/views/settings/settings-help-view.js index 10e0d8dc..5235f155 100644 --- a/app/scripts/views/settings/settings-help-view.js +++ b/app/scripts/views/settings/settings-help-view.js @@ -1,5 +1,5 @@ const Backbone = require('backbone'); -const RuntimeInfo = require('../../comp/runtime-info'); +const RuntimeInfo = require('../../comp/app/runtime-info'); const Links = require('../../const/links'); const SettingsHelpView = Backbone.View.extend({ diff --git a/app/scripts/views/settings/settings-plugins-view.js b/app/scripts/views/settings/settings-plugins-view.js index ab405876..60513dfe 100644 --- a/app/scripts/views/settings/settings-plugins-view.js +++ b/app/scripts/views/settings/settings-plugins-view.js @@ -5,10 +5,10 @@ const PluginGallery = require('../../plugins/plugin-gallery'); const AppSettingsModel = require('../../models/app-settings-model'); const Comparators = require('../../util/data/comparators'); const DateFormat = require('../../util/formatting/date-format'); -const SettingsManager = require('../../comp/settings-manager'); +const SettingsManager = require('../../comp/settings/settings-manager'); const Features = require('../../util/features'); const SemVer = require('../../util/data/semver'); -const RuntimeInfo = require('../../comp/runtime-info'); +const RuntimeInfo = require('../../comp/app/runtime-info'); const Links = require('../../const/links'); const SettingsPluginsView = Backbone.View.extend({ diff --git a/app/scripts/views/settings/settings-shortcuts-view.js b/app/scripts/views/settings/settings-shortcuts-view.js index f218cd87..13155b37 100644 --- a/app/scripts/views/settings/settings-shortcuts-view.js +++ b/app/scripts/views/settings/settings-shortcuts-view.js @@ -2,7 +2,7 @@ const Backbone = require('backbone'); const Locale = require('../../util/locale'); const Keys = require('../../const/keys'); const Launcher = require('../../comp/launcher'); -const Shortcuts = require('../../comp/shortcuts'); +const Shortcuts = require('../../comp/app/shortcuts'); const Features = require('../../util/features'); const SettingsShortcutsView = Backbone.View.extend({ diff --git a/app/scripts/views/settings/settings-view.js b/app/scripts/views/settings/settings-view.js index 6b03d876..1ce38b70 100644 --- a/app/scripts/views/settings/settings-view.js +++ b/app/scripts/views/settings/settings-view.js @@ -1,7 +1,7 @@ const Backbone = require('backbone'); const Scrollable = require('../../mixins/scrollable'); const Keys = require('../../const/keys'); -const KeyHandler = require('../../comp/key-handler'); +const KeyHandler = require('../../comp/browser/key-handler'); const SettingsView = Backbone.View.extend({ template: require('templates/settings/settings.hbs'), diff --git a/app/scripts/views/tag-view.js b/app/scripts/views/tag-view.js index 1d7634f7..54f30ad6 100644 --- a/app/scripts/views/tag-view.js +++ b/app/scripts/views/tag-view.js @@ -1,6 +1,6 @@ const Backbone = require('backbone'); const Locale = require('../util/locale'); -const Alerts = require('../comp/alerts'); +const Alerts = require('../comp/ui/alerts'); const TagView = Backbone.View.extend({ template: require('templates/tag.hbs'),