rimecms 0.27.6 → 0.28.1

package/dist/panel/pages/dashboard/Dashboard.svelte

@@ -8,6 +8,7 @@
   import PageHeader from '../../components/ui/page-header/PageHeader.svelte';
   import { getConfigContext } from '../../context/config.svelte.js';
   import { Eye } from '@lucide/svelte';
+  import DashboardCollection from './DashboardCollection.svelte';
   import type { DashboardEntry } from './types.js';
 
   type Props = { entries: DashboardEntry[]; user?: User };
@@ -43,30 +44,36 @@
         <CustomDashBoard {entries} />
       {:else}
         <div class="rz-dashboard__content">
-          {#each entries as entry, index (index)}
-            {@const Icon = config.raw.icons[entry.slug]}
-            <a class="rz-dashboard__entry" href={entry.link}>
-              <div class="rz-dashboard__entry-icon">
-                <Icon size="16" strokeWidth="1" />
-              </div>
-              <div>
-                <header>
-                  <h2>{entry.title}</h2>
-                </header>
-                {#if entry.description}
-                  <p class="rz-dashboard__entry-description">{entry.description}</p>
-                {/if}
-              </div>
-            </a>
-          {/each}
+          <div class="rz-dashboard__collections">
+            {#each entries.filter((e) => e.prototype === 'collection') as entry, index (index)}
+              <DashboardCollection {entry} />
+            {/each}
+          </div>
+          <div class="rz-dashboard__areas">
+            {#each entries.filter((e) => e.prototype === 'area') as entry, index (index)}
+              {@const Icon = config.raw.icons[entry.slug]}
+              <a class="rz-dashboard__area" href={entry.link}>
+                <div class="rz-dashboard__area-icon">
+                  <Icon size="16" strokeWidth="1" />
+                </div>
+                <div>
+                  <header>
+                    <h2>{entry.title}</h2>
+                  </header>
+                  {#if entry.description}
+                    <p class="rz-dashboard__area-description">{entry.description}</p>
+                  {/if}
+                </div>
+              </a>
+            {/each}
+          </div>
         </div>
       {/if}
     </div>
   {/snippet}
 </Page>
 
-<style>
-  .rz-dashboard {
+<style>.rz-dashboard {
     background-color: hsl(var(--rz-color-bg));
     min-height: 100vh;
 
@@ -76,10 +83,24 @@
       font-weight: 500;
     }
   }
-  .rz-dashboard__entry {
-    height: 100%;
-    background-color: light-dark(hsl(var(--rz-gray-16)), hsl(var(--rz-gray-3)));
-    border-radius: var(--rz-radius-md);
+
+  .rz-dashboard__collections {
+    grid-column: span 2;
+    display: grid;
+    gap: var(--rz-size-6);
+  }
+
+  .rz-dashboard__areas {
+    grid-column: span 1;
+    gap: var(--rz-size-4);
+    display: flex;
+    flex-direction: column;
+  }
+
+  .rz-dashboard__area {
+    background-color: light-dark(hsl(var(--rz-gray-18)), hsl(var(--rz-gray-3)));
+    border: var(--rz-border);
+    border-radius: var(--rz-radius-xl);
     padding: var(--rz-size-4);
     position: relative;
     min-height: 130px;
@@ -89,7 +110,7 @@
     transition: background-color 0.3s ease-out;
 
     &:hover {
-      background-color: light-dark(hsl(var(--rz-gray-15)), hsl(var(--rz-gray-4)));
+      background-color: light-dark(hsl(var(--rz-gray-19)), hsl(var(--rz-gray-4)));
     }
 
     :global(svg) {
@@ -103,26 +124,29 @@
       gap: var(--rz-size-2);
     }
   }
-  .rz-dashboard__entry-icon {
+  .rz-dashboard__area-icon {
     width: var(--rz-size-8);
     height: var(--rz-size-8);
-    background-color: light-dark(hsl(var(--rz-gray-13)), hsl(var(--rz-gray-0)));
+    background-color: light-dark(hsl(var(--rz-gray-16)), hsl(var(--rz-gray-0)));
     border-radius: var(--rz-size-10);
     display: flex;
     align-items: center;
     justify-content: center;
   }
 
-  .rz-dashboard__entry-description {
+  .rz-dashboard__area-description {
     opacity: 0.5;
     margin-top: var(--rz-size-1);
   }
 
   .rz-dashboard__content {
     display: grid;
-    gap: var(--rz-size-4);
+    gap: var(--rz-size-16);
     padding: var(--rz-size-8) var(--rz-page-gutter);
     height: 100%;
-    grid-template-columns: repeat(auto-fit, minmax(290px, 1fr));
+    grid-template-columns: repeat(1, minmax(0, 1fr));
+    @media (min-width: 1024px) {
+      grid-template-columns: repeat(3, minmax(0, 1fr));
+    }
   }
 </style>

package/dist/panel/pages/dashboard/DashboardCollection.svelte

@@ -0,0 +1,91 @@
+<script lang="ts">
+  import { t__ } from '../../../core/i18n/index.js';
+  import Empty from '../../components/sections/collection/Empty.svelte';
+  import GridItem from '../../components/sections/collection/grid/grid-item/GridItem.svelte';
+  import ButtonCreate from '../../components/sections/collection/header/ButtonCreate.svelte';
+  import Row from '../../components/sections/collection/list/row/Row.svelte';
+  import Button from '../../components/ui/button/button.svelte';
+  import { getConfigContext } from '../../context/config.svelte.js';
+  import { ChevronRight } from '@lucide/svelte';
+
+  import type { DashboardEntry } from './types.js';
+
+  type Props = { entry: DashboardEntry & { prototype: 'collection' } };
+  const { entry }: Props = $props();
+
+  const config = getConfigContext();
+  const collectionConfig = $derived(config.getCollection(entry.slug));
+</script>
+
+<section>
+  <header>
+    <div>
+      <h2>{entry.title}</h2>
+      {#if entry.canCreate}
+        <ButtonCreate config={collectionConfig} size="sm" />
+      {/if}
+      <p>{entry.description}</p>
+    </div>
+    <Button variant="text" href={entry.link}>
+      {t__('common.view_all')}
+      <ChevronRight size={12} />
+    </Button>
+  </header>
+  {#if entry.lastEdited?.length === 0}
+    <Empty config={collectionConfig} />
+  {:else}
+    <div class="rz-dashboard-collection__list rz-dashboard-collection__list--{entry.layout}">
+      {#each entry.lastEdited as doc, index (index)}
+        {#if entry.layout === 'grid'}
+          <GridItem isSelectMode={false} config={collectionConfig} {doc} checked={false} />
+        {:else}
+          <Row isSelectMode={false} config={collectionConfig} {doc} checked={false} />
+        {/if}
+      {/each}
+    </div>
+  {/if}
+</section>
+
+<style>header {
+    display: flex;
+    gap: var(--rz-size-2);
+    align-items: center;
+    justify-content: space-between;
+    margin-bottom: var(--rz-size-2);
+    > div {
+      display: flex;
+      gap: var(--rz-size-2);
+      align-items: center;
+    }
+    p {
+      opacity: 0.5;
+      overflow: hidden;
+      display: -webkit-box;
+      -webkit-box-orient: vertical;
+      -webkit-line-clamp: 1;
+    }
+  }
+  h2 {
+    font-weight: 600;
+    font-size: var(--rz-size-4);
+  }
+
+  .rz-dashboard-collection__list {
+    display: grid;
+    gap: var(--rz-size-2);
+  }
+
+  .rz-dashboard-collection__list--grid {
+    --columns: 1;
+    grid-template-columns: repeat(var(--columns), minmax(150px, 1fr));
+    @media (min-width: 640px) {
+      --columns: 2;
+    }
+    @media (min-width: 1024px) {
+      --columns: 3;
+    }
+    @media (min-width: 1280px) {
+      --columns: 4;
+    }
+  }
+</style>

package/dist/panel/pages/dashboard/DashboardCollection.svelte.d.ts

@@ -0,0 +1,9 @@
+import type { DashboardEntry } from './types.js';
+type Props = {
+    entry: DashboardEntry & {
+        prototype: 'collection';
+    };
+};
+declare const DashboardCollection: import("svelte").Component<Props, {}, "">;
+type DashboardCollection = ReturnType<typeof DashboardCollection>;
+export default DashboardCollection;

package/dist/panel/pages/dashboard/load.server.js

@@ -3,20 +3,36 @@ import { capitalize } from '../../../util/string.js';
 export const dashboardLoad = async (event) => {
     const { locale, user, rime } = event.locals;
     const entries = [];
-    const buildBaseEntry = (c) => ({
-        prototype: 'collection',
-        description: c.panel && c.panel?.description ? c.panel.description : null,
-        slug: c.slug,
-        canCreate: user && c.access.create(user, {}),
-        link: panelUrl(c.kebab),
-        titleSingular: c.label.singular,
-        title: c.label.plural
-    });
-    const getLastEdited = async (c) => {
+    const normalizedPanelConfig = (c) => {
+        const incomingConfig = c.panel || {};
+        const incomingDashboardConfig = incomingConfig.dashboard || {};
+        return {
+            ...incomingConfig,
+            dashboard: {
+                layout: incomingDashboardConfig.layout ? incomingDashboardConfig.layout : 'rows',
+                maxEntries: incomingDashboardConfig.maxEntries || 8
+            }
+        };
+    };
+    const buildBaseEntry = (c) => {
+        const panelConfig = normalizedPanelConfig(c);
+        return {
+            prototype: 'collection',
+            description: panelConfig.description || null,
+            slug: c.slug,
+            canCreate: user && c.access.create(user, {}),
+            link: panelUrl(c.kebab),
+            titleSingular: c.label.singular,
+            title: c.label.plural,
+            layout: panelConfig.dashboard.layout
+        };
+    };
+    const getLastEdited = async (c, limit = 8) => {
         try {
             return await rime.collection(c.slug).find({
-                limit: 6,
-                locale
+                limit,
+                locale,
+                draft: true
             });
         }
         catch (err) {
@@ -27,10 +43,10 @@ export const dashboardLoad = async (event) => {
     };
     const promiseEntries = rime.config.raw.collections
         .filter((collection) => user && collection.access.read(user, {}))
-        .filter((collection) => collection.panel !== false)
+        .filter((collection) => collection.panel !== false && collection.panel?.dashboard !== false)
         .map(async (collection) => {
         if (collection.panel) {
-            return getLastEdited(collection).then((docs) => ({
+            return getLastEdited(collection, normalizedPanelConfig(collection).dashboard?.maxEntries).then((docs) => ({
                 ...buildBaseEntry(collection),
                 lastEdited: docs
             }));

package/dist/panel/pages/dashboard/types.d.ts

@@ -5,6 +5,7 @@ export type DashboardEntry = {
     titleSingular: string;
     link: string;
     canCreate?: boolean;
+    layout?: 'rows' | 'grid';
     prototype: 'collection';
     description: string | null;
     lastEdited?: GenericDoc[];