@awes-io/ui 2.92.0 → 2.93.0

package/CHANGELOG.md

@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [2.93.0](https://github.com/awes-io/client/compare/@awes-io/ui@2.92.0...@awes-io/ui@2.93.0) (2024-02-01)
+
+
+### Bug Fixes
+
+* release fixes ([fae62d8](https://github.com/awes-io/client/commit/fae62d8883f56900794dfe54d1c433b10700cb74))
+
+
+### Features
+
+* add header slot for modal ([65b06f9](https://github.com/awes-io/client/commit/65b06f95372628dac9e8a39523219297550f4eed))
+
+
+
+
+
 # [2.92.0](https://github.com/awes-io/client/compare/@awes-io/ui@2.91.1...@awes-io/ui@2.92.0) (2024-01-29)
 
 

package/assets/css/components/button-nav.css

@@ -12,16 +12,12 @@
         padding: 0;
     }
 
-    &__toggler,
-    &__toggler > span {
-        @apply text-mono-400;
+    &__toggler {
+        @apply bg-mono-900 text-mono-400;
+
         display: flex;
         align-items: center;
         justify-content: center;
-    }
-
-    &__toggler {
-        @apply bg-mono-900;
 
         position: relative;
         white-space: nowrap;
@@ -50,17 +46,20 @@
     }
 
     &__toggler > span {
+        @apply text-mono-400;
+
         display: flex;
         align-items: center;
         justify-content: center;
 
-        height: 2.75rem;
+        min-height: 2.75rem;
         min-width: 6.25rem;
+        height: 100%;
         width: 100%;
         border-radius: 0.5rem;
 
-        padding-left: 0.5rem;
-        padding-right: 0.5rem;
+        padding-left: 1.5rem;
+        padding-right: 1.5rem;
     }
 
     &__toggler:focus,
@@ -139,19 +138,6 @@
         }
     }
 
-    &__arrow-btn.aw-button.theme-ghost {
-        align-items: center;
-
-        width: 2.5rem;
-        height: 2.5rem;
-
-        border-radius: 0.625rem;
-
-        .aw-button__overlay {
-            border-radius: 0.625rem;
-        }
-    }
-
     &--pagination {
         .aw-button-nav {
             &__toggler {
@@ -169,7 +155,7 @@
                 }
 
                 & > span {
-                    height: 2.375rem;
+                    min-height: 2.375rem;
                     border-radius: 0.5625rem;
                     min-width: 0;
                     width: 2.6rem;
@@ -221,7 +207,7 @@
 
             & > span {
                 border-radius: 0.5rem;
-                height: 2.25rem;
+                min-height: 2.25rem;
             }
         }
 

package/assets/css/components/mobile-menu-nav.css

@@ -7,7 +7,7 @@
         line-height: 1rem;
         font-weight: bold;
         padding: 0 1.5rem;
-        margin-bottom: 1rem;
+        margin-bottom: 1.5rem;
     }
 
     ol, ul {

package/assets/css/components/modal.css

@@ -57,17 +57,17 @@ $modal-aside-width-large: 75vw;
     }
 
     &__close {
-        margin-left: auto;
         width: 3rem;
         height: 3rem;
     }
 
     &__title {
-        @apply m-0 pr-6 text-left leading-tight font-heading truncate;
+        @apply my-0 ml-0 pr-6 text-left leading-tight font-heading truncate;
 
         font-size: 1.25rem;
         line-height: 1.5rem;
         font-weight: 700;
+        margin-right: auto;
     }
 
     &__subtitle {

package/assets/css/components/page-single.css

@@ -61,6 +61,10 @@
         &--reverse {
             order: -1;
         }
+
+        &--column:empty {
+            display: none;
+        }
     }
 
     &__top-scroll-mark {

package/assets/js/router.js

@@ -79,3 +79,24 @@ export function getLayout(context) {
 
     return 'default'
 }
+
+/**
+ * Merges vue-router routes recursively
+ * @param {Array} existingRoutes 
+ * @param {Array} newRoutes 
+ */
+export function mergeRoutes(existingRoutes, newRoutes) {
+    newRoutes.forEach(newRoute => {
+        const existing = existingRoutes.find(
+            ({ path }) => path === newRoute.path
+        )
+
+        if (existing && existing.children) {
+            return mergeRoutes(existing.children, newRoute.children)
+        }
+
+        if (!existing) {
+            existingRoutes.push(newRoute)
+        }
+    })
+}

package/components/3_organisms/AwBottomBar.vue

@@ -43,7 +43,7 @@
 import { viewOr, lensProp, omit } from 'rambdax'
 import AwMenuItemIcon from '@AwLayouts/_AwMenuItemIcon.vue'
 
-const VISIBLE_ITEMS_COUNT = 4
+export const VISIBLE_ITEMS_COUNT = 4
 
 const ICON_SIZE = 28
 

package/components/3_organisms/AwModal.vue

@@ -23,23 +23,29 @@
                 <div :class="elClasses.dialog" role="document">
                     <!-- header -->
                     <div ref="header" tabindex="-1" :class="elClasses.header">
-                        <div :class="elClasses.title">
-                            {{ title }}
-                        </div>
-
-                        <AwButton
-                            v-if="!notClosing"
-                            :class="elClasses.close"
-                            :title="$t('Close')"
-                            :aria-label="$t('Close')"
-                            color="mono-light"
-                            tabindex="0"
-                            @click.prevent="close()"
-                        >
-                            <template #icon>
-                                <AwIconSystemMono name="close" size="16" />
-                            </template>
-                        </AwButton>
+                        <slot name="header" :title="title" :close="close">
+                            <slot name="before-title" />
+
+                            <div :class="elClasses.title">
+                                {{ title }}
+                            </div>
+
+                            <slot name="after-title" />
+
+                            <AwButton
+                                v-if="!notClosing"
+                                :class="elClasses.close"
+                                :title="$t('Close')"
+                                :aria-label="$t('Close')"
+                                color="mono-light"
+                                tabindex="0"
+                                @click.prevent="close()"
+                            >
+                                <template #icon>
+                                    <AwIconSystemMono name="close" size="16" />
+                                </template>
+                            </AwButton>
+                        </slot>
                     </div>
                     <!-- / header -->
 

package/components/4_pages/_AwPageHeadline.vue

@@ -7,9 +7,8 @@
                     v-if="backUrl || isMenuToggler"
                     class="aw-page-headline__back"
                     color="mono"
-                    :href="backUrl"
+                    :href="backUrl || '/more'"
                     :aria-label="isMenuToggler ? $t('Menu') : breadcrumb.title"
-                    v-on="isMenuToggler ? { click: openMenu } : null"
                 >
                     <template #icon>
                         <AwIconSystemMono name="arrow" />
@@ -134,12 +133,6 @@ export default {
         isMenuToggler() {
             return !this.backUrl && !this.$screen.lg && this.breadcrumbMenu
         }
-    },
-
-    methods: {
-        openMenu() {
-            this.$store.commit('awesIo/TOGGLE_MOBILE_MENU', true)
-        }
     }
 }
 </script>

package/nuxt/index.js

@@ -11,7 +11,7 @@ import {
     notify as configNotify
 } from './awes.config.js'
 import defaultTailwindConfig from '../tailwind.config.js'
-import { mergeRoutes } from '@awes-io/nuxt-admin/src/utils/merge-routes'
+import { mergeRoutes } from '../assets/js/router.js'
 
 const DEFAULT_DAYJS_LOCALE = 'en'
 

package/nuxt/pages/more.vue

@@ -102,6 +102,7 @@ import { lensProp, pathOr, viewOr } from 'rambdax'
 
 import AwMobileMenuNav from '@AwLayouts/_AwMobileMenuNav.vue'
 import AwMobileMenuItem from '@AwLayouts/_AwMobileMenuItem.vue'
+import { VISIBLE_ITEMS_COUNT } from '@AwOrganisms/AwBottomBar.vue'
 
 export default {
     name: 'More',
@@ -124,17 +125,22 @@ export default {
             'user',
             'logoComponent',
             'afterMobileMenuComponent',
-            'beforeMobileMenuComponent'
+            'beforeMobileMenuComponent',
+            'bottomBarAction'
         ]),
 
         profileUrl() {
             return pathOr(null, 'awesIo.profileUrl', this.$store.state)
         },
 
+        menuItemsStartIndex() {
+            return VISIBLE_ITEMS_COUNT - (this.bottomBarAction ? 2 : 1)
+        },
+
         mainMenu() {
             return viewOr([], lensProp('mainMenu'), this.layoutProvider).filter(
                 ({ is }) => !is
-            )
+            ).slice(this.menuItemsStartIndex)
         },
 
         secondaryMenu() {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@awes-io/ui",
-    "version": "2.92.0",
+    "version": "2.93.0",
     "description": "User Interface (UI) components",
     "keywords": [
         "ui",
@@ -114,5 +114,5 @@
         "rollup-plugin-visualizer": "^2.6.0",
         "rollup-plugin-vue": "^5.0.1"
     },
-    "gitHead": "eb28d05b048c7d2545694dbf4ac607e0267971d0"
+    "gitHead": "f26263752064890282eda08c1e201dc59adc25ac"
 }