Merge branch 'new-navigation-structure' into upadate-bootstrap-styleg…

…uide # Conflicts: # app/assets/stylesheets/application.scss # app/assets/stylesheets/components/ElementsTable.scss # app/assets/stylesheets/global-styles/bootstrap-config.scss # app/assets/stylesheets/global-styles/bootstrap-mods.scss # app/assets/stylesheets/global-styles/package-mods/react-select.scss # app/assets/stylesheets/global-styles/utilities.scss # app/assets/stylesheets/global-styles/utilities/borders.scss # app/assets/stylesheets/global-styles/utilities/detail-card.scss # app/packs/src/apps/mydb/App.js # app/packs/src/apps/mydb/elements/Elements.js # app/packs/src/apps/mydb/elements/details/ElementDetails.js # app/packs/src/apps/mydb/elements/list/ElementsList.js # app/packs/src/apps/mydb/elements/list/ElementsTable.js # app/packs/src/apps/mydb/elements/list/ElementsTableSampleEntries.js # app/packs/src/apps/mydb/inbox/InboxModal.js # app/packs/src/apps/mydb/layout/Sidebar.js # app/packs/src/apps/mydb/layout/Topbar.js # app/packs/src/components/common/Select.js # app/packs/src/components/common/SpectraEditorButton.js # app/packs/src/components/container/ContainerDatasetField.js # app/packs/src/components/contextActions/SplitElementButton.js # app/packs/src/components/navigation/NavHead.js # app/packs/src/components/navigation/UserAuth.js # app/packs/src/components/reactQuill/ToolbarDropdown.js # app/packs/src/components/textTemplateToolbar/ToolbarTemplateCreator.js
ComPlat · Oct 23, 2024 · 051e594 · 051e594
2 parents 45821f9 + d0d5a9a
commit 051e594
Show file tree

Hide file tree

Showing 23 changed files with 556 additions and 284 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -107,68 +107,68 @@ GEM
   specs:
     aasm (5.5.0)
       concurrent-ruby (~> 1.0)
-    actioncable (6.1.7.8)
-      actionpack (= 6.1.7.8)
-      activesupport (= 6.1.7.8)
+    actioncable (6.1.7.9)
+      actionpack (= 6.1.7.9)
+      activesupport (= 6.1.7.9)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (6.1.7.8)
-      actionpack (= 6.1.7.8)
-      activejob (= 6.1.7.8)
-      activerecord (= 6.1.7.8)
-      activestorage (= 6.1.7.8)
-      activesupport (= 6.1.7.8)
+    actionmailbox (6.1.7.9)
+      actionpack (= 6.1.7.9)
+      activejob (= 6.1.7.9)
+      activerecord (= 6.1.7.9)
+      activestorage (= 6.1.7.9)
+      activesupport (= 6.1.7.9)
       mail (>= 2.7.1)
-    actionmailer (6.1.7.8)
-      actionpack (= 6.1.7.8)
-      actionview (= 6.1.7.8)
-      activejob (= 6.1.7.8)
-      activesupport (= 6.1.7.8)
+    actionmailer (6.1.7.9)
+      actionpack (= 6.1.7.9)
+      actionview (= 6.1.7.9)
+      activejob (= 6.1.7.9)
+      activesupport (= 6.1.7.9)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (6.1.7.8)
-      actionview (= 6.1.7.8)
-      activesupport (= 6.1.7.8)
+    actionpack (6.1.7.9)
+      actionview (= 6.1.7.9)
+      activesupport (= 6.1.7.9)
       rack (~> 2.0, >= 2.0.9)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (6.1.7.8)
-      actionpack (= 6.1.7.8)
-      activerecord (= 6.1.7.8)
-      activestorage (= 6.1.7.8)
-      activesupport (= 6.1.7.8)
+    actiontext (6.1.7.9)
+      actionpack (= 6.1.7.9)
+      activerecord (= 6.1.7.9)
+      activestorage (= 6.1.7.9)
+      activesupport (= 6.1.7.9)
       nokogiri (>= 1.8.5)
-    actionview (6.1.7.8)
-      activesupport (= 6.1.7.8)
+    actionview (6.1.7.9)
+      activesupport (= 6.1.7.9)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
     active_model_serializers (0.9.12)
       activemodel (>= 3.2)
       concurrent-ruby (~> 1.0)
-    activejob (6.1.7.8)
-      activesupport (= 6.1.7.8)
+    activejob (6.1.7.9)
+      activesupport (= 6.1.7.9)
       globalid (>= 0.3.6)
     activejob-status (1.0.2)
       activejob (>= 6.0)
       activesupport (>= 6.0)
-    activemodel (6.1.7.8)
-      activesupport (= 6.1.7.8)
-    activerecord (6.1.7.8)
-      activemodel (= 6.1.7.8)
-      activesupport (= 6.1.7.8)
+    activemodel (6.1.7.9)
+      activesupport (= 6.1.7.9)
+    activerecord (6.1.7.9)
+      activemodel (= 6.1.7.9)
+      activesupport (= 6.1.7.9)
     activerecord-nulldb-adapter (1.0.1)
       activerecord (>= 5.2.0, < 7.2)
-    activestorage (6.1.7.8)
-      actionpack (= 6.1.7.8)
-      activejob (= 6.1.7.8)
-      activerecord (= 6.1.7.8)
-      activesupport (= 6.1.7.8)
+    activestorage (6.1.7.9)
+      actionpack (= 6.1.7.9)
+      activejob (= 6.1.7.9)
+      activerecord (= 6.1.7.9)
+      activesupport (= 6.1.7.9)
       marcel (~> 1.0)
       mini_mime (>= 1.1.0)
-    activesupport (6.1.7.8)
+    activesupport (6.1.7.9)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -392,7 +392,7 @@ GEM
       csv
       mini_mime (>= 1.0.0)
       multi_xml (>= 0.5.2)
-    i18n (1.14.5)
+    i18n (1.14.6)
       concurrent-ruby (~> 1.0)
     icalendar (2.10.2)
       ice_cube (~> 0.16)
@@ -480,7 +480,7 @@ GEM
       ruby2_keywords (~> 0.0.1)
     mustermann-grape (1.0.2)
       mustermann (>= 1.0.0)
-    net-imap (0.4.14)
+    net-imap (0.4.17)
       date
       net-protocol
     net-pop (0.1.2)
@@ -596,20 +596,20 @@ GEM
       rack
     rack-test (2.1.0)
       rack (>= 1.3)
-    rails (6.1.7.8)
-      actioncable (= 6.1.7.8)
-      actionmailbox (= 6.1.7.8)
-      actionmailer (= 6.1.7.8)
-      actionpack (= 6.1.7.8)
-      actiontext (= 6.1.7.8)
-      actionview (= 6.1.7.8)
-      activejob (= 6.1.7.8)
-      activemodel (= 6.1.7.8)
-      activerecord (= 6.1.7.8)
-      activestorage (= 6.1.7.8)
-      activesupport (= 6.1.7.8)
+    rails (6.1.7.9)
+      actioncable (= 6.1.7.9)
+      actionmailbox (= 6.1.7.9)
+      actionmailer (= 6.1.7.9)
+      actionpack (= 6.1.7.9)
+      actiontext (= 6.1.7.9)
+      actionview (= 6.1.7.9)
+      activejob (= 6.1.7.9)
+      activemodel (= 6.1.7.9)
+      activerecord (= 6.1.7.9)
+      activestorage (= 6.1.7.9)
+      activesupport (= 6.1.7.9)
       bundler (>= 1.15.0)
-      railties (= 6.1.7.8)
+      railties (= 6.1.7.9)
       sprockets-rails (>= 2.0.0)
     rails-dom-testing (2.2.0)
       activesupport (>= 5.0.0)
@@ -618,9 +618,9 @@ GEM
     rails-html-sanitizer (1.6.0)
       loofah (~> 2.21)
       nokogiri (~> 1.14)
-    railties (6.1.7.8)
-      actionpack (= 6.1.7.8)
-      activesupport (= 6.1.7.8)
+    railties (6.1.7.9)
+      actionpack (= 6.1.7.9)
+      activesupport (= 6.1.7.9)
       method_source
       rake (>= 12.2)
       thor (~> 1.0)
@@ -847,7 +847,7 @@ GEM
       rails (>= 3.0)
       rake (>= 0.8.7)
     yard (0.9.36)
-    zeitwerk (2.6.17)
+    zeitwerk (2.6.18)
 
 PLATFORMS
   x86_64-linux

diff --git a/app/api/chemotion/ui_api.rb b/app/api/chemotion/ui_api.rb
@@ -31,6 +31,7 @@ class UiAPI < Grape::API
           molecule_viewer: Matrice.molecule_viewer,
           collector_address: collector_address.presence,
           third_party_apps: Entities::ThirdPartyAppEntity.represent(ThirdPartyApp.all),
+          version: Chemotion::Application.config.version,
         }
       end
     end

diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
@@ -1,7 +1,7 @@
 /*
  * In order to control import order and provide access to variables, mixins and utilities, we import
  * the files within this directory manually via sass `@import`, instead of using `require_tree .`
- *
+ * 
  * The files in the legacy directory have not yet been aligned with the design system initiative and
  * will be refactored in the future.
  *
@@ -25,6 +25,7 @@
 @import "components/Report";
 @import "components/SearchModal";
 @import "components/SearchResult";
+@import "components/SideBar";
 @import "components/QuillEditor";
 @import "components/QuillViewer";
 @import "components/Styleguide";

diff --git a/app/assets/stylesheets/components/QuillEditor.css b/app/assets/stylesheets/components/QuillEditor.css
@@ -456,6 +456,11 @@
 .ql-snow .ql-toolbar .ql-picker-item.ql-selected .ql-stroke-miter {
   stroke: $primary;
 }
+.ql-snow .ql-picker .ql-picker-label::before, .ql-snow .ql-picker.ql-size .ql-picker-item::before {
+  content: attr(data-label);
+  line-height: 25px;
+}
+
 .ql-snow {
   box-sizing: border-box;
 }

diff --git a/app/assets/stylesheets/components/Sidebar.scss b/app/assets/stylesheets/components/Sidebar.scss
@@ -0,0 +1,36 @@
+.sidebar {
+  @extend .text-bg-white;
+  @extend .position-relative;
+  @extend .p-3;
+  width: 300px;
+  &.sidebar--collapsed {
+    width: 80px;
+  }
+}
+
+$sidebar-button-diameter: 16px;
+
+.sidebar-collapse-button-container {
+  @extend .position-absolute;
+  @extend .end-0;
+  @extend .overflow-hidden;
+  top: calc(50% - #{$sidebar-button-diameter});
+  width: $sidebar-button-diameter;
+  margin: auto -14px auto 0;
+  z-index: 1000;
+}
+
+.sidebar-collapse-button {
+  @extend .rounded-start-0;
+  @extend .btn-sm;
+  @extend .p-2;
+  @extend .text-end;
+  @extend .text-primary;
+  @extend .border;
+  background-color: $white !important;
+  margin-left: -$sidebar-button-diameter;
+  border-top-right-radius: 100% !important;
+  border-bottom-right-radius: 100% !important;
+  width: $sidebar-button-diameter * 2;
+  height: $sidebar-button-diameter * 2;
+}
diff --git a/app/assets/stylesheets/global-styles/bootstrap-config.scss b/app/assets/stylesheets/global-styles/bootstrap-config.scss
@@ -4,6 +4,7 @@ $success: $chemstrap-green;
 $info: #5bc0de; // to be removed application wide
 $warning: $chemstrap-yellow;
 $danger: $chemstrap-red;
+$white: white;
 
 $zindex-levels: (
   n1: -1,
@@ -17,6 +18,7 @@ $zindex-levels: (
 
 $chemstrap-theme-colors: (
   "active": $chemstrap-blue-dark,
+  "white": $white,
 );
 
 @import "bootstrap/functions";

diff --git a/app/assets/stylesheets/global-styles/bootstrap-mods.scss b/app/assets/stylesheets/global-styles/bootstrap-mods.scss
@@ -38,7 +38,7 @@ $button-variant-colors: (
     map-get(map-get($button-variant-colors, $name), "text-active"),
     map-get(map-get($button-variant-colors, $name), "bg-default"),
     map-get(map-get($button-variant-colors, $name), "bg-default"),
-    map-get(map-get($button-variant-colors, $name), "text-default"),
+    map-get(map-get($button-variant-colors, $name), "text-default")
   );
 }
 
@@ -72,19 +72,26 @@ $button-variant-colors: (
 }
 
 .input-group-xsm > {
-  .form-control, .form-select, .input-group-text, .btn {
+  .form-control,
+  .form-select,
+  .input-group-text,
+  .btn {
     @include xsm-form-elements;
   }
 }
 
 .input-group-xxsm > {
-  .form-control, .form-select, .input-group-text, .btn {
+  .form-control,
+  .form-select,
+  .input-group-text,
+  .btn {
     @include xxsm-form-elements;
   }
 }
 
 .popover-header:not(:first-child) {
-  border-top: var(--bs-popover-border-width) solid var(--bs-popover-border-color);
+  border-top: var(--bs-popover-border-width) solid
+    var(--bs-popover-border-color);
   border-radius: 0;
 }