better imports organization

src/components/settings_modal/admin_tabs/emoji_tab.js

@@ -1,3 +1,17 @@
+import Checkbox from 'components/checkbox/checkbox.vue'
+import ConfirmModal from 'components/confirm_modal/confirm_modal.vue'
+import Popover from 'components/popover/popover.vue'
+import Select from 'components/select/select.vue'
+import StillImage from 'components/still-image/still-image.vue'
+import { assign, clone } from 'lodash'
+
+import TabSwitcher from 'src/components/tab_switcher/tab_switcher.jsx'
+import { useInterfaceStore } from 'src/stores/interface'
+import EmojiEditingPopover from '../helpers/emoji_editing_popover.vue'
+import ModifiedIndicator from '../helpers/modified_indicator.vue'
+import SharedComputedObject from '../helpers/shared_computed_object.js'
+import StringSetting from '../helpers/string_setting.vue'
+
 import { library } from '@fortawesome/fontawesome-svg-core'
 import {
   faArrowsRotate,
@@ -5,18 +19,6 @@ import {
   faFolderOpen,
   faServer,
 } from '@fortawesome/free-solid-svg-icons'
-import Checkbox from 'components/checkbox/checkbox.vue'
-import ConfirmModal from 'components/confirm_modal/confirm_modal.vue'
-import Popover from 'components/popover/popover.vue'
-import Select from 'components/select/select.vue'
-import StillImage from 'components/still-image/still-image.vue'
-import { assign, clone } from 'lodash'
-import TabSwitcher from 'src/components/tab_switcher/tab_switcher.jsx'
-import { useInterfaceStore } from 'src/stores/interface'
-import EmojiEditingPopover from '../helpers/emoji_editing_popover.vue'
-import ModifiedIndicator from '../helpers/modified_indicator.vue'
-import SharedComputedObject from '../helpers/shared_computed_object.js'
-import StringSetting from '../helpers/string_setting.vue'
 
 library.add(faArrowsRotate, faFolderOpen, faDownload, faServer)
 

src/components/settings_modal/admin_tabs/frontends_tab.js

@@ -1,5 +1,3 @@
-import { library } from '@fortawesome/fontawesome-svg-core'
-import { faGlobe } from '@fortawesome/free-solid-svg-icons'
 import PanelLoading from 'src/components/panel_loading/panel_loading.vue'
 import Popover from 'src/components/popover/popover.vue'
 import { useInterfaceStore } from 'src/stores/interface'
@@ -10,6 +8,9 @@ import IntegerSetting from '../helpers/integer_setting.vue'
 import SharedComputedObject from '../helpers/shared_computed_object.js'
 import StringSetting from '../helpers/string_setting.vue'
 
+import { library } from '@fortawesome/fontawesome-svg-core'
+import { faGlobe } from '@fortawesome/free-solid-svg-icons'
+
 library.add(faGlobe)
 
 const FrontendsTab = {

src/components/settings_modal/admin_tabs/http_tab.js

@@ -1,4 +1,5 @@
 import { get } from 'lodash'
+
 import AttachmentSetting from '../helpers/attachment_setting.vue'
 import BooleanSetting from '../helpers/boolean_setting.vue'
 import ChoiceSetting from '../helpers/choice_setting.vue'

src/components/settings_modal/admin_tabs/instance_tab.js

@@ -1,4 +1,5 @@
 import { get } from 'lodash'
+
 import AttachmentSetting from '../helpers/attachment_setting.vue'
 import BooleanSetting from '../helpers/boolean_setting.vue'
 import ChoiceSetting from '../helpers/choice_setting.vue'
@@ -8,7 +9,6 @@ import IntegerSetting from '../helpers/integer_setting.vue'
 import ListSetting from '../helpers/list_setting.vue'
 import MapSetting from '../helpers/map_setting.vue'
 import PWAManifestIconsSetting from '../helpers/pwa_manifest_icons_setting.vue'
-
 import SharedComputedObject from '../helpers/shared_computed_object.js'
 import StringSetting from '../helpers/string_setting.vue'
 

src/components/settings_modal/admin_tabs/links_tab.js

@@ -1,4 +1,5 @@
 import { get } from 'lodash'
+
 import Checkbox from 'src/components/checkbox/checkbox.vue'
 import AttachmentSetting from '../helpers/attachment_setting.vue'
 import BooleanSetting from '../helpers/boolean_setting.vue'
@@ -6,7 +7,6 @@ import ChoiceSetting from '../helpers/choice_setting.vue'
 import GroupSetting from '../helpers/group_setting.vue'
 import IntegerSetting from '../helpers/integer_setting.vue'
 import ListSetting from '../helpers/list_setting.vue'
-
 import SharedComputedObject from '../helpers/shared_computed_object.js'
 import StringSetting from '../helpers/string_setting.vue'
 

src/components/settings_modal/admin_tabs/monitoring_tab.js

@@ -1,5 +1,3 @@
-import { library } from '@fortawesome/fontawesome-svg-core'
-import { faGlobe } from '@fortawesome/free-solid-svg-icons'
 import AttachmentSetting from '../helpers/attachment_setting.vue'
 import BooleanSetting from '../helpers/boolean_setting.vue'
 import ChoiceSetting from '../helpers/choice_setting.vue'
@@ -9,6 +7,9 @@ import ListSetting from '../helpers/list_setting.vue'
 import SharedComputedObject from '../helpers/shared_computed_object.js'
 import StringSetting from '../helpers/string_setting.vue'
 
+import { library } from '@fortawesome/fontawesome-svg-core'
+import { faGlobe } from '@fortawesome/free-solid-svg-icons'
+
 library.add(faGlobe)
 
 const MonitoringTab = {

src/components/settings_modal/admin_tabs/rates_tab.js

@@ -1,5 +1,4 @@
 import RateSetting from '../helpers/rate_setting.vue'
-
 import SharedComputedObject from '../helpers/shared_computed_object.js'
 
 const RatesTab = {

src/components/settings_modal/helpers/draft_buttons.vue

@@ -57,9 +57,10 @@
 </template>
 
 <script>
+import Popover from 'src/components/popover/popover.vue'
+
 import { library } from '@fortawesome/fontawesome-svg-core'
 import { faWrench } from '@fortawesome/free-solid-svg-icons'
-import Popover from 'src/components/popover/popover.vue'
 
 library.add(faWrench)
 

src/components/settings_modal/helpers/help_indicator.vue

@@ -18,9 +18,10 @@
 </template>
 
 <script>
+import Popover from 'src/components/popover/popover.vue'
+
 import { library } from '@fortawesome/fontawesome-svg-core'
 import { faCircleQuestion } from '@fortawesome/free-solid-svg-icons'
-import Popover from 'src/components/popover/popover.vue'
 
 library.add(faCircleQuestion)
 

src/components/settings_modal/helpers/modified_indicator.vue

@@ -23,9 +23,10 @@
 </template>
 
 <script>
+import Popover from 'src/components/popover/popover.vue'
+
 import { library } from '@fortawesome/fontawesome-svg-core'
 import { faWrench } from '@fortawesome/free-solid-svg-icons'
-import Popover from 'src/components/popover/popover.vue'
 
 library.add(faWrench)
 

src/components/settings_modal/helpers/profile_setting_indicator.vue

@@ -23,9 +23,10 @@
 </template>
 
 <script>
+import Popover from 'src/components/popover/popover.vue'
+
 import { library } from '@fortawesome/fontawesome-svg-core'
 import { faServer } from '@fortawesome/free-solid-svg-icons'
-import Popover from 'src/components/popover/popover.vue'
 
 library.add(faServer)
 

src/components/settings_modal/helpers/pwa_manifest_icons_setting.js

@@ -1,4 +1,5 @@
 import { clone } from 'lodash'
+
 import Attachment from 'src/components/attachment/attachment.vue'
 import MediaUpload from 'src/components/media_upload/media_upload.vue'
 import Select from 'src/components/select/select.vue'

src/components/settings_modal/helpers/setting.js

@@ -1,4 +1,5 @@
 import { cloneDeep, get, isEqual, set } from 'lodash'
+
 import DraftButtons from './draft_buttons.vue'
 import ModifiedIndicator from './modified_indicator.vue'
 import ProfileSettingIndicator from './profile_setting_indicator.vue'

src/components/settings_modal/helpers/vertical_tab_switcher.jsx

@@ -1,11 +1,13 @@
 // eslint-disable-next-line no-unused
 
-import { FontAwesomeIcon as FAIcon } from '@fortawesome/vue-fontawesome'
 import { throttle } from 'lodash'
 import { mapState as mapPiniaState, mapState } from 'pinia'
 import { Fragment, h } from 'vue'
 
+import { FontAwesomeIcon as FAIcon } from '@fortawesome/vue-fontawesome'
+
 import './vertical_tab_switcher.scss'
+
 import { useInterfaceStore } from 'src/stores/interface'
 
 const findFirstUsable = (slots) => slots.findIndex((_) => _.props)

src/components/settings_modal/settings_modal.js

@@ -1,13 +1,6 @@
-import { library } from '@fortawesome/fontawesome-svg-core'
-import { faWindowMinimize } from '@fortawesome/free-regular-svg-icons'
-import {
-  faChevronDown,
-  faFileDownload,
-  faFileUpload,
-  faTimes,
-} from '@fortawesome/free-solid-svg-icons'
 import { cloneDeep, isEqual } from 'lodash'
 import { mapActions, mapState } from 'pinia'
+
 import AsyncComponentError from 'src/components/async_component_error/async_component_error.vue'
 import Checkbox from 'src/components/checkbox/checkbox.vue'
 import ConfirmModal from 'src/components/confirm_modal/confirm_modal.vue'
@@ -21,6 +14,15 @@ import getResettableAsyncComponent from 'src/services/resettable_async_component
 import { useInterfaceStore } from 'src/stores/interface'
 import Popover from '../popover/popover.vue'
 
+import { library } from '@fortawesome/fontawesome-svg-core'
+import { faWindowMinimize } from '@fortawesome/free-regular-svg-icons'
+import {
+  faChevronDown,
+  faFileDownload,
+  faFileUpload,
+  faTimes,
+} from '@fortawesome/free-solid-svg-icons'
+
 const PLEROMAFE_SETTINGS_MAJOR_VERSION = 1
 const PLEROMAFE_SETTINGS_MINOR_VERSION = 0
 

src/components/settings_modal/settings_modal_admin_content.js

@@ -1,22 +1,3 @@
-import { library } from '@fortawesome/fontawesome-svg-core'
-import {
-  faChain,
-  faChartLine,
-  faCircleNodes,
-  faDoorOpen,
-  faEllipsis,
-  faEnvelope,
-  faGauge,
-  faGears,
-  faGlobe,
-  faHand,
-  faKey,
-  faLaptopCode,
-  faMessage,
-  faTowerBroadcast,
-  faUpload,
-  faWrench,
-} from '@fortawesome/free-solid-svg-icons'
 import { useInterfaceStore } from 'src/stores/interface'
 import AuthTab from './admin_tabs/auth_tab.vue'
 import EmojiTab from './admin_tabs/emoji_tab.vue'
@@ -37,6 +18,26 @@ import RegistrationsTab from './admin_tabs/registrations_tab.vue'
 import UploadsTab from './admin_tabs/uploads_tab.vue'
 import VerticalTabSwitcher from './helpers/vertical_tab_switcher.jsx'
 
+import { library } from '@fortawesome/fontawesome-svg-core'
+import {
+  faChain,
+  faChartLine,
+  faCircleNodes,
+  faDoorOpen,
+  faEllipsis,
+  faEnvelope,
+  faGauge,
+  faGears,
+  faGlobe,
+  faHand,
+  faKey,
+  faLaptopCode,
+  faMessage,
+  faTowerBroadcast,
+  faUpload,
+  faWrench,
+} from '@fortawesome/free-solid-svg-icons'
+
 library.add(
   faWrench,
   faHand,

src/components/settings_modal/settings_modal_user_content.js

@@ -1,20 +1,3 @@
-import { library } from '@fortawesome/fontawesome-svg-core'
-import {
-  faBell,
-  faBroom,
-  faCode,
-  faColumns,
-  faDownload,
-  faEyeSlash,
-  faFilter,
-  faLock,
-  faMessage,
-  faPaintBrush,
-  faPalette,
-  faUser,
-  faWindowRestore,
-  faWrench,
-} from '@fortawesome/free-solid-svg-icons'
 import { useInterfaceStore } from 'src/stores/interface'
 import VerticalTabSwitcher from './helpers/vertical_tab_switcher.jsx'
 import AppearanceTab from './tabs/appearance_tab.vue'
@@ -33,6 +16,24 @@ import ProfileTab from './tabs/profile_tab.vue'
 import SecurityTab from './tabs/security_tab/security_tab.vue'
 import StyleTab from './tabs/style_tab/style_tab.vue'
 
+import { library } from '@fortawesome/fontawesome-svg-core'
+import {
+  faBell,
+  faBroom,
+  faCode,
+  faColumns,
+  faDownload,
+  faEyeSlash,
+  faFilter,
+  faLock,
+  faMessage,
+  faPaintBrush,
+  faPalette,
+  faUser,
+  faWindowRestore,
+  faWrench,
+} from '@fortawesome/free-solid-svg-icons'
+
 library.add(
   faWrench,
   faUser,

src/components/settings_modal/tabs/appearance_tab.js

@@ -1,4 +1,5 @@
 import { mapActions } from 'pinia'
+
 import fileSizeFormatService from 'src/components/../services/file_size_format/file_size_format.js'
 import PaletteEditor from 'src/components/palette_editor/palette_editor.vue'
 import { newImporter } from 'src/services/export_import/export_import.js'

src/components/settings_modal/tabs/clutter_tab.js

@@ -1,10 +1,10 @@
 import { mapActions, mapState } from 'pinia'
-import Checkbox from 'src/components/checkbox/checkbox.vue'
-import Select from 'src/components/select/select.vue'
-
-import { useServerSideStorageStore } from 'src/stores/serverSideStorage'
 import { v4 as uuidv4 } from 'uuid'
 import { mapState as mapVuexState } from 'vuex'
+
+import Checkbox from 'src/components/checkbox/checkbox.vue'
+import Select from 'src/components/select/select.vue'
+import { useServerSideStorageStore } from 'src/stores/serverSideStorage'
 import BooleanSetting from '../helpers/boolean_setting.vue'
 import ChoiceSetting from '../helpers/choice_setting.vue'
 import HelpIndicator from '../helpers/help_indicator.vue'

src/components/settings_modal/tabs/composing_tab.js

@@ -1,3 +1,19 @@
+import { mapState } from 'vuex'
+
+import FontControl from 'src/components/font_control/font_control.vue'
+import InterfaceLanguageSwitcher from 'src/components/interface_language_switcher/interface_language_switcher.vue'
+import ScopeSelector from 'src/components/scope_selector/scope_selector.vue'
+import Select from 'src/components/select/select.vue'
+import localeService from 'src/services/locale/locale.service.js'
+import { cacheKey, clearCache, emojiCacheKey } from 'src/services/sw/sw.js'
+import BooleanSetting from '../helpers/boolean_setting.vue'
+import ChoiceSetting from '../helpers/choice_setting.vue'
+import FloatSetting from '../helpers/float_setting.vue'
+import IntegerSetting from '../helpers/integer_setting.vue'
+import ProfileSettingIndicator from '../helpers/profile_setting_indicator.vue'
+import SharedComputedObject from '../helpers/shared_computed_object.js'
+import UnitSetting from '../helpers/unit_setting.vue'
+
 import { library } from '@fortawesome/fontawesome-svg-core'
 import {
   faDatabase,
@@ -6,20 +22,6 @@ import {
   faPenAlt,
   faSliders,
 } from '@fortawesome/free-solid-svg-icons'
-import FontControl from 'src/components/font_control/font_control.vue'
-import InterfaceLanguageSwitcher from 'src/components/interface_language_switcher/interface_language_switcher.vue'
-import ScopeSelector from 'src/components/scope_selector/scope_selector.vue'
-import Select from 'src/components/select/select.vue'
-import localeService from 'src/services/locale/locale.service.js'
-import { cacheKey, clearCache, emojiCacheKey } from 'src/services/sw/sw.js'
-import { mapState } from 'vuex'
-import BooleanSetting from '../helpers/boolean_setting.vue'
-import ChoiceSetting from '../helpers/choice_setting.vue'
-import FloatSetting from '../helpers/float_setting.vue'
-import IntegerSetting from '../helpers/integer_setting.vue'
-import ProfileSettingIndicator from '../helpers/profile_setting_indicator.vue'
-import SharedComputedObject from '../helpers/shared_computed_object.js'
-import UnitSetting from '../helpers/unit_setting.vue'
 
 library.add(faGlobe, faMessage, faPenAlt, faDatabase, faSliders)
 

src/components/settings_modal/tabs/data_import_export_tab.js

@@ -1,8 +1,9 @@
+import { mapState } from 'vuex'
+
 import Checkbox from 'src/components/checkbox/checkbox.vue'
 import Exporter from 'src/components/exporter/exporter.vue'
 import Importer from 'src/components/importer/importer.vue'
 import { useOAuthTokensStore } from 'src/stores/oauth_tokens'
-import { mapState } from 'vuex'
 
 const DataImportExportTab = {
   data() {

src/components/settings_modal/tabs/filtering_tab.js

@@ -1,5 +1,8 @@
 import { cloneDeep } from 'lodash'
 import { mapActions, mapState } from 'pinia'
+import { v4 as uuidv4 } from 'uuid'
+import { mapState as mapVuexState } from 'vuex'
+
 import Checkbox from 'src/components/checkbox/checkbox.vue'
 import Select from 'src/components/select/select.vue'
 import {
@@ -8,8 +11,6 @@ import {
 } from 'src/services/export_import/export_import.js'
 import { useInterfaceStore } from 'src/stores/interface'
 import { useServerSideStorageStore } from 'src/stores/serverSideStorage'
-import { v4 as uuidv4 } from 'uuid'
-import { mapState as mapVuexState } from 'vuex'
 import BooleanSetting from '../helpers/boolean_setting.vue'
 import ChoiceSetting from '../helpers/choice_setting.vue'
 import HelpIndicator from '../helpers/help_indicator.vue'

src/components/settings_modal/tabs/general_tab.js

@@ -1,12 +1,12 @@
+import { mapState } from 'vuex'
+
 import FontControl from 'src/components/font_control/font_control.vue'
 import InterfaceLanguageSwitcher from 'src/components/interface_language_switcher/interface_language_switcher.vue'
 import localeService from 'src/services/locale/locale.service.js'
-import { mapState } from 'vuex'
 import BooleanSetting from '../helpers/boolean_setting.vue'
 import ChoiceSetting from '../helpers/choice_setting.vue'
 import FloatSetting from '../helpers/float_setting.vue'
 import ProfileSettingIndicator from '../helpers/profile_setting_indicator.vue'
-
 import SharedComputedObject from '../helpers/shared_computed_object.js'
 import UnitSetting from '../helpers/unit_setting.vue'
 

src/components/settings_modal/tabs/mutes_and_blocks_tab.js

@@ -1,6 +1,7 @@
 import get from 'lodash/get'
 import map from 'lodash/map'
 import reject from 'lodash/reject'
+
 import withLoadMore from 'src/components/../hocs/with_load_more/with_load_more'
 import withSubscription from 'src/components/../hocs/with_subscription/with_subscription'
 import Autosuggest from 'src/components/autosuggest/autosuggest.vue'

src/components/settings_modal/tabs/old_theme_tab/theme_preview.vue

@@ -118,6 +118,8 @@
 </template>
 
 <script>
+import Checkbox from 'src/components/checkbox/checkbox.vue'
+
 import { library } from '@fortawesome/fontawesome-svg-core'
 import {
   faReply,
@@ -125,7 +127,6 @@ import {
   faStar,
   faTimes,
 } from '@fortawesome/free-solid-svg-icons'
-import Checkbox from 'src/components/checkbox/checkbox.vue'
 
 library.add(faTimes, faStar, faRetweet, faReply)
 

src/components/settings_modal/tabs/posts_tab.js

@@ -3,7 +3,6 @@ import BooleanSetting from '../helpers/boolean_setting.vue'
 import ChoiceSetting from '../helpers/choice_setting.vue'
 import IntegerSetting from '../helpers/integer_setting.vue'
 import ProfileSettingIndicator from '../helpers/profile_setting_indicator.vue'
-
 import SharedComputedObject from '../helpers/shared_computed_object.js'
 
 const GeneralTab = {

src/components/settings_modal/tabs/profile_tab.js

@@ -1,14 +1,15 @@
+import Checkbox from 'src/components/checkbox/checkbox.vue'
+import UserCard from 'src/components/user_card/user_card.vue'
+import BooleanSetting from '../helpers/boolean_setting.vue'
+import ProfileSettingIndicator from '../helpers/profile_setting_indicator.vue'
+import SharedComputedObject from '../helpers/shared_computed_object.js'
+
 import { library } from '@fortawesome/fontawesome-svg-core'
 import {
   faCircleNotch,
   faPlus,
   faTimes,
 } from '@fortawesome/free-solid-svg-icons'
-import Checkbox from 'src/components/checkbox/checkbox.vue'
-import UserCard from 'src/components/user_card/user_card.vue'
-import BooleanSetting from '../helpers/boolean_setting.vue'
-import ProfileSettingIndicator from '../helpers/profile_setting_indicator.vue'
-import SharedComputedObject from '../helpers/shared_computed_object.js'
 
 library.add(faTimes, faPlus, faCircleNotch)
 

src/components/settings_modal/tabs/security_tab/mfa.js

@@ -1,5 +1,6 @@
 import VueQrcode from '@chenfengyuan/vue-qrcode'
 import { mapState } from 'vuex'
+
 import Confirm from './confirm.vue'
 import RecoveryCodes from './mfa_backup_codes.vue'
 import TOTP from './mfa_totp.vue'

src/components/settings_modal/tabs/security_tab/mfa_totp.js

@@ -1,4 +1,5 @@
 import { mapState } from 'vuex'
+
 import Confirm from './confirm.vue'
 
 export default {

src/components/settings_modal/tabs/style_tab/style_tab.js

@@ -1,12 +1,13 @@
-import { library } from '@fortawesome/fontawesome-svg-core'
-import {
-  faArrowsRotate,
-  faCheck,
-  faFile,
-  faFloppyDisk,
-  faFolderOpen,
-} from '@fortawesome/free-solid-svg-icons'
 import { get, set, throttle, unset } from 'lodash'
+import {
+  computed,
+  getCurrentInstance,
+  provide,
+  reactive,
+  ref,
+  watch,
+} from 'vue'
+
 import Checkbox from 'src/components/checkbox/checkbox.vue'
 import ColorInput from 'src/components/color_input/color_input.vue'
 import ComponentPreview from 'src/components/component_preview/component_preview.vue'
@@ -43,18 +44,19 @@ import {
   init,
 } from 'src/services/theme_data/theme_data_3.service.js'
 import { useInterfaceStore } from 'src/stores/interface'
-import {
-  computed,
-  getCurrentInstance,
-  provide,
-  reactive,
-  ref,
-  watch,
-} from 'vue'
 import StringSetting from '../../helpers/string_setting.vue'
 import Preview from '../old_theme_tab/theme_preview.vue'
 import VirtualDirectivesTab from './virtual_directives_tab.vue'
 
+import { library } from '@fortawesome/fontawesome-svg-core'
+import {
+  faArrowsRotate,
+  faCheck,
+  faFile,
+  faFloppyDisk,
+  faFolderOpen,
+} from '@fortawesome/free-solid-svg-icons'
+
 // helper for debugging
 // const toValue = (x) => JSON.parse(JSON.stringify(x === undefined ? 'null' : x))
 

src/components/settings_modal/tabs/style_tab/virtual_directives_tab.js

@@ -1,10 +1,10 @@
-import ColorInput from 'src/components/color_input/color_input.vue'
+import { computed, inject, ref, watch } from 'vue'
 
+import ColorInput from 'src/components/color_input/color_input.vue'
 import Select from 'src/components/select/select.vue'
 import SelectMotion from 'src/components/select/select_motion.vue'
 import ShadowControl from 'src/components/shadow_control/shadow_control.vue'
 import { serializeShadow } from 'src/services/theme_data/iss_serializer.js'
-import { computed, inject, ref, watch } from 'vue'
 
 // helper for debugging
 // const toValue = (x) => JSON.parse(JSON.stringify(x === undefined ? 'null' : x))