Philipp Heckel 3 лет назад
Родитель
Сommit
d44ee2bbf6

+ 2 - 2
web/src/components/Icon.js → web/src/components/AttachmentIcon.js

@@ -6,7 +6,7 @@ import fileVideo from "../img/file-video.svg";
 import fileAudio from "../img/file-audio.svg";
 import fileApp from "../img/file-app.svg";
 
-const Icon = (props) => {
+const AttachmentIcon = (props) => {
     const type = props.type;
     let imageFile;
     if (!type) {
@@ -35,4 +35,4 @@ const Icon = (props) => {
     );
 }
 
-export default Icon;
+export default AttachmentIcon;

+ 3 - 8
web/src/components/Notifications.js

@@ -33,17 +33,12 @@ import Box from "@mui/material/Box";
 import Button from "@mui/material/Button";
 import subscriptionManager from "../app/SubscriptionManager";
 import InfiniteScroll from "react-infinite-scroll-component";
-import fileApp from "../img/file-app.svg";
-import fileAudio from "../img/file-audio.svg";
-import fileDocument from "../img/file-document.svg";
-import fileImage from "../img/file-image.svg";
-import fileVideo from "../img/file-video.svg";
 import priority1 from "../img/priority-1.svg";
 import priority2 from "../img/priority-2.svg";
 import priority4 from "../img/priority-4.svg";
 import priority5 from "../img/priority-5.svg";
 import logoOutline from "../img/ntfy-outline.svg";
-import Icon from "./Icon";
+import AttachmentIcon from "./AttachmentIcon";
 
 const Notifications = (props) => {
     if (props.mode === "all") {
@@ -240,7 +235,7 @@ const Attachment = (props) => {
                     padding: 1,
                     borderRadius: '4px',
             }}>
-                <Icon type={attachment.type}/>
+                <AttachmentIcon type={attachment.type}/>
                 <Typography variant="body2" sx={{ marginLeft: 1, textAlign: 'left', color: 'text.primary' }}>
                     <b>{attachment.name}</b>
                     {maybeInfoText}
@@ -269,7 +264,7 @@ const Attachment = (props) => {
                         }
                 }}
             >
-                <Icon type={attachment.type}/>
+                <AttachmentIcon type={attachment.type}/>
                 <Typography variant="body2" sx={{ marginLeft: 1, textAlign: 'left', color: 'text.primary' }}>
                     <b>{attachment.name}</b>
                     {maybeInfoText}

+ 2 - 2
web/src/components/SendDialog.js

@@ -20,7 +20,7 @@ import {Close} from "@mui/icons-material";
 import MenuItem from "@mui/material/MenuItem";
 import {basicAuth, formatBytes, shortUrl, splitTopicUrl, validTopicUrl} from "../app/utils";
 import Box from "@mui/material/Box";
-import Icon from "./Icon";
+import AttachmentIcon from "./AttachmentIcon";
 import DialogFooter from "./DialogFooter";
 import api from "../app/Api";
 import userManager from "../app/UserManager";
@@ -483,7 +483,7 @@ const AttachmentBox = (props) => {
                 padding: 0.5,
                 borderRadius: '4px',
             }}>
-                <Icon type={file.type}/>
+                <AttachmentIcon type={file.type}/>
                 <Box sx={{ marginLeft: 1, textAlign: 'left' }}>
                     <ExpandingTextField
                         minWidth={140}