From f835582bd745fda670568824423b7dea5a48d6b7 Mon Sep 17 00:00:00 2001
From: Jannik Stehle <jannik.stehle@gmail.com>
Date: Fri, 29 Apr 2022 09:52:23 +0200
Subject: [PATCH 1/3] Polish the upload overlay

---
 .../web-runtime/src/components/UploadInfo.vue | 135 +++++++++++-------
 1 file changed, 86 insertions(+), 49 deletions(-)

diff --git a/packages/web-runtime/src/components/UploadInfo.vue b/packages/web-runtime/src/components/UploadInfo.vue
index 8c2894fcb09..5f0e028a826 100644
--- a/packages/web-runtime/src/components/UploadInfo.vue
+++ b/packages/web-runtime/src/components/UploadInfo.vue
@@ -1,17 +1,7 @@
 <template>
   <div id="upload-info" class="oc-rounded oc-box-shadow-medium" :class="{ 'oc-hidden': !showInfo }">
-    <div class="upload-info-title oc-flex oc-flex-between oc-flex-middle oc-p-m">
-      <span class="oc-flex oc-flex-middle">
-        <oc-icon
-          v-if="!filesUploading && !uploadCancelled"
-          variation="success"
-          name="check"
-          class="oc-mr-s"
-        />
-        <oc-icon v-else-if="uploadCancelled" variation="danger" name="close" class="oc-mr-s" />
-        <span v-text="uploadInfoTitle" />
-      </span>
-
+    <div class="upload-info-title oc-flex oc-flex-between oc-flex-middle oc-px-m oc-pt-m">
+      <span class="oc-flex oc-flex-middle" v-text="uploadInfoTitle" />
       <oc-button
         id="close-upload-info-btn"
         v-oc-tooltip="$gettext('Close')"
@@ -21,17 +11,19 @@
         <oc-icon name="close" />
       </oc-button>
     </div>
+    <div class="upload-info-status-bar oc-px-m" />
     <div
-      class="upload-info-status-bar oc-px-m"
-      :class="{ 'oc-mb-m': successfulUploads.length && filesUploading.length }"
-    />
-    <div class="upload-info-successful-uploads oc-px-m oc-pb-m">
-      <ul id="files-collaborators-list" class="oc-list">
+      class="upload-info-successful-uploads oc-px-m oc-pb-m"
+      :class="{ 'oc-pt-m': successfulUploads.length }"
+    >
+      <ul class="oc-list">
         <li
           v-for="(item, idx) in successfulUploads"
           :key="idx"
+          class="oc-flex oc-flex-middle"
           :class="{ 'oc-mb-s': idx !== successfulUploads.length - 1 }"
         >
+          <oc-icon name="check" variation="success" size="small" />
           <oc-resource
             v-if="displayFileAsResource(item)"
             :key="item.path"
@@ -92,10 +84,15 @@ export default {
           { filesUploading: this.filesUploading }
         )
       }
-      if (this.uploadCancelled) {
-        return this.$gettext('Upload cancelled')
-      }
-      return this.$gettext('Upload completed')
+
+      return this.$gettextInterpolate(
+        this.$ngettext(
+          '%{ successfulUploads } upload completed',
+          '%{ successfulUploads } uploads completed',
+          this.successfulUploads.length
+        ),
+        { successfulUploads: this.successfulUploads.length }
+      )
     },
     displayThumbnails() {
       return !this.configuration.options.disablePreviews
@@ -119,6 +116,9 @@ export default {
     this.$uppyService.$on('uploadCancelled', () => {
       this.filesUploading = 0
       this.uploadCancelled = true
+      if (!this.successfulUploads.length) {
+        this.closeInfo()
+      }
     })
     this.$uppyService.$on('uploadSuccess', (file) => {
       // @TODO we need the storage ID here... maybe fetch the file via DAV and call buildResources()?
@@ -191,33 +191,70 @@ export default {
   background-color: var(--oc-color-background-secondary);
   bottom: 20px;
   width: 300px;
-}
-.upload-info-successful-uploads {
-  max-height: 50vh;
-  overflow-y: auto;
-}
-.upload-info-status-bar .uppy-StatusBar,
-.upload-info-status-bar .uppy-StatusBar-actionBtn--retry:hover {
-  background-color: unset !important;
-}
-.upload-info-status-bar .uppy-StatusBar-content {
-  padding-left: 0.25rem !important;
-  color: var(--oc-color-text-default);
-}
-.upload-info-status-bar .uppy-StatusBar-actions {
-  right: 0.25rem !important;
-}
-.upload-info-status-bar .uppy-c-btn {
-  color: var(--oc-color-text-default);
-}
-.upload-info-status-bar .uppy-StatusBar-statusSecondary {
-  color: var(--oc-color-swatch-passive-default);
-}
-.upload-info-status-bar .uppy-StatusBar-details,
-.upload-info-status-bar .uppy-StatusBar-actionBtn--retry svg {
-  display: none;
-}
-.upload-info-status-bar .uppy-StatusBar-statusPrimary {
-  font-size: 0.9rem;
+
+  .oc-resource-details {
+    padding-left: var(--oc-space-xsmall);
+  }
+
+  .oc-resource-indicators .parent-folder .text {
+    color: var(--oc-color-text-default);
+  }
+
+  .upload-info-successful-uploads {
+    max-height: 50vh;
+    overflow-y: auto;
+  }
+
+  .upload-info-status-bar {
+    .uppy-StatusBar {
+      height: unset;
+      background-color: unset !important;
+    }
+    .uppy-StatusBar-actionBtn--retry:hover {
+      background-color: unset !important;
+      text-decoration: underline;
+    }
+    .uppy-StatusBar-content {
+      padding-left: var(--oc-space-xsmall) !important;
+      color: var(--oc-color-text-default);
+      margin-top: 0.75rem;
+    }
+    .uppy-StatusBar-actions {
+      right: var(--oc-space-xsmall) !important;
+    }
+    .uppy-c-btn {
+      color: var(--oc-color-text-default);
+    }
+    .uppy-StatusBar-statusPrimary {
+      font-size: var(--oc-font-size-default);
+    }
+    .uppy-StatusBar-statusSecondary {
+      color: var(--oc-color-swatch-passive-default);
+    }
+    .uppy-StatusBar-statusIndicator {
+      margin-right: var(--oc-space-medium) !important;
+    }
+    .uppy-StatusBar-actionBtn--retry {
+      background-color: unset;
+      font-size: var(--oc-font-size-small);
+      padding: 0;
+    }
+    .uppy-StatusBar.is-error,
+    .uppy-StatusBar.is-uploading {
+      margin-top: var(--oc-space-medium);
+    }
+    .uppy-StatusBar.is-error .uppy-StatusBar-progress {
+      background-color: var(--oc-color-swatch-danger-default);
+    }
+    .uppy-StatusBar.is-error .uppy-StatusBar-statusIndicator {
+      color: var(--oc-color-swatch-danger-default);
+      width: 8px;
+      height: 8px;
+    }
+    .uppy-StatusBar-details,
+    .uppy-StatusBar-actionBtn--retry svg {
+      display: none;
+    }
+  }
 }
 </style>

From 96be3b27c09dd3e1d74a2c06230e0cb15e6c773b Mon Sep 17 00:00:00 2001
From: Jannik Stehle <jannik.stehle@gmail.com>
Date: Fri, 29 Apr 2022 10:27:18 +0200
Subject: [PATCH 2/3] Add changelog item

---
 changelog/unreleased/enhancement-polish-upload-overlay | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 changelog/unreleased/enhancement-polish-upload-overlay

diff --git a/changelog/unreleased/enhancement-polish-upload-overlay b/changelog/unreleased/enhancement-polish-upload-overlay
new file mode 100644
index 00000000000..ca679e200dc
--- /dev/null
+++ b/changelog/unreleased/enhancement-polish-upload-overlay
@@ -0,0 +1,9 @@
+Enhancement: Polish the upload overlay
+
+We polished the overlay that pops up on the bottom right corner when uploading files:
+
+* The header now shows the amount of successful uploads
+* Polished the overall design of the overlay
+
+https://github.com/owncloud/web/pull/6837
+https://github.com/owncloud/web/issues/6819

From 50c6092340b0ebdfae2c14778ea6c775a301fd43 Mon Sep 17 00:00:00 2001
From: Jannik Stehle <jannik.stehle@gmail.com>
Date: Fri, 29 Apr 2022 11:36:25 +0200
Subject: [PATCH 3/3] Use --oc-space-small css var instead of px

---
 packages/web-runtime/src/components/UploadInfo.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/web-runtime/src/components/UploadInfo.vue b/packages/web-runtime/src/components/UploadInfo.vue
index 5f0e028a826..cacda7e9af6 100644
--- a/packages/web-runtime/src/components/UploadInfo.vue
+++ b/packages/web-runtime/src/components/UploadInfo.vue
@@ -248,8 +248,8 @@ export default {
     }
     .uppy-StatusBar.is-error .uppy-StatusBar-statusIndicator {
       color: var(--oc-color-swatch-danger-default);
-      width: 8px;
-      height: 8px;
+      width: var(--oc-space-small);
+      height: var(--oc-space-small);
     }
     .uppy-StatusBar-details,
     .uppy-StatusBar-actionBtn--retry svg {