Revert "feat: Refactor logo components into Grid and List views"

This reverts commit aaf7db1471.

ToDo.md

@@ -0,0 +1,2 @@
+- png/jpg genareto can generate image all colors
+- for color palette add support combination

src/App.svelte

@@ -1,8 +1,7 @@
 <script>
   import { onMount } from 'svelte';
-  import LogoGrid from './components/Grid.svelte';
-  import LogoList from './components/List.svelte';
-  import Header from './components/Header.svelte';
+  import LogoGrid from './components/LogoGrid.svelte';
+  import LogoList from './components/LogoList.svelte';
 
   let viewMode = 'grid'; // 'grid' or 'list'
   let searchQuery = '';
@@ -141,6 +140,7 @@
       effectiveTheme = window.matchMedia('(prefers-color-scheme: dark)').matches ? 'dark' : 'light';
     }
     document.documentElement.setAttribute('data-theme', effectiveTheme);
+    console.log('[theme] Applied theme:', effectiveTheme, '(from', theme, ')');
   }
 
   function setTheme(newTheme) {
@@ -179,10 +179,6 @@
     }
   }
 
-  function getTagObj(text) {
-    return allTags.find(t => t.text === text);
-  }
-
   // Listen for outside click to close dropdown
   $: if (tagDropdownOpen) {
     window.addEventListener('click', closeDropdown);
@@ -207,7 +203,6 @@
     {addTag}
     {removeTag}
     {toggleTag}
-    {getTagObj}
     {closeDropdown}
     {filteredLogos}
   />

src/components/Grid.svelte

@@ -1,35 +0,0 @@
-<script>
-  import Preview from './Preview.svelte';
-  import Actions from './Actions.svelte';
-  import Row from './Row.svelte';
-  import { onMount, onDestroy } from 'svelte';
-
-  export let logos = [];
-  export let onCopy;
-  export let onDownload;
-
-  let showModal = false;
-  let selectedLogo = null;
-
-  export let theme;
-</script>
-
-<Preview show={showModal} logo={selectedLogo} theme={theme} on:close={() => showModal = false} />
-
-<div class="logo-grid">
-  {#each logos as logo}
-    <Row {logo} view="grid" showActions={true} onPreview={() => { selectedLogo = logo; showModal = true; }}>
-      <svelte:fragment slot="actions">
-        <Actions {logo} {onCopy} {onDownload} />
-      </svelte:fragment>
-    </Row>
-  {/each}
-</div>
-
-<style>
-  .logo-grid {
-    display: grid;
-    grid-template-columns: repeat(auto-fill, minmax(320px, 1fr));
-    gap: 1.5rem;
-  }
-</style>

src/components/Header.svelte

@@ -12,7 +12,6 @@
   export let toggleDropdown;
   export let addTag;
   export let removeTag;
-  export let getTagObj;
 </script>
 
 <header class="main-header">
@@ -39,17 +38,14 @@
     </div>
     <div class="tag-filter">
       {#each selectedTags as tagText}
-        {#if getTagObj(tagText)}
           <button
             class="selected-tag"
-            style={getTagObj(tagText).color ? `background: ${getTagObj(tagText).color}; color: #fff;` : ''}
-            aria-label={`Remove tag: ${getTagObj(tagText).text}`}
-            on:click={() => removeTag(getTagObj(tagText).text)}
+            aria-label={`Remove tag: ${tagText}`}
+            on:click={() => removeTag(tagText)}
           >
-            {getTagObj(tagText).text}
+            {tagText}
             <span class="close">&times;</span>
           </button>
-        {/if}
       {/each}
       <div class="tag-dropdown">
         <button class="dropdown-toggle" on:click={toggleDropdown} aria-label="Add tag filter">

src/components/InlineSvg.svelte

@@ -3,7 +3,6 @@
   export let path;
   export let color;
   export let colorConfig = { target: 'path', attribute: 'fill' };
-  export let alt;
 
   let svgHtml = '';
 

src/components/List.svelte

@@ -1,35 +0,0 @@
-<script>
-  import Preview from './Preview.svelte';
-  import Actions from './Actions.svelte';
-  import Row from './Row.svelte';
-  import { onMount, onDestroy } from 'svelte';
-
-  export let logos = [];
-  export let onCopy;
-  export let onDownload;
-
-  let showModal = false;
-  let selectedLogo = null;
-
-  export let theme;
-</script>
-
-<Preview show={showModal} logo={selectedLogo} theme={theme} on:close={() => showModal = false} />
-
-<div class="logo-list">
-  {#each logos as logo}
-    <Row {logo} view="list" showActions={true} onPreview={() => { selectedLogo = logo; showModal = true; }}>
-      <svelte:fragment slot="actions">
-        <Actions {logo} {onCopy} {onDownload} />
-      </svelte:fragment>
-    </Row>
-  {/each}
-</div>
-
-<style>
-  .logo-list {
-    display: flex;
-    flex-direction: column;
-    gap: 0.5em;
-  }
-</style>

src/components/LogoActions.svelte

@@ -1,5 +1,6 @@
 <script>
   export let logo;
+  export let onCopy;
   export let onDownload;
 
   // Download menu state

src/components/LogoGrid.svelte

@@ -0,0 +1,196 @@
+<script>
+  import LogoModal from './LogoModal.svelte';
+  import LogoActions from './LogoActions.svelte';
+  import InlineSvg from './InlineSvg.svelte';
+  import { onMount, onDestroy } from 'svelte';
+  import { getDefaultLogoColor, getThemeColor } from '../utils/colorTheme.js';
+
+  export let logos = [];
+  export let onCopy;
+  export let onDownload;
+
+  let showModal = false;
+  let selectedLogo = null;
+
+  function openPreview(logo) {
+    selectedLogo = logo;
+    showModal = true;
+  }
+
+  function closeModal() {
+    showModal = false;
+  }
+
+  function isSvgLogo(logo) {
+    return logo.format && logo.format.toLowerCase() === 'svg';
+  }
+
+  export let theme;
+$: getLogoThemeColor = logo => getDefaultLogoColor(logo.colors, theme);
+
+  // Improved debug logging for color and theme for each logo
+  $: {
+    if (logos && logos.length) {
+      logos.forEach(logo => {
+        if (logo.colors) {
+          const themeColor = getDefaultLogoColor(logo.colors, theme);
+          const fallbackColor = getThemeColor(logo.colors, theme);
+          const activeColor = logo._activeColor || themeColor;
+        }
+      });
+    }
+  }
+
+  // Inline SVG logic for color switching
+  let svgCache = {};
+
+  async function fetchInlineSvg(path) {
+    if (svgCache[path]) return svgCache[path];
+    const res = await fetch(path);
+    const text = await res.text();
+    svgCache[path] = text;
+    return text;
+  }
+</script>
+
+<LogoModal show={showModal} logo={selectedLogo} theme={theme} on:close={closeModal} />
+
+<div class="logo-grid">
+  {#each logos as logo}
+    <div class="logo-card">
+      <div class="logo-image"
+        role="button"
+        tabindex="0"
+        aria-label="Preview {logo.name}"
+        on:click={() => openPreview(logo)}
+        on:keydown={(e) => (e.key === 'Enter' || e.key === ' ') && openPreview(logo)}
+        style="cursor:pointer;"
+      >
+        {#if isSvgLogo(logo)}
+          {#key theme + (logo._activeColor || '')}
+            <InlineSvg
+              path={logo.path}
+              color={logo.colors ? (logo._activeColor || getLogoThemeColor(logo)) : undefined}
+              colorConfig={logo.colors ? logo.colorConfig : undefined}
+              alt={logo.name}
+            />
+          {/key}
+        {:else}
+          <img src={logo.path} alt={logo.name} />
+        {/if}
+      </div>
+      <div class="logo-info">
+        <h3>{logo.name}</h3>
+        <div class="format-row">
+          <span><strong>Format:</strong> {logo.format}</span>
+          {#if logo.colors}
+            <div class="color-switcher-preview align-right">
+              <span
+                class="color-circle color-reset"
+                title="Reset to theme color"
+                tabindex="0"
+                role="button"
+                aria-label="Reset to theme color"
+                style="background: none; width: 24px; height: 24px; display: inline-flex; align-items: center; justify-content: center; padding: 0; margin: 0; border: none;"
+                on:click|stopPropagation={() => logo._activeColor = undefined}
+                on:keydown|stopPropagation={(e) => (e.key === 'Enter' || e.key === ' ') && (logo._activeColor = undefined)}
+              >
+                <svg width="100%" height="100%" viewBox="0 0 800 800" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
+                  <circle cx="400" cy="400" r="400" style="fill:#d6d6d6;"/>
+                  <path d="M682.843,117.843l-565.686,565.685c-156.209,-156.21 -156.209,-409.476 0,-565.685c156.21,-156.21 409.476,-156.21 565.686,-0Z" style="fill:#33363f;"/>
+                </svg>
+              </span>
+              {#each logo.colors as colorObj}
+                <span
+                  class="color-circle"
+                  title={colorObj.label}
+                  style="background:{colorObj.value}"
+                  tabindex="0"
+                  role="button"
+                  on:click|stopPropagation={() => logo._activeColor = colorObj.value}
+                  on:keydown|stopPropagation={(e) => (e.key === 'Enter' || e.key === ' ') && (logo._activeColor = colorObj.value)}
+                ></span>
+              {/each}
+            </div>
+          {/if}
+        </div>
+        <div class="logo-actions">
+          <LogoActions {logo} {onCopy} {onDownload} />
+        </div>
+      </div>
+    </div>
+  {:else}
+    <p class="no-results">No logos found matching your search criteria.</p>
+  {/each}
+</div>
+
+<style>
+  :global(.logo-card) {
+    background: var(--color-card);
+    color: var(--color-text);
+    border: 1px solid var(--color-border);
+    border-radius: 8px;
+    /* overflow: hidden; removed to allow dropdown menus to escape the card */
+    transition: background 0.2s, color 0.2s, transform 0.2s, box-shadow 0.2s;
+    min-width: 320px;
+  }
+  .logo-grid {
+    display: grid;
+    grid-template-columns: repeat(auto-fill, minmax(320px, 1fr));
+    gap: 1.5rem;
+  }
+  .logo-image {
+    height: 260px;
+    width: 100%;
+    padding: 1rem;
+    position: relative;
+  }
+  .logo-info {
+    padding: 1rem;
+    background: var(--color-card);
+    color: var(--color-text);
+    border-top: 1px solid var(--color-border);
+    transition: background 0.2s, color 0.2s;
+  }
+  .logo-info h3 {
+    margin-bottom: 0.5rem;
+    color: var(--color-accent, #4f8cff);
+  }
+  .no-results {
+    grid-column: 1 / -1;
+    text-align: center;
+    padding: 2rem;
+    color: #666;
+  }
+  .color-circle.color-reset {
+    background: none !important;
+    width: 24px;
+    height: 24px;
+    display: inline-flex;
+    align-items: center;
+    justify-content: center;
+    padding: 0;
+    margin: 0;
+    border: none;
+  }
+  .color-circle.color-reset svg {
+    pointer-events: none;
+  }
+  .color-circle {
+    width: 24px;
+    height: 24px;
+    border-radius: 50%;
+    display: inline-flex;
+    align-items: center;
+    justify-content: center;
+    margin-right: 4px;
+    cursor: pointer;
+    box-sizing: border-box;
+    padding: 0;
+  }
+  .color-switcher-preview.align-right {
+    display: flex;
+    align-items: center;
+    justify-content: flex-end;
+  }
+</style>

src/components/LogoList.svelte

@@ -0,0 +1,187 @@
+<script>
+  import LogoModal from './LogoModal.svelte';
+  import LogoActions from './LogoActions.svelte';
+  import InlineSvg from './InlineSvg.svelte';
+  import { getThemeColor, getDefaultLogoColor } from '../utils/colorTheme.js';
+  import { onMount, onDestroy } from 'svelte';
+
+  export let logos = [];
+  export let onCopy;
+  export let onDownload;
+
+  let showModal = false;
+  let selectedLogo = null;
+
+  let theme = getTheme();
+
+  function openPreview(logo) {
+    selectedLogo = logo;
+    showModal = true;
+  }
+
+  function closeModal() {
+    showModal = false;
+  }
+
+  function isSvgLogo(logo) {
+    return logo.format && logo.format.toLowerCase() === 'svg';
+  }
+
+  function getTheme() {
+    if (typeof window !== 'undefined' && window.matchMedia) {
+      return window.matchMedia('(prefers-color-scheme: dark)').matches ? 'dark' : 'light';
+    }
+    return 'light';
+  }
+
+  function handleThemeChange(e) {
+    theme = e.matches ? 'dark' : 'light';
+  }
+
+  onMount(() => {
+    const mql = window.matchMedia('(prefers-color-scheme: dark)');
+    mql.addEventListener('change', handleThemeChange);
+  });
+
+  onDestroy(() => {
+    const mql = window.matchMedia('(prefers-color-scheme: dark)');
+    mql.removeEventListener('change', handleThemeChange);
+  });
+
+  $: getLogoThemeColor = logo => getDefaultLogoColor(logo.colors, theme);
+
+  // Debug logging for color and theme
+  $: {
+    if (logos && logos.length) {
+      logos.forEach(logo => {
+        if (logo.colors) {
+          const themeColor = getDefaultLogoColor(logo.colors, theme);
+          const activeColor = logo._activeColor || themeColor;
+          console.log('[LogoList] Logo:', logo.name, '| Theme:', theme, '| Theme color:', themeColor, '| Active color:', activeColor);
+        }
+      });
+    }
+  }
+</script>
+
+<LogoModal show={showModal} logo={selectedLogo} on:close={closeModal} />
+
+<div class="logo-list">
+  {#each logos as logo}
+    <div class="logo-item">
+      <div class="logo-preview"
+        role="button"
+        tabindex="0"
+        aria-label="Preview {logo.name}"
+        on:click={() => openPreview(logo)}
+        on:keydown={(e) => (e.key === 'Enter' || e.key === ' ') && openPreview(logo)}
+        style="cursor:pointer;"
+      >
+        {#if isSvgLogo(logo)}
+          <InlineSvg
+            path={logo.path}
+            color={logo.colors ? (logo._activeColor || getLogoThemeColor(logo)) : undefined}
+            colorConfig={logo.colors ? logo.colorConfig : undefined}
+            alt={logo.name}
+          />
+        {:else}
+          <img src={logo.path} alt={logo.name} />
+        {/if}
+      </div>
+      <div class="logo-info">
+        <h3>{logo.name}</h3>
+        <div class="format-row">
+          <span><strong>Format:</strong> {logo.format}</span>
+        </div>
+        {#if logo.colors}
+          <div class="color-switcher-preview align-left">
+            <span
+              class="color-circle color-reset"
+              title="Reset to theme color"
+              tabindex="0"
+              role="button"
+              aria-label="Reset to theme color"
+              style="background: none; width: 24px; height: 24px; display: inline-flex; align-items: center; justify-content: center; padding: 0; margin: 0; border: none;"
+              on:click|stopPropagation={() => logo._activeColor = undefined}
+              on:keydown|stopPropagation={(e) => (e.key === 'Enter' || e.key === ' ') && (logo._activeColor = undefined)}
+            >
+              <svg width="100%" height="100%" viewBox="0 0 800 800" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
+                <circle cx="400" cy="400" r="400" style="fill:#d6d6d6;"/>
+                <path d="M682.843,117.843l-565.686,565.685c-156.209,-156.21 -156.209,-409.476 0,-565.685c156.21,-156.21 409.476,-156.21 565.686,-0Z" style="fill:#33363f;"/>
+              </svg>
+            </span>
+            {#each logo.colors as colorObj}
+              <span
+                class="color-circle"
+                title={colorObj.label}
+                style={`background:${colorObj.value}`}
+                tabindex="0"
+                role="button"
+                on:click|stopPropagation={() => logo._activeColor = colorObj.value}
+                on:keydown|stopPropagation={(e) => (e.key === 'Enter' || e.key === ' ') && (logo._activeColor = colorObj.value)}
+              ></span>
+            {/each}
+          </div>
+        {/if}
+      </div>
+      <div class="logo-actions">
+        <LogoActions {logo} {onCopy} {onDownload} />
+      </div>
+    </div>
+  {:else}
+    <p class="no-results">No logos found matching your search criteria.</p>
+  {/each}
+</div>
+
+<style>
+  :global(.logo-item) {
+    background: var(--color-card);
+    color: var(--color-text);
+    border: 1px solid var(--color-border);
+    border-radius: 8px;
+    display: grid;
+    grid-template-columns: 80px 2fr 3fr 150px;
+    align-items: center;
+    gap: 1rem;
+    padding: 1rem;
+    transition: background 0.2s, color 0.2s;
+  }
+  .logo-preview {
+    height: 100px;
+    width: 80px;
+    padding: 0;
+    border-radius: 4px;
+    position: relative;
+  }
+  .logo-info h3 {
+    margin-bottom: 0.5rem;
+    color: var(--color-accent, #4f8cff);
+  }
+  .logo-list {
+    display: flex;
+    flex-direction: column;
+    gap: 1rem;
+  }
+  .no-results {
+    text-align: center;
+    padding: 2rem;
+    color: #666;
+  }
+  .color-circle {
+    width: 24px;
+    height: 24px;
+    border-radius: 50%;
+    display: inline-flex;
+    align-items: center;
+    justify-content: center;
+    margin-right: 4px;
+    cursor: pointer;
+    box-sizing: border-box;
+  }
+  .color-switcher-preview.align-left {
+    justify-content: flex-start;
+  }
+  .color-circle.color-reset {
+    background: none !important;
+  }
+</style>

src/components/LogoModal.svelte

@@ -1,12 +1,16 @@
 <script>
   import { onMount, onDestroy, createEventDispatcher } from 'svelte';
   import InlineSvg from './InlineSvg.svelte';
+<<<<<<< HEAD:src/components/Preview.svelte
   import { getDefaultLogoColor } from '../utils/colorTheme.js';
-  import tagsData from '../../public/data/tags.json';
-  console.log('Loaded tagsData:', tagsData);
+  import { loadTagsData, getTagObj } from '../utils/tagUtils.js';
+=======
+  import { getDefaultLogoColor, getThemeColor } from '../utils/colorTheme.js';
+>>>>>>> parent of aaf7db1 (feat: Refactor logo components into Grid and List views):src/components/LogoModal.svelte
 
   export let show = false;
   export let logo = null;
+  export let theme;
 
   const dispatch = createEventDispatcher();
 
@@ -24,34 +28,31 @@
     return logo && logo.format && logo.format.toLowerCase() === 'svg';
   }
 
-  // Helper to get tag object from tags.json by text
-  function getTagObj(text) {
-    const tag = tagsData && typeof tagsData === 'object' && tagsData[text] ? { text, ...tagsData[text] } : { text };
-    console.log('[LogoModal] Tag lookup:', text, tag, tagsData);
-    return tag;
+<<<<<<< HEAD:src/components/Preview.svelte
+  function getLogoThemeColor(logo) {
+    return logo && logo.colors ? getDefaultLogoColor(logo.colors, theme) : undefined;
   }
 
+  onMount(async () => {
+    document.addEventListener('keydown', handleKeydown);
+    await loadTagsData();
+=======
   // Always use $theme directly, do not cache in a function
   export let theme;
 $: getLogoThemeColor = logo => getDefaultLogoColor(logo.colors, theme);
 
+  // Improved debug logging for color and theme
   $: {
     if (logo && logo.colors) {
       const themeColor = getDefaultLogoColor(logo.colors, theme);
+      const fallbackColor = getThemeColor(logo.colors, theme);
       const activeColor = logo._activeColor || themeColor;
     }
   }
 
-  $: if (logo && logo.tags && logo.tags.length) {
-    logo.tags.forEach(tag => {
-      console.log('[LogoModal] Tag:', tag);
-      getTagObj(tag);
-    });
-  }
-
   onMount(() => {
     document.addEventListener('keydown', handleKeydown);
-    console.log('[LogoModal] Mounted, added keydown event listener');
+>>>>>>> parent of aaf7db1 (feat: Refactor logo components into Grid and List views):src/components/LogoModal.svelte
   });
 
   onDestroy(() => {
@@ -59,26 +60,12 @@ $: getLogoThemeColor = logo => getDefaultLogoColor(logo.colors, theme);
   });
 </script>
 
-<div class="modal-backdrop"
-  style="display: {show && logo ? 'flex' : 'none'}"
-  role="dialog"
-  aria-modal="true"
->
+<div class="modal-backdrop" class:show style="display: {show ? 'flex' : 'none'}" on:click={close}>
   {#if logo}
-    <div class="modal-content">
-      <div class="modal-header">
-        <h2>{logo.name}</h2>
-        <button class="close-btn" on:click={close} aria-label="Close preview">×</button>
-      </div>
+    <div class="modal-content" on:click|stopPropagation>
+      <button class="close-btn" on:click={close} aria-label="Close modal">&times;</button>
       <div class="modal-body">
-        <div class="preview-container"
-          role="button"
-          tabindex="0"
-          aria-label="Close preview"
-          on:click={close}
-          on:keydown={(e) => (e.key === 'Enter' || e.key === ' ') && close()}
-          style="cursor:pointer;"
-        >
+        <div class="preview-image-container">
           {#if isSvgLogo(logo)}
             <InlineSvg
               path={logo.path}
@@ -91,6 +78,7 @@ $: getLogoThemeColor = logo => getDefaultLogoColor(logo.colors, theme);
           {/if}
         </div>
         <div class="logo-details">
+          <h2>{logo.name}</h2>
           {#if isSvgLogo(logo) && logo.colors}
             <div class="color-switcher-preview">
               <span
@@ -103,7 +91,7 @@ $: getLogoThemeColor = logo => getDefaultLogoColor(logo.colors, theme);
                 on:click|stopPropagation={() => logo._activeColor = undefined}
                 on:keydown|stopPropagation={(e) => (e.key === 'Enter' || e.key === ' ') && (logo._activeColor = undefined)}
               >
-                <svg width="100%" height="100%" viewBox="0 0 800 800" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
+                <svg width="100%" height="100%" viewBox="0 0 800 800" version="1.1" xmlns="http://www.w3.org/2000/svg" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
                   <circle cx="400" cy="400" r="400" style="fill:#d6d6d6;"/>
                   <path d="M682.843,117.843l-565.686,565.685c-156.209,-156.21 -156.209,-409.476 0,-565.685c156.21,-156.21 409.476,-156.21 565.686,-0Z" style="fill:#33363f;"/>
                 </svg>
@@ -128,12 +116,17 @@ $: getLogoThemeColor = logo => getDefaultLogoColor(logo.colors, theme);
           <p><strong>Path:</strong> {logo.path}</p>
           {#if logo.tags && logo.tags.length}
             <div class="logo-tags">
+<<<<<<< HEAD:src/components/Preview.svelte
               {#each logo.tags as tag}
                 {#if getTagObj(tag).color}
-                  <span class="logo-tag" style={`background:${getTagObj(tag).color}`}>{getTagObj(tag).text}</span>
+                  <span class="logo-tag" style={`background:${getTagObj(tag).color}`}>{tag}</span>
                 {:else}
-                  <span class="logo-tag">{getTagObj(tag).text}</span>
+                  <span class="logo-tag">{tag}</span>
                 {/if}
+=======
+              {#each logo.tags as tagObj}
+                <span class="logo-tag" style={tagObj.color ? `background:${tagObj.color}` : ''}>{tagObj.text || tagObj}</span>
+>>>>>>> parent of aaf7db1 (feat: Refactor logo components into Grid and List views):src/components/LogoModal.svelte
               {/each}
             </div>
           {/if}
@@ -144,118 +137,91 @@ $: getLogoThemeColor = logo => getDefaultLogoColor(logo.colors, theme);
 </div>
 
 <style>
-  :global(.modal-backdrop) {
+  .modal-backdrop {
     position: fixed;
     top: 0;
     left: 0;
-    right: 0;
-    bottom: 0;
-    background-color: rgba(0, 0, 0, 0.7);
-    display: flex;
-    align-items: center;
-    justify-content: center;
+    width: 100vw;
+    height: 100vh;
+    background: rgba(0,0,0,0.7);
     z-index: 1000;
-  }
-
-  :global(.modal-content) {
-    background: var(--color-card);
-    color: var(--text-color);
-    border-radius: 8px;
-    padding: 1rem;
-    max-width: 500px;
-    width: 90%;
-    box-shadow: 0 5px 15px rgba(0, 0, 0, 0.3);
-    border: 1px solid var(--color-border);
-    transition: background 0.2s, color 0.2s;
-  }
-
-  .modal-header {
     display: flex;
-    justify-content: space-between;
     align-items: center;
-    margin-bottom: 1rem;
-  }
-
-  .modal-header h2 {
-    margin: 0;
-    font-size: 1.5rem;
-  }
-
-  .close-btn {
-    background: none;
-    border: none;
-    font-size: 1.5rem;
-    cursor: pointer;
-    color: var(--text-color, #222);
-    transition: color 0.2s;
-  }
-
-  .close-btn:hover {
-    color: var(--color-accent, #4f8cff);
-  }
-
-  .modal-body img {
-    max-width: 100%;
-    margin-bottom: 1rem;
-  }
-
-  .preview-container {
-    display: flex;
     justify-content: center;
-    align-items: center;
-    background-color: var(--color-card);
-    border-radius: 4px;
+  }
+  .modal-content {
+    background: var(--color-card);
+    color: var(--color-text);
+    border-radius: 12px;
+    box-shadow: 0 4px 32px rgba(0,0,0,0.18);
+    max-width: 96vw;
+    max-height: 96vh;
+    width: 100vw;
+    height: 100vh;
+    display: flex;
+    flex-direction: column;
+    position: relative;
     padding: 2rem;
-    min-height: 200px;
-    max-height: 60vh;
-    max-width: 100%;
-    transition: background 0.2s, color 0.2s;
     overflow: auto;
   }
-
-  .preview-container img {
+  .preview-image-container {
+    flex: 1 1 auto;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    width: 100%;
+    height: 100%;
     max-width: 100%;
-    max-height: 60vh;
-    object-fit: contain;
+    max-height: 80vh;
+    overflow: auto;
+    margin-bottom: 2rem;
+  }
+  .preview-image-container img,
+  .preview-image-container :global(svg) {
+    max-width: 90%;
+    max-height: 70vh;
+    width: auto;
+    height: auto;
+    object-fit: contain;
+    display: block;
+    margin: auto;
+  }
+  .close-btn {
+    position: absolute;
+    top: 1.5rem;
+    right: 2rem;
+    font-size: 2.2rem;
+    background: none;
+    border: none;
+    color: var(--color-text);
+    cursor: pointer;
+    z-index: 1100;
+    padding: 0.2em 0.5em;
+    border-radius: 50%;
+    transition: background 0.2s;
+  }
+  .close-btn:hover {
+    background: rgba(0,0,0,0.18);
   }
-
   .logo-details {
     padding: 1rem;
-    background-color: var(--color-card);
-    color: var(--text-color);
-    border-radius: 4px;
-    transition: background 0.2s, color 0.2s;
+    background: var(--color-card);
+    color: var(--color-text);
+    border-radius: 8px;
+    border: 1px solid var(--color-border);
+  }
+  .logo-details h2 {
+    margin-top: 0;
+    margin-bottom: 1rem;
+    color: var(--color-accent);
   }
-
   .logo-details p {
     margin-bottom: 0.5rem;
   }
-
   .logo-tags {
     margin-top: 1rem;
     display: flex;
     flex-wrap: wrap;
     gap: 0.5rem;
   }
-
-  .color-switcher-preview {
-    display: flex;
-    align-items: center;
-  }
-
-  .color-circle.color-reset {
-    background: none !important;
-  }
-
-  .color-circle {
-    width: 24px;
-    height: 24px;
-    border-radius: 50%;
-    display: inline-flex;
-    align-items: center;
-    justify-content: center;
-    margin-right: 4px;
-    cursor: pointer;
-    box-sizing: border-box;
-  }
 </style>

src/components/Row.svelte

@@ -1,21 +1,23 @@
 <script>
+  import { onMount } from 'svelte';
   export let logo;
   export let view = 'grid'; // or 'list'
   export let showActions = true;
   export let onPreview = null;
   import InlineSvg from './InlineSvg.svelte';
   import { getDefaultLogoColor } from '../utils/colorTheme.js';
-  import tagsData from '../../public/data/tags.json';
-  function getTagObj(text) {
-    return tagsData[text] ? { text, ...tagsData[text] } : { text };
-  }
+  import { loadTagsData, getTagObj } from '../utils/tagUtils.js';
+
+  onMount(async () => {
+    await loadTagsData();
+  });
 </script>
 
 <div class="logo-row {view}">
   <div
     class="logo-img"
     on:click={onPreview}
-    on:keydown={(e) => (e.key === 'Enter' || e.key === ' ') && onPreview && onPreview(e)}
+    on:keydown={(e) => (e.key === 'Enter' || e.key === ' ') && onPreview && onPreview()}
     tabindex="0"
     role="button"
     aria-label="Preview logo"
@@ -52,9 +54,9 @@
       <div class="logo-tags">
         {#each logo.tags as tag}
           {#if getTagObj(tag).color}
-            <span class="logo-tag" style={`background:${getTagObj(tag).color}`}>{getTagObj(tag).text}</span>
+            <span class="logo-tag" style={`background:${getTagObj(tag).color}`}>{tag}</span>
           {:else}
-            <span class="logo-tag">{getTagObj(tag).text}</span>
+            <span class="logo-tag">{tag}</span>
           {/if}
         {/each}
       </div>

src/utils/tagUtils.js

@@ -0,0 +1,27 @@
+// Shared tag data loading and utilities
+let tagsDataPromise = null;
+let tagsData = null;
+
+// Load tags data once and cache it
+export function loadTagsData() {
+  if (!tagsDataPromise) {
+    tagsDataPromise = fetch('/data/tags.json')
+      .then(res => res.json())
+      .then(data => {
+        console.log('Tags data loaded successfully:', data);
+        tagsData = data;
+        return data;
+      })
+      .catch(err => {
+        console.error('Failed to load tags data:', err);
+        return {};
+      });
+  }
+  return tagsDataPromise;
+}
+
+// Get tag object (with color) from tag text
+export function getTagObj(text) {
+  if (!tagsData) return { text };
+  return tagsData[text] ? { text, ...tagsData[text] } : { text };
+}