Allow normal user to upload.

2025-09-27 12:17:24 +00:00 · 2025-07-10 15:10:56 +08:00
parent 747f76991d
commit dd5e5193da
14 changed files with 216 additions and 17 deletions
--- a/frontend/src/app.ts
+++ b/frontend/src/app.ts
@@ -4,6 +4,8 @@ interface MyWindow extends Window {
  serverName?: string;
  cloudflareTurnstileSiteKey?: string;
  siteInfo?: string;
+  uploadPrompt?: string;
+  allowNormalUserUpload?: string;
 }

 class App {
@@ -17,6 +19,10 @@ class App {

  siteInfo = "";

+  uploadPrompt = "";
+
+  allowNormalUserUpload = true;
+
  constructor() {
    this.init();
  }
@@ -37,6 +43,8 @@ class App {
      this.cloudflareTurnstileSiteKey = null; // Placeholder value, set to null if not configured
    }
    this.siteInfo = (window as MyWindow).siteInfo || "";
+    this.uploadPrompt = (window as MyWindow).uploadPrompt || "";
+    // this.allowNormalUserUpload = (window as MyWindow).allowNormalUserUpload === "true";
  }

  saveData() {
--- a/frontend/src/network/models.ts
+++ b/frontend/src/network/models.ts
@@ -93,6 +93,7 @@ export interface Storage {
  maxSize: number;
  currentSize: number;
  createdAt: string;
+  isDefault: boolean;
 }

 export interface RFile {
@@ -157,6 +158,9 @@ export interface ServerConfig {
  server_name: string;
  server_description: string;
  site_info: string;
+  allow_normal_user_upload: boolean;
+  max_normal_user_upload_size_in_mb: number;
+  upload_prompt: string;
 }

 export enum RSort {
--- a/frontend/src/network/network.ts
+++ b/frontend/src/network/network.ts
@@ -460,6 +460,12 @@ class Network {
    );
  }

+  async setDefaultStorage(id: number): Promise<Response<Storage>> {
+    return this._callApi(() =>
+      axios.put(`${this.apiBaseUrl}/storage/${id}/default`),
+    );
+  }
+
  async initFileUpload(
    filename: string,
    description: string,
--- a/frontend/src/pages/manage_server_config_page.tsx
+++ b/frontend/src/pages/manage_server_config_page.tsx
@@ -108,7 +108,7 @@ export default function ManageServerConfigPage() {
        }}
      ></Input>
      <fieldset className="fieldset w-full">
-        <legend className="fieldset-legend">Allow register</legend>
+        <legend className="fieldset-legend">Allow registration</legend>
        <input
          type="checkbox"
          checked={config.allow_register}
@@ -164,6 +164,36 @@ export default function ManageServerConfigPage() {
        label="Site info (Markdown)"
        height={180}
      />
+      <fieldset className="fieldset w-full">
+        <legend className="fieldset-legend">Allow normal user upload</legend>
+        <input
+          type="checkbox"
+          checked={config.allow_normal_user_upload}
+          className="toggle-primary toggle"
+          onChange={(e) => {
+            setConfig({ ...config, allow_normal_user_upload: e.target.checked });
+          }}
+        />
+      </fieldset>
+      <Input
+        type="number"
+        value={config.max_normal_user_upload_size_in_mb.toString()}
+        label="Max normal user upload size (MB)"
+        onChange={(e) => {
+          setConfig({
+            ...config,
+            max_normal_user_upload_size_in_mb: parseInt(e.target.value),
+          });
+        }}
+      ></Input>
+      <Input
+        type="text"
+        value={config.upload_prompt}
+        label="Upload prompt"
+        onChange={(e) => {
+          setConfig({ ...config, upload_prompt: e.target.value });
+        }}
+      ></Input>
      <InfoAlert
        className="my-2"
        message="If the cloudflare turnstile keys are not empty, the turnstile will be used for register and download."
--- a/frontend/src/pages/manage_storage_page.tsx
+++ b/frontend/src/pages/manage_storage_page.tsx
@@ -3,10 +3,12 @@ import { Storage } from "../network/models.ts";
 import { network } from "../network/network.ts";
 import showToast from "../components/toast.ts";
 import Loading from "../components/loading.tsx";
-import { MdAdd, MdDelete } from "react-icons/md";
+import { MdAdd, MdMoreHoriz } from "react-icons/md";
 import { ErrorAlert } from "../components/alert.tsx";
 import { useTranslation } from "react-i18next";
 import { app } from "../app.ts";
+import showPopup, { PopupMenuItem } from "../components/popup.tsx";
+import Badge from "../components/badge.tsx";

 export default function StorageView() {
  const { t } = useTranslation();
@@ -84,6 +86,26 @@ export default function StorageView() {
    setLoadingId(null);
  };

+  const handleSetDefault = async (id: number) => {
+    if (loadingId != null) {
+      return;
+    }
+    setLoadingId(id);
+    const response = await network.setDefaultStorage(id);
+    if (response.success) {
+      showToast({
+        message: t("Storage set as default successfully"),
+      });
+      updateStorages();
+    } else {
+      showToast({
+        message: response.message,
+        type: "error",
+      });
+    }
+    setLoadingId(null);
+  };
+
  return (
    <>
      <div
@@ -121,7 +143,10 @@ export default function StorageView() {
            {storages.map((s) => {
              return (
                <tr key={s.id} className={"hover"}>
-                  <td>{s.name}</td>
+                  <td>
+                    {s.name}
+                    {s.isDefault && <Badge className={"ml-1"}>{t("Default")}</Badge>}
+                  </td>
                  <td>{new Date(s.createdAt).toLocaleString()}</td>
                  <td>
                    {(s.currentSize / 1024 / 1024).toFixed(2)} /{" "}
@@ -129,13 +154,39 @@ export default function StorageView() {
                  </td>
                  <td>
                    <button
+                      id={`set_default_button_${s.id}`}
                      className={"btn btn-square"}
                      type={"button"}
                      onClick={() => {
-                        const dialog = document.getElementById(
-                          `confirm_delete_dialog_${s.id}`,
-                        ) as HTMLDialogElement;
-                        dialog.showModal();
+                        showPopup(
+                          <ul className="menu bg-base-100 rounded-box z-1 w-64 p-2 shadow-sm">
+                            <h4 className="text-sm font-bold px-3 py-1 text-primary">
+                              {t("Actions")}
+                            </h4>
+                            <PopupMenuItem
+                              onClick={() => {
+                                const dialog = document.getElementById(
+                                  `confirm_delete_dialog_${s.id}`,
+                                ) as HTMLDialogElement;
+                                dialog.showModal();
+                              }}
+                            >
+                              <a>{t("Delete")}</a>
+                            </PopupMenuItem>
+                            {!s.isDefault && <PopupMenuItem
+                              onClick={() => {
+                                handleSetDefault(s.id);
+                              }}
+                            >
+                              <a>
+                                t("Set as Default")
+                              </a>
+                            </PopupMenuItem>}
+                          </ul>,
+                          document.getElementById(
+                            `set_default_button_${s.id}`,
+                          )!,
+                        );
                      }}
                    >
                      {loadingId === s.id ? (
@@ -143,7 +194,7 @@ export default function StorageView() {
                          className={"loading loading-spinner loading-sm"}
                        ></span>
                      ) : (
-                        <MdDelete size={24} />
+                        <MdMoreHoriz size={24} />
                      )}
                    </button>
                    <dialog
--- a/frontend/src/pages/resource_details_page.tsx
+++ b/frontend/src/pages/resource_details_page.tsx
@@ -404,7 +404,6 @@ function Article({ resource }: { resource: ResourceDetails }) {
      <Markdown
        components={{
          p: ({ node, ...props }) => {
-            console.log(props.children);
            if (
              typeof props.children === "object" &&
              (props.children as ReactElement).type === "strong"
@@ -722,7 +721,7 @@ function Files({ files, resourceID }: { files: RFile[]; resourceID: number }) {
        return <FileTile file={file} key={file.id}></FileTile>;
      })}
      <div className={"h-2"}></div>
-      {app.canUpload() && (
+      {app.canUpload() || app.allowNormalUserUpload && (
        <div className={"flex flex-row-reverse"}>
          <CreateFileDialog resourceId={resourceID}></CreateFileDialog>
        </div>
@@ -876,6 +875,12 @@ function CreateFileDialog({ resourceId }: { resourceId: number }) {
                showToast({ message: res.message, type: "error" });
              } else {
                storages.current = res.data!;
+                let defaultStorage = storages.current.find((s) => s.isDefault);
+                if (!defaultStorage && storages.current.length > 0) {
+                  defaultStorage = storages.current[0];
+                }
+                console.log("defaultStorage", defaultStorage);
+                setStorage(defaultStorage || null);
                setLoading(false);
                const dialog = document.getElementById(
                  "upload_dialog",
@@ -902,6 +907,10 @@ function CreateFileDialog({ resourceId }: { resourceId: number }) {
        <div className="modal-box">
          <h3 className="font-bold text-lg mb-2">{t("Create File")}</h3>

+          {app.uploadPrompt && (
+            <p className={"text-sm p-2"}>{app.uploadPrompt}</p>
+          )}
+
          <p className={"text-sm font-bold p-2"}>{t("Type")}</p>
          <form className="filter mb-2">
            <input
@@ -980,8 +989,9 @@ function CreateFileDialog({ resourceId }: { resourceId: number }) {
                )}
              </p>
              <select
+                disabled={!app.canUpload()} // normal user cannot choose storage
                className="select select-primary w-full my-2"
-                defaultValue={""}
+                value={storage?.id || ""}
                onChange={(e) => {
                  const id = parseInt(e.target.value);
                  if (isNaN(id)) {
@@ -1027,7 +1037,15 @@ function CreateFileDialog({ resourceId }: { resourceId: number }) {
            </>
          )}

-          {fileType === FileType.serverTask && (
+          {fileType === FileType.serverTask && !app.canUpload() && (
+            <p className={"text-sm p-2"}>
+              {t(
+                "You do not have permission to upload files, please contact the administrator.",
+              )}
+            </p>
+          )}
+
+          {fileType === FileType.serverTask && app.canUpload() && (
            <>
              <p className={"text-sm p-2"}>
                {t(
@@ -1035,8 +1053,9 @@ function CreateFileDialog({ resourceId }: { resourceId: number }) {
                )}
              </p>
              <select
+                disabled={!app.canUpload()}
                className="select select-primary w-full my-2"
-                defaultValue={""}
+                value={storage?.id || ""}
                onChange={(e) => {
                  const id = parseInt(e.target.value);
                  if (isNaN(id)) {