Skip to content

Commit

Permalink
fix broken refs after rebase
Browse files Browse the repository at this point in the history
  • Loading branch information
nucleogenesis committed Aug 10, 2022
1 parent 95afde2 commit 6356f39
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 21 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@
import HeaderWithOptions from '../HeaderWithOptions';
import commonDeviceStrings from '../commonDeviceStrings';
import { PageNames } from '../../constants';
import FacilityTaskPanel from './FacilityTaskPanel';
import facilityTasksQueue from './facilityTasksQueue';
export default {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -169,14 +169,11 @@
SyncFacilityModalGroup,
} from 'kolibri.coreVue.componentSets.sync';
import AppBarPage from 'kolibri.coreVue.components.AppBarPage';
import { TaskStatuses, TaskTypes } from 'kolibri.utils.syncTaskUtils';
import TasksBar from '../ManageContentPage/TasksBar';
import HeaderWithOptions from '../HeaderWithOptions';
import { TaskStatuses, TaskTypes } from '../../constants';
import DeviceTopNav from '../DeviceTopNav';
import { deviceString } from '../commonDeviceStrings';
import { TaskStatuses, TaskTypes } from 'kolibri.utils.syncTaskUtils';
import TasksBar from '../ManageContentPage/TasksBar';
import HeaderWithOptions from '../HeaderWithOptions';
import RemoveFacilityModal from './RemoveFacilityModal';
import SyncAllFacilitiesModal from './SyncAllFacilitiesModal';
import ImportFacilityModalGroup from './ImportFacilityModalGroup';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,8 @@
import { TaskResource } from 'kolibri.resources';
import KResponsiveWindowMixin from 'kolibri-design-system/lib/KResponsiveWindowMixin';
import ImmersivePage from 'kolibri.coreVue.components.ImmersivePage';
import { PageNames, TaskTypes } from '../../constants';
import { TaskTypes } from 'kolibri.utils.syncTaskUtils';
import { PageNames } from '../../constants';
import DeviceChannelResource from '../../apiResources/deviceChannel';
import useContentTasks from '../../composables/useContentTasks';
import taskNotificationMixin from '../taskNotificationMixin';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,6 @@
import BottomAppBar from 'kolibri.coreVue.components.BottomAppBar';
import CoreInfoIcon from 'kolibri.coreVue.components.CoreInfoIcon';
import ImmersivePage from 'kolibri.coreVue.components.ImmersivePage';
import { TaskStatuses, PageNames, TaskTypes } from '../../constants';
import { TaskStatuses, TaskTypes } from 'kolibri.utils.syncTaskUtils';
import { PageNames } from '../../constants';
import useContentTasks from '../../composables/useContentTasks';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -83,25 +83,20 @@
import { mapState, mapActions, mapMutations, mapGetters } from 'vuex';
import UiAlert from 'kolibri-design-system/lib/keen/UiAlert';
import isEmpty from 'lodash/isEmpty';
import { crossComponentTranslator } from 'kolibri.utils.i18n';
import ImmersivePage from 'kolibri.coreVue.components.ImmersivePage';
import { TaskTypes, PageNames } from 'kolibri.utils.syncTaskUtils';
import find from 'lodash/find';
import responsiveWindowMixin from 'kolibri.coreVue.mixins.responsiveWindowMixin';
import { TaskResource } from 'kolibri.resources';
import { crossComponentTranslator } from 'kolibri.utils.i18n';
import ImmersivePage from 'kolibri.coreVue.components.ImmersivePage';
import TaskProgress from '../ManageContentPage/TaskProgress';
import NewChannelVersionBanner from '../ManageContentPage/NewChannelVersionBanner';
import { getChannelWithContentSizes } from '../../modules/wizard/apiChannelMetadata';
import { updateTreeViewTopic } from '../../modules/wizard/handlers';
import taskNotificationMixin from '../taskNotificationMixin';
import SelectionBottomBar from '../ManageContentPage/SelectionBottomBar';
import { ContentWizardPages, ContentWizardErrors } from '../../constants';
import useContentTasks from '../../composables/useContentTasks';
import { ContentWizardPages, ContentWizardErrors, TaskTypes, PageNames } from '../../constants';
import { TaskTypes, PageNames } from 'kolibri.utils.syncTaskUtils';
import { ContentWizardErrors } from '../../constants';
import { TaskTypes } from 'kolibri.utils.syncTaskUtils';
import { ContentWizardErrors, PageNames } from '../../constants';
import TaskProgress from '../ManageContentPage/TaskProgress';
import useContentTasks from '../../composables/useContentTasks';
import SelectionBottomBar from '../ManageContentPage/SelectionBottomBar';
import taskNotificationMixin from '../taskNotificationMixin';
import { updateTreeViewTopic } from '../../modules/wizard/handlers';
import { getChannelWithContentSizes } from '../../modules/wizard/apiChannelMetadata';
import NewChannelVersionBanner from '../ManageContentPage/NewChannelVersionBanner';
import AvailableChannelsPage from '../AvailableChannelsPage';
import ChannelContentsSummary from './ChannelContentsSummary';
import ContentTreeViewer from './ContentTreeViewer';
Expand Down

0 comments on commit 6356f39

Please sign in to comment.