Skip to content

Commit

Permalink
refactor: shorten imports
Browse files Browse the repository at this point in the history
  • Loading branch information
blackxored committed Nov 23, 2018
1 parent 5711332 commit e39ec73
Show file tree
Hide file tree
Showing 24 changed files with 26 additions and 37 deletions.
2 changes: 1 addition & 1 deletion app/components/obs/inputs/GenericFormGroups.vue.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import Vue from 'vue';
import GenericForm from './GenericForm.vue';
import { Component, Prop } from 'vue-property-decorator';
import { ISettingsSubCategory } from '../../../services/settings/index';
import { ISettingsSubCategory } from '../../../services/settings';

@Component({
components: { GenericForm },
Expand Down
2 changes: 1 addition & 1 deletion app/components/obs/inputs/ObsGoogleFontSelector.vue.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { Component, Prop } from 'vue-property-decorator';
import { Multiselect } from 'vue-multiselect';
import { FontLibraryService } from '../../../services/font-library';
import { Inject } from '../../../util/injector';
import { SourcesService } from '../../../services/sources/index';
import { SourcesService } from '../../../services/sources';
import { ObsInput, IGoogleFont } from './ObsInput';
import ObsFontSizeSelector from './ObsFontSizeSelector.vue';
import * as fi from 'node-fontinfo';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import {
INumberMetadata,
ISliderMetadata,
IInputMetadata,
} from 'components/shared/inputs/index';
} from '../../../shared/inputs';

interface IChatbotPunishmentMetadata {
type: IListMetadata<string>;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Component, Prop } from 'vue-property-decorator';
import ChatbotBase from 'components/page-components/Chatbot/ChatbotBase.vue';

import { ITextMetadata } from 'components/shared/inputs/index';
import { ITextMetadata } from '../../../shared/inputs';

@Component({})
export default class ChatbotAliases extends ChatbotBase {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,7 @@ import { $t } from 'services/i18n';

import { ICustomCommand, IChatbotErrorResponse } from 'services/chatbot';

import {
EInputType,
IListMetadata,
ITextMetadata,
INumberMetadata,
} from 'components/shared/inputs/index';
import { EInputType, IListMetadata, ITextMetadata, INumberMetadata } from '../../../shared/inputs';

@Component({
components: {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import { metadata as metadataHelper } from 'components/widgets/inputs';
import { $t } from 'services/i18n';
import ValidatedForm from 'components/shared/inputs/ValidatedForm.vue';

import { IListMetadata, ITextMetadata, EInputType } from 'components/shared/inputs/index';
import { IListMetadata, ITextMetadata, EInputType } from '../../../shared/inputs';

@Component({
components: {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { Component, Prop } from 'vue-property-decorator';
import ChatbotBase from 'components/page-components/Chatbot/ChatbotBase.vue';
import ValidatedForm from 'components/shared/inputs/ValidatedForm.vue';

import { ITextMetadata } from 'components/shared/inputs/index';
import { ITextMetadata } from '../../../shared/inputs';

import { NEW_LINK_PROTECTION_LIST_MODAL_ID } from 'services/chatbot';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,7 @@ import ListInput from 'components/shared/inputs/ListInput.vue';
import NumberInput from 'components/shared/inputs/NumberInput.vue';
import { $t } from 'services/i18n';
import ValidatedForm from 'components/shared/inputs/ValidatedForm.vue';
import {
IListMetadata,
ITextMetadata,
INumberMetadata,
EInputType,
} from 'components/shared/inputs/index';
import { IListMetadata, ITextMetadata, INumberMetadata, EInputType } from '../../../shared/inputs';

import { IAlertMessage, NEW_ALERT_MODAL_ID, ChatbotAlertType } from 'services/chatbot';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { $t } from 'services/i18n';
import { metadata as metadataHelper } from 'components/widgets/inputs';
import { IQueuePreferencesGeneralSettings } from 'services/chatbot';

import { EInputType } from 'components/shared/inputs/index';
import { EInputType } from '../../../shared/inputs';

@Component({})
export default class ChatbotQueuePreferencesWindow extends ChatbotWindowsBase {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import ValidatedForm from 'components/shared/inputs/ValidatedForm.vue';

import { IQuotePreferencesGeneralSettings } from 'services/chatbot';

import { EInputType } from 'components/shared/inputs/index';
import { EInputType } from '../../../shared/inputs';

@Component({
components: { ValidatedForm },
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import { ITab } from 'components/Tabs.vue';
import { metadata as metadataHelper } from 'components/widgets/inputs';
import { cloneDeep } from 'lodash';
import { IMediaShareBan } from 'services/widgets/settings/media-share';
import { EInputType } from 'components/shared/inputs/index';
import ValidatedForm from 'components/shared/inputs/ValidatedForm.vue';

import { ISongRequestData } from 'services/chatbot';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { $t } from 'services/i18n';

import { IChatbotTimer, IChatbotErrorResponse } from 'services/chatbot';

import { ITextMetadata, INumberMetadata, EInputType } from 'components/shared/inputs/index';
import { ITextMetadata, INumberMetadata, EInputType } from '../../../shared/inputs';
import ValidatedForm from 'components/shared/inputs/ValidatedForm.vue';

@Component({
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import {
IListMetadata,
INumberMetadata,
EInputType,
} from 'components/shared/inputs/index';
} from '../../../shared/inputs';

import { IWordProtectionBlackListItem, NEW_WORD_PROTECTION_LIST_MODAL_ID } from 'services/chatbot';

Expand Down
6 changes: 3 additions & 3 deletions app/services/audio/audio-api.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import * as obs from '../../../obs-api';
import { Observable } from 'rxjs/Observable';
import { Subscription } from 'rxjs/Subscription';
import { TObsFormData } from 'components/obs/inputs/ObsInput';
import { ISource } from '../sources/sources-api';
import { Observable } from 'rxjs/Observable';
import * as obs from '../../../obs-api';
import { ISource } from '../sources';

export interface IAudioSourcesState {
audioSources: Dictionary<IAudioSource>;
Expand Down
2 changes: 1 addition & 1 deletion app/services/performance-monitor/performance-monitor.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { NotificationsService, ENotificationType } from 'services/notifications'
import { ServicesManager } from '../../services-manager';
import { PerformanceService } from 'services/performance';
import { Subscription } from 'rxjs/Subscription';
import { JsonrpcService } from '../jsonrpc/jsonrpc';
import { JsonrpcService } from '../jsonrpc';
import { TroubleshooterService, TIssueCode } from 'services/troubleshooter';
import { $t } from 'services/i18n';

Expand Down
2 changes: 1 addition & 1 deletion app/services/platforms/facebook.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { StatefulService, mutation } from './../stateful-service';
import { StatefulService, mutation } from '../stateful-service';
import { IPlatformService, IPlatformAuth, IChannelInfo, IGame } from '.';
import { HostsService } from '../hosts';
import { SettingsService } from '../settings';
Expand Down
2 changes: 1 addition & 1 deletion app/services/platforms/mixer.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Service } from '../service';
import { StatefulService, mutation } from './../stateful-service';
import { StatefulService, mutation } from '../stateful-service';
import { IPlatformService, IPlatformAuth, IChannelInfo, IGame } from '.';
import { HostsService } from '../hosts';
import { SettingsService } from '../settings';
Expand Down
2 changes: 1 addition & 1 deletion app/services/platforms/youtube.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Service } from '../service';
import { StatefulService, mutation } from './../stateful-service';
import { StatefulService, mutation } from '../stateful-service';
import { IPlatformService, IChannelInfo, IPlatformAuth } from '.';
import { HostsService } from '../hosts';
import { SettingsService } from '../settings';
Expand Down
2 changes: 1 addition & 1 deletion app/services/scene-collections/nodes/scene-items.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Node } from './node';
import { Scene } from '../../scenes/scene';
import { Scene } from '../../scenes';
import { HotkeysNode } from './hotkeys';
import { SourcesService } from '../../sources';
import { ISceneItemFolder, ScenesService, TSceneNodeType } from '../../scenes';
Expand Down
2 changes: 1 addition & 1 deletion app/services/stream-info.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { StatefulService, mutation } from 'services/stateful-service';
import { IChannelInfo, getPlatformService } from 'services/platforms';
import { UserService } from './user';
import { Inject } from 'util/injector';
import { StreamingService } from '../services/streaming';
import { StreamingService } from './streaming';
import { TwitchService } from 'services/platforms/twitch';
import { YoutubeService } from 'services/platforms/youtube';
import { MixerService } from 'services/platforms/mixer';
Expand Down
2 changes: 1 addition & 1 deletion app/util/menus/EditMenu.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Inject } from '../../util/injector';
import { Inject } from '../injector';
import { Menu } from './Menu';
import { Source, SourcesService } from '../../services/sources';
import { ScenesService } from '../../services/scenes';
Expand Down
2 changes: 1 addition & 1 deletion app/util/menus/GroupMenu.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { uniq } from 'lodash';
import { Menu } from './Menu';
import { ScenesService } from 'services/scenes';
import { SelectionService } from 'services/selection';
import { Inject } from '../../util/injector';
import { Inject } from '../injector';
import { $t } from 'services/i18n';

export class GroupMenu extends Menu {
Expand Down
2 changes: 1 addition & 1 deletion app/util/menus/SourceTransformMenu.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { Menu } from './Menu';
import { ScenesService } from 'services/scenes';
import { VideoService } from 'services/video';
import { SelectionService } from 'services/selection';
import { Inject } from '../../util/injector';
import { Inject } from '../injector';
import { $t } from 'services/i18n';

export class SourceTransformMenu extends Menu {
Expand Down
4 changes: 2 additions & 2 deletions test/screentest/screenshoter.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ import { CustomizationService } from '../../app/services/customization';
import { getConfigsVariations, getConfig } from './utils';
import test from 'ava';
import { sleep } from '../helpers/sleep';
import { focusChild } from '../helpers/spectron/index';
import { focusChild } from '../helpers/spectron';
import { PerformanceService } from '../../app/services/performance';
import { IAudioServiceApi } from '../../app/services/audio/audio-api';
import { IAudioServiceApi } from '../../app/services/audio';
import { WindowsService } from '../../app/services/windows';

const fs = require('fs');
Expand Down

0 comments on commit e39ec73

Please sign in to comment.