diff --git a/src/routes/idaa/(idaa)/archives/10_list__archive_content_obj.svelte b/src/routes/idaa/(idaa)/archives/10_list__archive_content_obj.svelte index cb096d95..cc13ee03 100644 --- a/src/routes/idaa/(idaa)/archives/10_list__archive_content_obj.svelte +++ b/src/routes/idaa/(idaa)/archives/10_list__archive_content_obj.svelte @@ -8,7 +8,7 @@ import { ae, api, Element_modal_v3 } from 'aether_npm_lib'; import { slct, ae_app, slct_trigger } from './stores'; import Edit_archive_content_obj from './10_edit__archive_content_obj.svelte'; -import Player_archive_content_obj from './10_player__archive_content_obj.svelte'; +import Player_archive_content_obj from './ae_idaa_comp__media_player.svelte'; let idaa_archive_content_obj_li_get_promise: Promise; let idaa_archive_content_obj_get_promise: Promise; diff --git a/src/routes/idaa/(idaa)/archives/10_player__archive_content_obj.svelte b/src/routes/idaa/(idaa)/archives/10_player__archive_content_obj.svelte deleted file mode 100644 index 93a0b43a..00000000 --- a/src/routes/idaa/(idaa)/archives/10_player__archive_content_obj.svelte +++ /dev/null @@ -1,78 +0,0 @@ - - - - -
- {#if file_icons[$slct.archive_content_obj.file_extension] == 'file-audio'} - - - {:else if file_icons[$slct.archive_content_obj.file_extension] == 'file-video'} - - - {:else if file_icons[$slct.archive_content_obj.file_extension] == 'file-image'} - {$slct.archive_content_obj.name} - {:else} - {$slct.archive_content_obj.filename} - {/if} - - {#if $slct.archive_content_obj.description} -
- {$slct.archive_content_obj.description} -
- {/if} - - {#if $slct.archive_content_obj.content_html} -
- {@html $slct.archive_content_obj.content_html} -
- {/if} - -
\ No newline at end of file diff --git a/src/routes/idaa/(idaa)/archives/[archive_id]/+page.svelte b/src/routes/idaa/(idaa)/archives/[archive_id]/+page.svelte index a9c78abd..efe9b91b 100644 --- a/src/routes/idaa/(idaa)/archives/[archive_id]/+page.svelte +++ b/src/routes/idaa/(idaa)/archives/[archive_id]/+page.svelte @@ -28,6 +28,7 @@ import Archive_view from './ae_idaa_comp__archive_obj_id_view.svelte'; import Archive_content_obj_li from './ae_idaa_comp__archive_content_obj_li.svelte'; import Archive_content_obj_id_edit from './ae_idaa_comp__archive_content_obj_id_edit.svelte'; +import Media_player from './../ae_idaa_comp__media_player.svelte'; import { browser } from '$app/environment'; @@ -144,7 +145,11 @@ if (browser) { {/if} - Edit Archive: {$lq__archive_obj?.name} + + Edit Archive: + + {$lq__archive_obj?.name} + @@ -205,7 +210,11 @@ if (browser) { {/if} - Edit Archive Content: {$lq__archive_content_obj?.name} + + Edit Archive Content: + + {$lq__archive_content_obj?.name} + @@ -231,4 +240,32 @@ if (browser) { --> + + + + + + + +
+

+ + Viewing: + + {$lq__archive_content_obj?.name}

+
+ + + + + \ No newline at end of file diff --git a/src/routes/idaa/(idaa)/archives/[archive_id]/ae_idaa_comp__archive_content_obj_id_edit.svelte b/src/routes/idaa/(idaa)/archives/[archive_id]/ae_idaa_comp__archive_content_obj_id_edit.svelte index 97f06dcc..ab9446af 100644 --- a/src/routes/idaa/(idaa)/archives/[archive_id]/ae_idaa_comp__archive_content_obj_id_edit.svelte +++ b/src/routes/idaa/(idaa)/archives/[archive_id]/ae_idaa_comp__archive_content_obj_id_edit.svelte @@ -12,6 +12,7 @@ import { core_func } from '$lib/ae_core/ae_core_functions'; import { api } from '$lib/api'; import { ae_snip, ae_loc, ae_sess, ae_api, ae_trig, slct, slct_trigger } from '$lib/ae_stores'; import { idaa_loc, idaa_sess, idaa_slct } from '$lib/ae_idaa_stores'; +import { archives_func } from '$lib/ae_archives/ae_archives_functions'; import Tiptap_editor from '$lib/element_tiptap_editor.svelte'; @@ -21,6 +22,7 @@ let create_archive_content_obj_promise: any; let delete_archive_content_obj_promise: any; let update_archive_content_obj_promise: any; let upload__hosted_file_obj_promise: any; +let prom_api__archive_content_obj_v2: any; let disable_submit_btn = true; @@ -105,52 +107,54 @@ onMount(() => { async function handle_submit_form(event) { - console.log('*** handle_submit_form() ***'); + if (log_lvl > 1) { + console.log('*** handle_submit_form() ***'); + console.log(event.target); + } disable_submit_btn = true; let form_data = new FormData(event.target); - console.log(form_data); + if (log_lvl) { + console.log(form_data); + } - let form_archive_content_data = ae_util.extract_prefixed_form_data({prefix: null, form_data: form_data, trim_values: true, bool_tf_str: true, log_lvl: 0}); - console.log(form_archive_content_data); + let archive_content_di = ae_util.extract_prefixed_form_data({prefix: null, form_data: form_data, trim_values: true, bool_tf_str: true, log_lvl: 0}); + console.log(archive_content_di); - let archive_content_data: key_val = {}; + let archive_content_do: key_val = {}; if (!$idaa_slct.archive_content_id) { - archive_content_data['account_id_random'] = $ae_loc.account_id; - archive_content_data['archive_id_random'] = $idaa_slct.archive_id; - // archive_content_data['enable'] = true; + archive_content_do['account_id_random'] = $ae_loc.account_id; + archive_content_do['archive_id_random'] = $idaa_slct.archive_id; + // archive_content_do['enable'] = true; } - archive_content_data['name'] = form_archive_content_data.name; - if (tinyMCE.get('description')) { - archive_content_data['description'] = tinyMCE.get('description').getContent(); + archive_content_do['name'] = archive_content_di.name; + // Check if the description_new_html exists and is a string + if (typeof $idaa_slct.archive_content_obj.description_new_html === 'string') { + console.log('New description is a string'); + archive_content_do['description'] = $idaa_slct.archive_content_obj.description_new_html; } else { - archive_content_data['description'] = form_archive_content_data.description; + console.log('New description is not a string. Do nothing.'); + // archive_content_do['description'] = event_meeting_fd.description; } - if (tinyMCE.get('content_html')) { - archive_content_data['content_html'] = tinyMCE.get('content_html').getContent(); + if (archive_content_di.archive_content_type) { + archive_content_do['archive_content_type'] = archive_content_di.archive_content_type; } else { - archive_content_data['content_html'] = form_archive_content_data.content_html; + archive_content_do['archive_content_type'] = null; } - if (form_archive_content_data.archive_content_type) { - archive_content_data['archive_content_type'] = form_archive_content_data.archive_content_type; - } else { - archive_content_data['archive_content_type'] = null; - } + archive_content_do['enable_for_public'] = !!!archive_content_di.enable_for_public; - archive_content_data['enable_for_public'] = !!!form_archive_content_data.enable_for_public; - - archive_content_data['file_path'] = form_archive_content_data.file_path; - archive_content_data['filename'] = form_archive_content_data.filename.trim(); - archive_content_data['file_extension'] = form_archive_content_data.file_extension.trim(); + archive_content_do['file_path'] = archive_content_di.file_path; + archive_content_do['filename'] = archive_content_di.filename.trim(); + archive_content_do['file_extension'] = archive_content_di.file_extension.trim(); let date_time_str = null; - let date_part = form_archive_content_data.original_datetime_date.trim(); - let time_part = form_archive_content_data.original_datetime_time.trim(); + let date_part = archive_content_di.original_datetime_date.trim(); + let time_part = archive_content_di.original_datetime_time.trim(); if (date_part && time_part) { date_time_str = `${date_part} ${time_part}`; } else if (date_part) { @@ -159,42 +163,47 @@ async function handle_submit_form(event) { // date_time_str = `${time_part}`; date_time_str = false; } - archive_content_data['original_datetime'] = date_time_str; + archive_content_do['original_datetime'] = date_time_str; - archive_content_data['original_timezone'] = form_archive_content_data.original_timezone; + archive_content_do['original_timezone'] = archive_content_di.original_timezone; - archive_content_data['original_location'] = form_archive_content_data.original_location; + archive_content_do['original_location'] = archive_content_di.original_location; - archive_content_data['hide'] = !!form_archive_content_data.hide; - archive_content_data['priority'] = !!form_archive_content_data.priority; - if (form_archive_content_data.sort) { - // Change this to a number type - archive_content_data['sort'] = Number(form_archive_content_data.sort); + archive_content_do['hide'] = archive_content_di.hide; + archive_content_do['priority'] = archive_content_di.priority; + if (archive_content_di.sort) { + archive_content_do['sort'] = Number(archive_content_di.sort); } else { - archive_content_data['sort'] = null; + archive_content_do['sort'] = null; } - if (form_archive_content_data.group) { - archive_content_data['group'] = form_archive_content_data.group; + if (archive_content_di.group) { + archive_content_do['group'] = archive_content_di.group; } else { - archive_content_data['group'] = null; - } - if (archive_content_data['enable']) { - archive_content_data['enable'] = !!form_archive_content_data.enable; + archive_content_do['group'] = null; } - if (tinyMCE.get('notes')) { - archive_content_data['notes'] = tinyMCE.get('notes').getContent(); + // Check if the enable exists and is a string + console.log(`archive_content_di.enable = ${archive_content_di.enable}`); + // if (typeof archive_content_di.enable !== 'undefined') { + archive_content_do['enable'] = !!archive_content_di.enable; + // } + + // Check if the notes_new_html exists and is a string + if (typeof $idaa_slct.archive_content_obj.notes_new_html === 'string') { + console.log('New notes is a string'); + archive_content_do['notes'] = $idaa_slct.archive_content_obj.notes_new_html; } else { - archive_content_data['notes'] = form_archive_content_data.notes; + console.log('New notes is not a string. Do nothing.'); + // archive_content_do['notes'] = event_meeting_fd.notes; } - console.log(archive_content_data); + console.log(archive_content_do); if (!$idaa_slct.archive_content_id) { create_archive_content_obj_promise = api.create_ae_obj_crud({ api_cfg: $ae_api, obj_type: 'archive_content', - fields: archive_content_data, + fields: archive_content_do, key: $ae_api.api_crud_super_key, log_lvl: 1 }) @@ -232,16 +241,16 @@ async function handle_submit_form(event) { console.log(upload__hosted_file_obj_promise); let hosted_file_id = upload__hosted_file_obj_promise[0].hosted_file_id_random; - archive_content_data = {}; - archive_content_data['hosted_file_id_random'] = hosted_file_id; - archive_content_data['file_path'] = `/hosted_file/download/${hosted_file_id}?filename=${form_archive_content_data.filename.trim()}`; - archive_content_data['archive_content_type'] = 'hosted_file'; + archive_content_do = {}; + archive_content_do['hosted_file_id_random'] = hosted_file_id; + archive_content_do['file_path'] = `/hosted_file/download/${hosted_file_id}?filename=${archive_content_di.filename.trim()}`; + archive_content_do['archive_content_type'] = 'hosted_file'; update_archive_content_obj_promise = await api.update_ae_obj_id_crud({ api_cfg: $ae_api, obj_type: 'archive_content', obj_id: $idaa_slct.archive_content_id, - fields: archive_content_data, + fields: archive_content_do, key: $ae_api.api_crud_super_key, log_lvl: 1 }) @@ -258,7 +267,7 @@ async function handle_submit_form(event) { return false; }); - // update_archive_content_obj_promise = await update_archive_content_obj({archive_content_id: $idaa_slct.archive_content_id, data: archive_content_data}) + // update_archive_content_obj_promise = await update_archive_content_obj({archive_content_id: $idaa_slct.archive_content_id, data: archive_content_do}) // console.log(update_archive_content_obj_promise); return update_archive_content_obj_promise }) @@ -282,13 +291,11 @@ async function handle_submit_form(event) { return create_archive_content_obj_promise; } else { - update_archive_content_obj_promise = api.update_ae_obj_id_crud({ + prom_api__archive_content_obj_v2 = archives_func.update_ae_obj__archive_content({ api_cfg: $ae_api, - obj_type: 'archive_content', - obj_id: $idaa_slct.archive_content_id, - fields: archive_content_data, - key: $ae_api.api_crud_super_key, - log_lvl: 1 + archive_content_id: $idaa_slct.archive_content_id, + data_kv: archive_content_do, + log_lvl: log_lvl }) .then(function (archive_content_obj_update_result) { if (!archive_content_obj_update_result) { @@ -296,23 +303,54 @@ async function handle_submit_form(event) { return false; } - // dispatch( - // 'updated__archive_content_obj', - // { - // archive_content_id: $idaa_slct.archive_content_id, - // } - // ); - return archive_content_obj_update_result; }) .catch(function (error) { console.log('Something went wrong.'); console.log(error); return false; + }) + .finally(() => { + // We need to do this since the comment has changed and the idaa_slct object does automatically update (yet...???). + $idaa_slct.archive_content_obj = $lq__archive_content_obj; + disable_submit_btn = false; + // $idaa_sess.archives.show__modal_edit__archive_content_id = false; }); - return update_archive_content_obj_promise; + return prom_api__archive_content_obj_v2; } + + // update_archive_content_obj_promise = api.update_ae_obj_id_crud({ + // api_cfg: $ae_api, + // obj_type: 'archive_content', + // obj_id: $idaa_slct.archive_content_id, + // fields: archive_content_do, + // key: $ae_api.api_crud_super_key, + // log_lvl: 1 + // }) + // .then(function (archive_content_obj_update_result) { + // if (!archive_content_obj_update_result) { + // console.log('The result was null or false.'); + // return false; + // } + + // // dispatch( + // // 'updated__archive_content_obj', + // // { + // // archive_content_id: $idaa_slct.archive_content_id, + // // } + // // ); + + // return archive_content_obj_update_result; + // }) + // .catch(function (error) { + // console.log('Something went wrong.'); + // console.log(error); + // return false; + // }); + + // return update_archive_content_obj_promise; + // } } @@ -383,7 +421,7 @@ async function handle_submit_form(event) { -
+ -
+ -->

File?

{#if !$idaa_slct.archive_content_id} + FILE INPUT GOES HERE + + {:else} + + + + + + + {/if} - - - - - - @@ -517,56 +557,117 @@ async function handle_submit_form(event) { {$idaa_loc.archives.show__admin_options ? 'Hide' : 'Show'} Admin +
+ >

Admin Options

- +
+ Hide +
+ + +
+
+ + +
+
- +
+ Priority +
+ + +
+
+ + +
+
+ - + + - + + - {#if $ae_loc.administrator_access} - - {/if} + {#if $ae_loc.administrator_access} + +
+ Enable +
+ + +
+
+ + +
+
+ + {/if} + -
+ {/if} diff --git a/src/routes/idaa/(idaa)/archives/[archive_id]/ae_idaa_comp__archive_content_obj_li.svelte b/src/routes/idaa/(idaa)/archives/[archive_id]/ae_idaa_comp__archive_content_obj_li.svelte index 96c78c3c..b5e38d7e 100644 --- a/src/routes/idaa/(idaa)/archives/[archive_id]/ae_idaa_comp__archive_content_obj_li.svelte +++ b/src/routes/idaa/(idaa)/archives/[archive_id]/ae_idaa_comp__archive_content_obj_li.svelte @@ -33,13 +33,13 @@ onMount(() => { >
-

+

{@html idaa_archive_content_obj.name}

{#if idaa_archive_content_obj.original_location} — -

+

{idaa_archive_content_obj.original_location}

@@ -50,7 +50,7 @@ onMount(() => {
- {#if $ae_loc.trusted_access && idaa_archive_content_obj?.hosted_file_id} + {#if $ae_loc.authenticated_access && idaa_archive_content_obj?.hosted_file_id}
- - {#if idaa_archive_content_obj.archive_content_id == $idaa_sess.archives.show_view__archive_content_media} - - Player Goes Here - {/if} - -
{#if idaa_archive_content_obj?.description}
{
{ console.log('** Component Mounted: ** ID - Archive Obj'); }); + +// Reminder: Styling is being done with Tailwind CSS, not Bootstrap.
-

{@html $lq__archive_obj?.name} - {$lq__archive_content_obj_li?.length}

+

{@html $lq__archive_obj?.name} ({$lq__archive_content_obj_li?.length}×)

-
+
{#if $lq__archive_obj?.description}
{@html $lq__archive_obj?.description}
{/if} {#if $lq__archive_obj?.content_html}
{@html $lq__archive_obj?.content_html}
{/if} {#if $lq__archive_obj?.original_url}
- URL: - {$lq__archive_obj?.original_url} + URL: + {$lq__archive_obj?.original_url}
{/if} {#if $lq__archive_obj?.original_datetime}
- Start Date: - {ae_util.iso_datetime_formatter($lq__archive_obj?.original_datetime, 'datetime_long')} + Start Date: + {ae_util.iso_datetime_formatter($lq__archive_obj?.original_datetime, 'date_long')}
{/if} {#if $lq__archive_obj?.original_timezone} - Timezone: - {$lq__archive_obj?.original_timezone} + Timezone: + {$lq__archive_obj?.original_timezone} {/if} {#if $lq__archive_obj?.original_location}
- Location: - {$lq__archive_obj?.original_location} + Location: + {$lq__archive_obj?.original_location}
{/if}
-
-
+
+ Created on: {ae_util.iso_datetime_formatter($lq__archive_obj?.created_on, 'datetime_iso_no_seconds')} - {#if $lq__archive_obj?.updated_on} + + {#if $lq__archive_obj?.updated_on} + Updated on: {ae_util.iso_datetime_formatter($lq__archive_obj?.updated_on, 'datetime_iso_no_seconds')} - {/if} -
+ + {/if}
{#if $ae_loc.trusted_access} diff --git a/src/routes/idaa/(idaa)/archives/ae_idaa_comp__media_player.svelte b/src/routes/idaa/(idaa)/archives/ae_idaa_comp__media_player.svelte new file mode 100644 index 00000000..91317194 --- /dev/null +++ b/src/routes/idaa/(idaa)/archives/ae_idaa_comp__media_player.svelte @@ -0,0 +1,107 @@ + + + + +
+ {#if file_icons[$idaa_slct.archive_content_obj.file_extension] == 'file-audio'} + + + {:else if file_icons[$idaa_slct.archive_content_obj.file_extension] == 'file-video'} + + + + + {:else if file_icons[$idaa_slct.archive_content_obj.file_extension] == 'file-image'} + {$idaa_slct.archive_content_obj.name} + {:else} + + + Download: + {$idaa_slct.archive_content_obj.filename} + + {/if} + + {#if $idaa_slct.archive_content_obj.description} +
+ {$idaa_slct.archive_content_obj.description} +
+ {/if} + + {#if $idaa_slct.archive_content_obj.content_html} +
+ {@html $idaa_slct.archive_content_obj.content_html} +
+ {/if} + +
\ No newline at end of file diff --git a/src/routes/idaa/(idaa)/bb/ae_idaa_comp__post_comment_obj_id_edit.svelte b/src/routes/idaa/(idaa)/bb/ae_idaa_comp__post_comment_obj_id_edit.svelte index f17bf1f6..74143cbd 100644 --- a/src/routes/idaa/(idaa)/bb/ae_idaa_comp__post_comment_obj_id_edit.svelte +++ b/src/routes/idaa/(idaa)/bb/ae_idaa_comp__post_comment_obj_id_edit.svelte @@ -20,8 +20,8 @@ let disable_submit_btn = false; async function handle_submit_form(event: any) { - console.log('*** handle_submit_form() ***'); if (log_lvl > 1) { + console.log('*** handle_submit_form() ***'); console.log(event.target); }