move things around for clarity

vitormv · Jan 18, 2024 · 209c218 · 209c218
1 parent 444ade7
commit 209c218
Show file tree

Hide file tree

Showing 14 changed files with 10 additions and 10 deletions.
diff --git a/src/components/Home.svelte b/src/components/Home.svelte
@@ -6,7 +6,7 @@
   import TerminalWindow from '~/components/TerminalWindow.svelte';
   import OptionsPanel from '~/components/OptionsPanel.svelte';
   import { onMount } from 'svelte';
-  import { dragScroll } from '~/utils/useDragScroll';
+  import { dragScroll } from '~/utils/svelte/useDragScroll';
 
   let terminalContentEl: HTMLDivElement;
 

diff --git a/src/components/PaletteColor.svelte b/src/components/PaletteColor.svelte
@@ -1,11 +1,11 @@
 <script lang="ts">
-  import { hexColorToRgb } from '~/utils/hexColorToRgb';
   import type { FzfColor } from '~/types/fzf';
-  import { getContrastColor } from '~/utils/getContrastColor';
   import { getColorOrFallback, colorsStore } from '~/data/colors.store';
   import { colorDefinitions } from '~/fzf/fzfColorDefinitions';
-  import { toFzfColorName } from '~/utils/toFzfColorName';
+  import { toFzfColorName } from '~/utils/colors/toFzfColorName';
   import { beforeUpdate } from 'svelte';
+  import { getContrastColor } from '~/utils/colors/getContrastColor';
+  import { hexColorToRgb } from '~/utils/colors/hexColorToRgb';
 
   export let token: FzfColor;
 

diff --git a/src/components/common/InputWithHelp.svelte b/src/components/common/InputWithHelp.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import createPopperAction from '~/utils/usePopper';
+  import createPopperAction from '~/utils/svelte/usePopper';
 
   export let tooltipContent: string;
 

diff --git a/src/data/import/importFromUrlHash.ts b/src/data/import/importFromUrlHash.ts
@@ -1,6 +1,6 @@
 import { validateAndParseThemeOptions } from '~/data/import/validateAndParseThemeOptions';
-import { base64Decode } from '~/utils/base64';
-import { toStoreColorName } from '~/utils/toFzfColorName';
+import { toStoreColorName } from '~/utils/colors/toFzfColorName';
+import { base64Decode } from '~/utils/strings/base64';
 
 export const importFromUrlHash = (hash: string) => {
   const jsonString = base64Decode(hash);

diff --git a/src/utils/getContrastColor.ts → src/utils/colors/getContrastColor.ts b/src/utils/getContrastColor.ts → src/utils/colors/getContrastColor.ts
diff --git a/src/utils/hexColorToRgb.ts → src/utils/colors/hexColorToRgb.ts b/src/utils/hexColorToRgb.ts → src/utils/colors/hexColorToRgb.ts
diff --git a/src/utils/toFzfColorName.ts → src/utils/colors/toFzfColorName.ts b/src/utils/toFzfColorName.ts → src/utils/colors/toFzfColorName.ts
diff --git a/src/utils/exportThemeToEnvVariable.ts b/src/utils/exportThemeToEnvVariable.ts
@@ -2,8 +2,8 @@ import { isValidColor, type ColorValues } from '~/data/colors.store';
 import { isValidOption, type ThemeOptions } from '~/data/options.store';
 import { colorDefinitions } from '~/fzf/fzfColorDefinitions';
 import { arrayChunk } from '~/utils/arrayChunk';
-import { base64Encode } from '~/utils/base64';
-import { toFzfColorName } from '~/utils/toFzfColorName';
+import { toFzfColorName } from '~/utils/colors/toFzfColorName';
+import { base64Encode } from '~/utils/strings/base64';
 
 type ExportItemDefinition<T extends keyof ThemeOptions> = {
   exportVariable: string;

diff --git a/src/utils/base64.ts → src/utils/strings/base64.ts b/src/utils/base64.ts → src/utils/strings/base64.ts
diff --git a/src/utils/htmlEscape.ts → src/utils/strings/htmlEscape.ts b/src/utils/htmlEscape.ts → src/utils/strings/htmlEscape.ts
diff --git a/src/utils/urlHash.ts → src/utils/strings/urlHash.ts b/src/utils/urlHash.ts → src/utils/strings/urlHash.ts
diff --git a/src/utils/useDragScroll.ts → src/utils/svelte/useDragScroll.ts b/src/utils/useDragScroll.ts → src/utils/svelte/useDragScroll.ts
diff --git a/src/utils/usePopper.ts → src/utils/svelte/usePopper.ts b/src/utils/usePopper.ts → src/utils/svelte/usePopper.ts
diff --git a/src/utils/tui/Token.ts b/src/utils/tui/Token.ts
@@ -1,4 +1,4 @@
-import { escapeHtml } from '~/utils/htmlEscape';
+import { escapeHtml } from '~/utils/strings/htmlEscape';
 
 export class Token {
   public readonly text: string;