Skip to content
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.

Sign up for GitHub

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

feat: Toaster #25

Merged
merged 4 commits into from
Jul 11, 2023
Merged

feat: Toaster #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3bbb3c9
upload bar in upload modal
DamoFD Jul 7, 2023
eb2c2a0
upload info in upload modal
DamoFD Jul 7, 2023
4acda05
Merge remote-tracking branch 'origin/dev' into feat/toaster
DamoFD Jul 10, 2023
384dc4e
created toaster and finished upload modal stats
DamoFD Jul 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions resources/js/Components/Reusable/ProgressBar.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ const props = defineProps({

<template>
<div class="w-full h-1 rounded-lg bg-gray-700 overflow-hidden shadow-md relative">
<div :style="{width: `${percentage}%`}" class="h-full bg-gradient-to-r from-brand-primary-500 via-brand-primary-600 to-brand-primary-700 animate-gradient shadow-lg relative transition-all duration-500 ease-in-out">
<div class="absolute w-full h-full bg-blue-700 opacity-50 animate-pulse" />
<div :style="{width: `${percentage}%`}" class="h-full bg-gradient-to-r from-brand-primary-500 via-brand-primary-600 to-brand-primary-700 animate-gradient shadow-lg relative transition-all duration-500 ease-in-out rounded-lg">
<div class="absolute w-full h-full bg-blue-700 opacity-50 animate-pulse rounded-lg" />
</div>
</div>
</template>
Expand Down
18 changes: 12 additions & 6 deletions resources/js/Components/Upload/UploadModal.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@ let isValidFile = ref(null)
let fileDisplay = ref('')
let isUploading = ref(false)
let percentage = ref(null)
let bytes = ref(null)
let rate = ref(null)
let estimated = ref(null)

const validTypes = ['video/mp4','video/mpeg']

Expand All @@ -47,7 +48,8 @@ const getUploadedFile = (e) => {
},
onProgress: progress => {
percentage.value = progress.percentage
bytes.value = (progress.bytes / 1000000).toFixed(2)
rate.value = (progress.rate / 1000000).toFixed(2)
estimated.value = progress.estimated.toFixed(2)
},
onSuccess: (res) => {
isUploading.value = false
Expand All @@ -74,7 +76,7 @@ const closeModal = () => {

<template>
<div class="backdrop-blur-md w-full h-full absolute top-0 left-0">
<div class="flex justify-center items-center absolute top-1/2 left-1/2 -translate-y-1/2 -translate-x-1/2 bg-neutral-900 rounded-2xl w-1/2">
<div class="flex flex-col overflow-x-hidden justify-center items-center absolute top-1/2 left-1/2 -translate-y-1/2 -translate-x-1/2 bg-neutral-900 rounded-2xl w-1/2">
<div class="w-3/4">
<!-- Input -->
<div v-if="!fileDisplay && isUploading === false">
Expand All @@ -95,9 +97,13 @@ const closeModal = () => {
<!-- </div>-->
<!-- Finished uploading -->
<div v-if="fileDisplay && isValidFile === true">
<div v-if="isUploading === true">
<ProgressBar :percentage="percentage" />
<p class="text-white">{{ bytes }} mb/s</p>
<div v-if="isUploading === true" class="w-full">
<ProgressBar :percentage="percentage" class="mt-2" />
<div class="flex w-full justify-between text-white">
<p>{{ rate }} mb/s</p>
<p>{{ percentage }}%</p>
<p>{{ estimated }}s left</p>
</div>
</div>
<div class="my-4">
<div class="mb-4">
Expand Down