summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Knox <psimyn@gmail.com>2017-11-30 16:48:26 +1100
committerSimon Knox <psimyn@gmail.com>2017-11-30 17:03:47 +1100
commit37a31c200bedf44b3ee8297d3f119f9536ba50b9 (patch)
treed52c60a7ce5595948c4bdb9f5b03fe643e5ac49d
parent5ce683e4f3d776d6f40b0c375c3ed7234b581408 (diff)
downloadgitlab-ce-37a31c200bedf44b3ee8297d3f119f9536ba50b9.tar.gz
move notes app to vue_shared
-rw-r--r--app/assets/javascripts/notes/index.js35
-rw-r--r--app/assets/javascripts/vue_shared/notes/components/comment_form.vue (renamed from app/assets/javascripts/notes/components/comment_form.vue)12
-rw-r--r--app/assets/javascripts/vue_shared/notes/components/discussion_locked_widget.vue (renamed from app/assets/javascripts/notes/components/discussion_locked_widget.vue)0
-rw-r--r--app/assets/javascripts/vue_shared/notes/components/note_actions.vue (renamed from app/assets/javascripts/notes/components/note_actions.vue)0
-rw-r--r--app/assets/javascripts/vue_shared/notes/components/note_attachment.vue (renamed from app/assets/javascripts/notes/components/note_attachment.vue)0
-rw-r--r--app/assets/javascripts/vue_shared/notes/components/note_awards_list.vue (renamed from app/assets/javascripts/notes/components/note_awards_list.vue)6
-rw-r--r--app/assets/javascripts/vue_shared/notes/components/note_body.vue (renamed from app/assets/javascripts/notes/components/note_body.vue)2
-rw-r--r--app/assets/javascripts/vue_shared/notes/components/note_edited_text.vue (renamed from app/assets/javascripts/notes/components/note_edited_text.vue)2
-rw-r--r--app/assets/javascripts/vue_shared/notes/components/note_form.vue (renamed from app/assets/javascripts/notes/components/note_form.vue)4
-rw-r--r--app/assets/javascripts/vue_shared/notes/components/note_header.vue (renamed from app/assets/javascripts/notes/components/note_header.vue)2
-rw-r--r--app/assets/javascripts/vue_shared/notes/components/note_signed_out_widget.vue (renamed from app/assets/javascripts/notes/components/note_signed_out_widget.vue)0
-rw-r--r--app/assets/javascripts/vue_shared/notes/components/noteable_discussion.vue (renamed from app/assets/javascripts/notes/components/noteable_discussion.vue)9
-rw-r--r--app/assets/javascripts/vue_shared/notes/components/noteable_note.vue (renamed from app/assets/javascripts/notes/components/noteable_note.vue)4
-rw-r--r--app/assets/javascripts/vue_shared/notes/components/notes_app.vue (renamed from app/assets/javascripts/notes/components/notes_app.vue)30
-rw-r--r--app/assets/javascripts/vue_shared/notes/components/placeholder_note.vue (renamed from app/assets/javascripts/vue_shared/components/notes/placeholder_note.vue)2
-rw-r--r--app/assets/javascripts/vue_shared/notes/components/placeholder_system_note.vue (renamed from app/assets/javascripts/vue_shared/components/notes/placeholder_system_note.vue)0
-rw-r--r--app/assets/javascripts/vue_shared/notes/components/system_note.vue (renamed from app/assets/javascripts/vue_shared/components/notes/system_note.vue)4
-rw-r--r--app/assets/javascripts/vue_shared/notes/constants.js (renamed from app/assets/javascripts/notes/constants.js)0
-rw-r--r--app/assets/javascripts/vue_shared/notes/event_hub.js (renamed from app/assets/javascripts/notes/event_hub.js)0
-rw-r--r--app/assets/javascripts/vue_shared/notes/index.js37
-rw-r--r--app/assets/javascripts/vue_shared/notes/mixins/autosave.js (renamed from app/assets/javascripts/notes/mixins/autosave.js)2
-rw-r--r--app/assets/javascripts/vue_shared/notes/mixins/issuable_state.js (renamed from app/assets/javascripts/notes/mixins/issuable_state.js)0
-rw-r--r--app/assets/javascripts/vue_shared/notes/services/notes_service.js (renamed from app/assets/javascripts/notes/services/notes_service.js)0
-rw-r--r--app/assets/javascripts/vue_shared/notes/stores/actions.js (renamed from app/assets/javascripts/notes/stores/actions.js)10
-rw-r--r--app/assets/javascripts/vue_shared/notes/stores/getters.js (renamed from app/assets/javascripts/notes/stores/getters.js)0
-rw-r--r--app/assets/javascripts/vue_shared/notes/stores/index.js (renamed from app/assets/javascripts/notes/stores/index.js)0
-rw-r--r--app/assets/javascripts/vue_shared/notes/stores/mutation_types.js (renamed from app/assets/javascripts/notes/stores/mutation_types.js)0
-rw-r--r--app/assets/javascripts/vue_shared/notes/stores/mutations.js (renamed from app/assets/javascripts/notes/stores/mutations.js)0
-rw-r--r--app/assets/javascripts/vue_shared/notes/stores/utils.js (renamed from app/assets/javascripts/notes/stores/utils.js)0
-rw-r--r--spec/javascripts/vue_shared/notes/components/comment_form_spec.js (renamed from spec/javascripts/notes/components/comment_form_spec.js)4
-rw-r--r--spec/javascripts/vue_shared/notes/components/note_actions_spec.js (renamed from spec/javascripts/notes/components/note_actions_spec.js)4
-rw-r--r--spec/javascripts/vue_shared/notes/components/note_app_spec.js (renamed from spec/javascripts/notes/components/note_app_spec.js)4
-rw-r--r--spec/javascripts/vue_shared/notes/components/note_attachment_spec.js (renamed from spec/javascripts/notes/components/note_attachment_spec.js)2
-rw-r--r--spec/javascripts/vue_shared/notes/components/note_awards_list_spec.js (renamed from spec/javascripts/notes/components/note_awards_list_spec.js)4
-rw-r--r--spec/javascripts/vue_shared/notes/components/note_body_spec.js (renamed from spec/javascripts/notes/components/note_body_spec.js)4
-rw-r--r--spec/javascripts/vue_shared/notes/components/note_edited_text_spec.js (renamed from spec/javascripts/notes/components/note_edited_text_spec.js)2
-rw-r--r--spec/javascripts/vue_shared/notes/components/note_form_spec.js (renamed from spec/javascripts/notes/components/note_form_spec.js)4
-rw-r--r--spec/javascripts/vue_shared/notes/components/note_header_spec.js (renamed from spec/javascripts/notes/components/note_header_spec.js)4
-rw-r--r--spec/javascripts/vue_shared/notes/components/note_signed_out_widget_spec.js (renamed from spec/javascripts/notes/components/note_signed_out_widget_spec.js)4
-rw-r--r--spec/javascripts/vue_shared/notes/components/noteable_discussion_spec.js (renamed from spec/javascripts/notes/components/noteable_discussion_spec.js)4
-rw-r--r--spec/javascripts/vue_shared/notes/components/noteable_note_spec.js (renamed from spec/javascripts/notes/components/noteable_note_spec.js)4
-rw-r--r--spec/javascripts/vue_shared/notes/components/notes/placeholder_note_spec.js (renamed from spec/javascripts/vue_shared/components/notes/placeholder_note_spec.js)4
-rw-r--r--spec/javascripts/vue_shared/notes/components/notes/placeholder_system_note_spec.js (renamed from spec/javascripts/vue_shared/components/notes/placeholder_system_note_spec.js)2
-rw-r--r--spec/javascripts/vue_shared/notes/components/notes/system_note_spec.js (renamed from spec/javascripts/vue_shared/components/notes/system_note_spec.js)4
-rw-r--r--spec/javascripts/vue_shared/notes/mock_data.js (renamed from spec/javascripts/notes/mock_data.js)0
-rw-r--r--spec/javascripts/vue_shared/notes/stores/actions_spec.js (renamed from spec/javascripts/notes/stores/actions_spec.js)2
-rw-r--r--spec/javascripts/vue_shared/notes/stores/getters_spec.js (renamed from spec/javascripts/notes/stores/getters_spec.js)2
-rw-r--r--spec/javascripts/vue_shared/notes/stores/mutation_spec.js (renamed from spec/javascripts/notes/stores/mutation_spec.js)2
48 files changed, 112 insertions, 109 deletions
diff --git a/app/assets/javascripts/notes/index.js b/app/assets/javascripts/notes/index.js
deleted file mode 100644
index ec77246e0d2..00000000000
--- a/app/assets/javascripts/notes/index.js
+++ /dev/null
@@ -1,35 +0,0 @@
-import Vue from 'vue';
-import notesApp from './components/notes_app.vue';
-
-document.addEventListener('DOMContentLoaded', () => new Vue({
- el: '#js-vue-notes',
- components: {
- notesApp,
- },
- data() {
- const notesDataset = document.getElementById('js-vue-notes').dataset;
-
- return {
- noteableData: JSON.parse(notesDataset.noteableData),
- currentUserData: JSON.parse(notesDataset.currentUserData),
- notesData: {
- lastFetchedAt: notesDataset.lastFetchedAt,
- discussionsPath: notesDataset.discussionsPath,
- newSessionPath: notesDataset.newSessionPath,
- registerPath: notesDataset.registerPath,
- notesPath: notesDataset.notesPath,
- markdownDocsPath: notesDataset.markdownDocsPath,
- quickActionsDocsPath: notesDataset.quickActionsDocsPath,
- },
- };
- },
- render(createElement) {
- return createElement('notes-app', {
- props: {
- noteableData: this.noteableData,
- notesData: this.notesData,
- userData: this.currentUserData,
- },
- });
- },
-}));
diff --git a/app/assets/javascripts/notes/components/comment_form.vue b/app/assets/javascripts/vue_shared/notes/components/comment_form.vue
index e594377bc40..413e143d949 100644
--- a/app/assets/javascripts/notes/components/comment_form.vue
+++ b/app/assets/javascripts/vue_shared/notes/components/comment_form.vue
@@ -2,16 +2,16 @@
import { mapActions, mapGetters } from 'vuex';
import _ from 'underscore';
import Autosize from 'autosize';
- import Flash from '../../flash';
- import Autosave from '../../autosave';
- import TaskList from '../../task_list';
+ import Flash from '~/flash';
+ import Autosave from '~/autosave';
+ import TaskList from '~/task_list';
import * as constants from '../constants';
import eventHub from '../event_hub';
- import issueWarning from '../../vue_shared/components/issue/issue_warning.vue';
+ import issueWarning from '~/vue_shared/components/issue/issue_warning.vue';
import noteSignedOutWidget from './note_signed_out_widget.vue';
import discussionLockedWidget from './discussion_locked_widget.vue';
- import markdownField from '../../vue_shared/components/markdown/field.vue';
- import userAvatarLink from '../../vue_shared/components/user_avatar/user_avatar_link.vue';
+ import markdownField from '~/vue_shared/components/markdown/field.vue';
+ import userAvatarLink from '~/vue_shared/components/user_avatar/user_avatar_link.vue';
import issuableStateMixin from '../mixins/issuable_state';
export default {
diff --git a/app/assets/javascripts/notes/components/discussion_locked_widget.vue b/app/assets/javascripts/vue_shared/notes/components/discussion_locked_widget.vue
index e6f7ee56ff3..e6f7ee56ff3 100644
--- a/app/assets/javascripts/notes/components/discussion_locked_widget.vue
+++ b/app/assets/javascripts/vue_shared/notes/components/discussion_locked_widget.vue
diff --git a/app/assets/javascripts/notes/components/note_actions.vue b/app/assets/javascripts/vue_shared/notes/components/note_actions.vue
index 45fc6196be4..45fc6196be4 100644
--- a/app/assets/javascripts/notes/components/note_actions.vue
+++ b/app/assets/javascripts/vue_shared/notes/components/note_actions.vue
diff --git a/app/assets/javascripts/notes/components/note_attachment.vue b/app/assets/javascripts/vue_shared/notes/components/note_attachment.vue
index cd9571a4002..cd9571a4002 100644
--- a/app/assets/javascripts/notes/components/note_attachment.vue
+++ b/app/assets/javascripts/vue_shared/notes/components/note_attachment.vue
diff --git a/app/assets/javascripts/notes/components/note_awards_list.vue b/app/assets/javascripts/vue_shared/notes/components/note_awards_list.vue
index c3a340139e7..169fac439d5 100644
--- a/app/assets/javascripts/notes/components/note_awards_list.vue
+++ b/app/assets/javascripts/vue_shared/notes/components/note_awards_list.vue
@@ -3,9 +3,9 @@
import emojiSmiling from 'icons/_emoji_slightly_smiling_face.svg';
import emojiSmile from 'icons/_emoji_smile.svg';
import emojiSmiley from 'icons/_emoji_smiley.svg';
- import Flash from '../../flash';
- import { glEmojiTag } from '../../emoji';
- import tooltip from '../../vue_shared/directives/tooltip';
+ import Flash from '~/flash';
+ import { glEmojiTag } from '~/emoji';
+ import tooltip from '~/vue_shared/directives/tooltip';
export default {
props: {
diff --git a/app/assets/javascripts/notes/components/note_body.vue b/app/assets/javascripts/vue_shared/notes/components/note_body.vue
index ac4e1ffe53a..33b1eb945f2 100644
--- a/app/assets/javascripts/notes/components/note_body.vue
+++ b/app/assets/javascripts/vue_shared/notes/components/note_body.vue
@@ -3,7 +3,7 @@
import noteAwardsList from './note_awards_list.vue';
import noteAttachment from './note_attachment.vue';
import noteForm from './note_form.vue';
- import TaskList from '../../task_list';
+ import TaskList from '~/task_list';
import autosave from '../mixins/autosave';
export default {
diff --git a/app/assets/javascripts/notes/components/note_edited_text.vue b/app/assets/javascripts/vue_shared/notes/components/note_edited_text.vue
index 49e09f0ecc5..45b8dddb907 100644
--- a/app/assets/javascripts/notes/components/note_edited_text.vue
+++ b/app/assets/javascripts/vue_shared/notes/components/note_edited_text.vue
@@ -1,5 +1,5 @@
<script>
- import timeAgoTooltip from '../../vue_shared/components/time_ago_tooltip.vue';
+ import timeAgoTooltip from '~/vue_shared/components/time_ago_tooltip.vue';
export default {
name: 'editedNoteText',
diff --git a/app/assets/javascripts/notes/components/note_form.vue b/app/assets/javascripts/vue_shared/notes/components/note_form.vue
index 4d527cb6643..48bf08ba554 100644
--- a/app/assets/javascripts/notes/components/note_form.vue
+++ b/app/assets/javascripts/vue_shared/notes/components/note_form.vue
@@ -1,8 +1,8 @@
<script>
import { mapGetters } from 'vuex';
import eventHub from '../event_hub';
- import issueWarning from '../../vue_shared/components/issue/issue_warning.vue';
- import markdownField from '../../vue_shared/components/markdown/field.vue';
+ import issueWarning from '~/vue_shared/components/issue/issue_warning.vue';
+ import markdownField from '~/vue_shared/components/markdown/field.vue';
import issuableStateMixin from '../mixins/issuable_state';
export default {
diff --git a/app/assets/javascripts/notes/components/note_header.vue b/app/assets/javascripts/vue_shared/notes/components/note_header.vue
index 63aa3d777d0..e9e26fe207b 100644
--- a/app/assets/javascripts/notes/components/note_header.vue
+++ b/app/assets/javascripts/vue_shared/notes/components/note_header.vue
@@ -1,6 +1,6 @@
<script>
import { mapActions } from 'vuex';
- import timeAgoTooltip from '../../vue_shared/components/time_ago_tooltip.vue';
+ import timeAgoTooltip from '~/vue_shared/components/time_ago_tooltip.vue';
export default {
props: {
diff --git a/app/assets/javascripts/notes/components/note_signed_out_widget.vue b/app/assets/javascripts/vue_shared/notes/components/note_signed_out_widget.vue
index 45d3c2de355..45d3c2de355 100644
--- a/app/assets/javascripts/notes/components/note_signed_out_widget.vue
+++ b/app/assets/javascripts/vue_shared/notes/components/note_signed_out_widget.vue
diff --git a/app/assets/javascripts/notes/components/noteable_discussion.vue b/app/assets/javascripts/vue_shared/notes/components/noteable_discussion.vue
index d81b5004055..5b37b74b604 100644
--- a/app/assets/javascripts/notes/components/noteable_discussion.vue
+++ b/app/assets/javascripts/vue_shared/notes/components/noteable_discussion.vue
@@ -1,14 +1,15 @@
<script>
import { mapActions, mapGetters } from 'vuex';
- import Flash from '../../flash';
+ import Flash from '~/flash';
import { SYSTEM_NOTE } from '../constants';
- import userAvatarLink from '../../vue_shared/components/user_avatar/user_avatar_link.vue';
+ import userAvatarLink from '~/vue_shared/components/user_avatar/user_avatar_link.vue';
import noteHeader from './note_header.vue';
import noteSignedOutWidget from './note_signed_out_widget.vue';
import noteEditedText from './note_edited_text.vue';
import noteForm from './note_form.vue';
- import placeholderNote from '../../vue_shared/components/notes/placeholder_note.vue';
- import placeholderSystemNote from '../../vue_shared/components/notes/placeholder_system_note.vue';
+ import noteableNote from './noteable_note.vue';
+ import placeholderNote from '~/vue_shared/notes/components/placeholder_note.vue';
+ import placeholderSystemNote from '~/vue_shared/notes/components/placeholder_system_note.vue';
import autosave from '../mixins/autosave';
export default {
diff --git a/app/assets/javascripts/notes/components/noteable_note.vue b/app/assets/javascripts/vue_shared/notes/components/noteable_note.vue
index 32e0332b711..805bac0bf23 100644
--- a/app/assets/javascripts/notes/components/noteable_note.vue
+++ b/app/assets/javascripts/vue_shared/notes/components/noteable_note.vue
@@ -1,7 +1,7 @@
<script>
import { mapGetters, mapActions } from 'vuex';
- import Flash from '../../flash';
- import userAvatarLink from '../../vue_shared/components/user_avatar/user_avatar_link.vue';
+ import Flash from '~/flash';
+ import userAvatarLink from '~/vue_shared/components/user_avatar/user_avatar_link.vue';
import noteHeader from './note_header.vue';
import noteActions from './note_actions.vue';
import noteBody from './note_body.vue';
diff --git a/app/assets/javascripts/notes/components/notes_app.vue b/app/assets/javascripts/vue_shared/notes/components/notes_app.vue
index 8315b3e5ba6..12f25ef9f44 100644
--- a/app/assets/javascripts/notes/components/notes_app.vue
+++ b/app/assets/javascripts/vue_shared/notes/components/notes_app.vue
@@ -1,18 +1,18 @@
<script>
import { mapGetters, mapActions } from 'vuex';
- import Flash from '../../flash';
+ import Flash from '~/flash';
import store from '../stores/';
import * as constants from '../constants';
- import issueNote from './issue_note.vue';
- import issueDiscussion from './issue_discussion.vue';
- import systemNote from '../../vue_shared/components/notes/system_note.vue';
- import issueCommentForm from './issue_comment_form.vue';
- import placeholderNote from '../../vue_shared/components/notes/placeholder_note.vue';
- import placeholderSystemNote from '../../vue_shared/components/notes/placeholder_system_note.vue';
- import loadingIcon from '../../vue_shared/components/loading_icon.vue';
+ import noteableNote from './noteable_note.vue';
+ import noteableDiscussion from './noteable_discussion.vue';
+ import systemNote from '~/vue_shared/notes/components/system_note.vue';
+ import commentForm from './comment_form.vue';
+ import placeholderNote from '~/vue_shared/notes/components/placeholder_note.vue';
+ import placeholderSystemNote from '~/vue_shared/notes/components/placeholder_system_note.vue';
+ import loadingIcon from '~/vue_shared/components/loading_icon.vue';
export default {
- name: 'issueNotesApp',
+ name: 'notesApp',
props: {
noteableData: {
type: Object,
@@ -35,10 +35,10 @@
};
},
components: {
- issueNote,
- issueDiscussion,
+ noteableNote,
+ noteableDiscussion,
systemNote,
- issueCommentForm,
+ commentForm,
loadingIcon,
placeholderNote,
placeholderSystemNote,
@@ -68,10 +68,10 @@
}
return placeholderNote;
} else if (note.individual_note) {
- return note.notes[0].system ? systemNote : issueNote;
+ return note.notes[0].system ? systemNote : noteableNote;
}
- return issueDiscussion;
+ return noteableDiscussion;
},
getComponentData(note) {
return note.individual_note ? note.notes[0] : note;
@@ -146,6 +146,6 @@
/>
</ul>
- <issue-comment-form />
+ <comment-form />
</div>
</template>
diff --git a/app/assets/javascripts/vue_shared/components/notes/placeholder_note.vue b/app/assets/javascripts/vue_shared/notes/components/placeholder_note.vue
index e467ca56704..6f12b11e096 100644
--- a/app/assets/javascripts/vue_shared/components/notes/placeholder_note.vue
+++ b/app/assets/javascripts/vue_shared/notes/components/placeholder_note.vue
@@ -17,7 +17,7 @@
* />
*/
import { mapGetters } from 'vuex';
- import userAvatarLink from '../user_avatar/user_avatar_link.vue';
+ import userAvatarLink from '~/vue_shared/components/user_avatar/user_avatar_link.vue';
export default {
name: 'placeholderNote',
diff --git a/app/assets/javascripts/vue_shared/components/notes/placeholder_system_note.vue b/app/assets/javascripts/vue_shared/notes/components/placeholder_system_note.vue
index d805fea8006..d805fea8006 100644
--- a/app/assets/javascripts/vue_shared/components/notes/placeholder_system_note.vue
+++ b/app/assets/javascripts/vue_shared/notes/components/placeholder_system_note.vue
diff --git a/app/assets/javascripts/vue_shared/components/notes/system_note.vue b/app/assets/javascripts/vue_shared/notes/components/system_note.vue
index 2248699c399..e593ec67873 100644
--- a/app/assets/javascripts/vue_shared/components/notes/system_note.vue
+++ b/app/assets/javascripts/vue_shared/notes/components/system_note.vue
@@ -17,8 +17,8 @@
* />
*/
import { mapGetters } from 'vuex';
- import noteHeader from '~/notes/components/note_header.vue';
- import { spriteIcon } from '../../../lib/utils/common_utils';
+ import noteHeader from '~/vue_shared/notes/components/note_header.vue';
+ import { spriteIcon } from '~/lib/utils/common_utils';
export default {
name: 'systemNote',
diff --git a/app/assets/javascripts/notes/constants.js b/app/assets/javascripts/vue_shared/notes/constants.js
index a6961063c01..a6961063c01 100644
--- a/app/assets/javascripts/notes/constants.js
+++ b/app/assets/javascripts/vue_shared/notes/constants.js
diff --git a/app/assets/javascripts/notes/event_hub.js b/app/assets/javascripts/vue_shared/notes/event_hub.js
index 0948c2e5352..0948c2e5352 100644
--- a/app/assets/javascripts/notes/event_hub.js
+++ b/app/assets/javascripts/vue_shared/notes/event_hub.js
diff --git a/app/assets/javascripts/vue_shared/notes/index.js b/app/assets/javascripts/vue_shared/notes/index.js
new file mode 100644
index 00000000000..72a535d1589
--- /dev/null
+++ b/app/assets/javascripts/vue_shared/notes/index.js
@@ -0,0 +1,37 @@
+import Vue from 'vue';
+import notesApp from './components/notes_app.vue';
+
+export default function () {
+ return new Vue({
+ el: '#js-vue-notes',
+ components: {
+ notesApp,
+ },
+ data() {
+ const notesDataset = document.getElementById('js-vue-notes').dataset;
+
+ return {
+ noteableData: JSON.parse(notesDataset.noteableData),
+ currentUserData: JSON.parse(notesDataset.currentUserData),
+ notesData: {
+ lastFetchedAt: notesDataset.lastFetchedAt,
+ discussionsPath: notesDataset.discussionsPath,
+ newSessionPath: notesDataset.newSessionPath,
+ registerPath: notesDataset.registerPath,
+ notesPath: notesDataset.notesPath,
+ markdownDocsPath: notesDataset.markdownDocsPath,
+ quickActionsDocsPath: notesDataset.quickActionsDocsPath,
+ },
+ };
+ },
+ render(createElement) {
+ return createElement('notes-app', {
+ props: {
+ noteableData: this.noteableData,
+ notesData: this.notesData,
+ userData: this.currentUserData,
+ },
+ });
+ },
+ });
+}
diff --git a/app/assets/javascripts/notes/mixins/autosave.js b/app/assets/javascripts/vue_shared/notes/mixins/autosave.js
index a008171beda..0db88cdeba5 100644
--- a/app/assets/javascripts/notes/mixins/autosave.js
+++ b/app/assets/javascripts/vue_shared/notes/mixins/autosave.js
@@ -1,4 +1,4 @@
-import Autosave from '../../autosave';
+import Autosave from '~/autosave';
export default {
methods: {
diff --git a/app/assets/javascripts/notes/mixins/issuable_state.js b/app/assets/javascripts/vue_shared/notes/mixins/issuable_state.js
index 97f3ea0d5de..97f3ea0d5de 100644
--- a/app/assets/javascripts/notes/mixins/issuable_state.js
+++ b/app/assets/javascripts/vue_shared/notes/mixins/issuable_state.js
diff --git a/app/assets/javascripts/notes/services/notes_service.js b/app/assets/javascripts/vue_shared/notes/services/notes_service.js
index b51b0cb2013..b51b0cb2013 100644
--- a/app/assets/javascripts/notes/services/notes_service.js
+++ b/app/assets/javascripts/vue_shared/notes/services/notes_service.js
diff --git a/app/assets/javascripts/notes/stores/actions.js b/app/assets/javascripts/vue_shared/notes/stores/actions.js
index 085b18642ba..957f642bce7 100644
--- a/app/assets/javascripts/notes/stores/actions.js
+++ b/app/assets/javascripts/vue_shared/notes/stores/actions.js
@@ -1,13 +1,13 @@
import Visibility from 'visibilityjs';
-import Flash from '../../flash';
-import Poll from '../../lib/utils/poll';
+import Flash from '~/flash';
+import Poll from '~/lib/utils/poll';
import * as types from './mutation_types';
import * as utils from './utils';
import * as constants from '../constants';
import service from '../services/notes_service';
-import loadAwardsHandler from '../../awards_handler';
-import sidebarTimeTrackingEventHub from '../../sidebar/event_hub';
-import { isInViewport, scrollToElement } from '../../lib/utils/common_utils';
+import loadAwardsHandler from '~/awards_handler';
+import sidebarTimeTrackingEventHub from '~/sidebar/event_hub';
+import { isInViewport, scrollToElement } from '~/lib/utils/common_utils';
let eTagPoll;
diff --git a/app/assets/javascripts/notes/stores/getters.js b/app/assets/javascripts/vue_shared/notes/stores/getters.js
index e18b277119e..e18b277119e 100644
--- a/app/assets/javascripts/notes/stores/getters.js
+++ b/app/assets/javascripts/vue_shared/notes/stores/getters.js
diff --git a/app/assets/javascripts/notes/stores/index.js b/app/assets/javascripts/vue_shared/notes/stores/index.js
index 488a9ca38d3..488a9ca38d3 100644
--- a/app/assets/javascripts/notes/stores/index.js
+++ b/app/assets/javascripts/vue_shared/notes/stores/index.js
diff --git a/app/assets/javascripts/notes/stores/mutation_types.js b/app/assets/javascripts/vue_shared/notes/stores/mutation_types.js
index d520c197407..d520c197407 100644
--- a/app/assets/javascripts/notes/stores/mutation_types.js
+++ b/app/assets/javascripts/vue_shared/notes/stores/mutation_types.js
diff --git a/app/assets/javascripts/notes/stores/mutations.js b/app/assets/javascripts/vue_shared/notes/stores/mutations.js
index 20f81a430c2..20f81a430c2 100644
--- a/app/assets/javascripts/notes/stores/mutations.js
+++ b/app/assets/javascripts/vue_shared/notes/stores/mutations.js
diff --git a/app/assets/javascripts/notes/stores/utils.js b/app/assets/javascripts/vue_shared/notes/stores/utils.js
index 6074115e855..6074115e855 100644
--- a/app/assets/javascripts/notes/stores/utils.js
+++ b/app/assets/javascripts/vue_shared/notes/stores/utils.js
diff --git a/spec/javascripts/notes/components/comment_form_spec.js b/spec/javascripts/vue_shared/notes/components/comment_form_spec.js
index 20e352dd8bd..516e1b1b192 100644
--- a/spec/javascripts/notes/components/comment_form_spec.js
+++ b/spec/javascripts/vue_shared/notes/components/comment_form_spec.js
@@ -1,7 +1,7 @@
import Vue from 'vue';
import Autosize from 'autosize';
-import store from '~/notes/stores';
-import issueCommentForm from '~/notes/components/comment_form.vue';
+import store from '~/vue_shared/notes/stores';
+import issueCommentForm from '~/vue_shared/notes/components/comment_form.vue';
import { loggedOutnoteableData, notesDataMock, userDataMock, noteableDataMock } from '../mock_data';
import { keyboardDownEvent } from '../../issue_show/helpers';
diff --git a/spec/javascripts/notes/components/note_actions_spec.js b/spec/javascripts/vue_shared/notes/components/note_actions_spec.js
index ab81aabb992..e31e8587223 100644
--- a/spec/javascripts/notes/components/note_actions_spec.js
+++ b/spec/javascripts/vue_shared/notes/components/note_actions_spec.js
@@ -1,6 +1,6 @@
import Vue from 'vue';
-import store from '~/notes/stores';
-import noteActions from '~/notes/components/note_actions.vue';
+import store from '~/vue_shared/notes/stores';
+import noteActions from '~/vue_shared/notes/components/note_actions.vue';
import { userDataMock } from '../mock_data';
describe('issse_note_actions component', () => {
diff --git a/spec/javascripts/notes/components/note_app_spec.js b/spec/javascripts/vue_shared/notes/components/note_app_spec.js
index a0352b6395e..829f0b4d5eb 100644
--- a/spec/javascripts/notes/components/note_app_spec.js
+++ b/spec/javascripts/vue_shared/notes/components/note_app_spec.js
@@ -1,6 +1,6 @@
import Vue from 'vue';
-import notesApp from '~/notes/components/notes_app.vue';
-import service from '~/notes/services/notes_service';
+import notesApp from '~/vue_shared/notes/components/notes_app.vue';
+import service from '~/vue_shared/notes/services/notes_service';
import * as mockData from '../mock_data';
describe('note_app', () => {
diff --git a/spec/javascripts/notes/components/note_attachment_spec.js b/spec/javascripts/vue_shared/notes/components/note_attachment_spec.js
index b14a518b622..7469ad1c0dd 100644
--- a/spec/javascripts/notes/components/note_attachment_spec.js
+++ b/spec/javascripts/vue_shared/notes/components/note_attachment_spec.js
@@ -1,5 +1,5 @@
import Vue from 'vue';
-import noteAttachment from '~/notes/components/note_attachment.vue';
+import noteAttachment from '~/vue_shared/notes/components/note_attachment.vue';
describe('issue note attachment', () => {
it('should render properly', () => {
diff --git a/spec/javascripts/notes/components/note_awards_list_spec.js b/spec/javascripts/vue_shared/notes/components/note_awards_list_spec.js
index 15995ec5a05..8091cc008dc 100644
--- a/spec/javascripts/notes/components/note_awards_list_spec.js
+++ b/spec/javascripts/vue_shared/notes/components/note_awards_list_spec.js
@@ -1,6 +1,6 @@
import Vue from 'vue';
-import store from '~/notes/stores';
-import awardsNote from '~/notes/components/note_awards_list.vue';
+import store from '~/vue_shared/notes/stores';
+import awardsNote from '~/vue_shared/notes/components/note_awards_list.vue';
import { noteableDataMock, notesDataMock } from '../mock_data';
describe('note_awards_list component', () => {
diff --git a/spec/javascripts/notes/components/note_body_spec.js b/spec/javascripts/vue_shared/notes/components/note_body_spec.js
index b42e7943b98..3f5d85024b0 100644
--- a/spec/javascripts/notes/components/note_body_spec.js
+++ b/spec/javascripts/vue_shared/notes/components/note_body_spec.js
@@ -1,7 +1,7 @@
import Vue from 'vue';
-import store from '~/notes/stores';
-import noteBody from '~/notes/components/note_body.vue';
+import store from '~/vue_shared/notes/stores';
+import noteBody from '~/vue_shared/notes/components/note_body.vue';
import { noteableDataMock, notesDataMock, note } from '../mock_data';
describe('issue_note_body component', () => {
diff --git a/spec/javascripts/notes/components/note_edited_text_spec.js b/spec/javascripts/vue_shared/notes/components/note_edited_text_spec.js
index e0b991c32ec..6c90ef369f6 100644
--- a/spec/javascripts/notes/components/note_edited_text_spec.js
+++ b/spec/javascripts/vue_shared/notes/components/note_edited_text_spec.js
@@ -1,5 +1,5 @@
import Vue from 'vue';
-import noteEditedText from '~/notes/components/note_edited_text.vue';
+import noteEditedText from '~/vue_shared/notes/components/note_edited_text.vue';
describe('note_edited_text', () => {
let vm;
diff --git a/spec/javascripts/notes/components/note_form_spec.js b/spec/javascripts/vue_shared/notes/components/note_form_spec.js
index 86e9e2a32a9..4c56057b448 100644
--- a/spec/javascripts/notes/components/note_form_spec.js
+++ b/spec/javascripts/vue_shared/notes/components/note_form_spec.js
@@ -1,6 +1,6 @@
import Vue from 'vue';
-import store from '~/notes/stores';
-import issueNoteForm from '~/notes/components/note_form.vue';
+import store from '~/vue_shared/notes/stores';
+import issueNoteForm from '~/vue_shared/notes/components/note_form.vue';
import { noteableDataMock, notesDataMock } from '../mock_data';
import { keyboardDownEvent } from '../../issue_show/helpers';
diff --git a/spec/javascripts/notes/components/note_header_spec.js b/spec/javascripts/vue_shared/notes/components/note_header_spec.js
index 16a76b11321..9d578c1e75c 100644
--- a/spec/javascripts/notes/components/note_header_spec.js
+++ b/spec/javascripts/vue_shared/notes/components/note_header_spec.js
@@ -1,6 +1,6 @@
import Vue from 'vue';
-import noteHeader from '~/notes/components/note_header.vue';
-import store from '~/notes/stores';
+import noteHeader from '~/vue_shared/notes/components/note_header.vue';
+import store from '~/vue_shared/notes/stores';
describe('note_header component', () => {
let vm;
diff --git a/spec/javascripts/notes/components/note_signed_out_widget_spec.js b/spec/javascripts/vue_shared/notes/components/note_signed_out_widget_spec.js
index 6cba8053888..185ab3ce02c 100644
--- a/spec/javascripts/notes/components/note_signed_out_widget_spec.js
+++ b/spec/javascripts/vue_shared/notes/components/note_signed_out_widget_spec.js
@@ -1,6 +1,6 @@
import Vue from 'vue';
-import noteSignedOut from '~/notes/components/note_signed_out_widget.vue';
-import store from '~/notes/stores';
+import noteSignedOut from '~/vue_shared/notes/components/note_signed_out_widget.vue';
+import store from '~/vue_shared/notes/stores';
import { notesDataMock } from '../mock_data';
describe('note_signed_out_widget component', () => {
diff --git a/spec/javascripts/notes/components/noteable_discussion_spec.js b/spec/javascripts/vue_shared/notes/components/noteable_discussion_spec.js
index 1928a91ee91..28bf2083fad 100644
--- a/spec/javascripts/notes/components/noteable_discussion_spec.js
+++ b/spec/javascripts/vue_shared/notes/components/noteable_discussion_spec.js
@@ -1,6 +1,6 @@
import Vue from 'vue';
-import store from '~/notes/stores';
-import issueDiscussion from '~/notes/components/noteable_discussion.vue';
+import store from '~/vue_shared/notes/stores';
+import issueDiscussion from '~/vue_shared/notes/components/noteable_discussion.vue';
import { noteableDataMock, discussionMock, notesDataMock } from '../mock_data';
describe('issue_discussion component', () => {
diff --git a/spec/javascripts/notes/components/noteable_note_spec.js b/spec/javascripts/vue_shared/notes/components/noteable_note_spec.js
index 623a2d6d9d7..679abde6c49 100644
--- a/spec/javascripts/notes/components/noteable_note_spec.js
+++ b/spec/javascripts/vue_shared/notes/components/noteable_note_spec.js
@@ -1,7 +1,7 @@
import Vue from 'vue';
-import store from '~/notes/stores';
-import issueNote from '~/notes/components/noteable_note.vue';
+import store from '~/vue_shared/notes/stores';
+import issueNote from '~/vue_shared/notes/components/noteable_note.vue';
import { noteableDataMock, notesDataMock, note } from '../mock_data';
describe('issue_note', () => {
diff --git a/spec/javascripts/vue_shared/components/notes/placeholder_note_spec.js b/spec/javascripts/vue_shared/notes/components/notes/placeholder_note_spec.js
index ba8ab0b2cd7..7c4123e70ed 100644
--- a/spec/javascripts/vue_shared/components/notes/placeholder_note_spec.js
+++ b/spec/javascripts/vue_shared/notes/components/notes/placeholder_note_spec.js
@@ -1,6 +1,6 @@
import Vue from 'vue';
-import issuePlaceholderNote from '~/vue_shared/components/notes/placeholder_note.vue';
-import store from '~/notes/stores';
+import issuePlaceholderNote from '~/vue_shared/notes/components/placeholder_note.vue';
+import store from '~/vue_shared/notes/stores';
import { userDataMock } from '../../../notes/mock_data';
describe('issue placeholder system note component', () => {
diff --git a/spec/javascripts/vue_shared/components/notes/placeholder_system_note_spec.js b/spec/javascripts/vue_shared/notes/components/notes/placeholder_system_note_spec.js
index 7b8e6c330c2..2b7398bcefe 100644
--- a/spec/javascripts/vue_shared/components/notes/placeholder_system_note_spec.js
+++ b/spec/javascripts/vue_shared/notes/components/notes/placeholder_system_note_spec.js
@@ -1,5 +1,5 @@
import Vue from 'vue';
-import placeholderSystemNote from '~/vue_shared/components/notes/placeholder_system_note.vue';
+import placeholderSystemNote from '~/vue_shared/notes/components/placeholder_system_note.vue';
import mountComponent from '../../../helpers/vue_mount_component_helper';
describe('placeholder system note component', () => {
diff --git a/spec/javascripts/vue_shared/components/notes/system_note_spec.js b/spec/javascripts/vue_shared/notes/components/notes/system_note_spec.js
index 36aaf0a6c2e..60e591d9d5f 100644
--- a/spec/javascripts/vue_shared/components/notes/system_note_spec.js
+++ b/spec/javascripts/vue_shared/notes/components/notes/system_note_spec.js
@@ -1,6 +1,6 @@
import Vue from 'vue';
-import issueSystemNote from '~/vue_shared/components/notes/system_note.vue';
-import store from '~/notes/stores';
+import issueSystemNote from '~/vue_shared/notes/components/system_note.vue';
+import store from '~/vue_shared/notes/stores';
describe('issue system note', () => {
let vm;
diff --git a/spec/javascripts/notes/mock_data.js b/spec/javascripts/vue_shared/notes/mock_data.js
index 42497de3c55..42497de3c55 100644
--- a/spec/javascripts/notes/mock_data.js
+++ b/spec/javascripts/vue_shared/notes/mock_data.js
diff --git a/spec/javascripts/notes/stores/actions_spec.js b/spec/javascripts/vue_shared/notes/stores/actions_spec.js
index e092320f9a3..46b4f5f2163 100644
--- a/spec/javascripts/notes/stores/actions_spec.js
+++ b/spec/javascripts/vue_shared/notes/stores/actions_spec.js
@@ -1,4 +1,4 @@
-import * as actions from '~/notes/stores/actions';
+import * as actions from '~/vue_shared/notes/stores/actions';
import testAction from '../../helpers/vuex_action_helper';
import { discussionMock, notesDataMock, userDataMock, noteableDataMock, individualNote } from '../mock_data';
diff --git a/spec/javascripts/notes/stores/getters_spec.js b/spec/javascripts/vue_shared/notes/stores/getters_spec.js
index c5a84b71788..ee810f9ca05 100644
--- a/spec/javascripts/notes/stores/getters_spec.js
+++ b/spec/javascripts/vue_shared/notes/stores/getters_spec.js
@@ -1,4 +1,4 @@
-import * as getters from '~/notes/stores/getters';
+import * as getters from '~/vue_shared/notes/stores/getters';
import { notesDataMock, userDataMock, noteableDataMock, individualNote } from '../mock_data';
describe('Getters Notes Store', () => {
diff --git a/spec/javascripts/notes/stores/mutation_spec.js b/spec/javascripts/vue_shared/notes/stores/mutation_spec.js
index 22d99998a7d..851870079fb 100644
--- a/spec/javascripts/notes/stores/mutation_spec.js
+++ b/spec/javascripts/vue_shared/notes/stores/mutation_spec.js
@@ -1,4 +1,4 @@
-import mutations from '~/notes/stores/mutations';
+import mutations from '~/vue_shared/notes/stores/mutations';
import { note, discussionMock, notesDataMock, userDataMock, noteableDataMock, individualNote } from '../mock_data';
describe('Mutation Notes Store', () => {