@enso-ui/ui 7.1.1 → 7.1.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@enso-ui/ui",
-  "version": "7.1.1",
+  "version": "7.1.4",
   "description": "Laravel Enso UI",
   "main": "bulma/index.js",
   "scripts": {

package/src/bulma/components/VueAside.vue

@@ -18,9 +18,12 @@ export default {
         padding-top: 1.25rem;
         padding-bottom: 1.25rem;
         width: var(--enso-sidebar-width);
+        font-size: 0.95em;
+        font-family: var(--bulma-family-secondary, var(--bulma-family-primary));
         max-height: 100vh;
-        z-index: 4;
+        z-index: 2;
         background: var(--enso-shell-surface);
-        border-right: 1px solid var(--bulma-border);
+        -webkit-box-shadow: 0 1px 1px hsla(0, 0%, 4%, .65);
+        box-shadow: 0 1px 1px hsla(0, 0%, 4%, .65);
     }
 </style>

package/src/bulma/components/navbar/NavbarItem.vue

@@ -42,7 +42,7 @@ export default {
 
     props: {
         icon: {
-            type: [Array, String],
+            type: [Array, Object, String],
             required: true,
         },
         loading: {

package/src/core/components/navbar/Navbar.vue

@@ -1,8 +1,8 @@
 <script>
 import App from '../../app';
 import eventBus from '../../services/eventBus';
-import { app as useApp } from '../../pinia/app';
-import { layout as useLayout } from '../../pinia/layout';
+import { app as useApp } from '../../../pinia/app';
+import { layout as useLayout } from '../../../pinia/layout';
 
 export default {
     name: 'Navbar',

package/src/core/components/navbar/Search.vue

@@ -1,5 +1,5 @@
 <script>
-import { layout } from '../../pinia/layout';
+import { layout } from '../../../pinia/layout';
 
 export default {
     name: 'Search',

package/src/core/components/navbar/SettingsControl.vue

@@ -1,5 +1,5 @@
 <script>
-import { layout } from '../../pinia/layout';
+import { layout } from '../../../pinia/layout';
 
 export default {
     name: 'SettingsControl',

package/src/core/components/settings/Settings.vue

@@ -1,6 +1,6 @@
 <script>
 import App from '../../app';
-import { app } from '../../pinia/app';
+import { app } from '../../../pinia/app';
 
 export default {
     name: 'Settings',

package/src/core/components/settings/SidebarState.vue

@@ -1,5 +1,5 @@
 <script>
-import { preferences } from '../../pinia/preferences';
+import { preferences } from '../../../pinia/preferences';
 
 export default {
     name: 'SidebarState',

package/src/core/layouts/Default.vue

@@ -46,7 +46,11 @@ export default {
         async bootstrap() {
             this.appState = false;
 
-            await loadAppState();
+            const loaded = await loadAppState();
+
+            if (!loaded) {
+                return;
+            }
 
             this.toastr.setup(usePreferences().global.toastrPosition);
 

package/src/pinia/loadState.js

@@ -2,6 +2,7 @@ import axios from 'axios';
 import App from '../core/app';
 import eventBus from '../core/services/eventBus';
 import { useStore } from '../core/services/pinia';
+import { auth } from '@enso-ui/auth/src/pinia/auth';
 import { app as useApp } from './app';
 import { layout } from './layout';
 import { preferences } from './preferences';
@@ -46,10 +47,13 @@ export const loadAppState = async (state = useApp()) => {
         if (state.meta.env === 'local') {
             window.http = axios;
         }
+
+        return true;
     } catch (error) {
         if (error.response && error.response.status === 401) {
-            useStore('auth')?.logout();
-            App.router?.push({ name: 'login' });
+            auth().logoutState();
+            App.router.push({ name: 'login' });
+            return false;
         } else {
             throw error;
         }