release: 0.3.5

Improved docker image (size & speed)

.github/FUNDING.yml

@@ -0,0 +1,2 @@
+# These are supported funding model platforms
+github: stonith404

CHANGELOG.md

@@ -1,3 +1,29 @@
+### [0.3.5](https://github.com/stonith404/pingvin-share/compare/v0.3.4...v0.3.5) (2022-12-11)
+
+
+### Features
+
+* upload 3 files at same time ([d010a8a](https://github.com/stonith404/pingvin-share/commit/d010a8a2d366708b1bb5088e9c1e9f9378d3e023))
+
+
+### Bug Fixes
+
+* jobs never get executed ([05cbb7b](https://github.com/stonith404/pingvin-share/commit/05cbb7b27ef98a3a80dd9edc318f1dcc9a8bd442))
+* only create zip if more than one file is in the share ([3d1d4d0](https://github.com/stonith404/pingvin-share/commit/3d1d4d0fc7c0351724387c3721280c334ae94d98))
+* remove unnecessary port expose ([084e911](https://github.com/stonith404/pingvin-share/commit/084e911eed95eb22fea0bf185803ba32c3eda1a9))
+* setup wizard table doesn't take full width ([9798e26](https://github.com/stonith404/pingvin-share/commit/9798e26872064edc1049138cf73479b1354a43ed))
+* use node slim to fix arm builds ([797f893](https://github.com/stonith404/pingvin-share/commit/797f8938cac9cc3bb788f632d97eba5c49fe98a5))
+* zip doesn't contain file extension ([5b01108](https://github.com/stonith404/pingvin-share/commit/5b0110877745f1fcde4952737a93c07ef4a2a92d))
+
+### [0.3.4](https://github.com/stonith404/pingvin-share/compare/v0.3.3...v0.3.4) (2022-12-10)
+
+
+### Bug Fixes
+
+* show alternative to copy button if site is not using https ([7e877ce](https://github.com/stonith404/pingvin-share/commit/7e877ce9f4b82d61c9b238e17def9f4c29e7aeb8))
+* sign up page available when registration is disabled ([c8a4521](https://github.com/stonith404/pingvin-share/commit/c8a4521677280d6aba89d293a1fe0c38adf9f92c))
+* tables on mobile ([b1bfb09](https://github.com/stonith404/pingvin-share/commit/b1bfb09dfd5c90cc18847470a9ce1ce8397c1476))
+
 ### [0.3.3](https://github.com/stonith404/pingvin-share/compare/v0.3.2...v0.3.3) (2022-12-08)
 
 

Dockerfile

@@ -1,27 +1,44 @@
-FROM node:18-slim AS frontend-builder
+# Using node slim because prisma ORM needs libc for ARM builds
+
+# Stage 1: on frontend dependency change
+FROM node:18-slim AS frontend-dependencies
 WORKDIR /opt/app
 COPY frontend/package.json frontend/package-lock.json ./
 RUN npm ci
+
+# Stage 2: on frontend change
+FROM node:18-slim AS frontend-builder
+WORKDIR /opt/app
 COPY ./frontend .
+COPY --from=frontend-dependencies /opt/app/node_modules ./node_modules
 RUN npm run build
 
-FROM node:18-slim AS backend-builder
-RUN apt-get update && apt-get install -y openssl
+# Stage 3: on backend dependency change
+FROM node:18-slim AS backend-dependencies
 WORKDIR /opt/app
 COPY backend/package.json backend/package-lock.json ./
 RUN npm ci
-COPY ./backend .
-RUN npx prisma generate
-RUN npm run build
 
+# Stage 4:on backend change
+FROM node:18-slim AS backend-builder
+RUN apt-get update && apt-get install -y openssl
+WORKDIR /opt/app
+COPY ./backend .
+COPY --from=backend-dependencies /opt/app/node_modules ./node_modules
+RUN npx prisma generate
+RUN npm run build  && npm prune --production
+
+# Stage 5: Final image
 FROM node:18-slim AS runner
 ENV NODE_ENV=production
 RUN apt-get update && apt-get install -y openssl
+
 WORKDIR /opt/app/frontend
-COPY --from=frontend-builder /opt/app/next.config.js .
 COPY --from=frontend-builder /opt/app/public ./public
-COPY --from=frontend-builder /opt/app/.next ./.next
-COPY --from=frontend-builder /opt/app/node_modules ./node_modules
+# Automatically leverage output traces to reduce image size
+# https://nextjs.org/docs/advanced-features/output-file-tracing
+COPY --from=frontend-builder /opt/app/.next/standalone ./
+COPY --from=frontend-builder /opt/app/.next/static ./.next/static
 
 WORKDIR /opt/app/backend
 COPY --from=backend-builder /opt/app/node_modules ./node_modules
@@ -31,4 +48,4 @@ COPY --from=backend-builder /opt/app/package.json ./
 
 WORKDIR /opt/app
 EXPOSE 3000
-CMD cd frontend && node_modules/.bin/next start & cd backend && npm run prod
+CMD node frontend/server.js & cd backend && npm run prod

backend/package.json

@@ -22,6 +22,7 @@
     "@nestjs/platform-express": "^9.2.1",
     "@nestjs/schedule": "^2.1.0",
     "@nestjs/throttler": "^3.1.0",
+    "@prisma/client": "^4.7.1",
     "archiver": "^5.3.1",
     "argon2": "^0.30.2",
     "class-transformer": "^0.5.1",
@@ -36,13 +37,13 @@
     "passport-local": "^1.0.0",
     "reflect-metadata": "^0.1.13",
     "rimraf": "^3.0.2",
-    "rxjs": "^7.6.0"
+    "rxjs": "^7.6.0",
+    "ts-node": "^10.9.1"
   },
   "devDependencies": {
     "@nestjs/cli": "^9.1.5",
     "@nestjs/schematics": "^9.0.3",
     "@nestjs/testing": "^9.2.1",
-    "@prisma/client": "^4.7.1",
     "@types/archiver": "^5.3.1",
     "@types/cron": "^2.0.0",
     "@types/express": "^4.17.14",
@@ -63,7 +64,6 @@
     "prisma": "^4.7.1",
     "source-map-support": "^0.5.21",
     "ts-loader": "^9.4.2",
-    "ts-node": "^10.9.1",
     "tsconfig-paths": "4.1.1",
     "typescript": "^4.9.3",
     "wait-on": "^6.0.1"

backend/src/app.module.ts

@@ -13,6 +13,7 @@ import { FileModule } from "./file/file.module";
 import { PrismaModule } from "./prisma/prisma.module";
 import { ShareModule } from "./share/share.module";
 import { UserModule } from "./user/user.module";
+import { JobsModule } from "./jobs/jobs.module";
 
 @Module({
   imports: [
@@ -22,6 +23,7 @@ import { UserModule } from "./user/user.module";
     EmailModule,
     PrismaModule,
     ConfigModule,
+    JobsModule,
     UserModule,
     MulterModule.registerAsync({
       useFactory: (config: ConfigService) => ({

backend/src/file/file.controller.ts

@@ -79,7 +79,7 @@ export class FileController {
     const zip = this.fileService.getZip(shareId);
     res.set({
       "Content-Type": "application/zip",
-      "Content-Disposition": `attachment ; filename="pingvin-share-${shareId}"`,
+      "Content-Disposition": `attachment ; filename="pingvin-share-${shareId}.zip"`,
     });
 
     return new StreamableFile(zip);

backend/src/jobs/jobs.module.ts

@@ -0,0 +1,9 @@
+import { Module } from "@nestjs/common";
+import { FileModule } from "src/file/file.module";
+import { JobsService } from "./jobs.service";
+
+@Module({
+  imports: [FileModule],
+  providers: [JobsService],
+})
+export class JobsModule {}

backend/src/prisma/prisma.service.ts

@@ -1,5 +1,4 @@
 import { Injectable } from "@nestjs/common";
-import { ConfigService } from "@nestjs/config";
 import { PrismaClient } from "@prisma/client";
 
 @Injectable()
@@ -8,7 +7,7 @@ export class PrismaService extends PrismaClient {
     super({
       datasources: {
         db: {
-          url: "file:../data/pingvin-share.db",
+          url: "file:../data/pingvin-share.db?connection_limit=1",
         },
       },
     });

backend/src/share/share.service.ts

@@ -105,9 +105,10 @@ export class ShareService {
       );
 
     // Asynchronously create a zip of all files
-    this.createZip(id).then(() =>
-      this.prisma.share.update({ where: { id }, data: { isZipReady: true } })
-    );
+    if (share.files.length > 1)
+      this.createZip(id).then(() =>
+        this.prisma.share.update({ where: { id }, data: { isZipReady: true } })
+      );
 
     // Send email for each recepient
     for (const recepient of share.recipients) {

frontend/next.config.js

@@ -1,10 +1,8 @@
 /** @type {import('next').NextConfig} */
 
-
 const withPWA = require("next-pwa")({
   dest: "public",
-  disable: process.env.NODE_ENV == "development"
+  disable: process.env.NODE_ENV == "development",
 });
 
-
-module.exports = withPWA();
+module.exports = withPWA({ output: "standalone" });

frontend/package-lock.json

@@ -26,6 +26,7 @@
         "next-cookies": "^2.0.3",
         "next-http-proxy-middleware": "^1.2.5",
         "next-pwa": "^5.6.0",
+        "p-limit": "^4.0.0",
         "react": "^18.2.0",
         "react-dom": "^18.2.0",
         "react-icons": "^4.7.1",
@@ -6161,6 +6162,35 @@
       }
     },
     "node_modules/p-limit": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-4.0.0.tgz",
+      "integrity": "sha512-5b0R4txpzjPWVw/cXXUResoD4hb6U/x9BH08L7nw+GN1sezDzPdxeRvpc9c433fZhBan/wusjbCsqwqm4EIBIQ==",
+      "dependencies": {
+        "yocto-queue": "^1.0.0"
+      },
+      "engines": {
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/p-locate": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
+      "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
+      "dev": true,
+      "dependencies": {
+        "p-limit": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/p-locate/node_modules/p-limit": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
       "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
@@ -6175,14 +6205,11 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/p-locate": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
-      "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
+    "node_modules/p-locate/node_modules/yocto-queue": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
+      "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
       "dev": true,
-      "dependencies": {
-        "p-limit": "^3.0.2"
-      },
       "engines": {
         "node": ">=10"
       },
@@ -8049,12 +8076,11 @@
       }
     },
     "node_modules/yocto-queue": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
-      "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
-      "dev": true,
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-1.0.0.tgz",
+      "integrity": "sha512-9bnSc/HEW2uRy67wc+T8UwauLuPJVn28jb+GtJY16iiKWyvmYJRXVT4UamsAEGQfPohgr2q4Tq0sQbQlxTfi1g==",
       "engines": {
-        "node": ">=10"
+        "node": ">=12.20"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
@@ -12482,12 +12508,11 @@
       }
     },
     "p-limit": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
-      "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
-      "dev": true,
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-4.0.0.tgz",
+      "integrity": "sha512-5b0R4txpzjPWVw/cXXUResoD4hb6U/x9BH08L7nw+GN1sezDzPdxeRvpc9c433fZhBan/wusjbCsqwqm4EIBIQ==",
       "requires": {
-        "yocto-queue": "^0.1.0"
+        "yocto-queue": "^1.0.0"
       }
     },
     "p-locate": {
@@ -12497,6 +12522,23 @@
       "dev": true,
       "requires": {
         "p-limit": "^3.0.2"
+      },
+      "dependencies": {
+        "p-limit": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
+          "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
+          "dev": true,
+          "requires": {
+            "yocto-queue": "^0.1.0"
+          }
+        },
+        "yocto-queue": {
+          "version": "0.1.0",
+          "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
+          "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
+          "dev": true
+        }
       }
     },
     "p-map": {
@@ -13865,10 +13907,9 @@
       "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg=="
     },
     "yocto-queue": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
-      "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
-      "dev": true
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-1.0.0.tgz",
+      "integrity": "sha512-9bnSc/HEW2uRy67wc+T8UwauLuPJVn28jb+GtJY16iiKWyvmYJRXVT4UamsAEGQfPohgr2q4Tq0sQbQlxTfi1g=="
     },
     "yup": {
       "version": "0.32.11",

frontend/package.json

@@ -27,6 +27,7 @@
     "next-cookies": "^2.0.3",
     "next-http-proxy-middleware": "^1.2.5",
     "next-pwa": "^5.6.0",
+    "p-limit": "^4.0.0",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "react-icons": "^4.7.1",

frontend/src/components/account/showShareLinkModal.tsx

@@ -0,0 +1,16 @@
+import { Stack, TextInput } from "@mantine/core";
+import { ModalsContextProps } from "@mantine/modals/lib/context";
+
+const showShareLinkModal = (modals: ModalsContextProps, shareId: string) => {
+  const link = `${window.location.origin}/share/${shareId}`;
+  return modals.openModal({
+    title: "Share link",
+    children: (
+      <Stack align="stretch">
+        <TextInput variant="filled" value={link} />
+      </Stack>
+    ),
+  });
+};
+
+export default showShareLinkModal;

frontend/src/components/admin/AdminConfigTable.tsx

@@ -1,4 +1,12 @@
-import { ActionIcon, Code, Group, Skeleton, Table, Text } from "@mantine/core";
+import {
+  ActionIcon,
+  Box,
+  Code,
+  Group,
+  Skeleton,
+  Table,
+  Text,
+} from "@mantine/core";
 import { useModals } from "@mantine/modals";
 import { useEffect, useState } from "react";
 import { TbEdit, TbLock } from "react-icons/tb";
@@ -43,53 +51,55 @@ const AdminConfigTable = () => {
   ));
 
   return (
-    <Table verticalSpacing="sm" horizontalSpacing="xl" withBorder>
-      <thead>
-        <tr>
-          <th>Key</th>
-          <th>Value</th>
-          <th></th>
-        </tr>
-      </thead>
-      <tbody>
-        {isLoading
-          ? skeletonRows
-          : configVariables.map((configVariable) => (
-              <tr key={configVariable.key}>
-                <td style={{ maxWidth: "200px" }}>
-                  <Code>{configVariable.key}</Code>{" "}
-                  {configVariable.secret && <TbLock />} <br />
-                  <Text size="xs" color="dimmed">
-                    {configVariable.description}
-                  </Text>
-                </td>
-                <td>
-                  {configVariable.obscured
-                    ? "•".repeat(configVariable.value.length)
-                    : configVariable.value}
-                </td>
-                <td>
-                  <Group position="right">
-                    <ActionIcon
-                      color="primary"
-                      variant="light"
-                      size={25}
-                      onClick={() =>
-                        showUpdateConfigVariableModal(
-                          modals,
-                          configVariable,
-                          getConfigVariables
-                        )
-                      }
-                    >
-                      <TbEdit />
-                    </ActionIcon>
-                  </Group>
-                </td>
-              </tr>
-            ))}
-      </tbody>
-    </Table>
+    <Box sx={{ display: "block", overflowX: "auto" }}>
+      <Table verticalSpacing="sm" horizontalSpacing="xl" withBorder>
+        <thead>
+          <tr>
+            <th>Key</th>
+            <th>Value</th>
+            <th></th>
+          </tr>
+        </thead>
+        <tbody>
+          {isLoading
+            ? skeletonRows
+            : configVariables.map((configVariable) => (
+                <tr key={configVariable.key}>
+                  <td style={{ maxWidth: "200px" }}>
+                    <Code>{configVariable.key}</Code>{" "}
+                    {configVariable.secret && <TbLock />} <br />
+                    <Text size="xs" color="dimmed">
+                      {configVariable.description}
+                    </Text>
+                  </td>
+                  <td>
+                    {configVariable.obscured
+                      ? "•".repeat(configVariable.value.length)
+                      : configVariable.value}
+                  </td>
+                  <td>
+                    <Group position="right">
+                      <ActionIcon
+                        color="primary"
+                        variant="light"
+                        size={25}
+                        onClick={() =>
+                          showUpdateConfigVariableModal(
+                            modals,
+                            configVariable,
+                            getConfigVariables
+                          )
+                        }
+                      >
+                        <TbEdit />
+                      </ActionIcon>
+                    </Group>
+                  </td>
+                </tr>
+              ))}
+        </tbody>
+      </Table>
+    </Box>
   );
 };
 

frontend/src/components/admin/ManageUserTable.tsx

@@ -18,8 +18,8 @@ const ManageUserTable = ({
   const modals = useModals();
 
   return (
-    <Box sx={{ display: "block", overflowX: "auto", whiteSpace: "nowrap" }}>
-      <Table verticalSpacing="sm" highlightOnHover>
+    <Box sx={{ display: "block", overflowX: "auto" }}>
+      <Table verticalSpacing="sm">
         <thead>
           <tr>
             <th>Username</th>

frontend/src/components/upload/modals/showCompletedUploadModal.tsx

@@ -40,14 +40,16 @@ const Body = ({ share }: { share: Share }) => {
         variant="filled"
         value={link}
         rightSection={
-          <ActionIcon
-            onClick={() => {
-              clipboard.copy(link);
-              toast.success("Your link was copied to the keyboard.");
-            }}
-          >
-            <TbCopy />
-          </ActionIcon>
+          window.isSecureContext && (
+            <ActionIcon
+              onClick={() => {
+                clipboard.copy(link);
+                toast.success("Your link was copied to the keyboard.");
+              }}
+            >
+              <TbCopy />
+            </ActionIcon>
+          )
         }
       />
       <Text

frontend/src/pages/account/shares.tsx

@@ -17,6 +17,7 @@ import Link from "next/link";
 import { useRouter } from "next/router";
 import { useEffect, useState } from "react";
 import { TbLink, TbTrash } from "react-icons/tb";
+import showShareLinkModal from "../../components/account/showShareLinkModal";
 import Meta from "../../components/Meta";
 import useUser from "../../hooks/user.hook";
 import shareService from "../../services/share.service";
@@ -83,12 +84,16 @@ const MyShares = () => {
                         variant="light"
                         size={25}
                         onClick={() => {
-                          clipboard.copy(
-                            `${window.location.origin}/share/${share.id}`
-                          );
-                          toast.success(
-                            "Your link was copied to the keyboard."
-                          );
+                          if (window.isSecureContext) {
+                            clipboard.copy(
+                              `${window.location.origin}/share/${share.id}`
+                            );
+                            toast.success(
+                              "Your link was copied to the keyboard."
+                            );
+                          } else {
+                            showShareLinkModal(modals, share.id);
+                          }
                         }}
                       >
                         <TbLink />

frontend/src/pages/admin/setup.tsx

@@ -1,4 +1,4 @@
-import { Button, Stack, Text, Title } from "@mantine/core";
+import { Box, Button, Stack, Text, Title } from "@mantine/core";
 import { useRouter } from "next/router";
 import { useState } from "react";
 import AdminConfigTable from "../../components/admin/AdminConfigTable";
@@ -28,7 +28,9 @@ const Setup = () => {
         <Logo height={80} width={80} />
         <Title order={2}>Welcome to Pingvin Share</Title>
         <Text>Let's customize Pingvin Share for you! </Text>
-        <AdminConfigTable />
+        <Box style={{ width: "100%" }}>
+          <AdminConfigTable />
+        </Box>
         <Button
           loading={isLoading}
           onClick={async () => {

frontend/src/pages/auth/signUp.tsx

@@ -10,7 +10,7 @@ const SignUp = () => {
   const router = useRouter();
   if (user) {
     router.replace("/");
-  } else if (config.get("ALLOW_REGISTRATION") == "false") {
+  } else if (!config.get("ALLOW_REGISTRATION")) {
     router.replace("/auth/signIn");
   } else {
     return (

frontend/src/pages/share/[shareId].tsx

@@ -17,7 +17,7 @@ export function getServerSideProps(context: GetServerSidePropsContext) {
 
 const Share = ({ shareId }: { shareId: string }) => {
   const modals = useModals();
-  const [fileList, setFileList] = useState<any[]>([]);
+  const [files, setFiles] = useState<any[]>([]);
 
   const getShareToken = async (password?: string) => {
     await shareService
@@ -41,7 +41,7 @@ const Share = ({ shareId }: { shareId: string }) => {
     shareService
       .get(shareId)
       .then((share) => {
-        setFileList(share.files);
+        setFiles(share.files);
       })
       .catch((e) => {
         const { error } = e.response.data;
@@ -77,14 +77,12 @@ const Share = ({ shareId }: { shareId: string }) => {
         title={`Share ${shareId}`}
         description="Look what I've shared with you."
       />
-      <Group position="right" mb="lg">
-        <DownloadAllButton shareId={shareId} />
-      </Group>
-      <FileList
-        files={fileList}
-        shareId={shareId}
-        isLoading={fileList.length == 0}
-      />
+      {files.length > 1 && (
+        <Group position="right" mb="lg">
+          <DownloadAllButton shareId={shareId} />
+        </Group>
+      )}
+      <FileList files={files} shareId={shareId} isLoading={files.length == 0} />
     </>
   );
 };

frontend/src/pages/upload.tsx

@@ -2,6 +2,7 @@ import { Button, Group } from "@mantine/core";
 import { useModals } from "@mantine/modals";
 import axios from "axios";
 import { useRouter } from "next/router";
+import pLimit from "p-limit";
 import { useEffect, useState } from "react";
 import Meta from "../components/Meta";
 import Dropzone from "../components/upload/Dropzone";
@@ -12,10 +13,11 @@ import useConfig from "../hooks/config.hook";
 import useUser from "../hooks/user.hook";
 import shareService from "../services/share.service";
 import { FileUpload } from "../types/File.type";
-import { ShareSecurity } from "../types/share.type";
+import { Share, ShareSecurity } from "../types/share.type";
 import toast from "../utils/toast.util";
 
-let share: any;
+let share: Share;
+const promiseLimit = pLimit(3);
 
 const Upload = () => {
   const router = useRouter();
@@ -41,7 +43,8 @@ const Upload = () => {
         })
       );
       share = await shareService.create(id, expiration, recipients, security);
-      for (let i = 0; i < files.length; i++) {
+      const uploadPromises = files.map((file, i) => {
+        // Callback to indicate current upload progress
         const progressCallBack = (progress: number) => {
           setFiles((files) => {
             return files.map((file, callbackIndex) => {
@@ -54,11 +57,15 @@ const Upload = () => {
         };
 
         try {
-          await shareService.uploadFile(share.id, files[i], progressCallBack);
+          return promiseLimit(() =>
+            shareService.uploadFile(share.id, file, progressCallBack)
+          );
         } catch {
-          files[i].uploadingProgress = -1;
+          file.uploadingProgress = -1;
         }
-      }
+      });
+
+      await Promise.all(uploadPromises);
     } catch (e) {
       if (axios.isAxiosError(e)) {
         toast.error(e.response?.data?.message ?? "An unkown error occured.");

package.json

@@ -1,6 +1,6 @@
 {
   "name": "pingvin-share",
-  "version": "0.3.3",
+  "version": "0.3.5",
   "scripts": {
     "format": "cd frontend && npm run format && cd ../backend && npm run format",
     "lint": "cd frontend && npm run lint && cd ../backend && npm run lint",