fix: resolve all merge conflicts in dashboard templates

- dashboard.ts: resolve initial URL conflict
- index.stx: resolve 3 conflicts (use inline HTML, add StxLink)
- layouts/default.stx: resolve conflict (use auto-shell, <main>)
- stx.config.ts: remove incorrect resources/ config from dashboard

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Author: glennmichael123

storage/framework/core/actions/src/dev/dashboard.ts

@@ -213,11 +213,7 @@ const dashboardLocalUrl = `http://localhost:${dashboardPort}`
 // Use local HTTP URL — Craft webview loads directly, no proxy needed
 const baseRoute = dashboardLocalUrl
 const sidebarConfig = buildSidebarConfig(baseRoute, discoveredModels)
-<<<<<<< Updated upstream
 const initialUrl = `http://localhost:${dashboardPort}/home?native-sidebar=1`
-=======
-const initialUrl = `http://localhost:${dashboardPort}/?native-sidebar=1`
->>>>>>> Stashed changes
 
 // Print vite-style output
 const elapsedMs = (Bun.nanoseconds() - startTime) / 1_000_000

storage/framework/defaults/views/dashboard/index.stx

@@ -47,48 +47,17 @@ const getActivityStatusClass = (status) => {
   return 'text-blue-600 dark:text-blue-400 bg-blue-100 dark:bg-blue-900/30'
 }
 </script>
-<<<<<<< Updated upstream
-  <!-- Page Header -->
-  <div class="flex flex-col sm:flex-row sm:items-center sm:justify-between gap-4 mb-6">
-    <div>
-      <h1 class="text-2xl font-semibold text-neutral-900 dark:text-white">Dashboard</h1>
-      <p class="mt-1 text-sm text-neutral-500 dark:text-neutral-400">
-        Welcome back! Here's an overview of your system.
-      </p>
-    </div>
-    <div class="w-44">
-      <Select
-        value="{{ timeRange }}"
-        data-model="timeRange"
-      >
-        @foreach(timeRangeOptions as option)
-          <option value="{{ option }}">{{ option.label }}</option>
-        @endforeach
-      </Select>
-    </div>
-=======
 
 <div class="p-6 max-w-7xl mx-auto">
   <!-- Header -->
   <div class="mb-8">
     <h1 class="text-2xl font-semibold text-neutral-900 dark:text-white">Dashboard</h1>
     <p class="mt-1 text-sm text-neutral-500 dark:text-neutral-400">Welcome back! Here's an overview of your system.</p>
->>>>>>> Stashed changes
   </div>
 
   <!-- Stats Grid -->
   <div class="grid grid-cols-1 gap-4 sm:grid-cols-2 lg:grid-cols-4 mb-8">
     @foreach(stats as stat)
-<<<<<<< Updated upstream
-      <StatsCard
-        :title="stat.title"
-        value="{{ stat.value }}"
-        trend="{{ stat.trend }}"
-        trendLabel="{{ stat.trendLabel }}"
-        icon="{{ stat.icon }}"
-        iconBg="{{ stat.iconBg }}"
-      />
-=======
       <div class="bg-white dark:bg-neutral-800 rounded-xl border border-neutral-200 dark:border-neutral-700 p-5">
         <div class="flex items-center justify-between">
           <div>
@@ -101,7 +70,6 @@ const getActivityStatusClass = (status) => {
           </div>
         </div>
       </div>
->>>>>>> Stashed changes
     @endforeach
   </div>
 
@@ -110,7 +78,7 @@ const getActivityStatusClass = (status) => {
     <h2 class="text-base font-semibold text-neutral-900 dark:text-white mb-4">Quick Links</h2>
     <div class="grid grid-cols-1 gap-4 sm:grid-cols-2 lg:grid-cols-4">
       @foreach(quickLinks as link)
-        <a :href="link.href" data-stx-link class="block bg-white dark:bg-neutral-800 rounded-xl border border-neutral-200 dark:border-neutral-700 p-5 hover:shadow-md transition-shadow">
+        <StxLink :to="link.href" class="block bg-white dark:bg-neutral-800 rounded-xl border border-neutral-200 dark:border-neutral-700 p-5 hover:shadow-md transition-shadow">
           <div class="flex items-center gap-4">
             <div class="{{ link.color }} flex-shrink-0 rounded-xl p-3">
               <div class="h-5 w-5 text-white"></div>
@@ -120,7 +88,7 @@ const getActivityStatusClass = (status) => {
               <p class="mt-0.5 text-xs text-neutral-500 dark:text-neutral-400">{{ link.description }}</p>
             </div>
           </div>
-        </a>
+        </StxLink>
       @endforeach
     </div>
   </div>
@@ -131,7 +99,7 @@ const getActivityStatusClass = (status) => {
     <div class="bg-white dark:bg-neutral-800 rounded-xl border border-neutral-200 dark:border-neutral-700">
       <div class="flex items-center justify-between p-5 border-b border-neutral-200 dark:border-neutral-700">
         <h3 class="text-base font-semibold text-neutral-900 dark:text-white">System Health</h3>
-        <a href="/health" data-stx-link class="text-sm text-neutral-500 hover:text-neutral-700 dark:hover:text-neutral-300">View all</a>
+        <StxLink to="/health" class="text-sm text-neutral-500 hover:text-neutral-700 dark:hover:text-neutral-300">View all</StxLink>
       </div>
       <div class="divide-y divide-neutral-100 dark:divide-neutral-700">
         @foreach(systemHealth as service)
@@ -154,7 +122,7 @@ const getActivityStatusClass = (status) => {
     <div class="bg-white dark:bg-neutral-800 rounded-xl border border-neutral-200 dark:border-neutral-700">
       <div class="flex items-center justify-between p-5 border-b border-neutral-200 dark:border-neutral-700">
         <h3 class="text-base font-semibold text-neutral-900 dark:text-white">Recent Activity</h3>
-        <a href="/data/activity" data-stx-link class="text-sm text-neutral-500 hover:text-neutral-700 dark:hover:text-neutral-300">View all</a>
+        <StxLink to="/data/activity" class="text-sm text-neutral-500 hover:text-neutral-700 dark:hover:text-neutral-300">View all</StxLink>
       </div>
       <div class="divide-y divide-neutral-100 dark:divide-neutral-700">
         @foreach(recentActivity as activity)
@@ -187,17 +155,5 @@ const getActivityStatusClass = (status) => {
       <p class="mt-1 text-xs text-green-700 dark:text-green-300">Star us on GitHub</p>
     </a>
   </div>
-<<<<<<< Updated upstream
-<script client>
-import { onMount } from 'stx'
-
-onMount(async () => {
-  fetchAll(timeRange)
-})
-</script>
-
-
-@endsection
-=======
 </div>
->>>>>>> Stashed changes
+@endsection

storage/framework/defaults/views/dashboard/layouts/default.stx

@@ -71,27 +71,8 @@ const sidebarRoutes = {
 window.craft = window.craft || {}
 window.craft._sidebarSelectHandler = (event) => {
   const url = sidebarRoutes[event.itemId]
-<<<<<<< Updated upstream
     || (event.itemId && event.itemId.startsWith('model-') ? '/data/' + event.itemId.slice(6) : null)
-  if (url) window.location.assign(url)
-}
-</script>
-
-<html>
-<head>
-  <meta charset="utf-8" />
-  <meta name="viewport" content="width=device-width, initial-scale=1" />
-  <title>Stacks Dashboard</title>
-</head>
-<body class="bg-neutral-100 dark:bg-neutral-950">
-  <DashboardLayout>
-    @slot('content')
-  </DashboardLayout>
-</body>
-</html>
-=======
   if (url) {
-    dashboardStore.navigate(event.itemId)
     navigate(url)
   }
 }
@@ -106,4 +87,3 @@ body {
   @apply bg-neutral-100 dark:bg-neutral-950;
 }
 </style>
->>>>>>> Stashed changes

storage/framework/discovered-packages.json

@@ -1,8 +1,4 @@
 {
-<<<<<<< Updated upstream
-  "generated_at": "2026-03-27T05:34:32.730Z",
-=======
-  "generated_at": "2026-03-30T11:52:41.332Z",
->>>>>>> Stashed changes
+  "generated_at": "2026-03-31T11:47:38.583Z",
   "packages": {}
 }