Skip to content

Commit

Permalink
Refactors GlobalSnackbar and AppError components into kolibri-common …
Browse files Browse the repository at this point in the history
…package
  • Loading branch information
akolson committed Nov 10, 2022
1 parent ebf3b7c commit 4b5556c
Show file tree
Hide file tree
Showing 13 changed files with 10 additions and 17 deletions.
2 changes: 0 additions & 2 deletions kolibri/core/assets/src/core-app/apiSpec.js
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,6 @@ import UserTable from '../views/UserTable';
import CoachContentLabel from '../views/CoachContentLabel';
import PrivacyInfoModal from '../views/PrivacyInfoModal';
import UserTypeDisplay from '../views/UserTypeDisplay';
import TechnicalTextBlock from '../views/AppError/TechnicalTextBlock';
import Draggable from '../views/sortable/Draggable';
import DragHandle from '../views/sortable/DragHandle';
import DragContainer from '../views/sortable/DragContainer';
Expand Down Expand Up @@ -194,7 +193,6 @@ export default {
UiToolbar,
PrivacyInfoModal,
UserTypeDisplay,
TechnicalTextBlock,
Draggable,
DragHandle,
DragContainer,
Expand Down
4 changes: 2 additions & 2 deletions kolibri/core/assets/src/views/CoreBase/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -138,9 +138,9 @@
import { currentLanguage, defaultLanguage } from 'kolibri.utils.i18n';
import coreBannerContent from 'kolibri.utils.coreBannerContent';
import commonCoreStrings from 'kolibri.coreVue.mixins.commonCoreStrings';
import AppError from 'kolibri-common/components/AppError';
import GlobalSnackbar from 'kolibri-common/components/GlobalSnackbar';
import navComponentsMixin from '../../mixins/nav-components';
import AppError from '../AppError';
import GlobalSnackbar from '../GlobalSnackbar';
import ImmersiveToolbar from '../ImmersiveToolbar';
import UpdateNotification from '../UpdateNotification';
import LanguageSwitcherModal from '../language-switcher/LanguageSwitcherModal';
Expand Down
4 changes: 2 additions & 2 deletions kolibri/core/assets/src/views/NotificationsRoot.vue
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,9 @@
import { currentLanguage, defaultLanguage } from 'kolibri.utils.i18n';
import AuthMessage from 'kolibri.coreVue.components.AuthMessage';
import AppBarPage from 'kolibri.coreVue.components.AppBarPage';
import GlobalSnackbar from './GlobalSnackbar.vue';
import AppError from 'kolibri-common/components/AppError';
import GlobalSnackbar from 'kolibri-common/components/GlobalSnackbar';
import UpdateNotification from './UpdateNotification.vue';
import AppError from './AppError';
export default {
name: 'NotificationsRoot',
Expand Down
2 changes: 1 addition & 1 deletion kolibri/plugins/device/assets/src/views/DeviceInfoPage.vue
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@
<script>
import { mapState } from 'vuex';
import TechnicalTextBlock from 'kolibri.coreVue.components.TechnicalTextBlock';
import TechnicalTextBlock from 'kolibri-common/components/AppError/TechnicalTextBlock';
import commonCoreStrings from 'kolibri.coreVue.mixins.commonCoreStrings';
import responsiveWindowMixin from 'kolibri.coreVue.mixins.responsiveWindowMixin';
import AppBarPage from 'kolibri.coreVue.components.AppBarPage';
Expand Down
4 changes: 2 additions & 2 deletions kolibri/plugins/learn/assets/src/views/TopicsContentPage.vue
Original file line number Diff line number Diff line change
Expand Up @@ -142,9 +142,9 @@
import commonCoreStrings from 'kolibri.coreVue.mixins.commonCoreStrings';
import client from 'kolibri.client';
import urls from 'kolibri.urls';
import GlobalSnackbar from '../../../../../../kolibri/core/assets/src/views/GlobalSnackbar';
import AppError from 'kolibri-common/components/AppError';
import GlobalSnackbar from 'kolibri-common/components/GlobalSnackbar';
import SkipNavigationLink from '../../../../../../kolibri/core/assets/src/views/SkipNavigationLink';
import AppError from '../../../../../../kolibri/core/assets/src/views/AppError';
import useCoreLearn from '../composables/useCoreLearn';
import useContentNodeProgress from '../composables/useContentNodeProgress';
import useLearnerResources from '../composables/useLearnerResources';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,8 @@
import AuthMessage from 'kolibri.coreVue.components.AuthMessage';
import coreBannerContent from 'kolibri.utils.coreBannerContent';
import commonCoreStrings from 'kolibri.coreVue.mixins.commonCoreStrings';
import { AppError, GlobalSnackbar } from 'kolibri-common';
import AppError from 'kolibri-common/components/AppError';
import GlobalSnackbar from 'kolibri-common/components/GlobalSnackbar';
import CoreBanner from '../../../../../core/assets/src/views/CoreBanner';
import { ComponentMap } from '../constants';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { mount } from '@vue/test-utils';
import AppError from '../index.vue';
import { coreStoreFactory as makeStore } from '../../../../src/state/store';
import { coreStoreFactory as makeStore } from '../../../../../kolibri/core/assets/src/state/store';

function makeWrapper() {
const store = makeStore();
Expand Down
6 changes: 0 additions & 6 deletions packages/kolibri-common/index.js

This file was deleted.

0 comments on commit 4b5556c

Please sign in to comment.