From 29660c0de19eb992c0e1d331314ba46ad0c6b1cd Mon Sep 17 00:00:00 2001
From: Jackson Harper <jacksonh@gmail.com>
Date: Tue, 22 Nov 2022 12:00:26 +0800
Subject: [PATCH] Use the radix progress bar to keep consistent

---
 .../templates/homeFeed/HomeFeedContainer.tsx  | 80 ++++++++++++-------
 packages/web/package.json                     |  2 +-
 packages/web/styles/globals.css               | 17 +++-
 3 files changed, 69 insertions(+), 30 deletions(-)

diff --git a/packages/web/components/templates/homeFeed/HomeFeedContainer.tsx b/packages/web/components/templates/homeFeed/HomeFeedContainer.tsx
index a042fd0af..9c53341a6 100644
--- a/packages/web/components/templates/homeFeed/HomeFeedContainer.tsx
+++ b/packages/web/components/templates/homeFeed/HomeFeedContainer.tsx
@@ -1,6 +1,6 @@
 import { Box, HStack, SpanBox, VStack } from './../../elements/LayoutPrimitives'
 import Dropzone from 'react-dropzone'
-import ProgressBar from '@ramonak/react-progress-bar'
+import * as Progress from '@radix-ui/react-progress'
 import type {
   LibraryItem,
   LibraryItemsQueryInput,
@@ -15,7 +15,7 @@ import { useCallback, useEffect, useMemo, useRef, useState } from 'react'
 import { LibrarySearchBar } from './LibrarySearchBar'
 import { StyledText } from '../../elements/StyledText'
 import { AddLinkModal } from './AddLinkModal'
-import { styled } from '../../tokens/stitches.config'
+import { styled, theme } from '../../tokens/stitches.config'
 import { ListLayoutIcon } from '../../elements/images/ListLayoutIcon'
 import { GridLayoutIcon } from '../../elements/images/GridLayoutIcon'
 import {
@@ -52,6 +52,7 @@ import {
   TypeaheadSearchItemsData,
   typeaheadSearchQuery,
 } from '../../../lib/networking/queries/typeaheadSearch'
+import axios from 'axios'
 import { uploadFileRequestMutation } from '../../../lib/networking/mutations/uploadFileMutation'
 
 export type LayoutType = 'LIST_LAYOUT' | 'GRID_LAYOUT'
@@ -99,14 +100,17 @@ export function HomeFeedContainer(): JSX.Element {
 
   const gridContainerRef = useRef<HTMLDivElement>(null)
 
-  const [shareTarget, setShareTarget] =
-    useState<LibraryItem | undefined>(undefined)
+  const [shareTarget, setShareTarget] = useState<LibraryItem | undefined>(
+    undefined
+  )
 
-  const [snoozeTarget, setSnoozeTarget] =
-    useState<LibraryItem | undefined>(undefined)
+  const [snoozeTarget, setSnoozeTarget] = useState<LibraryItem | undefined>(
+    undefined
+  )
 
-  const [labelsTarget, setLabelsTarget] =
-    useState<LibraryItem | undefined>(undefined)
+  const [labelsTarget, setLabelsTarget] = useState<LibraryItem | undefined>(
+    undefined
+  )
 
   const [showAddLinkModal, setShowAddLinkModal] = useState(false)
   const [showEditTitleModal, setShowEditTitleModal] = useState(false)
@@ -726,6 +730,7 @@ function HomeFeedGrid(props: HomeFeedContentProps): JSX.Element {
 
   const [uploadingFiles, setUploadingFiles] = useState([])
   const [inDragOperation, setInDragOperation] = useState(false)
+  const [uploadProgress, setUploadProgress] = useState(0)
 
   const handleDrop = async (acceptedFiles: any) => {
     setInDragOperation(false)
@@ -744,9 +749,18 @@ function HomeFeedGrid(props: HomeFeedContentProps): JSX.Element {
           throw 'No upload URL available'
         }
 
-        const uploadResult = await fetch(request?.uploadSignedUrl, {
+        const uploadResult = await axios.request({
           method: 'PUT',
-          body: file,
+          url: request?.uploadSignedUrl,
+          data: file,
+          withCredentials: false,
+          headers: {
+            'Content-Type': 'application/pdf',
+          },
+          onUploadProgress: (p) => {
+            console.log('upload progress: ', (p.loaded / p.total) * 100)
+            setUploadProgress((p.loaded / p.total) * 100)
+          },
         })
 
         console.log('result of uploading: ', uploadResult)
@@ -894,31 +908,41 @@ function HomeFeedGrid(props: HomeFeedContentProps): JSX.Element {
                       fontSize: '$4',
                     }}
                   >
-                    Drag n drop files here
+                    Drop PDF document here to add to your library
                   </Box>
                 </DragnDropStyle>
               )}
               {uploadingFiles.length > 0 && (
-                  <DragnDropStyle>
-                    <Box
+                <DragnDropStyle>
+                  <Box
+                    css={{
+                      color: '$utilityTextDefault',
+                      fontWeight: '800',
+                      fontSize: '$4',
+                      width: '80%',
+                    }}
+                  >
+                    <Progress.Root
+                      className="ProgressRoot"
+                      value={uploadProgress}
+                    >
+                      <Progress.Indicator
+                        className="ProgressIndicator"
+                        style={{
+                          transform: `translateX(-${100 - uploadProgress}%)`,
+                        }}
+                      />
+                    </Progress.Root>
+                    <StyledText
+                      style="boldText"
                       css={{
-                        color: '$utilityTextDefault',
-                        fontWeight: '800',
-                        fontSize: '$4',
-                        width: '80%',
+                        color: theme.colors.omnivoreGray.toString(),
                       }}
                     >
-                      <ProgressBar
-                        completed={60}
-                        maxCompleted={100}
-                        customLabel="Uploading Files..."
-                        bgColor="rgb(255, 210, 52)"
-                        labelColor="black"
-                        animateOnRender={true}
-                        initCompletedOnAnimation={60}
-                      />
-                    </Box>
-                  </DragnDropStyle>
+                      Uploading file
+                    </StyledText>
+                  </Box>
+                </DragnDropStyle>
               )}
               <input {...getInputProps()} />
               {!props.isValidating && props.items.length == 0 ? (
diff --git a/packages/web/package.json b/packages/web/package.json
index 136742bf0..6c47538d0 100644
--- a/packages/web/package.json
+++ b/packages/web/package.json
@@ -24,9 +24,9 @@
     "@radix-ui/react-dropdown-menu": "^0.1.6",
     "@radix-ui/react-id": "^0.1.1",
     "@radix-ui/react-popover": "^0.1.1",
+    "@radix-ui/react-progress": "^1.0.1",
     "@radix-ui/react-separator": "^0.1.0",
     "@radix-ui/react-tooltip": "^0.1.7",
-    "@ramonak/react-progress-bar": "^5.0.3",
     "@segment/analytics-next": "^1.33.5",
     "@sentry/nextjs": "^6.16.1",
     "@stitches/react": "^1.2.5",
diff --git a/packages/web/styles/globals.css b/packages/web/styles/globals.css
index 2b11e4ad9..f8616bd79 100644
--- a/packages/web/styles/globals.css
+++ b/packages/web/styles/globals.css
@@ -376,4 +376,19 @@ button {
 /* .omnivore-masonry-grid_column > div {
   background: grey;
   margin-bottom: 16px;
-} */
\ No newline at end of file
+} */
+
+.ProgressRoot {
+  overflow: hidden;
+  background: var(--colors-omnivoreGray);
+  border-radius: 99999px;
+  height: 25px;
+  transform: translateZ(0);
+}
+
+.ProgressIndicator {
+  background-color: var(--colors-omnivoreCtaYellow) ;
+  width: 100%;
+  height: 100%;
+  transition: transform 660ms cubic-bezier(0.65, 0, 0.35, 1);
+}
\ No newline at end of file