Package updates round 3ish. Other minor code clean up.

2025-03-04 17:31:40 -05:00
parent 3719739b57
commit 643edbd50a
7 changed files with 29 additions and 36 deletions
--- a/package-lock.json
+++ b/package-lock.json
@@ -79,9 +79,9 @@
        "svelte-highlight": "^7.8.0",
        "svelte-idle": "^3.0.1",
        "svelte-tiptap": "^2.1.0",
-        "tailwind-merge": "^2.5.5",
+        "tailwind-merge": "^3.0.0",
        "tailwind-variants": "^0.3.0",
-        "tailwindcss": "^3.4.15",
+        "tailwindcss": "^3.4.0",
        "tailwindcss-animate": "^1.0.7",
        "tslib": "^2.4.1",
        "typescript": "^5.0.0",
@@ -3980,16 +3980,6 @@
        "svelte": "^3.55.1 || ^4.0.0 || ^5.0.0"
      }
    },
-    "node_modules/flowbite-svelte/node_modules/tailwind-merge": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/tailwind-merge/-/tailwind-merge-3.0.2.tgz",
-      "integrity": "sha512-l7z+OYZ7mu3DTqrL88RiKrKIqO3NcpEO8V/Od04bNpvk0kiIFndGEoqfuzvj4yuhRkHKjRkII2z+KS2HfPcSxw==",
-      "license": "MIT",
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/dcastil"
-      }
-    },
    "node_modules/follow-redirects": {
      "version": "1.15.9",
      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.9.tgz",
@@ -7043,10 +7033,9 @@
      "license": "MIT"
    },
    "node_modules/tailwind-merge": {
-      "version": "2.6.0",
-      "resolved": "https://registry.npmjs.org/tailwind-merge/-/tailwind-merge-2.6.0.tgz",
-      "integrity": "sha512-P+Vu1qXfzediirmHOC3xKGAYeZtPcV9g76X+xg2FD4tYgR71ewMA35Y3sCz3zhiN/dwefRpJX0yBcgwi1fXNQA==",
-      "dev": true,
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/tailwind-merge/-/tailwind-merge-3.0.2.tgz",
+      "integrity": "sha512-l7z+OYZ7mu3DTqrL88RiKrKIqO3NcpEO8V/Od04bNpvk0kiIFndGEoqfuzvj4yuhRkHKjRkII2z+KS2HfPcSxw==",
      "license": "MIT",
      "funding": {
        "type": "github",
--- a/package.json
+++ b/package.json
@@ -74,9 +74,9 @@
    "svelte-highlight": "^7.8.0",
    "svelte-idle": "^3.0.1",
    "svelte-tiptap": "^2.1.0",
-    "tailwind-merge": "^2.5.5",
+    "tailwind-merge": "^3.0.0",
    "tailwind-variants": "^0.3.0",
-    "tailwindcss": "^3.4.15",
+    "tailwindcss": "^3.4.0",
    "tailwindcss-animate": "^1.0.7",
    "tslib": "^2.4.1",
    "typescript": "^5.0.0",
--- a/src/app.css
+++ b/src/app.css
@@ -0,0 +1,3 @@
+@import 'tailwindcss';
+@plugin '@tailwindcss/forms';
+@plugin '@tailwindcss/typography';
--- a/src/lib/ae_core/ae_comp__hosted_files_clip_video.svelte
+++ b/src/lib/ae_core/ae_comp__hosted_files_clip_video.svelte
@@ -3,7 +3,7 @@ export let log_lvl: number = 0;

 // Imports
 // Import components and elements
-import Element_input_files_tbl from '$lib/element_input_files_tbl.svelte';
+// import Element_input_files_tbl from '$lib/element_input_files_tbl.svelte';

 // Import storage, functions, and libraries
 import type { key_val } from '$lib/ae_stores';
@@ -17,15 +17,15 @@ import { ae_snip, ae_loc, ae_sess, ae_api, ae_trig, slct, slct_trigger } from '$
 export let link_to_type: string;
 export let link_to_id: string;

-export let input_name = 'file_list';
-export let multiple: boolean = true;
-export let required: boolean = true;
-export let accept: string = 'audio/*, image/*, video/*, .bak, .cfg, .css, .csv, .doc, .docx, .gz, .htm, .html, .ini, .iso, .j2, .json, .key, .keynote, .md, .pdf, .ppt, .pptx, .rar, .rtf, .sql, .svelte, ttf, .txt, .xls, .xlsx, .xz, .zip, .bin, .dmg, .exe, .js, .msi, .php, .py, .sh';
+// export let input_name = 'file_list';
+// export let multiple: boolean = true;
+// export let required: boolean = true;
+// export let accept: string = 'audio/*, image/*, video/*, .bak, .cfg, .css, .csv, .doc, .docx, .gz, .htm, .html, .ini, .iso, .j2, .json, .key, .keynote, .md, .pdf, .ppt, .pptx, .rar, .rtf, .sql, .svelte, ttf, .txt, .xls, .xlsx, .xz, .zip, .bin, .dmg, .exe, .js, .msi, .php, .py, .sh';

 export let class_li_default: string = 'flex flex-col gap-1 items-center justify-center w-full max-w-2xl mx-auto my-1';
 export let class_li: string = '';
-export let input_class_li: string[] = ['file_drop_area'];
-export let table_class_li: string[] = ['table', 'table-sm', 'table-striped', 'table-hover' , 'text-sm'];
+// export let input_class_li: string[] = ['file_drop_area'];
+// export let table_class_li: string[] = ['table', 'table-sm', 'table-striped', 'table-hover' , 'text-sm'];

 export let clip_complete: boolean = false;
 // export let upload_complete: boolean = false;
--- a/src/lib/element_manage_hosted_file_li.svelte
+++ b/src/lib/element_manage_hosted_file_li.svelte
@@ -1,12 +1,12 @@
 <script lang="ts">
 export let log_lvl: number = 0;
-import { onMount } from 'svelte';
-import { clipboard } from '@skeletonlabs/skeleton';
+// import { onMount } from 'svelte';
+// import { clipboard } from '@skeletonlabs/skeleton';
 // import { liveQuery } from "dexie";

 import type { key_val } from '$lib/ae_stores';
 import { ae_util } from '$lib/ae_utils/ae_utils';
-import { api } from '$lib/api';
+// import { api } from '$lib/api';
 // import Element_ae_crud from '$lib/element_ae_crud.svelte';
 // import Element_data_store from '$lib/element_data_store_v2.svelte';

@@ -19,8 +19,8 @@ export let container_class_li: string|Array<string> = [];
 export let lq__hosted_file_obj_li: any;
 export let link_to_type: string;
 export let link_to_id: string;
-export let allow_basic: boolean = false;
-export let allow_moderator: boolean = false;
+// export let allow_basic: boolean = false;
+// export let allow_moderator: boolean = false;
 export let display_mode: string = 'default'; // 'default', 'compact', 'minimal', 'launcher'

 // export let show_convert_btn: null|boolean = null;
--- a/src/lib/element_manage_hosted_file_li_all.svelte
+++ b/src/lib/element_manage_hosted_file_li_all.svelte
@@ -20,8 +20,8 @@ import { db_core } from "$lib/ae_core/db_core";
 export let container_class_li: string|Array<string> = [];
 export let link_to_type: string;
 export let link_to_id: string;
-export let allow_basic: boolean = false;
-export let allow_moderator: boolean = false;
+export let allow_basic: boolean = false; // Not used yet
+export let allow_moderator: boolean = false; // Not used yet
 export let display_mode: string = 'default'; // 'default', 'compact', 'minimal', 'launcher'

 console.log(`HERE HERE HERE HERE: link_to_type: ${link_to_type} link_to_id: ${link_to_id}`);
@@ -73,16 +73,17 @@ $: lq__hosted_file_obj_li = liveQuery(async () => {
    <p>No files found</p>
 {/if} -->

+
 {#if lq__hosted_file_obj_li}
    <Element_manage_hosted_file_li
        link_to_type={link_to_type}
        link_to_id={link_to_id}
        lq__hosted_file_obj_li={lq__hosted_file_obj_li}
-        allow_basic={allow_basic}
-        allow_moderator={allow_moderator}
        container_class_li={container_class_li}
        display_mode={display_mode}
        />
+        <!-- allow_basic={allow_basic} -->
+        <!-- allow_moderator={allow_moderator} -->
 {:else}
    <p>No files found</p>
 {/if}
--- a/src/routes/hosted_files/+page.svelte
+++ b/src/routes/hosted_files/+page.svelte
@@ -5,9 +5,9 @@ export let data;
 import { onMount } from 'svelte';


-import { api } from '$lib/api.js';
+// import { api } from '$lib/api.js';
 import { ae_loc, ae_sess, ae_api, slct, slct_trigger } from '$lib/ae_stores';
-import { ae_util } from '$lib/ae_utils/ae_utils';
+// import { ae_util } from '$lib/ae_utils/ae_utils';
 import type { key_val } from '$lib/ae_stores';

 import Comp_hosted_files_upload from '$lib/ae_core/ae_comp__hosted_files_upload.svelte';