diff options
Diffstat (limited to 'app/assets/javascripts/static_site_editor')
9 files changed, 19 insertions, 25 deletions
diff --git a/app/assets/javascripts/static_site_editor/components/edit_area.vue b/app/assets/javascripts/static_site_editor/components/edit_area.vue index b47126cdeb3..a51a4f9f604 100644 --- a/app/assets/javascripts/static_site_editor/components/edit_area.vue +++ b/app/assets/javascripts/static_site_editor/components/edit_area.vue @@ -1,15 +1,15 @@ <script> -import RichContentEditor from '~/vue_shared/components/rich_content_editor/rich_content_editor.vue'; -import PublishToolbar from './publish_toolbar.vue'; -import EditHeader from './edit_header.vue'; -import EditDrawer from './edit_drawer.vue'; -import UnsavedChangesConfirmDialog from './unsaved_changes_confirm_dialog.vue'; import parseSourceFile from '~/static_site_editor/services/parse_source_file'; import { EDITOR_TYPES } from '~/vue_shared/components/rich_content_editor/constants'; +import RichContentEditor from '~/vue_shared/components/rich_content_editor/rich_content_editor.vue'; import imageRepository from '../image_repository'; import formatter from '../services/formatter'; -import templater from '../services/templater'; import renderImage from '../services/renderers/render_image'; +import templater from '../services/templater'; +import EditDrawer from './edit_drawer.vue'; +import EditHeader from './edit_header.vue'; +import PublishToolbar from './publish_toolbar.vue'; +import UnsavedChangesConfirmDialog from './unsaved_changes_confirm_dialog.vue'; export default { components: { diff --git a/app/assets/javascripts/static_site_editor/components/edit_drawer.vue b/app/assets/javascripts/static_site_editor/components/edit_drawer.vue index 0484d38dde0..0685dfdb1d1 100644 --- a/app/assets/javascripts/static_site_editor/components/edit_drawer.vue +++ b/app/assets/javascripts/static_site_editor/components/edit_drawer.vue @@ -22,11 +22,6 @@ export default { <template> <gl-drawer class="gl-pt-8" :open="isOpen" @close="$emit('close')"> <template #header>{{ __('Page settings') }}</template> - <template> - <front-matter-controls - :settings="settings" - @updateSettings="$emit('updateSettings', $event)" - /> - </template> + <front-matter-controls :settings="settings" @updateSettings="$emit('updateSettings', $event)" /> </gl-drawer> </template> diff --git a/app/assets/javascripts/static_site_editor/components/edit_meta_modal.vue b/app/assets/javascripts/static_site_editor/components/edit_meta_modal.vue index f583d2049af..8c3ee7b9609 100644 --- a/app/assets/javascripts/static_site_editor/components/edit_meta_modal.vue +++ b/app/assets/javascripts/static_site_editor/components/edit_meta_modal.vue @@ -1,12 +1,11 @@ <script> import { GlModal } from '@gitlab/ui'; -import { __, s__, sprintf } from '~/locale'; import Api from '~/api'; +import { __, s__, sprintf } from '~/locale'; import LocalStorageSync from '~/vue_shared/components/local_storage_sync.vue'; -import EditMetaControls from './edit_meta_controls.vue'; - import { ISSUABLE_TYPE, MR_META_LOCAL_STORAGE_KEY } from '../constants'; +import EditMetaControls from './edit_meta_controls.vue'; export default { components: { diff --git a/app/assets/javascripts/static_site_editor/graphql/index.js b/app/assets/javascripts/static_site_editor/graphql/index.js index bce320ed805..23f800517c9 100644 --- a/app/assets/javascripts/static_site_editor/graphql/index.js +++ b/app/assets/javascripts/static_site_editor/graphql/index.js @@ -1,10 +1,10 @@ import Vue from 'vue'; import VueApollo from 'vue-apollo'; import createDefaultClient from '~/lib/graphql'; -import typeDefs from './typedefs.graphql'; import fileResolver from './resolvers/file'; -import submitContentChangesResolver from './resolvers/submit_content_changes'; import hasSubmittedChangesResolver from './resolvers/has_submitted_changes'; +import submitContentChangesResolver from './resolvers/submit_content_changes'; +import typeDefs from './typedefs.graphql'; Vue.use(VueApollo); diff --git a/app/assets/javascripts/static_site_editor/image_repository.js b/app/assets/javascripts/static_site_editor/image_repository.js index 56b2434d2e2..57f32ab4847 100644 --- a/app/assets/javascripts/static_site_editor/image_repository.js +++ b/app/assets/javascripts/static_site_editor/image_repository.js @@ -1,5 +1,5 @@ -import { __ } from '~/locale'; import { deprecatedCreateFlash as Flash } from '~/flash'; +import { __ } from '~/locale'; import { getBinary } from './services/image_service'; const imageRepository = () => { diff --git a/app/assets/javascripts/static_site_editor/index.js b/app/assets/javascripts/static_site_editor/index.js index fbb14be21ba..985579f68e8 100644 --- a/app/assets/javascripts/static_site_editor/index.js +++ b/app/assets/javascripts/static_site_editor/index.js @@ -1,8 +1,8 @@ import Vue from 'vue'; import { parseBoolean } from '~/lib/utils/common_utils'; import App from './components/app.vue'; -import createRouter from './router'; import createApolloProvider from './graphql'; +import createRouter from './router'; const initStaticSiteEditor = (el) => { const { diff --git a/app/assets/javascripts/static_site_editor/pages/home.vue b/app/assets/javascripts/static_site_editor/pages/home.vue index 6c958cb2d22..22f80ead74b 100644 --- a/app/assets/javascripts/static_site_editor/pages/home.vue +++ b/app/assets/javascripts/static_site_editor/pages/home.vue @@ -2,16 +2,16 @@ import { deprecatedCreateFlash as createFlash } from '~/flash'; import Tracking from '~/tracking'; -import SkeletonLoader from '../components/skeleton_loader.vue'; import EditArea from '../components/edit_area.vue'; import EditMetaModal from '../components/edit_meta_modal.vue'; import InvalidContentMessage from '../components/invalid_content_message.vue'; +import SkeletonLoader from '../components/skeleton_loader.vue'; import SubmitChangesError from '../components/submit_changes_error.vue'; -import appDataQuery from '../graphql/queries/app_data.query.graphql'; -import sourceContentQuery from '../graphql/queries/source_content.query.graphql'; +import { LOAD_CONTENT_ERROR, TRACKING_ACTION_INITIALIZE_EDITOR } from '../constants'; import hasSubmittedChangesMutation from '../graphql/mutations/has_submitted_changes.mutation.graphql'; import submitContentChangesMutation from '../graphql/mutations/submit_content_changes.mutation.graphql'; -import { LOAD_CONTENT_ERROR, TRACKING_ACTION_INITIALIZE_EDITOR } from '../constants'; +import appDataQuery from '../graphql/queries/app_data.query.graphql'; +import sourceContentQuery from '../graphql/queries/source_content.query.graphql'; import { SUCCESS_ROUTE } from '../router/constants'; export default { diff --git a/app/assets/javascripts/static_site_editor/pages/success.vue b/app/assets/javascripts/static_site_editor/pages/success.vue index 1ee1a3b0edf..70e692a0c86 100644 --- a/app/assets/javascripts/static_site_editor/pages/success.vue +++ b/app/assets/javascripts/static_site_editor/pages/success.vue @@ -2,8 +2,8 @@ import { GlButton, GlEmptyState, GlLoadingIcon } from '@gitlab/ui'; import { s__, __, sprintf } from '~/locale'; -import savedContentMetaQuery from '../graphql/queries/saved_content_meta.query.graphql'; import appDataQuery from '../graphql/queries/app_data.query.graphql'; +import savedContentMetaQuery from '../graphql/queries/saved_content_meta.query.graphql'; import { HOME_ROUTE } from '../router/constants'; export default { diff --git a/app/assets/javascripts/static_site_editor/services/submit_content_changes.js b/app/assets/javascripts/static_site_editor/services/submit_content_changes.js index 84e90deacfc..6391cfd6cc2 100644 --- a/app/assets/javascripts/static_site_editor/services/submit_content_changes.js +++ b/app/assets/javascripts/static_site_editor/services/submit_content_changes.js @@ -1,7 +1,7 @@ import Api from '~/api'; -import Tracking from '~/tracking'; import { convertObjectPropsToSnakeCase } from '~/lib/utils/common_utils'; import generateBranchName from '~/static_site_editor/services/generate_branch_name'; +import Tracking from '~/tracking'; import { DEFAULT_TARGET_BRANCH, |