From 6709d5ee73bfe7b410dbbef09741503513574607 Mon Sep 17 00:00:00 2001 From: Gregor Lasnibat Date: Wed, 13 Sep 2023 08:16:26 +0200 Subject: [PATCH 01/49] Finished v.01 of inventory item card (RepositoryItemSidebar) [SCI-9091] --- .../packs/vue/repository_item_sidebar.js | 20 ++ .../vue/components/RepositoryItemSidebar.vue | 188 ++++++++++++++++++ app/views/layouts/application.html.erb | 10 + config/webpack/webpack.config.js | 3 + 4 files changed, 221 insertions(+) create mode 100644 app/javascript/packs/vue/repository_item_sidebar.js create mode 100644 app/javascript/vue/components/RepositoryItemSidebar.vue diff --git a/app/javascript/packs/vue/repository_item_sidebar.js b/app/javascript/packs/vue/repository_item_sidebar.js new file mode 100644 index 000000000..71879686c --- /dev/null +++ b/app/javascript/packs/vue/repository_item_sidebar.js @@ -0,0 +1,20 @@ +/* global notTurbolinksPreview */ + +import TurbolinksAdapter from 'vue-turbolinks'; +import Vue from 'vue/dist/vue.esm'; +import RepositoryItemSidebar from '../../vue/components/RepositoryItemSidebar.vue'; + +Vue.use(TurbolinksAdapter); +Vue.prototype.i18n = window.I18n; + +function initRepositoryItemSidebar() { + new Vue({ + el: '#repositoryItemSidebar', + components: { + RepositoryItemSidebar + } + }); +} + +initRepositoryItemSidebar(); + diff --git a/app/javascript/vue/components/RepositoryItemSidebar.vue b/app/javascript/vue/components/RepositoryItemSidebar.vue new file mode 100644 index 000000000..9cf8f312b --- /dev/null +++ b/app/javascript/vue/components/RepositoryItemSidebar.vue @@ -0,0 +1,188 @@ + + \ No newline at end of file diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index ad72e6946..3b7dfbb0e 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -49,6 +49,7 @@ <%= stylesheet_link_tag 'tui_image_editor_styles' %> <%= javascript_include_tag 'vue_navigation_navigator' %> <%= javascript_include_tag 'vue_navigation_top_menu' %> + <%= render "shared/comments/comments_sidebar" %> + +
+ +
<%= render partial: 'shared/flash_alerts', @@ -117,5 +125,7 @@ <%= javascript_include_tag 'prism' %> + <%= javascript_include_tag "vue_components_repository_item_sidebar" %> + diff --git a/config/webpack/webpack.config.js b/config/webpack/webpack.config.js index e603350de..80dd5d1a6 100644 --- a/config/webpack/webpack.config.js +++ b/config/webpack/webpack.config.js @@ -36,6 +36,9 @@ const entryList = { vue_share_task_container: './app/javascript/packs/vue/share_task_container.js', vue_navigation_top_menu: './app/javascript/packs/vue/navigation/top_menu.js', vue_navigation_navigator: './app/javascript/packs/vue/navigation/navigator.js', + vue_components_action_toolbar: './app/javascript/packs/vue/action_toolbar.js', + vue_components_repository_item_sidebar: './app/javascript/packs/vue/repository_item_sidebar.js', + vue_components_open_vector_editor: './app/javascript/packs/vue/open_vector_editor.js', vue_navigation_breadcrumbs: './app/javascript/packs/vue/navigation/breadcrumbs.js', vue_components_action_toolbar: './app/javascript/packs/vue/action_toolbar.js', vue_protocol_file_import_modal: './app/javascript/packs/vue/protocol_file_import_modal.js' From cf641201ac39ac192a15cd22c067ffa8ba3cca35 Mon Sep 17 00:00:00 2001 From: Gregor Lasnibat Date: Wed, 13 Sep 2023 16:13:22 +0200 Subject: [PATCH 02/49] New item card custom columns [SCI-9153] --- .../vue/components/RepositoryItemSidebar.vue | 264 ++++++++++++++++-- 1 file changed, 238 insertions(+), 26 deletions(-) diff --git a/app/javascript/vue/components/RepositoryItemSidebar.vue b/app/javascript/vue/components/RepositoryItemSidebar.vue index 9cf8f312b..d9e9a2d5b 100644 --- a/app/javascript/vue/components/RepositoryItemSidebar.vue +++ b/app/javascript/vue/components/RepositoryItemSidebar.vue @@ -1,11 +1,13 @@