Uh oh!
There was an error while loading. Please reload this page.
- Notifications
You must be signed in to change notification settings - Fork 8
Fix/pictique issues#775
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Uh oh!
There was an error while loading. Please reload this page.
Merged
Fix/pictique issues #775
Changes from all commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
4d6433c
fix: update CreatePostModal layout and button styling
Bekiboo e6bcb91
fix: reduce "new group" button size and set on top right corner
Bekiboo 4f5ccc5
fix: prevent empty messages, prevent spamming send button, improve st…
Bekiboo 548ba5d
fix: improve profile image upload handling and error messaging
Bekiboo d3d8b10
fix: profile placeholder url
Bekiboo 24bf406
Add invitation to start conversation
Bekiboo f62d008
fix: enhance image upload validation, error handling in CreatePostMod…
Bekiboo eb677a7
fix: refine image upload handling and validation across components
Bekiboo 608b2d7
fix: improve image upload validation and error handling across compon…
Bekiboo 780506c
fix: update maximum file size for profile picture upload to 500KB
Bekiboo File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Uh oh!
There was an error while loading. Please reload this page.
Jump to
Jump to file
Failed to load files.
Loading
Uh oh!
There was an error while loading. Please reload this page.
Diff view
Diff view
There are no files selected for viewing
166 changes: 128 additions & 38 deletions
166 platforms/pictique/src/lib/fragments/CreatePostModal/CreatePostModal.svelte
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,63 +1,103 @@ | ||
| <script lang="ts"> | ||
| import { closeCreatePostModal, createPost } from '$lib/stores/posts'; | ||
| import { Button, Modal } from '$lib/ui'; | ||
| import { formatSize, validateFileSize } from '$lib/utils/fileValidation'; | ||
| let { open = $bindable() }: { open: boolean } = $props(); | ||
| interface UploadItem { | ||
| file: File; | ||
| dataUrl: string; | ||
| } | ||
| let text = $state(''); | ||
| let images = $state<string[]>([]); | ||
| let uploadItems = $state<UploadItem[]>([]); | ||
| let isSubmitting = $state(false); | ||
| let error = $state(''); | ||
| const MAX_TOTAL_SIZE = 5 * 1024 * 1024; // 5MB total | ||
| const MAX_FILE_SIZE = 1 * 1024 * 1024; // 1MB per individual image | ||
| let totalSize = $derived(uploadItems.reduce((sum, item) => sum + item.file.size, 0)); | ||
| let usagePercentage = $derived((totalSize / MAX_TOTAL_SIZE) * 100); | ||
| let remainingSize = $derived(MAX_TOTAL_SIZE - totalSize); | ||
| const handleImageUpload = (event: Event) => { | ||
| const input = event.target as HTMLInputElement; | ||
| if (!input.files?.length) return; | ||
| const file = input.files[0]; | ||
| const validation = validateFileSize(file, MAX_FILE_SIZE, totalSize, MAX_TOTAL_SIZE); | ||
| if (!validation.valid) { | ||
| error = validation.error || 'Invalid file'; | ||
| input.value = ''; | ||
| return; | ||
| } | ||
| error = ''; | ||
Bekiboo marked this conversation as resolved.
Uh oh!There was an error while loading. Please reload this page. | ||
| const reader = new FileReader(); | ||
| reader.onload = (e) => { | ||
| const result = e.target?.result; | ||
| if (typeof result === 'string') { | ||
| console.log(result); | ||
| images = [...images, result]; | ||
| // Atomically add both file and dataUrl together | ||
| uploadItems = [...uploadItems, { file, dataUrl: result }]; | ||
| } else { | ||
| error = 'Failed to read image file'; | ||
| } | ||
| }; | ||
| reader.onerror = () => { | ||
| error = 'Error reading image file'; | ||
| }; | ||
| reader.readAsDataURL(file); | ||
| input.value = ''; | ||
| }; | ||
| const removeImage = (index: number) => { | ||
| images = images.filter((_, i) => i !== index); | ||
| uploadItems = uploadItems.filter((_, i) => i !== index); | ||
| error = ''; | ||
| }; | ||
| const handleSubmit = async () => { | ||
| if (!text.trim() && images.length === 0) return; | ||
| if (!text.trim() && uploadItems.length === 0) return; | ||
| try { | ||
| isSubmitting = true; | ||
| const images = uploadItems.map((item) => item.dataUrl); | ||
| await createPost(text, images); | ||
| closeCreatePostModal(); | ||
| text = ''; | ||
| images = []; | ||
| } catch (error) { | ||
| console.error('Failed to create post:', error); | ||
| uploadItems = []; | ||
| error = ''; | ||
| } catch (err) { | ||
| error = err instanceof Error ? err.message : String(err); | ||
| console.error('Failed to create post:', err); | ||
| } finally { | ||
| isSubmitting = false; | ||
| } | ||
| }; | ||
| </script> | ||
| <Modal {open} onclose={closeCreatePostModal}> | ||
| <div class="w-full max-w-2xl rounded-lg bg-white p-6"> | ||
| <div class="w-[80vw] max-w-sm rounded-lg bg-white p-6 sm:max-w-md md:max-w-lg lg:max-w-2xl"> | ||
| <div class="mb-4 flex items-center justify-between"> | ||
| <h2 class="text-xl font-semibold">Create Post</h2> | ||
| <button | ||
| type="button" | ||
| class="rounded-full p-2 hover:bg-gray-100" | ||
| onclick={closeCreatePostModal} | ||
| > | ||
| ✕ | ||
| {@render Cross()} | ||
| </button> | ||
| </div> | ||
| {#if error} | ||
| <div class="mb-4 rounded-md bg-red-500 px-4 py-2 text-sm text-white"> | ||
| {error} | ||
| </div> | ||
| {/if} | ||
| <div class="mb-4"> | ||
| <!-- svelte-ignore element_invalid_self_closing_tag --> | ||
| <textarea | ||
| @@ -68,45 +108,95 @@ | ||
| /> | ||
| </div> | ||
| {#if images.length > 0} | ||
| <div class="mb-4 grid grid-cols-2 gap-4"> | ||
| {#each images as image, index (index)} | ||
| <div class="relative"> | ||
| <!-- svelte-ignore a11y_img_redundant_alt --> | ||
| <img | ||
| src={image} | ||
| alt="Post image" | ||
| class="aspect-square w-full rounded-lg object-cover" | ||
| /> | ||
| <button | ||
| type="button" | ||
| class="absolute top-2 right-2 rounded-full bg-black/50 p-1 text-white hover:bg-black/70" | ||
| onclick={() => removeImage(index)} | ||
| > | ||
| ✕ | ||
| </button> | ||
| </div> | ||
| {/each} | ||
| <div class="mb-4 grid grid-cols-2 gap-4 md:grid-cols-3 lg:grid-cols-4"> | ||
| {#each uploadItems as item, index (index)} | ||
| <div class="relative"> | ||
| <!-- svelte-ignore a11y_img_redundant_alt --> | ||
| <img | ||
| src={item.dataUrl} | ||
| alt="Post image" | ||
| class="aspect-square w-full rounded-lg object-cover" | ||
| /> | ||
| <button | ||
| type="button" | ||
| class="absolute top-2 right-2 rounded-full bg-black/50 p-1 text-white hover:bg-black/70" | ||
| onclick={() => removeImage(index)} | ||
| aria-label="Remove image" | ||
| > | ||
| {@render Cross()} | ||
| </button> | ||
| </div> | ||
| {/each} | ||
| <!-- Add Photo Frame --> | ||
| {#if remainingSize > 0} | ||
| <label | ||
| class="flex aspect-square cursor-pointer flex-col items-center justify-center gap-2 rounded-lg border-2 border-dashed border-gray-300 bg-gray-50 transition-colors hover:border-gray-400 hover:bg-gray-100" | ||
| > | ||
| <svg | ||
| xmlns="http://www.w3.org/2000/svg" | ||
| class="h-8 w-8 text-gray-400" | ||
| fill="none" | ||
| viewBox="0 0 24 24" | ||
| stroke="currentColor" | ||
| stroke-width="2" | ||
| > | ||
| <path stroke-linecap="round" stroke-linejoin="round" d="M12 4v16m8-8H4" /> | ||
| </svg> | ||
| <span class="text-sm font-medium text-gray-600">Add Photo</span> | ||
| <input | ||
| type="file" | ||
| accept="image/*" | ||
| class="hidden" | ||
| onchange={handleImageUpload} | ||
| /> | ||
| </label> | ||
| {/if} | ||
| </div> | ||
| {#if uploadItems.length > 1} | ||
| <div class="mb-4"> | ||
| <div class="mb-2 flex items-center justify-between text-sm"> | ||
| <span class="text-gray-600"> | ||
| {formatSize(totalSize)} / {formatSize(MAX_TOTAL_SIZE)} | ||
| </span> | ||
| <span class="text-gray-600">{formatSize(remainingSize)} remaining</span> | ||
| </div> | ||
| <div class="h-2 w-full overflow-hidden rounded-full bg-gray-200"> | ||
| <div | ||
| class="h-full transition-all duration-300" | ||
| class:bg-red-500={usagePercentage >= 90} | ||
| class:bg-yellow-500={usagePercentage >= 70 && usagePercentage < 90} | ||
| class:bg-green-500={usagePercentage < 70} | ||
| style="width: {Math.min(usagePercentage, 100)}%" | ||
| ></div> | ||
| </div> | ||
| </div> | ||
| {/if} | ||
| <div class="flex items-center justify-between gap-2"> | ||
| <label | ||
| class="w-full cursor-pointer rounded-full bg-gray-100 px-4 py-3 text-center hover:bg-gray-200" | ||
| > | ||
| <input type="file" accept="image/*" class="hidden" onchange={handleImageUpload} /> | ||
| Add Photo | ||
| </label> | ||
| <div class="flex justify-end"> | ||
| <Button | ||
| variant="secondary" | ||
| size="sm" | ||
| callback={handleSubmit} | ||
| isLoading={isSubmitting} | ||
| disabled={!text.trim() && images.length === 0} | ||
| disabled={!text.trim() && uploadItems.length === 0} | ||
| > | ||
| Post | ||
| </Button> | ||
| </div> | ||
| </div> | ||
| </Modal> | ||
| {#snippet Cross()} | ||
| <svg | ||
| xmlns="http://www.w3.org/2000/svg" | ||
| class="h-4 w-4" | ||
| fill="none" | ||
| viewBox="0 0 24 24" | ||
| stroke="currentColor" | ||
| stroke-width="2" | ||
| > | ||
| <path stroke-linecap="round" stroke-linejoin="round" d="M6 18L18 6M6 6l12 12" /> | ||
| </svg> | ||
| {/snippet} | ||
29 changes: 23 additions & 6 deletions
29 platforms/pictique/src/lib/fragments/MessageInput/MessageInput.svelte
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
15 changes: 5 additions & 10 deletions
15 platforms/pictique/src/lib/fragments/UploadedPostView/UploadedPostView.svelte
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Uh oh!
There was an error while loading. Please reload this page.
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ah well, we don't really want to enforce these that hard