Scott.Idem/OSIT-AE-App-Svelte
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Everything is working except for the file uploads

Browse Source
This commit is contained in:
Scott Idem
2024-06-14 14:42:49 -04:00
parent 65daf86cc7
commit 06df9a6230
7 changed files with 652 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/routes/+layout.svelte
View File

@@ -224,7 +224,9 @@ onMount(() => {
// let event_file_id = endpoint.split('/')[3];
// ae_downloads[event_file_id] = {
$ae_sess.download = {
// $ae_sess.download = {
$ae_sess.download[endpoint] = {
'endpoint': endpoint,
'filename': event.data.filename,
'size_total': event.data.size_total,

183
src/routes/events_pres_mgmt/session/[slug]/+page.svelte
View File

@@ -26,6 +26,7 @@ import { events_loc, events_sess, events_slct, events_trigger } from '$lib/ae_ev
import { events_func } from '$lib/ae_events_functions';
import Form_agree from './form_agree.svelte';
import Presenter_view from './presenter_view.svelte';
// Quickly save the data passed from the parent(s) to the Svelte stores, localStorage, and other.
$slct.account_id = data.account_id;
@@ -106,6 +107,10 @@ let lq__event_presenter_obj = liveQuery(
$events_slct.event_presenter_obj = $lq__event_presenter_obj;
let lq__event_file_obj_li = liveQuery(
() => db_events.files.where('event_session_id_random').equals($events_slct.event_session_id).toArray()
);
// Load the Event Obj with ID based on the slug param.
// $events_slct.event_id = param_slug_event_id;
// console.log('Selected Event ID:', $events_slct.event_id);
@@ -331,14 +336,14 @@ function send_init_confirm_email({to_email, to_name, person_id, person_passcode,
console.log('Show/Hide Description');
$events_loc.pres_mgmt.show_content__session_description = !$events_loc.pres_mgmt.show_content__session_description;
}}
class="btn btn-sm variant-soft-surface hover:variant-filled-surface"
class="btn btn-sm variant-soft-surface hover:variant-filled-surface text-xs"
>
{#if $events_loc.pres_mgmt.show_content__session_description}
<span class="fas fa-eye-slash mx-1"></span>
<span class="text-xs">Hide Description</span>
<span>Hide Description</span>
{:else}
<span class="fas fa-eye mx-1"></span>
<span class="text-xs">Show</span>
<span>Show</span>
{/if}
</button>
</div>
@@ -580,14 +585,14 @@ function send_init_confirm_email({to_email, to_name, person_id, person_passcode,
$events_loc.pres_mgmt.show_content__presentation_description = event_presentation_obj.event_presentation_id_random;
}
}}
class="btn btn-sm variant-soft-surface hover:variant-filled-surface"
class="btn btn-sm variant-soft-surface hover:variant-filled-surface text-xs"
>
{#if $events_loc.pres_mgmt.show_content__presentation_description == event_presentation_obj.event_presentation_id_random}
<span class="fas fa-eye-slash mx-1"></span>
<span class="text-xs">Hide Description</span>
<span>Hide Description</span>
{:else}
<span class="fas fa-eye mx-1"></span>
<span class="text-xs">Show</span>
<span>Show</span>
{/if}
</button>
</div>
@@ -610,7 +615,7 @@ function send_init_confirm_email({to_email, to_name, person_id, person_passcode,
<li>
<button
type="button"
disabled={!$ae_loc.trusted_access && !$events_loc.auth__kv.presenter[event_presenter_obj.event_presenter_id_random]}
disabled={!$ae_loc.trusted_access && (!$events_loc.auth__kv.presenter[event_presenter_obj.event_presenter_id_random] || !event_presenter_obj.agree)}
on:click={
() => {
console.log('View presenter details');
@@ -727,11 +732,11 @@ function send_init_confirm_email({to_email, to_name, person_id, person_passcode,
{#if $ae_loc.trusted_access && event_presenter_obj.email}
<span class="fas fa-envelope"></span>
<!-- <span class="fas fa-envelope"></span>
<a
href="mailto:{event_presenter_obj.email}"
class="text-blue-500"
>{event_presenter_obj.email}</a>
>{event_presenter_obj.email}</a> -->
{#if event_presenter_obj.agree}
@@ -741,19 +746,19 @@ function send_init_confirm_email({to_email, to_name, person_id, person_passcode,
</span>
{/if}
{#if event_presenter_obj.person_passcode}
<!-- {#if event_presenter_obj.person_passcode}
<span>
<span class="fas fa-user-secret"></span>
Passcode: {event_presenter_obj.person_passcode}
</span>
{/if}
{/if} -->
{#if event_presenter_obj.passcode}
<!-- {#if event_presenter_obj.passcode}
<span class="bg-red-100 p-1 rounded-md">
<span class="fas fa-key"></span>
Passcode: {event_presenter_obj.passcode}
</span>
{/if}
{/if} -->
{:else}
{/if}
@@ -791,8 +796,59 @@ function send_init_confirm_email({to_email, to_name, person_id, person_passcode,
<p>Error: {error.message}</p>
{/await}
{#if $lq__event_file_obj_li && $lq__event_file_obj_li.length > 0}
<strong class="text-sm">Files:</strong>
<ul
class="space-y-2 px-4"
>
{#each $lq__event_file_obj_li as event_file_obj}
{#if (event_file_obj.event_presentation_id_random == event_presentation_obj.event_presentation_id_random && ($ae_loc.trusted_access || $events_loc.auth__kv.presentation[event_presentation_obj.event_presentation_id_random]))}
<li>
<button
class="btn btn-md variant-soft-primary"
on:click={() => {
// ae_promises[event_file_obj.event_file_id_random]
ae_promises[event_file_obj.event_file_id_random] = api.download_hosted_file({
api_cfg: $ae_api,
hosted_file_id: event_file_obj.hosted_file_id_random,
return_file: true,
filename: event_file_obj.filename,
auto_download: true,
log_lvl: 1
});
// window.postMessage({ type: 'download_event_file', event_file_id: event_file_obj.event_file_id_random, filename: event_file_obj.filename, auto_download: true }, '*');
}}
title={`Download this file: ${event_file_obj.filename} [API] -- SHA256 hash: ${event_file_obj.hash_sha256.slice(0, 10)}...`}
>
{#await ae_promises[event_file_obj.event_file_id_random]}
<span class="mx-1">
<span class="fas fa-spinner fa-spin mx-1"></span>
Downloading
{#if $ae_sess.download[`/hosted_file/${event_file_obj.hosted_file_id_random}/download`]}
{$ae_sess.download[`/hosted_file/${event_file_obj.hosted_file_id_random}/download`].percent_completed}%
{/if}
:
</span>
{:then}
<span class="fas fa-download mx-1"></span>
Download:
{/await}
{event_file_obj.filename.slice(0, 20)}...{event_file_obj.extension}
</button>
</li>
{/if}
{/each}
</ul>
{/if}
<!-- Show files list for this presentation -->
{#await event_presentation_obj.event_file_li}
<!-- {#await event_presentation_obj.event_file_li}
<p>Loading...</p>
{:then event_file_li}
{#if event_file_li}
@@ -813,7 +869,7 @@ function send_init_confirm_email({to_email, to_name, person_id, person_passcode,
{/if}
{:catch error}
<p>Error: {error.message}</p>
{/await}
{/await} -->
</li>
{/each}
@@ -844,7 +900,7 @@ function send_init_confirm_email({to_email, to_name, person_id, person_passcode,
<!-- </div> -->
<section class="ae_modal_scrollfix">
<button
<button
on:click={
() => {
$events_loc.pres_mgmt.show_content__agree_text = null;
@@ -856,8 +912,7 @@ function send_init_confirm_email({to_email, to_name, person_id, person_passcode,
Close
</button>
<Form_agree />
<Form_agree />
</section>
<!-- <div class="h-12"> -->
@@ -884,6 +939,8 @@ function send_init_confirm_email({to_email, to_name, person_id, person_passcode,
<div class="ae_quick_modal_container">
<section class="ae_quick_popover">
<div class="flex flex-col items-center">
<section class="ae_modal_scrollfix">
<button
on:click={
@@ -897,93 +954,8 @@ function send_init_confirm_email({to_email, to_name, person_id, person_passcode,
Close
</button>
<h2 class="h3">
Presenter Details for:<br>
<strong>{$events_slct.presenter_obj.full_name} ({$events_slct.presenter_obj.email})</strong>
</h2>
<!-- <Element_data_store
ds_code="event_presenter_details"
ds_type="html"
display="block"
class_li="p-2"
/> -->
<section class="p-2">
<h3 class="h4">Title: "{$events_slct.presentation_obj.name}"</h3>
<h3 class="h4">Presenter:</h3>
<ul
class="space-y-2 px-4"
>
<li>
<span class="fas fa-user"></span>
{$events_slct.presenter_obj.full_name}
</li>
<li>
<span class="fas fa-envelope"></span>
<a
href="mailto:{$events_slct.presenter_obj.email}"
class="text-blue-500"
>{$events_slct.presenter_obj.email}</a>
</li>
<!-- <li>
<span class="fas fa-phone"></span>
{$events_slct.presenter_obj.phone}
</li> -->
<li>
<span class="fas fa-building"></span>
{$events_slct.presenter_obj.affiliations}
</li>
<li>
<span class="fas fa-user-tag"></span>
{$events_slct.presenter_obj.professional_title}
</li>
<li>
<span class="fas fa-user-secret"></span>
{$events_slct.presenter_obj.person_passcode} (your passcode)
<button title="Edit your passcode" class="btn btn-sm variant-soft-warning">
<span class="fas fa-edit">
</span>
Edit
</button>
</li>
</ul>
<h3 class="h4">Files:</h3>
<label>
Upload new file(s):
<input
type="file"
class="form-input"
multiple
>
</label>
<ul
class="space-y-2 px-4"
>
{#if $events_slct.presenter_obj.file_li}
{#each $events_slct.presenter_obj.file_li as file_obj}
<li>
<span class="fas fa-file"></span>
<a
href={file_obj.url}
class="text-blue-500"
>{file_obj.name}</a>
</li>
{/each}
{:else}
<li>
<span class="fas fa-file"></span>
No files uploaded
</li>
{/if}
</ul>
<Presenter_view />
</section>
</section>
<button
on:click={
@@ -996,6 +968,9 @@ function send_init_confirm_email({to_email, to_name, person_id, person_passcode,
<span class="fas fa-times mx-1"></span>
Close
</button>
</div>
</section>
</div>
{/if}

13
src/routes/events_pres_mgmt/session/[slug]/+page.ts
View File

@@ -66,6 +66,19 @@ export async function load({ parent }) { // route
console.log(`load_event_presentation_obj_li = `, load_event_presentation_obj_li);
ae_acct.slct.event_presentation_obj_li = load_event_presentation_obj_li;
let load_event_file_obj_li = await events_func.handle_load_ae_obj_li__event_file({
api_cfg: ae_acct.api,
event_session_id: event_session_id,
params: {enabled: 'all', qry__limit: 50},
try_cache: false
})
.then((event_file_obj_li) => {
console.log(`event_file_obj_li = `, event_file_obj_li);
return event_file_obj_li;
});
console.log(`load_event_file_obj_li = `, load_event_file_obj_li);
ae_acct.slct.event_file_obj_li = load_event_file_obj_li;
// WARNING: Precaution against shared data between sites and presentations.
data[account_id] = ae_acct;

12
src/routes/events_pres_mgmt/session/[slug]/form_agree.svelte
View File

@@ -92,7 +92,6 @@ async function handle_submit_form(event) {
}
async function handle_update__event_presenter({
obj_type,
obj_id,
@@ -129,14 +128,10 @@ async function handle_update__event_presenter({
}
// function send_init_confirm_email() {
// console.log(`*** send_init_confirm_email() *** to ${$lq__event_presenter_obj.email}.`);
// let subject = `LCI 2024 Pres Mgmt Hub Link for ${$lq__event_session_obj.name} (ID: ${$lq__event_session_obj.eventt_session_id_random})`;
// let subject = `LCI 2024 Pres Mgmt Hub Link for ${$lq__event_session_obj.name} (ID: ${$lq__event_session_obj.event_session_id_random})`;
// let body_html = `
// <div>${$lq__event_session_obj.full_name},
@@ -161,8 +156,6 @@ async function handle_update__event_presenter({
// });
// }
</script>
{#await $lq__event_presenter_obj}
@@ -183,6 +176,7 @@ async function handle_update__event_presenter({
/>
<section class="text-lg border border-red-200 rounded-md bg-red-100 space-y-2">
<!-- Highlight the persons name, email, and that whole line. -->
<p class="text-lg bg-yellow-100 p-2">
<strong>{$lq__event_presenter_obj.full_name} ({$lq__event_presenter_obj.email})</strong> agrees to the following terms and conditions for the presentation:
@@ -287,10 +281,8 @@ async function handle_update__event_presenter({
</button>
</form>
<h3 class="h4">Agree?</h3>
<!-- Agree (agreement) means this presenter has agreed to the terms and conditions. -->
<Element_ae_crud

311
src/routes/events_pres_mgmt/session/[slug]/presenter_view.svelte Normal file
View File

@@ -0,0 +1,311 @@
<script lang="ts">
console.log(`ae_events_pres_mgmt session [slug] form_agree.svelte`);
import { onMount } from 'svelte';
import { clipboard, FileDropzone } from '@skeletonlabs/skeleton';
import { liveQuery } from "dexie";
import type { key_val } from '$lib/ae_stores';
import { ae_util } from '$lib/ae_utils';
import { api } from '$lib/api';
import Element_data_store from '$lib/element_data_store.svelte';
import Element_ae_crud from '$lib/element_ae_crud.svelte';
import { ae_loc, ae_sess, ae_api, ae_trig, slct, slct_trigger } from '$lib/ae_stores';
import { db_events } from "$lib/db_events";
import { events_loc, events_sess, events_slct, events_trigger } from '$lib/ae_events_stores';
import { events_func } from '$lib/ae_events_functions';
let ae_triggers: key_val = {};
let ae_promises: key_val = {}; // Promise<any>;
let ae_placeholder_li: key_val = {};
let lq__event_session_obj = liveQuery(
() => db_events.sessions.get($events_slct.event_session_id)
);
// let lq__event_presentation_obj = liveQuery(
// async () => await db_events.presentations.get($events_slct.event_presentation_id)
// );
console.log(`$events_slct.event_presenter_id:`, $events_slct.event_presenter_id);
let lq__event_presenter_obj = liveQuery(
() => db_events.presenters.get($events_slct.event_presenter_id)
);
let lq__event_file_obj_li = liveQuery(
() => db_events.files.where('event_presenter_id_random').equals($events_slct.event_presenter_id).toArray()
);
// $events_slct.event_presenter_obj = $lq__event_presenter_obj;
// $events_sess.pres_mgmt.disable_submit__opt_out = false;
// let tmp_agree = false;
// let tmp_opt_out: key_val = {
// audio: false,
// video: false,
// transcription_and_publication: false,
// publication_in_app: false
// };
onMount(() => {
console.log('Events Session [slug]: presenter_view.svelte');
console.log(`$events_slct.event_presenter_id:`, $events_slct.event_presenter_id);
console.log(`$lq__event_presenter_obj:`, $lq__event_presenter_obj);
});
// async function handle_submit_form(event) {
// console.log('*** handle_submit_form() ***');
// $events_sess.pres_mgmt.disable_submit__opt_out = true;
// $events_sess.pres_mgmt.submit_status = 'saving';
// // Data in
// let form_data = new FormData(event.target);
// console.log(form_data);
// let opt_out_di: key_val = ae_util.extract_prefixed_form_data({prefix: null, form_data: form_data, trim_values: true, bool_tf_str: true, log_lvl: 0});
// console.log(`opt_out_di:`, opt_out_di);
// // Data out
// let opt_out_do: key_val = {};
// opt_out_do.optout_audio = opt_out_di.optout_audio??false;
// opt_out_do.optout_video = opt_out_di.optout_video??false;
// opt_out_do.optout_transcription_and_publication = opt_out_di.optout_transcription_and_publication??false;
// opt_out_do.optout_publication_in_app = opt_out_di.optout_publication_in_app??false;
// console.log(`opt_out_do:`, opt_out_do);
// let data_out = {
// data_json: opt_out_do,
// }
// ae_promises.update__event_presenter_obj = await handle_update__event_presenter({
// obj_type: 'event_presenter',
// obj_id: $lq__event_presenter_obj?.event_presenter_id_random,
// data: data_out
// });
// console.log(ae_promises.update__event_presenter_obj);
// $events_sess.pres_mgmt.disable_submit__opt_out = false;
// $events_sess.pres_mgmt.submit_status = 'saved';
// }
// async function handle_update__event_presenter({
// obj_type,
// obj_id,
// data
// }) {
// console.log('*** handle_update__event_presenter() ***');
// ae_promises.update__event_presenter_obj = api.update_ae_obj_id_crud({
// api_cfg: $ae_api,
// obj_type: obj_type,
// obj_id: obj_id,
// fields: data,
// key: $ae_api.api_crud_super_key,
// return_obj: true,
// log_lvl: 2
// })
// .then(async function (update__obj_result) {
// if (!update__obj_result) {
// console.log('The result was null or false.');
// return false;
// } else {
// console.log(`update__obj_result = `, update__obj_result);
// }
// $slct_trigger = 'load__event_presenter_obj_li';
// return update__obj_result;
// })
// .catch(function (error) {
// console.log('Something went wrong.');
// console.log(error);
// return false;
// });
// return ae_promises.update__event_presenter_obj;
// }
</script>
{#await $lq__event_presenter_obj}
Loading...
{:then result}
{#if $lq__event_presenter_obj}
<h2 class="h3">
Presenter Details for:<br>
<strong>{$events_slct.presenter_obj.full_name} ({$events_slct.presenter_obj.email})</strong>
</h2>
<section class="p-2">
<h3 class="h4">Title: "{$events_slct.presentation_obj.name}"</h3>
<h3 class="h4">Presenter:</h3>
<ul
class="space-y-2 px-4"
>
<li>
<span class="fas fa-user"></span>
{$events_slct.presenter_obj.full_name}
</li>
<li>
<span class="fas fa-envelope"></span>
<a
href="mailto:{$events_slct.presenter_obj.email}"
class="text-blue-500"
>{$events_slct.presenter_obj.email}</a>
</li>
<!-- <li>
<span class="fas fa-phone"></span>
{$events_slct.presenter_obj.phone}
</li> -->
<li>
<span class="fas fa-building"></span>
{$events_slct.presenter_obj.affiliations}
</li>
<li>
<span class="fas fa-user-tag"></span>
{$events_slct.presenter_obj.professional_title ?? '-- not set --'}
</li>
<li>
<span class="fas fa-user-secret"></span>
{$events_slct.presenter_obj.person_passcode} (your passcode)
<button title="Edit your passcode" class="btn btn-sm variant-soft-warning">
<span class="fas fa-edit">
</span>
Edit
</button>
</li>
<li>
{#if $ae_loc.trusted_access}
<!-- A button to copy the access link to the clipboard. -->
<!-- Example: /events_pres_mgmt/session/Wh8UnJlbIA0?person_id=fV1dl_IJ0yY&person_pass=abc123 -->
<button
type="button"
class="btn btn-sm variant-soft-warning"
use:clipboard={encodeURI(`${data.url.origin}/events_pres_mgmt/session/${$events_slct.event_session_id}?person_id=${event_presenter_obj.person_id_random}&person_pass=${event_presenter_obj.person_passcode}&presentation_id=${event_presentation_obj.event_presentation_id_random}&presenter_id=${event_presenter_obj.event_presenter_id_random}`)}
>
<span class="fas fa-copy mx-1"></span>
Copy Access Link
</button>
{/if}
</li>
</ul>
<h3 class="h4">Files:</h3>
<label for="input__presenter_event_file">
Upload outline or draft file(s):
<FileDropzone
id="input__presenter_event_file"
name="presenter_event_file"
padding="p-1"
accept="image/*"
class="w-96 variant-glass-warning"
on:change={(e) => {
console.log('*** FileDropzone change event ***', e);
if (e.target.files.length) {
ae_placeholder_li.new_file = `Ready to upload: ${e.target.files[0].name}`;
} else {
ae_placeholder_li.new_file = null;
}
}}
>
<svelte:fragment slot="lead"><span class="fas fa-file-upload"></svelte:fragment>
<svelte:fragment slot="message"><strong>Upload your file</strong> (drag and drop)</svelte:fragment>
<svelte:fragment slot="meta">High resolution image files only<br>(PNG, WEBP, JPG, etc)</svelte:fragment>
{ae_placeholder_li.new_file ?? 'No files selected.'}
</FileDropzone>
</label>
File count: {$events_slct.presenter_obj.file_count ?? '-- none --'}
{#if $lq__event_file_obj_li}
<ul
class="space-y-2 px-4"
>
{#each $lq__event_file_obj_li as event_file_obj}
<li>
<!-- <span class="fas fa-file"></span> -->
<!-- <a
href={file_obj.url}
class="text-blue-500"
>{file_obj.filename}</a> -->
<button
class="btn btn-md variant-soft-primary"
on:click={() => {
// ae_promises[event_file_obj.event_file_id_random]
ae_promises[event_file_obj.event_file_id_random] = api.download_hosted_file({
api_cfg: $ae_api,
hosted_file_id: event_file_obj.hosted_file_id_random,
return_file: true,
filename: event_file_obj.filename,
auto_download: true,
log_lvl: 1
});
// window.postMessage({ type: 'download_event_file', event_file_id: event_file_obj.event_file_id_random, filename: event_file_obj.filename, auto_download: true }, '*');
}}
title={`Download this file: ${event_file_obj.filename} [API] -- SHA256 hash: ${event_file_obj.hash_sha256.slice(0, 10)}...`}
>
{#await ae_promises[event_file_obj.event_file_id_random]}
<span class="mx-1">
<span class="fas fa-spinner fa-spin mx-1"></span>
Downloading
{#if $ae_sess.download[`/hosted_file/${event_file_obj.hosted_file_id_random}/download`]}
{$ae_sess.download[`/hosted_file/${event_file_obj.hosted_file_id_random}/download`].percent_completed}%
{/if}
:
</span>
{:then}
<span class="fas fa-download mx-1"></span>
Download:
{/await}
{event_file_obj.filename.slice(0, 20)}...{event_file_obj.extension}
</button>
</li>
{/each}
</ul>
{:else}
<p>No files uploaded</p>
{/if}
<!-- <ul
class="space-y-2 px-4"
>
{#if $events_slct.presenter_obj.file_li}
{#each $events_slct.presenter_obj.file_li as file_obj}
<li>
<span class="fas fa-file"></span>
<a
href={file_obj.url}
class="text-blue-500"
>{file_obj.name}</a>
</li>
{/each}
{:else}
<li>
<span class="fas fa-file"></span>
No files uploaded
</li>
{/if}
</ul> -->
</section>
{/if}
{/await}