From 309e338b4d7dc7bb2b2308fa898b3883178ec4b2 Mon Sep 17 00:00:00 2001
From: viktorstrate <viktorstrate@gmail.com>
Date: Fri, 4 Jun 2021 15:24:55 +0200
Subject: [PATCH] Style sidebar downloads

---
 ui/babel.config.js                            |  14 +-
 ui/src/components/sidebar/Sharing.tsx         |   9 +-
 ui/src/components/sidebar/Sidebar.tsx         |   2 +-
 .../components/sidebar/SidebarComponents.tsx  |   7 +
 ui/src/components/sidebar/SidebarDownload.tsx | 190 +++++++++---------
 ui/vite.config.ts                             |  10 +-
 6 files changed, 120 insertions(+), 112 deletions(-)
 create mode 100644 ui/src/components/sidebar/SidebarComponents.tsx

diff --git a/ui/babel.config.js b/ui/babel.config.js
index 6a120520..848c35d8 100644
--- a/ui/babel.config.js
+++ b/ui/babel.config.js
@@ -10,13 +10,13 @@ module.exports = function (api) {
     plugins.push('@babel/plugin-transform-runtime')
   } else {
     if (!isProduction) {
-      plugins.push([
-        'i18next-extract',
-        {
-          locales: ['en', 'da', 'fr', 'sv', 'es', 'it', 'pl', 'de'],
-          defaultValue: null,
-        },
-      ])
+      // plugins.push([
+      //   'i18next-extract',
+      //   {
+      //     locales: ['en', 'da', 'fr', 'sv', 'es', 'it', 'pl', 'de'],
+      //     defaultValue: null,
+      //   },
+      // ])
     }
 
     plugins.push(['styled-components', { pure: true }])
diff --git a/ui/src/components/sidebar/Sharing.tsx b/ui/src/components/sidebar/Sharing.tsx
index 48ffa419..7fde76bf 100644
--- a/ui/src/components/sidebar/Sharing.tsx
+++ b/ui/src/components/sidebar/Sharing.tsx
@@ -38,6 +38,7 @@ import {
   sidebarGetAlbumSharesVariables,
 } from './__generated__/sidebarGetAlbumShares'
 import { authToken } from '../../helpers/authentication'
+import { SidebarSection, SidebarSectionTitle } from './SidebarComponents'
 
 const SHARE_PHOTO_QUERY = gql`
   query sidebarGetPhotoShares($id: ID!) {
@@ -403,8 +404,10 @@ const SidebarShare = ({
   }
 
   return (
-    <div>
-      <h2>{t('sidebar.sharing.title', 'Sharing options')}</h2>
+    <SidebarSection>
+      <SidebarSectionTitle>
+        {t('sidebar.sharing.title', 'Sharing options')}
+      </SidebarSectionTitle>
       <div>
         <Table>
           <Table.Header>
@@ -438,6 +441,6 @@ const SidebarShare = ({
           </Table.Footer>
         </Table>
       </div>
-    </div>
+    </SidebarSection>
   )
 }
diff --git a/ui/src/components/sidebar/Sidebar.tsx b/ui/src/components/sidebar/Sidebar.tsx
index 2f59f56f..98c821f1 100644
--- a/ui/src/components/sidebar/Sidebar.tsx
+++ b/ui/src/components/sidebar/Sidebar.tsx
@@ -85,7 +85,7 @@ export const Sidebar = () => {
 
   return (
     <div
-      className={`fixed top-[72px] bg-white bottom-0 w-full overflow-y-scroll transform transition-transform motion-reduce:transition-none ${
+      className={`fixed top-[72px] bg-white bottom-0 w-full overflow-y-auto transform transition-transform motion-reduce:transition-none ${
         content == null && !pinned ? 'translate-x-full' : 'translate-x-0'
       } ${
         pinned ? 'mt-[62px]' : 'lg:shadow-separator'
diff --git a/ui/src/components/sidebar/SidebarComponents.tsx b/ui/src/components/sidebar/SidebarComponents.tsx
new file mode 100644
index 00000000..8a7f2d19
--- /dev/null
+++ b/ui/src/components/sidebar/SidebarComponents.tsx
@@ -0,0 +1,7 @@
+import styled from 'styled-components'
+
+export const SidebarSection = styled.div.attrs({ className: 'mb-8' })``
+
+export const SidebarSectionTitle = styled.h2.attrs({
+  className: 'text-xl mb-2 mx-4',
+})``
diff --git a/ui/src/components/sidebar/SidebarDownload.tsx b/ui/src/components/sidebar/SidebarDownload.tsx
index e50f7887..15a85b51 100644
--- a/ui/src/components/sidebar/SidebarDownload.tsx
+++ b/ui/src/components/sidebar/SidebarDownload.tsx
@@ -1,7 +1,5 @@
 import React from 'react'
 import PropTypes from 'prop-types'
-import { Table } from 'semantic-ui-react'
-import styled from 'styled-components'
 import { MessageState } from '../messages/Messages'
 import { useLazyQuery, gql } from '@apollo/client'
 import { authToken } from '../../helpers/authentication'
@@ -13,6 +11,7 @@ import {
   sidebarDownloadQueryVariables,
   sidebarDownloadQuery_media_downloads,
 } from './__generated__/sidebarDownloadQuery'
+import { SidebarSection, SidebarSectionTitle } from './SidebarComponents'
 
 export const SIDEBAR_DOWNLOAD_QUERY = gql`
   query sidebarDownloadQuery($mediaId: ID!) {
@@ -93,86 +92,85 @@ const downloadMedia = (t: TranslationFn) => async (url: string) => {
   downloadBlob(blob, filename)
 }
 
-const downloadMediaShowProgress = (t: TranslationFn) => async (
-  response: Response
-) => {
-  const totalBytes = Number(response.headers.get('content-length'))
-  const reader = response.body?.getReader()
-  const data = new Uint8Array(totalBytes)
+const downloadMediaShowProgress =
+  (t: TranslationFn) => async (response: Response) => {
+    const totalBytes = Number(response.headers.get('content-length'))
+    const reader = response.body?.getReader()
+    const data = new Uint8Array(totalBytes)
 
-  if (reader == null) {
-    throw new Error('Download reader is null')
-  }
+    if (reader == null) {
+      throw new Error('Download reader is null')
+    }
 
-  let canceled = false
-  const onDismiss = () => {
-    canceled = true
-    reader.cancel('Download canceled by user')
-  }
-
-  const notifyKey = Math.random().toString(26)
-  MessageState.add({
-    key: notifyKey,
-    type: 'progress',
-    onDismiss,
-    props: {
-      header: 'Downloading photo',
-      content: `Starting download`,
-      progress: 0,
-    },
-  })
-
-  let receivedBytes = 0
-  let result
-  do {
-    result = await reader.read()
-
-    if (canceled) break
-
-    if (result.value) data.set(result.value, receivedBytes)
-
-    receivedBytes += result.value ? result.value.length : 0
+    let canceled = false
+    const onDismiss = () => {
+      canceled = true
+      reader.cancel('Download canceled by user')
+    }
 
+    const notifyKey = Math.random().toString(26)
     MessageState.add({
       key: notifyKey,
       type: 'progress',
       onDismiss,
       props: {
         header: 'Downloading photo',
-        percent: (receivedBytes / totalBytes) * 100,
-        content: `${formatBytes(t)(receivedBytes)} of ${formatBytes(t)(
-          totalBytes
-        )} bytes downloaded`,
+        content: `Starting download`,
+        progress: 0,
       },
     })
-  } while (!result.done)
 
-  if (canceled) {
-    return
+    let receivedBytes = 0
+    let result
+    do {
+      result = await reader.read()
+
+      if (canceled) break
+
+      if (result.value) data.set(result.value, receivedBytes)
+
+      receivedBytes += result.value ? result.value.length : 0
+
+      MessageState.add({
+        key: notifyKey,
+        type: 'progress',
+        onDismiss,
+        props: {
+          header: 'Downloading photo',
+          percent: (receivedBytes / totalBytes) * 100,
+          content: `${formatBytes(t)(receivedBytes)} of ${formatBytes(t)(
+            totalBytes
+          )} bytes downloaded`,
+        },
+      })
+    } while (!result.done)
+
+    if (canceled) {
+      return
+    }
+
+    MessageState.add({
+      key: notifyKey,
+      type: 'progress',
+      props: {
+        header: 'Downloading photo completed',
+        content: `The photo has been downloaded`,
+        percent: 100,
+        positive: true,
+      },
+    })
+
+    setTimeout(() => {
+      MessageState.removeKey(notifyKey)
+    }, 2000)
+
+    const content = new Blob([data.buffer], {
+      type: response.headers.get('content-type') || undefined,
+    })
+
+    return content
   }
 
-  MessageState.add({
-    key: notifyKey,
-    type: 'progress',
-    props: {
-      header: 'Downloading photo completed',
-      content: `The photo has been downloaded`,
-      percent: 100,
-      positive: true,
-    },
-  })
-
-  setTimeout(() => {
-    MessageState.removeKey(notifyKey)
-  }, 2000)
-
-  const content = new Blob([data.buffer], {
-    type: response.headers.get('content-type') || undefined,
-  })
-
-  return content
-}
-
 const downloadBlob = async (blob: Blob, filename: string) => {
   const objectUrl = window.URL.createObjectURL(blob)
 
@@ -188,10 +186,6 @@ const downloadBlob = async (blob: Blob, filename: string) => {
   window.URL.revokeObjectURL(objectUrl)
 }
 
-const DownloadTableRow = styled(Table.Row)`
-  cursor: pointer;
-`
-
 type SidebarDownladProps = {
   media: MediaSidebarMedia
 }
@@ -229,41 +223,45 @@ const SidebarDownload = ({ media }: SidebarDownladProps) => {
   const download = downloadMedia(t)
   const bytes = formatBytes(t)
   const downloadRows = downloads.map(x => (
-    <DownloadTableRow
+    <tr
+      className="cursor-pointer border-gray-100 border-b hover:bg-gray-50 focus:bg-gray-50"
       key={x.mediaUrl.url}
       onClick={() => download(x.mediaUrl.url)}
+      tabIndex={0}
     >
-      <Table.Cell>{`${x.title}`}</Table.Cell>
-      <Table.Cell>{`${x.mediaUrl.width} x ${x.mediaUrl.height}`}</Table.Cell>
-      <Table.Cell>{`${bytes(x.mediaUrl.fileSize)}`}</Table.Cell>
-      <Table.Cell>{extractExtension(x.mediaUrl.url)}</Table.Cell>
-    </DownloadTableRow>
+      <td className="pl-4 py-2">{`${x.title}`}</td>
+      <td className="py-2">{`${x.mediaUrl.width} x ${x.mediaUrl.height}`}</td>
+      <td className="py-2">{`${bytes(x.mediaUrl.fileSize)}`}</td>
+      <td className="pr-4 py-2">{extractExtension(x.mediaUrl.url)}</td>
+    </tr>
   ))
 
   return (
-    <div style={{ marginBottom: 24 }}>
-      <h2>{t('sidebar.download.title', 'Download')}</h2>
+    <SidebarSection>
+      <SidebarSectionTitle>
+        {t('sidebar.download.title', 'Download')}
+      </SidebarSectionTitle>
 
-      <Table selectable singleLine compact>
-        <Table.Header>
-          <Table.Row>
-            <Table.HeaderCell>
+      <table className="table-fixed w-full">
+        <thead className="bg-[#f9f9fb]">
+          <tr className="text-left uppercase text-xs border-gray-100 border-b border-t">
+            <th className="w-2/6 pl-4 py-2">
               {t('sidebar.download.table_columns.name', 'Name')}
-            </Table.HeaderCell>
-            <Table.HeaderCell>
+            </th>
+            <th className="w-2/6 py-2">
               {t('sidebar.download.table_columns.dimensions', 'Dimensions')}
-            </Table.HeaderCell>
-            <Table.HeaderCell>
+            </th>
+            <th className="w-1/6 py-2">
               {t('sidebar.download.table_columns.file_size', 'Size')}
-            </Table.HeaderCell>
-            <Table.HeaderCell>
+            </th>
+            <th className="w-1/6 pr-4 py-2">
               {t('sidebar.download.table_columns.file_type', 'Type')}
-            </Table.HeaderCell>
-          </Table.Row>
-        </Table.Header>
-        <Table.Body>{downloadRows}</Table.Body>
-      </Table>
-    </div>
+            </th>
+          </tr>
+        </thead>
+        <tbody>{downloadRows}</tbody>
+      </table>
+    </SidebarSection>
   )
 }
 
diff --git a/ui/vite.config.ts b/ui/vite.config.ts
index a9646293..8ce22d14 100644
--- a/ui/vite.config.ts
+++ b/ui/vite.config.ts
@@ -7,11 +7,11 @@ import svgr from 'vite-plugin-svgr'
 export default defineConfig({
   plugins: [
     reactRefresh(),
-    // babel({
-    //   babelHelpers: 'bundled',
-    //   exclude: 'node_modules/**',
-    //   extensions: ['.js', '.jsx', '.ts', '.tsx'],
-    // }),
+    babel({
+      babelHelpers: 'bundled',
+      exclude: 'node_modules/**',
+      extensions: ['.js', '.jsx', '.ts', '.tsx'],
+    }),
     svgr(),
   ],
   server: {